GNOME.org
 

[cantarell-fonts: 1/2] Punctuation tweaks to outlines and spacing

commit 1320078b476c908dd706ca78d491e9ef4cc44a45
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Thu Jan 2 10:25:41 2020 +0000

    Punctuation tweaks to outlines and spacing
    
    https://docs.microsoft.com/en-us/typography/develop/character-design-standards/punctuation

 .editorconfig                                      |   2 +-
 .gitlab-ci.yml                                     |   5 +-
 NEWS                                               |  39 +-
 meson.build                                        |   2 +-
 prebuilt/meson.build                               |   2 +-
 proofs/pi.py                                       |  22 +
 proofs/pi.txt                                      |   1 +
 proofs/print-characters-between-placeholders.py    |  10 +
 proofs/spacing.py                                  | 102 ++++
 proofs/test.html                                   | 368 ++++++++++++
 requirements-dev.in                                |   3 +-
 requirements-dev.txt                               |  54 +-
 requirements.in                                    |   9 +-
 requirements.txt                                   |  34 +-
 scripts/LICENSE_ufoProcessor                       |  20 -
 scripts/instantiator.py                            | 640 ++++++++++++++-------
 scripts/make-static-fonts.py                       |   8 +-
 scripts/make-variable-font.py                      |  12 +-
 src/Cantarell-Bold.ufo/features.fea                | 209 ++-----
 src/Cantarell-Bold.ufo/fontinfo.plist              |  10 +-
 .../glyphs.F_inal B_ent/be-cy.glif                 |  47 ++
 .../glyphs.F_inal B_ent/contents.plist             |   8 +
 .../glyphs.F_inal B_ent/layerinfo.plist            |  13 +
 .../glyphs.J_un 8 19, 20_46/contents.plist         |  22 +
 .../glyphs.J_un 8 19, 20_46/eight.tf.glif          |  61 ++
 .../glyphs.J_un 8 19, 20_46/five.tf.glif           |  48 ++
 .../glyphs.J_un 8 19, 20_46/four.tf.glif           |  29 +
 .../glyphs.J_un 8 19, 20_46/layerinfo.plist        |  27 +
 .../nine.tf.glif}                                  |   2 +-
 .../glyphs.J_un 8 19, 20_46/seven.tf.glif          |  25 +
 .../six.tf.glif}                                   |   4 +-
 .../glyphs.J_un 8 19, 20_46/three.tf.glif          |  57 ++
 .../glyphs.J_un 8 19, 20_46/two.tf.glif            |  41 ++
 .../glyphs.J_un 8 19, 20_55/contents.plist         |   8 +
 .../glyphs.J_un 8 19, 20_55/layerinfo.plist        |  13 +
 .../glyphs.J_un 8 19, 20_55/zero.tf.glif           |  44 ++
 .../glyphs.M_ay 11 19, 19_56/contents.plist        |   8 +
 .../glyphs.M_ay 11 19, 19_56/layerinfo.plist       |  13 +
 .../glyphs.M_ay 11 19, 19_56/six.glif              |  47 ++
 .../glyphs.M_ay 11 19, 19_57/contents.plist        |   8 +
 .../glyphs.M_ay 11 19, 19_57/five.glif             |  40 ++
 .../glyphs.M_ay 11 19, 19_57/layerinfo.plist       |  13 +
 .../glyphs.M_ay 11 19, 20_04/contents.plist        |   8 +
 .../glyphs.M_ay 11 19, 20_04/layerinfo.plist       |  13 +
 .../glyphs.M_ay 11 19, 20_04/three.glif            |  51 ++
 .../glyphs.M_ay 11 19, 20_09/contents.plist        |  10 +
 .../glyphs.M_ay 11 19, 20_09/eight.glif            |  53 ++
 .../glyphs.M_ay 11 19, 20_09/layerinfo.plist       |  15 +
 .../glyphs.M_ay 11 19, 20_09/six.glif              |  47 ++
 .../glyphs.M_ay 11 19, 20_10/contents.plist        |  10 +
 .../glyphs.M_ay 11 19, 20_10/five.glif             |  40 ++
 .../glyphs.M_ay 11 19, 20_10/four.glif             |  21 +
 .../glyphs.M_ay 11 19, 20_10/layerinfo.plist       |  15 +
 .../glyphs.M_ay 11 19, 20_11/contents.plist        |   8 +
 .../glyphs.M_ay 11 19, 20_11/layerinfo.plist       |  13 +
 .../glyphs.M_ay 11 19, 20_11/two.glif              |  33 ++
 .../glyphs.M_ay 11 19, 20_12/contents.plist        |   8 +
 .../glyphs.M_ay 11 19, 20_12/layerinfo.plist       |  13 +
 .../glyphs.M_ay 11 19, 20_12/zero.glif             |  42 ++
 .../glyphs.M_ay 5 19, 13_08/contents.plist         |  14 +
 .../glyphs.M_ay 5 19, 13_08/eight.glif             |  53 ++
 .../glyphs.M_ay 5 19, 13_08/layerinfo.plist        |  19 +
 .../f_f.glif => glyphs.M_ay 5 19, 13_08/nine.glif} |  12 +-
 .../glyphs.M_ay 5 19, 13_08/one.glif               |  23 +
 .../glyphs.M_ay 5 19, 13_08/seven.glif             |  17 +
 .../glyphs.O_utline/S_hcha-cy.glif                 |  37 ++
 .../glyphs.O_utline/contents.plist                 |  10 +
 .../glyphs.O_utline/layerinfo.plist                |  15 +
 .../glyphs.O_utline/shcha-cy.glif                  |  46 ++
 .../glyphs.S_lanted/contents.plist                 |   8 +
 src/Cantarell-Bold.ufo/glyphs.S_lanted/el-cy.glif  |  44 ++
 .../glyphs.S_lanted/layerinfo.plist                |  13 +
 src/Cantarell-Bold.ufo/glyphs.S_teeper/be-cy.glif  |  43 ++
 .../glyphs.S_teeper/contents.plist                 |   8 +
 .../glyphs.S_teeper/layerinfo.plist                |  13 +
 .../glyphs.T_emplate/florin.glif                   |   2 +
 src/Cantarell-Bold.ufo/glyphs.W_avy/be-cy.glif     |  47 ++
 src/Cantarell-Bold.ufo/glyphs.W_avy/contents.plist |   8 +
 .../glyphs.W_avy/layerinfo.plist                   |  13 +
 src/Cantarell-Bold.ufo/glyphs/A_-cy.glif           |   2 +-
 src/Cantarell-Bold.ufo/glyphs/A_.glif              |  41 +-
 src/Cantarell-Bold.ufo/glyphs/A_E_.glif            |  56 +-
 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    |   5 +-
 src/Cantarell-Bold.ufo/glyphs/A_brevedotbelow.glif |   6 +-
 src/Cantarell-Bold.ufo/glyphs/A_brevegrave.glif    |   5 +-
 .../glyphs/A_brevehookabove.glif                   |   5 +-
 src/Cantarell-Bold.ufo/glyphs/A_brevetilde.glif    |   5 +-
 src/Cantarell-Bold.ufo/glyphs/A_caron.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/A_circumflex.glif    |   4 +-
 .../glyphs/A_circumflexacute.glif                  |  20 +-
 .../glyphs/A_circumflexdotbelow.glif               |   6 +-
 .../glyphs/A_circumflexgrave.glif                  |  20 +-
 .../glyphs/A_circumflexhookabove.glif              |  20 +-
 .../glyphs/A_circumflextilde.glif                  |  20 +-
 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              |  83 +--
 src/Cantarell-Bold.ufo/glyphs/B_e-cy.glif          |  54 +-
 src/Cantarell-Bold.ufo/glyphs/C_.glif              |  67 +--
 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/C_he-cy.glif         |  52 +-
 .../glyphs/C_hedescender-cy.glif                   |   8 +-
 src/Cantarell-Bold.ufo/glyphs/C_hedieresis-cy.glif |   4 +-
 .../glyphs/C_hekhakassian-cy.glif                  |   4 +-
 .../glyphs/C_heverticalstroke-cy.glif              |  58 +-
 src/Cantarell-Bold.ufo/glyphs/D_.glif              |  55 +-
 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_e-cy.glif          |  46 +-
 src/Cantarell-Bold.ufo/glyphs/D_je-cy.glif         |  64 ++-
 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/D_zhe-cy.glif        |  34 +-
 src/Cantarell-Bold.ufo/glyphs/E_-cy.glif           |  70 ++-
 src/Cantarell-Bold.ufo/glyphs/E_.glif              |  53 +-
 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                  |  20 +-
 .../glyphs/E_circumflexdotbelow.glif               |   6 +-
 .../glyphs/E_circumflexgrave.glif                  |  20 +-
 .../glyphs/E_circumflexhookabove.glif              |  20 +-
 .../glyphs/E_circumflextilde.glif                  |  20 +-
 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_f-cy.glif          |  64 ++-
 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_l-cy.glif          |  48 +-
 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          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/E_ndescender-cy.glif |   8 +-
 src/Cantarell-Bold.ufo/glyphs/E_ng.glif            |  46 +-
 src/Cantarell-Bold.ufo/glyphs/E_nghe-cy.glif       |  42 +-
 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_reversed-cy.glif   |  72 +--
 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              |  41 +-
 src/Cantarell-Bold.ufo/glyphs/F_ita-cy.glif        |   2 +-
 src/Cantarell-Bold.ufo/glyphs/G_.glif              |  77 +--
 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_e-cy.glif          |  24 +-
 src/Cantarell-Bold.ufo/glyphs/G_edescender-cy.glif |   4 +-
 src/Cantarell-Bold.ufo/glyphs/G_ermandbls.glif     |  76 +--
 .../glyphs/G_hemiddlehook-cy.glif                  |  60 +-
 src/Cantarell-Bold.ufo/glyphs/G_hestroke-cy.glif   |  30 +-
 src/Cantarell-Bold.ufo/glyphs/G_heupturn-cy.glif   |  26 +-
 src/Cantarell-Bold.ufo/glyphs/G_je-cy.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/G_macron.glif        |   4 +-
 src/Cantarell-Bold.ufo/glyphs/H_.glif              |  49 +-
 src/Cantarell-Bold.ufo/glyphs/H_a-cy.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/H_adescender-cy.glif |  10 +-
 src/Cantarell-Bold.ufo/glyphs/H_ardsign-cy.glif    |  56 +-
 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              |  27 +-
 src/Cantarell-Bold.ufo/glyphs/I_a-cy.glif          |  64 ++-
 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-cy.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          |   3 +-
 src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/I_grave.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/I_hookabove.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/I_i-cy.glif          |  38 +-
 src/Cantarell-Bold.ufo/glyphs/I_igrave-cy.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/I_invertedbreve.glif |   4 +-
 src/Cantarell-Bold.ufo/glyphs/I_ishort-cy.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/I_macron-cy.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/I_macron.glif        |   4 +-
 src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/I_ogonek.glif        |   4 +-
 src/Cantarell-Bold.ufo/glyphs/I_tilde.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/I_u-cy.glif          |  76 +--
 src/Cantarell-Bold.ufo/glyphs/I_zhitsa-cy.glif     |  36 +-
 src/Cantarell-Bold.ufo/glyphs/J_.glif              |  41 +-
 src/Cantarell-Bold.ufo/glyphs/J_acute.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/J_circumflex.glif    |   4 +-
 src/Cantarell-Bold.ufo/glyphs/J_e-cy.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/K_.glif              |  37 +-
 src/Cantarell-Bold.ufo/glyphs/K_a-cy.glif          |  42 +-
 src/Cantarell-Bold.ufo/glyphs/K_abashkir-cy.glif   |  42 +-
 src/Cantarell-Bold.ufo/glyphs/K_acute.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/K_adescender-cy.glif |   8 +-
 .../glyphs/K_averticalstroke-cy.glif               |  48 +-
 src/Cantarell-Bold.ufo/glyphs/K_commaaccent.glif   |   4 +-
 src/Cantarell-Bold.ufo/glyphs/K_je-cy.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/L_.glif              |  33 +-
 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_je-cy.glif         |  80 +--
 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              |  49 +-
 src/Cantarell-Bold.ufo/glyphs/M_dotbelow.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/N_.glif              |  41 +-
 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_je-cy.glif         |  70 ++-
 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           |   3 +-
 src/Cantarell-Bold.ufo/glyphs/O_.glif              |  73 +--
 src/Cantarell-Bold.ufo/glyphs/O_E_.glif            |  92 ++-
 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                  |  20 +-
 .../glyphs/O_circumflexdotbelow.glif               |   6 +-
 .../glyphs/O_circumflexgrave.glif                  |  20 +-
 .../glyphs/O_circumflexhookabove.glif              |  20 +-
 .../glyphs/O_circumflextilde.glif                  |  20 +-
 src/Cantarell-Bold.ufo/glyphs/O_dblgrave.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/O_dieresis-cy.glif   |   4 +-
 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_hm.glif            |  66 +--
 src/Cantarell-Bold.ufo/glyphs/O_hookabove.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/O_horn.glif          |   6 +-
 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              |  59 +-
 src/Cantarell-Bold.ufo/glyphs/P_alochka-cy.glif    |   2 +-
 src/Cantarell-Bold.ufo/glyphs/P_e-cy.glif          |  28 +-
 src/Cantarell-Bold.ufo/glyphs/Q_.glif              |  71 +--
 src/Cantarell-Bold.ufo/glyphs/Q_a-cy.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/R_.glif              |  67 ++-
 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              |  73 ++-
 src/Cantarell-Bold.ufo/glyphs/S_acute.glif         |   4 +-
 .../glyphs/S_acutedotaccent.glif                   |   6 +-
 src/Cantarell-Bold.ufo/glyphs/S_altillo.glif       |  12 +-
 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_chwa-cy.glif       |   2 +-
 src/Cantarell-Bold.ufo/glyphs/S_chwa.glif          |  70 +--
 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/S_ha-cy.glif         |  35 +-
 src/Cantarell-Bold.ufo/glyphs/S_hcha-cy.glif       |  39 +-
 src/Cantarell-Bold.ufo/glyphs/S_hha-cy.glif        |  48 +-
 src/Cantarell-Bold.ufo/glyphs/S_oftsign-cy.glif    |  48 +-
 src/Cantarell-Bold.ufo/glyphs/T_.glif              |  35 +-
 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          |   3 +-
 src/Cantarell-Bold.ufo/glyphs/T_horn.glif          |  48 +-
 src/Cantarell-Bold.ufo/glyphs/T_linebelow.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/T_se-cy.glif         |  34 +-
 src/Cantarell-Bold.ufo/glyphs/T_she-cy.glif        |  60 +-
 src/Cantarell-Bold.ufo/glyphs/U_-cy.glif           |  24 +-
 src/Cantarell-Bold.ufo/glyphs/U_.glif              |  55 +-
 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-cy.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          |   6 +-
 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 +-
 .../glyphs/U_hungarumlaut-cy.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-cy.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_short-cy.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              |  31 +-
 src/Cantarell-Bold.ufo/glyphs/V_e-cy.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/W_.glif              |  47 +-
 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              |  43 +-
 src/Cantarell-Bold.ufo/glyphs/Y_.glif              |  37 +-
 src/Cantarell-Bold.ufo/glyphs/Y_acute.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/Y_at-cy.glif         |  58 +-
 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_eru-cy.glif        |  60 +-
 .../glyphs/Y_erudieresis-cy.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/Y_usbig-cy.glif      |  68 ++-
 src/Cantarell-Bold.ufo/glyphs/Z_.glif              |  33 +-
 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/Z_e-cy.glif          |  90 +--
 src/Cantarell-Bold.ufo/glyphs/Z_edescender-cy.glif |   4 +-
 src/Cantarell-Bold.ufo/glyphs/Z_edieresis-cy.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/Z_he-cy.glif         |  50 +-
 src/Cantarell-Bold.ufo/glyphs/Z_hebreve-cy.glif    |   4 +-
 .../glyphs/Z_hedescender-cy.glif                   |  10 +-
 src/Cantarell-Bold.ufo/glyphs/Z_hedieresis-cy.glif |   4 +-
 src/Cantarell-Bold.ufo/glyphs/_currencyvstem.glif  |   8 +-
 .../glyphs/_descenderreverse-cy.case.glif          |   2 +-
 .../glyphs/_descenderreversed-cy.glif              |   2 +-
 src/Cantarell-Bold.ufo/glyphs/_o.numero.glif       |  16 -
 src/Cantarell-Bold.ufo/glyphs/_typoquote.glif      |  14 +-
 src/Cantarell-Bold.ufo/glyphs/a-cy.glif            |   3 +-
 src/Cantarell-Bold.ufo/glyphs/a.glif               |  91 +--
 src/Cantarell-Bold.ufo/glyphs/aacute.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/abreve-cy.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/abreve.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/abreveacute.glif     |   5 +-
 src/Cantarell-Bold.ufo/glyphs/abrevedotbelow.glif  |   6 +-
 src/Cantarell-Bold.ufo/glyphs/abrevegrave.glif     |   5 +-
 src/Cantarell-Bold.ufo/glyphs/abrevehookabove.glif |   5 +-
 src/Cantarell-Bold.ufo/glyphs/abrevetilde.glif     |   5 +-
 src/Cantarell-Bold.ufo/glyphs/acaron.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/acircumflex.glif     |   4 +-
 .../glyphs/acircumflexacute.glif                   |  20 +-
 .../glyphs/acircumflexdotbelow.glif                |   6 +-
 .../glyphs/acircumflexgrave.glif                   |  20 +-
 .../glyphs/acircumflexhookabove.glif               |  20 +-
 .../glyphs/acircumflextilde.glif                   |   5 +-
 src/Cantarell-Bold.ufo/glyphs/acute.glif           |  10 +-
 .../glyphs/acutecomb_dotaccentcomb.glif            |  18 -
 src/Cantarell-Bold.ufo/glyphs/adblgrave.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/adieresis-cy.glif    |   4 +-
 src/Cantarell-Bold.ufo/glyphs/adieresis.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/adotbelow.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ae.glif              | 140 ++---
 src/Cantarell-Bold.ufo/glyphs/aeacute.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/agrave.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ahookabove.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/aie-cy.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/ainvertedbreve.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/amacron.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ampersand.glif       |  78 +--
 src/Cantarell-Bold.ufo/glyphs/aogonek.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/apostrophemod.glif   |   4 +-
 src/Cantarell-Bold.ufo/glyphs/approxequal.glif     |  88 +--
 src/Cantarell-Bold.ufo/glyphs/approxequal.tf.glif  |  50 --
 src/Cantarell-Bold.ufo/glyphs/aring.glif           |   4 +-
 src/Cantarell-Bold.ufo/glyphs/aringacute.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/asciicircum.glif     |  24 +-
 src/Cantarell-Bold.ufo/glyphs/asciitilde.glif      |  48 +-
 src/Cantarell-Bold.ufo/glyphs/asterisk.glif        |  56 +-
 src/Cantarell-Bold.ufo/glyphs/at.glif              | 140 ++---
 src/Cantarell-Bold.ufo/glyphs/atilde.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/b.glif               |  79 +--
 src/Cantarell-Bold.ufo/glyphs/backslash.glif       |  12 +-
 src/Cantarell-Bold.ufo/glyphs/bar.glif             |  18 +-
 src/Cantarell-Bold.ufo/glyphs/be-cy.glif           |  72 ++-
 src/Cantarell-Bold.ufo/glyphs/blackC_ircle.glif    |  29 +-
 src/Cantarell-Bold.ufo/glyphs/blank.glif           |  29 +-
 src/Cantarell-Bold.ufo/glyphs/braceleft.glif       |  64 +--
 src/Cantarell-Bold.ufo/glyphs/braceright.glif      |  12 +-
 src/Cantarell-Bold.ufo/glyphs/bracketleft.glif     |  18 +-
 src/Cantarell-Bold.ufo/glyphs/bracketright.glif    |  12 +-
 src/Cantarell-Bold.ufo/glyphs/breve.glif           |  10 +-
 src/Cantarell-Bold.ufo/glyphs/brevecomb-cy.glif    |  28 +-
 .../glyphs/brevecomb_acutecomb.case.glif           |  13 -
 .../glyphs/brevecomb_acutecomb.glif                |  13 -
 .../glyphs/brevecomb_gravecomb.case.glif           |  13 -
 .../glyphs/brevecomb_gravecomb.glif                |  13 -
 .../glyphs/brevecomb_hookabovecomb.case.glif       |  13 -
 .../glyphs/brevecomb_hookabovecomb.glif            |  13 -
 .../glyphs/brevecomb_tildecomb.case.glif           |  13 -
 .../glyphs/brevecomb_tildecomb.glif                |  13 -
 .../glyphs/breveinvertedcomb.case.glif             |   2 +-
 src/Cantarell-Bold.ufo/glyphs/brokenbar.glif       |  26 +-
 src/Cantarell-Bold.ufo/glyphs/bullet.glif          |  23 +-
 src/Cantarell-Bold.ufo/glyphs/bulletoperator.glif  |  10 +-
 .../glyphs/bulletoperator.tf.glif                  |  20 -
 src/Cantarell-Bold.ufo/glyphs/c.glif               |  61 +-
 src/Cantarell-Bold.ufo/glyphs/cacute.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/caron.glif           |  10 +-
 .../glyphs/caroncomb.loclV_I_E_T_.glif             |   4 +-
 .../glyphs/caroncomb_dotaccentcomb.glif            |  18 -
 src/Cantarell-Bold.ufo/glyphs/ccaron.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ccedilla.glif        |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ccedillaacute.glif   |   6 +-
 src/Cantarell-Bold.ufo/glyphs/ccircumflex.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/cdotaccent.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/cedi.glif            |  53 +-
 src/Cantarell-Bold.ufo/glyphs/cedilla.glif         |  10 +-
 src/Cantarell-Bold.ufo/glyphs/cent.glif            |  10 +-
 src/Cantarell-Bold.ufo/glyphs/che-cy.glif          |  48 +-
 src/Cantarell-Bold.ufo/glyphs/chedescender-cy.glif |   6 +-
 src/Cantarell-Bold.ufo/glyphs/chedieresis-cy.glif  |   4 +-
 .../glyphs/chekhakassian-cy.glif                   |   4 +-
 .../glyphs/cheverticalstroke-cy.glif               |  58 +-
 src/Cantarell-Bold.ufo/glyphs/circumflex.glif      |  10 +-
 src/Cantarell-Bold.ufo/glyphs/circumflexcomb.glif  |   2 +-
 .../glyphs/circumflexcomb.loclV_I_E_T_.glif        |   2 +-
 .../glyphs/circumflexcomb_acutecomb.case.glif      |  13 -
 .../glyphs/circumflexcomb_acutecomb.glif           |  18 -
 .../glyphs/circumflexcomb_gravecomb.case.glif      |  13 -
 .../glyphs/circumflexcomb_gravecomb.glif           |  18 -
 .../glyphs/circumflexcomb_hookabovecomb.case.glif  |  13 -
 .../glyphs/circumflexcomb_hookabovecomb.glif       |  13 -
 .../glyphs/circumflexcomb_tildecomb.case.glif      |  13 -
 .../glyphs/circumflexcomb_tildecomb.glif           |  13 -
 src/Cantarell-Bold.ufo/glyphs/colon.glif           |   4 +-
 src/Cantarell-Bold.ufo/glyphs/colonsign.glif       |  69 ++-
 src/Cantarell-Bold.ufo/glyphs/comma.glif           |  18 +-
 .../glyphs/commaturnedabovecomb.glif               |   8 +-
 src/Cantarell-Bold.ufo/glyphs/commaturnedmod.glif  |   4 +-
 .../glyphs/commercialM_inusS_ign.glif              |  64 ++-
 .../glyphs/commercialM_inusS_ign.tf.glif           |  40 --
 src/Cantarell-Bold.ufo/glyphs/contents.plist       | 140 +----
 src/Cantarell-Bold.ufo/glyphs/copyright.glif       | 108 ++--
 src/Cantarell-Bold.ufo/glyphs/currency.glif        |  88 +--
 src/Cantarell-Bold.ufo/glyphs/d.glif               |  83 +--
 src/Cantarell-Bold.ufo/glyphs/dagger.glif          |  30 +-
 src/Cantarell-Bold.ufo/glyphs/daggerdbl.glif       |  54 +-
 src/Cantarell-Bold.ufo/glyphs/dblgravecomb.glif    |  12 +-
 src/Cantarell-Bold.ufo/glyphs/dcaron.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/dcroat.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ddotbelow.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/de-cy.glif           |  46 +-
 src/Cantarell-Bold.ufo/glyphs/degree.glif          |  56 +-
 .../glyphs/descender-cy.case.glif                  |   6 +-
 src/Cantarell-Bold.ufo/glyphs/descender-cy.glif    |   4 +-
 src/Cantarell-Bold.ufo/glyphs/dieresis.glif        |  10 +-
 .../glyphs/dieresisbelowcomb.glif                  |  28 +-
 src/Cantarell-Bold.ufo/glyphs/dieresiscomb.glif    |  28 +-
 .../glyphs/dieresiscomb.loclV_I_E_T_.glif          |  28 +-
 .../glyphs/dieresiscomb_acutecomb.glif             |  18 -
 .../glyphs/dieresiscomb_caroncomb.glif             |  18 -
 .../glyphs/dieresiscomb_gravecomb.glif             |  18 -
 .../glyphs/dieresiscomb_macroncomb.glif            |  18 -
 src/Cantarell-Bold.ufo/glyphs/divide.glif          |  64 ++-
 src/Cantarell-Bold.ufo/glyphs/divide.tf.glif       |  40 --
 src/Cantarell-Bold.ufo/glyphs/divisionslash.glif   |  15 +-
 .../glyphs/divisionslash.tf.glif                   |  12 -
 src/Cantarell-Bold.ufo/glyphs/dje-cy.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/dlinebelow.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/dollar.glif          |  59 +-
 src/Cantarell-Bold.ufo/glyphs/dong.glif            |  58 +-
 src/Cantarell-Bold.ufo/glyphs/dotaccent.glif       |  10 +-
 .../glyphs/dotaccentcomb_macroncomb.glif           |  13 -
 src/Cantarell-Bold.ufo/glyphs/doubleprimemod.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/downA_rrow.glif      |  15 +-
 src/Cantarell-Bold.ufo/glyphs/dzcaron.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/dze-cy.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/dzhe-cy.glif         |  30 +-
 src/Cantarell-Bold.ufo/glyphs/e-cy.glif            |  74 +--
 src/Cantarell-Bold.ufo/glyphs/e.glif               |  81 +--
 src/Cantarell-Bold.ufo/glyphs/eacute.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ebreve.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ecaron.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ecedillabreve.glif   |   6 +-
 src/Cantarell-Bold.ufo/glyphs/ecircumflex.glif     |   4 +-
 .../glyphs/ecircumflexacute.glif                   |  20 +-
 .../glyphs/ecircumflexdotbelow.glif                |   6 +-
 .../glyphs/ecircumflexgrave.glif                   |  20 +-
 .../glyphs/ecircumflexhookabove.glif               |  20 +-
 .../glyphs/ecircumflextilde.glif                   |   5 +-
 src/Cantarell-Bold.ufo/glyphs/edblgrave.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/edieresis.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/edotaccent.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/edotbelow.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ef-cy.glif           | 122 ++--
 src/Cantarell-Bold.ufo/glyphs/egrave.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ehookabove.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/eight.dnom.glif      |  99 ++--
 src/Cantarell-Bold.ufo/glyphs/eight.glif           |  90 +--
 src/Cantarell-Bold.ufo/glyphs/eight.numr.glif      |   2 +-
 src/Cantarell-Bold.ufo/glyphs/eight.osf.glif       |  98 ++--
 src/Cantarell-Bold.ufo/glyphs/eight.tf.glif        |  49 +-
 src/Cantarell-Bold.ufo/glyphs/eight.tosf.glif      |  61 --
 src/Cantarell-Bold.ufo/glyphs/eightinferior.glif   |   2 +-
 src/Cantarell-Bold.ufo/glyphs/eightsuperior.glif   |   2 +-
 src/Cantarell-Bold.ufo/glyphs/einvertedbreve.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/el-cy.glif           |  44 +-
 src/Cantarell-Bold.ufo/glyphs/ellipsis.glif        |  14 +-
 src/Cantarell-Bold.ufo/glyphs/em-cy.glif           |  38 +-
 src/Cantarell-Bold.ufo/glyphs/emacron.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/emacronacute.glif    |   5 +-
 src/Cantarell-Bold.ufo/glyphs/emacrongrave.glif    |   5 +-
 src/Cantarell-Bold.ufo/glyphs/emdash.glif          |  11 +-
 src/Cantarell-Bold.ufo/glyphs/emptyset.glif        |  58 +-
 src/Cantarell-Bold.ufo/glyphs/emquad.glif          |   7 -
 src/Cantarell-Bold.ufo/glyphs/emspace.glif         |   1 +
 src/Cantarell-Bold.ufo/glyphs/en-cy.glif           |  32 +-
 src/Cantarell-Bold.ufo/glyphs/endash.glif          |  10 +-
 src/Cantarell-Bold.ufo/glyphs/endescender-cy.glif  |   6 +-
 src/Cantarell-Bold.ufo/glyphs/eng.glif             |  64 +--
 src/Cantarell-Bold.ufo/glyphs/enghe-cy.glif        |  42 +-
 src/Cantarell-Bold.ufo/glyphs/enquad.glif          |   7 -
 src/Cantarell-Bold.ufo/glyphs/enspace.glif         |   1 +
 src/Cantarell-Bold.ufo/glyphs/eogonek.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/equal.glif           |  24 +-
 src/Cantarell-Bold.ufo/glyphs/equal.tf.glif        |  18 -
 src/Cantarell-Bold.ufo/glyphs/equivalence.glif     |  34 +-
 src/Cantarell-Bold.ufo/glyphs/equivalence.tf.glif  |  24 -
 src/Cantarell-Bold.ufo/glyphs/er-cy.glif           |   2 +-
 src/Cantarell-Bold.ufo/glyphs/ereversed-cy.glif    |  68 +--
 src/Cantarell-Bold.ufo/glyphs/es-cy.glif           |   2 +-
 src/Cantarell-Bold.ufo/glyphs/esdescender-cy.glif  |   2 +-
 src/Cantarell-Bold.ufo/glyphs/estimated.glif       |  62 +-
 src/Cantarell-Bold.ufo/glyphs/etilde.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/euro.glif            |  76 +--
 src/Cantarell-Bold.ufo/glyphs/exclam.glif          |  34 +-
 src/Cantarell-Bold.ufo/glyphs/exclamdown.glif      |  12 +-
 src/Cantarell-Bold.ufo/glyphs/f.glif               |  49 +-
 src/Cantarell-Bold.ufo/glyphs/fi.glif              |   4 +-
 src/Cantarell-Bold.ufo/glyphs/figuredash.glif      |  16 +-
 src/Cantarell-Bold.ufo/glyphs/figurespace.glif     |   8 +-
 .../glyphs/firsttonechinese.glif                   |   4 +-
 src/Cantarell-Bold.ufo/glyphs/fita-cy.glif         |   2 +-
 src/Cantarell-Bold.ufo/glyphs/five.dnom.glif       |  73 ++-
 src/Cantarell-Bold.ufo/glyphs/five.glif            |  64 +--
 src/Cantarell-Bold.ufo/glyphs/five.numr.glif       |   2 +-
 src/Cantarell-Bold.ufo/glyphs/five.osf.glif        |  72 +--
 src/Cantarell-Bold.ufo/glyphs/five.tf.glif         |  36 +-
 src/Cantarell-Bold.ufo/glyphs/five.tosf.glif       |  48 --
 src/Cantarell-Bold.ufo/glyphs/fiveeighths.glif     |   6 +-
 src/Cantarell-Bold.ufo/glyphs/fiveinferior.glif    |   2 +-
 src/Cantarell-Bold.ufo/glyphs/fivesixths.glif      |   6 +-
 src/Cantarell-Bold.ufo/glyphs/fivesuperior.glif    |   2 +-
 src/Cantarell-Bold.ufo/glyphs/fl.glif              |   4 +-
 src/Cantarell-Bold.ufo/glyphs/florin.glif          |  68 ++-
 src/Cantarell-Bold.ufo/glyphs/four.dnom.glif       |  35 +-
 src/Cantarell-Bold.ufo/glyphs/four.glif            |  26 +-
 src/Cantarell-Bold.ufo/glyphs/four.numr.glif       |   2 +-
 src/Cantarell-Bold.ufo/glyphs/four.osf.glif        |  34 +-
 src/Cantarell-Bold.ufo/glyphs/four.tf.glif         |  26 +-
 src/Cantarell-Bold.ufo/glyphs/four.tosf.glif       |  29 -
 src/Cantarell-Bold.ufo/glyphs/fourfifths.glif      |   6 +-
 src/Cantarell-Bold.ufo/glyphs/fourinferior.glif    |   2 +-
 src/Cantarell-Bold.ufo/glyphs/foursuperior.glif    |   2 +-
 .../glyphs/fourthtonechinese.glif                  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/fraction.glif        |  10 +-
 src/Cantarell-Bold.ufo/glyphs/franc.glif           |  29 +-
 src/Cantarell-Bold.ufo/glyphs/g.glif               | 103 ++--
 src/Cantarell-Bold.ufo/glyphs/gbreve.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/gcaron.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/gcircumflex.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/gcommaaccent.glif    |   4 +-
 src/Cantarell-Bold.ufo/glyphs/gdotaccent.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ge-cy.glif           |  20 +-
 src/Cantarell-Bold.ufo/glyphs/gedescender-cy.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/germandbls.glif      |   6 +
 .../glyphs/ghemiddlehook-cy.glif                   |  56 +-
 src/Cantarell-Bold.ufo/glyphs/ghestroke-cy.glif    |  28 +-
 src/Cantarell-Bold.ufo/glyphs/gheupturn-cy.glif    |  26 +-
 src/Cantarell-Bold.ufo/glyphs/gje-cy.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/gmacron.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/grave.glif           |  10 +-
 src/Cantarell-Bold.ufo/glyphs/greater.glif         |  24 +-
 src/Cantarell-Bold.ufo/glyphs/greater.tf.glif      |  16 -
 src/Cantarell-Bold.ufo/glyphs/greaterequal.glif    |  32 +-
 src/Cantarell-Bold.ufo/glyphs/greaterequal.tf.glif |  22 -
 src/Cantarell-Bold.ufo/glyphs/guarani.glif         |  58 +-
 src/Cantarell-Bold.ufo/glyphs/guillemetleft.glif   |  30 +-
 src/Cantarell-Bold.ufo/glyphs/guillemetright.glif  |  38 +-
 src/Cantarell-Bold.ufo/glyphs/guilsinglleft.glif   |  16 +-
 src/Cantarell-Bold.ufo/glyphs/guilsinglright.glif  |  24 +-
 src/Cantarell-Bold.ufo/glyphs/h.glif               |  59 +-
 src/Cantarell-Bold.ufo/glyphs/ha-cy.glif           |   4 +-
 src/Cantarell-Bold.ufo/glyphs/hadescender-cy.glif  |   6 +-
 src/Cantarell-Bold.ufo/glyphs/hardsign-cy.glif     |  54 +-
 src/Cantarell-Bold.ufo/glyphs/hbar.glif            |   4 +-
 src/Cantarell-Bold.ufo/glyphs/hbrevebelow.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/hcircumflex.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/hdotbelow.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/horizontalbar.glif   |   8 -
 src/Cantarell-Bold.ufo/glyphs/hryvnia.glif         |  62 ++
 src/Cantarell-Bold.ufo/glyphs/hungarumlaut.glif    |  10 +-
 .../glyphs/hungarumlautcomb.case.glif              |  12 +-
 src/Cantarell-Bold.ufo/glyphs/hyphen.glif          |  11 +-
 src/Cantarell-Bold.ufo/glyphs/hyphentwo.glif       |   8 -
 src/Cantarell-Bold.ufo/glyphs/i-cy.glif            |   2 +-
 src/Cantarell-Bold.ufo/glyphs/i.glif               |   8 +-
 src/Cantarell-Bold.ufo/glyphs/ia-cy.glif           |  58 +-
 src/Cantarell-Bold.ufo/glyphs/iacute.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ibreve.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/icaron.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/icircumflex.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/idblgrave.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/idieresis-cy.glif    |   4 +-
 src/Cantarell-Bold.ufo/glyphs/idieresis.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/idieresisacute.glif  |   5 +-
 src/Cantarell-Bold.ufo/glyphs/idotaccent.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/idotbelow.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/idotless.glif        |  27 +-
 src/Cantarell-Bold.ufo/glyphs/ie-cy.glif           |   3 +-
 src/Cantarell-Bold.ufo/glyphs/iebreve-cy.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/iegrave-cy.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/igrave.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ihookabove.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ii-cy.glif           |  34 +-
 src/Cantarell-Bold.ufo/glyphs/iigrave-cy.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/iinvertedbreve.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/iishort-cy.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/imacron-cy.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/imacron.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/increment.glif       |  18 +-
 src/Cantarell-Bold.ufo/glyphs/infinity.glif        |  74 +--
 src/Cantarell-Bold.ufo/glyphs/integral.glif        |  66 +--
 src/Cantarell-Bold.ufo/glyphs/io-cy.glif           |   4 +-
 src/Cantarell-Bold.ufo/glyphs/iogonek.glif         |   6 +-
 src/Cantarell-Bold.ufo/glyphs/itilde.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/iu-cy.glif           |  72 +--
 src/Cantarell-Bold.ufo/glyphs/izhitsa-cy.glif      |  32 +-
 src/Cantarell-Bold.ufo/glyphs/j.glif               |   7 +-
 src/Cantarell-Bold.ufo/glyphs/jacute.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/jcircumflex.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/jdotless.glif        |  35 +-
 src/Cantarell-Bold.ufo/glyphs/je-cy.glif           |   2 +-
 src/Cantarell-Bold.ufo/glyphs/k.glif               |  37 +-
 src/Cantarell-Bold.ufo/glyphs/ka-cy.glif           |  38 +-
 src/Cantarell-Bold.ufo/glyphs/kabashkir-cy.glif    |  42 +-
 src/Cantarell-Bold.ufo/glyphs/kacute.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/kadescender-cy.glif  |   8 +-
 .../glyphs/kaverticalstroke-cy.glif                |  40 +-
 src/Cantarell-Bold.ufo/glyphs/kcommaaccent.glif    |   4 +-
 src/Cantarell-Bold.ufo/glyphs/kgreenlandic.glif    |  24 +-
 src/Cantarell-Bold.ufo/glyphs/kip.glif             |  38 +-
 src/Cantarell-Bold.ufo/glyphs/kje-cy.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/l.glif               |  53 +-
 src/Cantarell-Bold.ufo/glyphs/l.ss01.glif          |  25 +
 src/Cantarell-Bold.ufo/glyphs/lacute.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/layerinfo.plist      | 158 +----
 src/Cantarell-Bold.ufo/glyphs/lcaron.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/lcommaaccent.glif    |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ldot.glif            |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ldotbelow.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/leftA_rrow.glif      |  15 +-
 .../glyphs/leftanglebracket-math.glif              |  16 +-
 src/Cantarell-Bold.ufo/glyphs/less.glif            |  12 +-
 src/Cantarell-Bold.ufo/glyphs/less.tf.glif         |   7 -
 src/Cantarell-Bold.ufo/glyphs/lessequal.glif       |  12 +-
 src/Cantarell-Bold.ufo/glyphs/lessequal.tf.glif    |   7 -
 src/Cantarell-Bold.ufo/glyphs/lira.glif            |  74 +--
 src/Cantarell-Bold.ufo/glyphs/liraT_urkish.glif    |  49 +-
 src/Cantarell-Bold.ufo/glyphs/literS_ign.glif      |  70 +--
 src/Cantarell-Bold.ufo/glyphs/lj.glif              |   4 +-
 src/Cantarell-Bold.ufo/glyphs/lje-cy.glif          |  80 +--
 src/Cantarell-Bold.ufo/glyphs/llinebelow.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/logicalnot.glif      |  24 +-
 src/Cantarell-Bold.ufo/glyphs/logicalnot.tf.glif   |  18 -
 src/Cantarell-Bold.ufo/glyphs/lozenge.glif         |  28 +-
 src/Cantarell-Bold.ufo/glyphs/lslash.glif          |   8 +-
 src/Cantarell-Bold.ufo/glyphs/m.glif               |  91 +--
 src/Cantarell-Bold.ufo/glyphs/macron.glif          |  10 +-
 .../glyphs/macroncomb_acutecomb.glif               |  18 -
 .../glyphs/macroncomb_dieresiscomb.glif            |  13 -
 .../glyphs/macroncomb_gravecomb.glif               |  18 -
 src/Cantarell-Bold.ufo/glyphs/manat.glif           |  52 +-
 src/Cantarell-Bold.ufo/glyphs/mdotbelow.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/micro.glif           |  56 +-
 src/Cantarell-Bold.ufo/glyphs/minus.glif           |  16 +-
 src/Cantarell-Bold.ufo/glyphs/minus.tf.glif        |  12 -
 src/Cantarell-Bold.ufo/glyphs/minute.glif          |   7 +-
 src/Cantarell-Bold.ufo/glyphs/multiply.glif        |  24 +-
 src/Cantarell-Bold.ufo/glyphs/multiply.tf.glif     |  18 -
 src/Cantarell-Bold.ufo/glyphs/n.glif               |  51 +-
 src/Cantarell-Bold.ufo/glyphs/nacute.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/naira.glif           |  55 +-
 src/Cantarell-Bold.ufo/glyphs/nbspace.glif         |  13 -
 src/Cantarell-Bold.ufo/glyphs/ncaron.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ncommaaccent.glif    |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ndotaccent.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ndotbelow.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/nine.dnom.glif       |  87 ++-
 src/Cantarell-Bold.ufo/glyphs/nine.glif            |  12 +-
 src/Cantarell-Bold.ufo/glyphs/nine.numr.glif       |   2 +-
 src/Cantarell-Bold.ufo/glyphs/nine.osf.glif        |  86 +--
 src/Cantarell-Bold.ufo/glyphs/nine.tf.glif         |  43 +-
 src/Cantarell-Bold.ufo/glyphs/nineinferior.glif    |   2 +-
 src/Cantarell-Bold.ufo/glyphs/ninesuperior.glif    |   2 +-
 src/Cantarell-Bold.ufo/glyphs/nj.glif              |   4 +-
 src/Cantarell-Bold.ufo/glyphs/nje-cy.glif          |  70 ++-
 src/Cantarell-Bold.ufo/glyphs/nlinebelow.glif      |   4 +-
 .../glyphs/nonbreakinghyphen.glif                  |  16 -
 src/Cantarell-Bold.ufo/glyphs/notequal.glif        |  34 +-
 src/Cantarell-Bold.ufo/glyphs/notequal.tf.glif     |  24 -
 src/Cantarell-Bold.ufo/glyphs/notidentical.glif    |  40 +-
 src/Cantarell-Bold.ufo/glyphs/notidentical.tf.glif |  30 -
 src/Cantarell-Bold.ufo/glyphs/ntilde.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/numbersign.glif      |  40 +-
 src/Cantarell-Bold.ufo/glyphs/numero.glif          |   8 +-
 src/Cantarell-Bold.ufo/glyphs/o-cy.glif            |   3 +-
 src/Cantarell-Bold.ufo/glyphs/o.glif               |  63 +-
 src/Cantarell-Bold.ufo/glyphs/oacute.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/obarred-cy.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/obreve.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ocaron.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ocircumflex.glif     |   4 +-
 .../glyphs/ocircumflexacute.glif                   |  20 +-
 .../glyphs/ocircumflexdotbelow.glif                |   6 +-
 .../glyphs/ocircumflexgrave.glif                   |  20 +-
 .../glyphs/ocircumflexhookabove.glif               |  20 +-
 .../glyphs/ocircumflextilde.glif                   |   5 +-
 src/Cantarell-Bold.ufo/glyphs/odblgrave.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/odieresis-cy.glif    |   4 +-
 src/Cantarell-Bold.ufo/glyphs/odieresis.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/odieresismacron.glif |   5 +-
 .../glyphs/odotaccentmacron.glif                   |   5 +-
 src/Cantarell-Bold.ufo/glyphs/odotbelow.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/oe.glif              | 116 ++--
 src/Cantarell-Bold.ufo/glyphs/ogonek.glif          |  10 +-
 src/Cantarell-Bold.ufo/glyphs/ograve.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ohookabove.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ohorn.glif           |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ohornacute.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ohorndotbelow.glif   |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ohorngrave.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ohornhookabove.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ohorntilde.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ohungarumlaut.glif   |   4 +-
 src/Cantarell-Bold.ufo/glyphs/oinvertedbreve.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/omacron.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/omacronacute.glif    |   5 +-
 src/Cantarell-Bold.ufo/glyphs/omacrongrave.glif    |   5 +-
 src/Cantarell-Bold.ufo/glyphs/one.dnom.glif        |  33 +-
 src/Cantarell-Bold.ufo/glyphs/one.glif             |  24 +-
 src/Cantarell-Bold.ufo/glyphs/one.numr.glif        |   2 +-
 src/Cantarell-Bold.ufo/glyphs/one.osf.glif         |  32 +-
 src/Cantarell-Bold.ufo/glyphs/one.tf.glif          |  26 +-
 src/Cantarell-Bold.ufo/glyphs/one.tosf.glif        |  31 -
 src/Cantarell-Bold.ufo/glyphs/oneeighth.glif       |   6 +-
 src/Cantarell-Bold.ufo/glyphs/onefifth.glif        |   6 +-
 src/Cantarell-Bold.ufo/glyphs/onefraction.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/onehalf.glif         |   6 +-
 src/Cantarell-Bold.ufo/glyphs/oneinferior.glif     |   2 +-
 src/Cantarell-Bold.ufo/glyphs/oneninth.glif        |   6 +-
 src/Cantarell-Bold.ufo/glyphs/onequarter.glif      |   6 +-
 src/Cantarell-Bold.ufo/glyphs/oneseventh.glif      |   6 +-
 src/Cantarell-Bold.ufo/glyphs/onesixth.glif        |   6 +-
 src/Cantarell-Bold.ufo/glyphs/onesuperior.glif     |   2 +-
 src/Cantarell-Bold.ufo/glyphs/onetenth.glif        |   8 +-
 src/Cantarell-Bold.ufo/glyphs/onethird.glif        |   6 +-
 src/Cantarell-Bold.ufo/glyphs/oogonek.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ordfeminine.glif     |  76 +--
 src/Cantarell-Bold.ufo/glyphs/ordmasculine.glif    |  50 +-
 src/Cantarell-Bold.ufo/glyphs/oslash.glif          |  68 ++-
 src/Cantarell-Bold.ufo/glyphs/oslashacute.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/otilde.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/otildeacute.glif     |   5 +-
 src/Cantarell-Bold.ufo/glyphs/otildedieresis.glif  |   5 +-
 src/Cantarell-Bold.ufo/glyphs/otildemacron.glif    |   5 +-
 src/Cantarell-Bold.ufo/glyphs/p.glif               |  79 +--
 src/Cantarell-Bold.ufo/glyphs/palochka-cy.glif     |   2 +-
 src/Cantarell-Bold.ufo/glyphs/paragraph.glif       |  38 +-
 src/Cantarell-Bold.ufo/glyphs/parenleft.glif       |  30 +-
 src/Cantarell-Bold.ufo/glyphs/parenright.glif      |  12 +-
 src/Cantarell-Bold.ufo/glyphs/partialdiff.glif     |  78 +--
 src/Cantarell-Bold.ufo/glyphs/pe-cy.glif           |  24 +-
 src/Cantarell-Bold.ufo/glyphs/percent.glif         | 112 ++--
 src/Cantarell-Bold.ufo/glyphs/period.glif          |  26 +-
 src/Cantarell-Bold.ufo/glyphs/periodcentered.glif  |  10 +-
 .../glyphs/periodcentered.loclC_A_T_.glif          |  24 +-
 src/Cantarell-Bold.ufo/glyphs/perthousand.glif     | 162 +++---
 src/Cantarell-Bold.ufo/glyphs/peseta.glif          |  49 +-
 src/Cantarell-Bold.ufo/glyphs/peso.glif            |  82 +--
 src/Cantarell-Bold.ufo/glyphs/plus.glif            |  26 +-
 src/Cantarell-Bold.ufo/glyphs/plus.tf.glif         |  18 -
 src/Cantarell-Bold.ufo/glyphs/plusminus.glif       |  32 +-
 src/Cantarell-Bold.ufo/glyphs/plusminus.tf.glif    |  24 -
 src/Cantarell-Bold.ufo/glyphs/primeR_eversed.glif  |   3 -
 src/Cantarell-Bold.ufo/glyphs/primemod.glif        |   4 +-
 src/Cantarell-Bold.ufo/glyphs/product.glif         |  26 +-
 .../glyphs/punctuationspace.glif                   |   4 +-
 src/Cantarell-Bold.ufo/glyphs/q.glif               |  79 +--
 src/Cantarell-Bold.ufo/glyphs/qa-cy.glif           |   2 +-
 src/Cantarell-Bold.ufo/glyphs/question.glif        |  70 +--
 src/Cantarell-Bold.ufo/glyphs/questiondown.glif    |  12 +-
 src/Cantarell-Bold.ufo/glyphs/quotedbl.glif        |  10 +-
 src/Cantarell-Bold.ufo/glyphs/quotedblbase.glif    |  10 +-
 src/Cantarell-Bold.ufo/glyphs/quotedblleft.glif    |  10 +-
 src/Cantarell-Bold.ufo/glyphs/quotedblright.glif   |  12 +-
 src/Cantarell-Bold.ufo/glyphs/quoteleft.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/quoteright.glif      |   8 +-
 src/Cantarell-Bold.ufo/glyphs/quotesinglbase.glif  |   8 +-
 src/Cantarell-Bold.ufo/glyphs/quotesingle.glif     |  10 +-
 src/Cantarell-Bold.ufo/glyphs/r.glif               |  53 +-
 src/Cantarell-Bold.ufo/glyphs/racute.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/radical.glif         |  20 +-
 src/Cantarell-Bold.ufo/glyphs/ratio.glif           |  12 +-
 src/Cantarell-Bold.ufo/glyphs/rcaron.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/rcommaaccent.glif    |   4 +-
 src/Cantarell-Bold.ufo/glyphs/rdblgrave.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/rdotbelow.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/registered.glif      | 108 ++--
 src/Cantarell-Bold.ufo/glyphs/rightA_rrow.glif     |  25 +-
 .../glyphs/rightanglebracket-math.glif             |  24 +-
 src/Cantarell-Bold.ufo/glyphs/ring.glif            |  10 +-
 src/Cantarell-Bold.ufo/glyphs/ringhalfleft.glif    |  12 +-
 src/Cantarell-Bold.ufo/glyphs/ringhalfright.glif   |  30 +-
 src/Cantarell-Bold.ufo/glyphs/rinvertedbreve.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/rlinebelow.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ruble.glif           |  60 +-
 src/Cantarell-Bold.ufo/glyphs/rupeeI_ndian.glif    |  68 ++-
 src/Cantarell-Bold.ufo/glyphs/s.glif               |  73 ++-
 src/Cantarell-Bold.ufo/glyphs/sacute.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/sacutedotaccent.glif |  20 +-
 src/Cantarell-Bold.ufo/glyphs/saltillo.glif        |  12 +-
 src/Cantarell-Bold.ufo/glyphs/scaron.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/scarondotaccent.glif |   5 +-
 src/Cantarell-Bold.ufo/glyphs/scedilla.glif        |   4 +-
 src/Cantarell-Bold.ufo/glyphs/schwa-cy.glif        |   2 +-
 src/Cantarell-Bold.ufo/glyphs/schwa.glif           |   4 +-
 src/Cantarell-Bold.ufo/glyphs/scircumflex.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/scommaaccent.glif    |   4 +-
 src/Cantarell-Bold.ufo/glyphs/sdotaccent.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/sdotbelow.glif       |   4 +-
 .../glyphs/sdotbelowdotaccent.glif                 |   6 +-
 src/Cantarell-Bold.ufo/glyphs/second.glif          |  17 +-
 .../glyphs/secondtonechinese.glif                  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/section.glif         | 106 ++--
 src/Cantarell-Bold.ufo/glyphs/semicolon.glif       |   6 +-
 src/Cantarell-Bold.ufo/glyphs/seven.dnom.glif      |  27 +-
 src/Cantarell-Bold.ufo/glyphs/seven.glif           |  16 +-
 src/Cantarell-Bold.ufo/glyphs/seven.numr.glif      |   2 +-
 src/Cantarell-Bold.ufo/glyphs/seven.osf.glif       |  26 +-
 src/Cantarell-Bold.ufo/glyphs/seven.tf.glif        |  18 +-
 src/Cantarell-Bold.ufo/glyphs/seven.tosf.glif      |  25 -
 src/Cantarell-Bold.ufo/glyphs/seveneighths.glif    |   6 +-
 src/Cantarell-Bold.ufo/glyphs/seveninferior.glif   |   2 +-
 src/Cantarell-Bold.ufo/glyphs/sevensuperior.glif   |   2 +-
 src/Cantarell-Bold.ufo/glyphs/sha-cy.glif          |  31 +-
 src/Cantarell-Bold.ufo/glyphs/shcha-cy.glif        |  35 +-
 src/Cantarell-Bold.ufo/glyphs/shha-cy.glif         |   2 +-
 src/Cantarell-Bold.ufo/glyphs/six.dnom.glif        |  87 ++-
 src/Cantarell-Bold.ufo/glyphs/six.glif             |  78 +--
 src/Cantarell-Bold.ufo/glyphs/six.numr.glif        |   2 +-
 src/Cantarell-Bold.ufo/glyphs/six.osf.glif         |  86 +--
 src/Cantarell-Bold.ufo/glyphs/six.tf.glif          |  43 +-
 src/Cantarell-Bold.ufo/glyphs/sixinferior.glif     |   2 +-
 src/Cantarell-Bold.ufo/glyphs/sixsuperior.glif     |   2 +-
 src/Cantarell-Bold.ufo/glyphs/slash.glif           |  10 +-
 src/Cantarell-Bold.ufo/glyphs/softhyphen.glif      |   8 -
 src/Cantarell-Bold.ufo/glyphs/softsign-cy.glif     |  44 +-
 src/Cantarell-Bold.ufo/glyphs/space.glif           |   6 +-
 src/Cantarell-Bold.ufo/glyphs/sterling.glif        |  66 ++-
 src/Cantarell-Bold.ufo/glyphs/summation.glif       |  26 +-
 src/Cantarell-Bold.ufo/glyphs/t.glif               |  53 +-
 src/Cantarell-Bold.ufo/glyphs/tbar.glif            |   4 +-
 src/Cantarell-Bold.ufo/glyphs/tcaron.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/tcedilla.glif        |   4 +-
 src/Cantarell-Bold.ufo/glyphs/tcommaaccent.glif    |   4 +-
 src/Cantarell-Bold.ufo/glyphs/tdieresis.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/tdotbelow.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/te-cy.glif           |  25 +-
 src/Cantarell-Bold.ufo/glyphs/tenge.glif           |  22 +
 src/Cantarell-Bold.ufo/glyphs/thorn.glif           |  62 +-
 src/Cantarell-Bold.ufo/glyphs/three.dnom.glif      |  93 ++-
 src/Cantarell-Bold.ufo/glyphs/three.glif           |  86 +--
 src/Cantarell-Bold.ufo/glyphs/three.numr.glif      |   2 +-
 src/Cantarell-Bold.ufo/glyphs/three.osf.glif       |  90 +--
 src/Cantarell-Bold.ufo/glyphs/three.tf.glif        |  45 +-
 src/Cantarell-Bold.ufo/glyphs/three.tosf.glif      |  57 --
 src/Cantarell-Bold.ufo/glyphs/threeeighths.glif    |   6 +-
 src/Cantarell-Bold.ufo/glyphs/threefifths.glif     |   6 +-
 src/Cantarell-Bold.ufo/glyphs/threeinferior.glif   |   2 +-
 src/Cantarell-Bold.ufo/glyphs/threequarters.glif   |   6 +-
 src/Cantarell-Bold.ufo/glyphs/threesuperior.glif   |   2 +-
 src/Cantarell-Bold.ufo/glyphs/tilde.glif           |  10 +-
 .../glyphs/tildecomb_acutecomb.glif                |  18 -
 .../glyphs/tildecomb_dieresiscomb.glif             |  18 -
 .../glyphs/tildecomb_macroncomb.glif               |  18 -
 src/Cantarell-Bold.ufo/glyphs/tlinebelow.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/trademark.glif       |  50 +-
 src/Cantarell-Bold.ufo/glyphs/tripleprime.glif     |   3 -
 src/Cantarell-Bold.ufo/glyphs/tse-cy.glif          |  30 +-
 src/Cantarell-Bold.ufo/glyphs/tshe-cy.glif         |   2 +-
 src/Cantarell-Bold.ufo/glyphs/tugrik.glif          |  28 +
 src/Cantarell-Bold.ufo/glyphs/two.dnom.glif        |  59 +-
 src/Cantarell-Bold.ufo/glyphs/two.glif             |  50 +-
 src/Cantarell-Bold.ufo/glyphs/two.numr.glif        |   2 +-
 src/Cantarell-Bold.ufo/glyphs/two.osf.glif         |  58 +-
 src/Cantarell-Bold.ufo/glyphs/two.tf.glif          |  29 +-
 src/Cantarell-Bold.ufo/glyphs/two.tosf.glif        |  41 --
 src/Cantarell-Bold.ufo/glyphs/twofifths.glif       |   6 +-
 src/Cantarell-Bold.ufo/glyphs/twoinferior.glif     |   2 +-
 src/Cantarell-Bold.ufo/glyphs/twosuperior.glif     |   2 +-
 src/Cantarell-Bold.ufo/glyphs/twothirds.glif       |   6 +-
 src/Cantarell-Bold.ufo/glyphs/u-cy.glif            |   3 +-
 src/Cantarell-Bold.ufo/glyphs/u.glif               |  63 +-
 src/Cantarell-Bold.ufo/glyphs/uacute.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ubreve.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ucaron.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ucircumflex.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/udblgrave.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/udieresis-cy.glif    |   4 +-
 src/Cantarell-Bold.ufo/glyphs/udieresis.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/udieresisacute.glif  |   5 +-
 src/Cantarell-Bold.ufo/glyphs/udieresiscaron.glif  |   5 +-
 src/Cantarell-Bold.ufo/glyphs/udieresisgrave.glif  |   5 +-
 src/Cantarell-Bold.ufo/glyphs/udieresismacron.glif |   5 +-
 src/Cantarell-Bold.ufo/glyphs/udotbelow.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ugrave.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/uhookabove.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/uhorn.glif           |   4 +-
 src/Cantarell-Bold.ufo/glyphs/uhornacute.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/uhorndotbelow.glif   |   4 +-
 src/Cantarell-Bold.ufo/glyphs/uhorngrave.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/uhornhookabove.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/uhorntilde.glif      |   4 +-
 .../glyphs/uhungarumlaut-cy.glif                   |   4 +-
 src/Cantarell-Bold.ufo/glyphs/uhungarumlaut.glif   |   4 +-
 src/Cantarell-Bold.ufo/glyphs/uinvertedbreve.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/umacron-cy.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/umacron.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/umacrondieresis.glif |   5 +-
 src/Cantarell-Bold.ufo/glyphs/underscore.glif      |  10 +-
 src/Cantarell-Bold.ufo/glyphs/uogonek.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/upA_rrow.glif        |  31 +-
 src/Cantarell-Bold.ufo/glyphs/uring.glif           |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ushort-cy.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ustraight-cy.glif    |  10 +-
 .../glyphs/ustraightstroke-cy.glif                 |   2 +-
 src/Cantarell-Bold.ufo/glyphs/utilde.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/utildeacute.glif     |   5 +-
 src/Cantarell-Bold.ufo/glyphs/v.glif               |  31 +-
 src/Cantarell-Bold.ufo/glyphs/ve-cy.glif           |  72 +--
 .../glyphs/verticallineabovecomb.glif              |   4 +-
 .../glyphs/verticallinelowmod.glif                 |   4 +-
 src/Cantarell-Bold.ufo/glyphs/verticallinemod.glif |   4 +-
 src/Cantarell-Bold.ufo/glyphs/w.glif               |  47 +-
 src/Cantarell-Bold.ufo/glyphs/wacute.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/wcircumflex.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/wdieresis.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/we-cy.glif           |   2 +-
 src/Cantarell-Bold.ufo/glyphs/wgrave.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/whiteC_ircle.glif    |  61 +-
 src/Cantarell-Bold.ufo/glyphs/won.glif             |  53 +-
 src/Cantarell-Bold.ufo/glyphs/x.glif               |   5 +-
 src/Cantarell-Bold.ufo/glyphs/y.glif               |  41 +-
 src/Cantarell-Bold.ufo/glyphs/yacute.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/yat-cy.glif          |  56 +-
 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/yen.glif             |  44 +-
 src/Cantarell-Bold.ufo/glyphs/yeru-cy.glif         |  56 +-
 src/Cantarell-Bold.ufo/glyphs/yerudieresis-cy.glif |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ygrave.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/yhookabove.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/yi-cy.glif           |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ymacron.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ytilde.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/yusbig-cy.glif       |  64 ++-
 src/Cantarell-Bold.ufo/glyphs/z.glif               |  33 +-
 src/Cantarell-Bold.ufo/glyphs/zacute.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/zcaron.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/zdotaccent.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/zdotbelow.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ze-cy.glif           |  90 +--
 src/Cantarell-Bold.ufo/glyphs/zedescender-cy.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/zedieresis-cy.glif   |   4 +-
 src/Cantarell-Bold.ufo/glyphs/zero.dnom.glif       |  61 +-
 src/Cantarell-Bold.ufo/glyphs/zero.glif            |  58 +-
 src/Cantarell-Bold.ufo/glyphs/zero.numr.glif       |   2 +-
 src/Cantarell-Bold.ufo/glyphs/zero.osf.glif        |  60 +-
 src/Cantarell-Bold.ufo/glyphs/zero.osf.zero.glif   |   4 +-
 src/Cantarell-Bold.ufo/glyphs/zero.tf.glif         |  32 +-
 src/Cantarell-Bold.ufo/glyphs/zero.tf.zero.glif    |   4 +-
 src/Cantarell-Bold.ufo/glyphs/zero.tosf.glif       |  44 --
 src/Cantarell-Bold.ufo/glyphs/zero.tosf.zero.glif  |  16 -
 src/Cantarell-Bold.ufo/glyphs/zero.zero.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/zeroinferior.glif    |   2 +-
 src/Cantarell-Bold.ufo/glyphs/zerosuperior.glif    |   2 +-
 src/Cantarell-Bold.ufo/glyphs/zerothird.glif       |   6 +-
 src/Cantarell-Bold.ufo/glyphs/zhe-cy.glif          |  52 +-
 src/Cantarell-Bold.ufo/glyphs/zhebreve-cy.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/zhedescender-cy.glif |  13 +-
 src/Cantarell-Bold.ufo/glyphs/zhedieresis-cy.glif  |   4 +-
 src/Cantarell-Bold.ufo/layercontents.plist         |  60 ++
 src/Cantarell-Bold.ufo/lib.plist                   | 296 +---------
 src/Cantarell-Light.ufo/features.fea               | 209 ++-----
 src/Cantarell-Light.ufo/fontinfo.plist             |  10 +-
 .../glyphs.F_inal B_ent/be-cy.glif                 |  47 ++
 .../glyphs.F_inal B_ent/contents.plist             |   8 +
 .../glyphs.F_inal B_ent/layerinfo.plist            |  13 +
 .../glyphs.J_un 8 19, 20_47/contents.plist         |  22 +
 .../eight.tf.glif}                                 |   2 +-
 .../glyphs.J_un 8 19, 20_47/five.tf.glif           |  48 ++
 .../glyphs.J_un 8 19, 20_47/four.tf.glif           |  29 +
 .../glyphs.J_un 8 19, 20_47/layerinfo.plist        |  27 +
 .../nine.tf.glif}                                  |   2 +-
 .../glyphs.J_un 8 19, 20_47/seven.tf.glif          |  25 +
 .../six.tf.glif}                                   |   2 +-
 .../glyphs.J_un 8 19, 20_47/three.tf.glif          |  57 ++
 .../glyphs.J_un 8 19, 20_47/two.tf.glif            |  41 ++
 .../glyphs.J_un 8 19, 20_55/contents.plist         |   8 +
 .../glyphs.J_un 8 19, 20_55/layerinfo.plist        |  13 +
 .../glyphs.J_un 8 19, 20_55/zero.tf.glif           |  44 ++
 .../glyphs.M_ay 5 19, 13_08/contents.plist         |  26 +
 .../glyphs.M_ay 5 19, 13_08/eight.glif             |  53 ++
 .../glyphs.M_ay 5 19, 13_08/five.glif              |  40 ++
 .../glyphs.M_ay 5 19, 13_08/four.glif              |  21 +
 .../glyphs.M_ay 5 19, 13_08/layerinfo.plist        |  31 +
 .../glyphs.M_ay 5 19, 13_08/nine.glif}             |  12 +-
 .../glyphs.M_ay 5 19, 13_08/one.glif               |  23 +
 .../glyphs.M_ay 5 19, 13_08/seven.glif             |  17 +
 .../glyphs.M_ay 5 19, 13_08/six.glif               |  47 ++
 .../glyphs.M_ay 5 19, 13_08/three.glif             |  51 ++
 .../glyphs.M_ay 5 19, 13_08/two.glif               |  33 ++
 .../glyphs.M_ay 5 19, 13_08/zero.glif              |  42 ++
 .../glyphs.O_utline/S_hcha-cy.glif                 |  37 ++
 .../glyphs.O_utline/contents.plist                 |  10 +
 .../glyphs.O_utline/layerinfo.plist                |  15 +
 .../glyphs.O_utline/shcha-cy.glif                  |  44 ++
 .../glyphs.S_lanted/contents.plist                 |   8 +
 src/Cantarell-Light.ufo/glyphs.S_lanted/el-cy.glif |  44 ++
 .../glyphs.S_lanted/layerinfo.plist                |  13 +
 src/Cantarell-Light.ufo/glyphs.S_teeper/be-cy.glif |  43 ++
 .../glyphs.S_teeper/contents.plist                 |   8 +
 .../glyphs.S_teeper/layerinfo.plist                |  13 +
 .../glyphs.T_emplate/florin.glif                   |   2 +
 src/Cantarell-Light.ufo/glyphs.W_avy/be-cy.glif    |  47 ++
 .../glyphs.W_avy/contents.plist                    |   8 +
 .../glyphs.W_avy/layerinfo.plist                   |  13 +
 src/Cantarell-Light.ufo/glyphs/A_-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/A_.glif             |  41 +-
 src/Cantarell-Light.ufo/glyphs/A_E_.glif           |  56 +-
 src/Cantarell-Light.ufo/glyphs/A_E_acute.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_breve-cy.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_breve.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_breveacute.glif   |   5 +-
 .../glyphs/A_brevedotbelow.glif                    |   6 +-
 src/Cantarell-Light.ufo/glyphs/A_brevegrave.glif   |   5 +-
 .../glyphs/A_brevehookabove.glif                   |   5 +-
 src/Cantarell-Light.ufo/glyphs/A_brevetilde.glif   |   5 +-
 src/Cantarell-Light.ufo/glyphs/A_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_circumflex.glif   |   4 +-
 .../glyphs/A_circumflexacute.glif                  |  20 +-
 .../glyphs/A_circumflexdotbelow.glif               |   6 +-
 .../glyphs/A_circumflexgrave.glif                  |  20 +-
 .../glyphs/A_circumflexhookabove.glif              |  20 +-
 .../glyphs/A_circumflextilde.glif                  |   5 +-
 src/Cantarell-Light.ufo/glyphs/A_dblgrave.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_dieresis-cy.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_dieresis.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_grave.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_hookabove.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_ie-cy.glif        |   2 +-
 .../glyphs/A_invertedbreve.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_macron.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_ogonek.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_ring.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_ringacute.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_tilde.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/B_.glif             |  83 +--
 src/Cantarell-Light.ufo/glyphs/B_e-cy.glif         |  54 +-
 src/Cantarell-Light.ufo/glyphs/C_.glif             |  67 +--
 src/Cantarell-Light.ufo/glyphs/C_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/C_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/C_cedilla.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/C_cedillaacute.glif |   6 +-
 src/Cantarell-Light.ufo/glyphs/C_circumflex.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/C_dotaccent.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/C_he-cy.glif        |  52 +-
 .../glyphs/C_hedescender-cy.glif                   |  13 +-
 .../glyphs/C_hedieresis-cy.glif                    |   4 +-
 .../glyphs/C_hekhakassian-cy.glif                  |   4 +-
 .../glyphs/C_heverticalstroke-cy.glif              |  58 +-
 src/Cantarell-Light.ufo/glyphs/D_.glif             |  55 +-
 src/Cantarell-Light.ufo/glyphs/D_Z_caron.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/D_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/D_croat.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/D_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/D_e-cy.glif         |  46 +-
 src/Cantarell-Light.ufo/glyphs/D_je-cy.glif        |  64 ++-
 src/Cantarell-Light.ufo/glyphs/D_linebelow.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/D_zcaron.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/D_ze-cy.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/D_zhe-cy.glif       |  34 +-
 src/Cantarell-Light.ufo/glyphs/E_-cy.glif          |  70 ++-
 src/Cantarell-Light.ufo/glyphs/E_.glif             |  53 +-
 src/Cantarell-Light.ufo/glyphs/E_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_breve.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif |   6 +-
 src/Cantarell-Light.ufo/glyphs/E_circumflex.glif   |   4 +-
 .../glyphs/E_circumflexacute.glif                  |  20 +-
 .../glyphs/E_circumflexdotbelow.glif               |   6 +-
 .../glyphs/E_circumflexgrave.glif                  |  20 +-
 .../glyphs/E_circumflexhookabove.glif              |  20 +-
 .../glyphs/E_circumflextilde.glif                  |   5 +-
 src/Cantarell-Light.ufo/glyphs/E_dblgrave.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_dieresis.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_f-cy.glif         |  64 ++-
 src/Cantarell-Light.ufo/glyphs/E_grave.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_hookabove.glif    |   4 +-
 .../glyphs/E_invertedbreve.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_l-cy.glif         |  48 +-
 src/Cantarell-Light.ufo/glyphs/E_m-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/E_macron.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_macronacute.glif  |   6 +-
 src/Cantarell-Light.ufo/glyphs/E_macrongrave.glif  |   6 +-
 src/Cantarell-Light.ufo/glyphs/E_n-cy.glif         |   4 +-
 .../glyphs/E_ndescender-cy.glif                    |  13 +-
 src/Cantarell-Light.ufo/glyphs/E_ng.glif           |  46 +-
 src/Cantarell-Light.ufo/glyphs/E_nghe-cy.glif      |  42 +-
 src/Cantarell-Light.ufo/glyphs/E_ogonek.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_r-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/E_reversed-cy.glif  |  72 +--
 src/Cantarell-Light.ufo/glyphs/E_s-cy.glif         |   2 +-
 .../glyphs/E_sdescender-cy.glif                    |   2 +-
 src/Cantarell-Light.ufo/glyphs/E_th.glif           |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_tilde.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/F_.glif             |  41 +-
 src/Cantarell-Light.ufo/glyphs/F_ita-cy.glif       |   2 +-
 src/Cantarell-Light.ufo/glyphs/G_.glif             |  77 +--
 src/Cantarell-Light.ufo/glyphs/G_breve.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/G_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/G_circumflex.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/G_commaaccent.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/G_dotaccent.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/G_e-cy.glif         |  24 +-
 .../glyphs/G_edescender-cy.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/G_ermandbls.glif    |  76 +--
 .../glyphs/G_hemiddlehook-cy.glif                  |  60 +-
 src/Cantarell-Light.ufo/glyphs/G_hestroke-cy.glif  |  30 +-
 src/Cantarell-Light.ufo/glyphs/G_heupturn-cy.glif  |  26 +-
 src/Cantarell-Light.ufo/glyphs/G_je-cy.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/G_macron.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/H_.glif             |  49 +-
 src/Cantarell-Light.ufo/glyphs/H_a-cy.glif         |   4 +-
 .../glyphs/H_adescender-cy.glif                    |  15 +-
 src/Cantarell-Light.ufo/glyphs/H_ardsign-cy.glif   |  56 +-
 src/Cantarell-Light.ufo/glyphs/H_bar.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/H_brevebelow.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/H_circumflex.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/H_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/I_.glif             |  27 +-
 src/Cantarell-Light.ufo/glyphs/I_a-cy.glif         |  64 ++-
 src/Cantarell-Light.ufo/glyphs/I_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_breve.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_circumflex.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_dblgrave.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_dieresis-cy.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_dieresis.glif     |   4 +-
 .../glyphs/I_dieresisacute.glif                    |   6 +-
 src/Cantarell-Light.ufo/glyphs/I_dotaccent.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_e-cy.glif         |   3 +-
 src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_grave.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_hookabove.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_i-cy.glif         |  38 +-
 src/Cantarell-Light.ufo/glyphs/I_igrave-cy.glif    |   4 +-
 .../glyphs/I_invertedbreve.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_ishort-cy.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_macron-cy.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_macron.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_o-cy.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_ogonek.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_tilde.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_u-cy.glif         |  76 +--
 src/Cantarell-Light.ufo/glyphs/I_zhitsa-cy.glif    |  34 +-
 src/Cantarell-Light.ufo/glyphs/J_.glif             |  41 +-
 src/Cantarell-Light.ufo/glyphs/J_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/J_circumflex.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/J_e-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/K_.glif             |  37 +-
 src/Cantarell-Light.ufo/glyphs/K_a-cy.glif         |  42 +-
 src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif  |  42 +-
 src/Cantarell-Light.ufo/glyphs/K_acute.glif        |   4 +-
 .../glyphs/K_adescender-cy.glif                    |  15 +-
 .../glyphs/K_averticalstroke-cy.glif               |  48 +-
 src/Cantarell-Light.ufo/glyphs/K_commaaccent.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/K_je-cy.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_.glif             |  33 +-
 src/Cantarell-Light.ufo/glyphs/L_J_.glif           |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_commaaccent.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_dot.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_j.glif            |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_je-cy.glif        |  78 +--
 src/Cantarell-Light.ufo/glyphs/L_linebelow.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_slash.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/M_.glif             |  49 +-
 src/Cantarell-Light.ufo/glyphs/M_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/N_.glif             |  41 +-
 src/Cantarell-Light.ufo/glyphs/N_J_.glif           |   4 +-
 src/Cantarell-Light.ufo/glyphs/N_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/N_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/N_commaaccent.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/N_dotaccent.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/N_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/N_j.glif            |   4 +-
 src/Cantarell-Light.ufo/glyphs/N_je-cy.glif        |  70 ++-
 src/Cantarell-Light.ufo/glyphs/N_linebelow.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/N_tilde.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_-cy.glif          |   3 +-
 src/Cantarell-Light.ufo/glyphs/O_.glif             |  73 +--
 src/Cantarell-Light.ufo/glyphs/O_E_.glif           |  92 ++-
 src/Cantarell-Light.ufo/glyphs/O_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_barred-cy.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_breve.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_circumflex.glif   |   4 +-
 .../glyphs/O_circumflexacute.glif                  |  20 +-
 .../glyphs/O_circumflexdotbelow.glif               |   6 +-
 .../glyphs/O_circumflexgrave.glif                  |  20 +-
 .../glyphs/O_circumflexhookabove.glif              |  20 +-
 .../glyphs/O_circumflextilde.glif                  |   5 +-
 src/Cantarell-Light.ufo/glyphs/O_dblgrave.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_dieresis-cy.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_dieresis.glif     |   4 +-
 .../glyphs/O_dieresismacron.glif                   |   6 +-
 .../glyphs/O_dotaccentmacron.glif                  |   6 +-
 src/Cantarell-Light.ufo/glyphs/O_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_grave.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_hm.glif           |  66 +--
 src/Cantarell-Light.ufo/glyphs/O_hookabove.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_horn.glif         |   6 +-
 src/Cantarell-Light.ufo/glyphs/O_hornacute.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_horndotbelow.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_horngrave.glif    |   4 +-
 .../glyphs/O_hornhookabove.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_horntilde.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_hungarumlaut.glif |   4 +-
 .../glyphs/O_invertedbreve.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_macron.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_macronacute.glif  |   6 +-
 src/Cantarell-Light.ufo/glyphs/O_macrongrave.glif  |   6 +-
 src/Cantarell-Light.ufo/glyphs/O_ogonek.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_slash.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_slashacute.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_tilde.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_tildeacute.glif   |   6 +-
 .../glyphs/O_tildedieresis.glif                    |   6 +-
 src/Cantarell-Light.ufo/glyphs/O_tildemacron.glif  |   6 +-
 src/Cantarell-Light.ufo/glyphs/P_.glif             |  59 +-
 src/Cantarell-Light.ufo/glyphs/P_alochka-cy.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/P_e-cy.glif         |  28 +-
 src/Cantarell-Light.ufo/glyphs/Q_.glif             |  71 +--
 src/Cantarell-Light.ufo/glyphs/Q_a-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/R_.glif             |  67 ++-
 src/Cantarell-Light.ufo/glyphs/R_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/R_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/R_commaaccent.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/R_dblgrave.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/R_dotbelow.glif     |   4 +-
 .../glyphs/R_invertedbreve.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/R_linebelow.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/S_.glif             |  73 ++-
 src/Cantarell-Light.ufo/glyphs/S_acute.glif        |   4 +-
 .../glyphs/S_acutedotaccent.glif                   |   6 +-
 src/Cantarell-Light.ufo/glyphs/S_altillo.glif      |  12 +-
 src/Cantarell-Light.ufo/glyphs/S_caron.glif        |   4 +-
 .../glyphs/S_carondotaccent.glif                   |   6 +-
 src/Cantarell-Light.ufo/glyphs/S_cedilla.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/S_chwa-cy.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/S_chwa.glif         |  70 +--
 src/Cantarell-Light.ufo/glyphs/S_circumflex.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/S_commaaccent.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/S_dotaccent.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/S_dotbelow.glif     |   4 +-
 .../glyphs/S_dotbelowdotaccent.glif                |   6 +-
 src/Cantarell-Light.ufo/glyphs/S_ha-cy.glif        |  35 +-
 src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif      |  39 +-
 src/Cantarell-Light.ufo/glyphs/S_hha-cy.glif       |  48 +-
 src/Cantarell-Light.ufo/glyphs/S_oftsign-cy.glif   |  48 +-
 src/Cantarell-Light.ufo/glyphs/T_.glif             |  35 +-
 src/Cantarell-Light.ufo/glyphs/T_bar.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/T_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/T_cedilla.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/T_commaaccent.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/T_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/T_e-cy.glif         |   3 +-
 src/Cantarell-Light.ufo/glyphs/T_horn.glif         |  48 +-
 src/Cantarell-Light.ufo/glyphs/T_linebelow.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/T_se-cy.glif        |  34 +-
 src/Cantarell-Light.ufo/glyphs/T_she-cy.glif       |  60 +-
 src/Cantarell-Light.ufo/glyphs/U_-cy.glif          |  24 +-
 src/Cantarell-Light.ufo/glyphs/U_.glif             |  55 +-
 src/Cantarell-Light.ufo/glyphs/U_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_breve.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_circumflex.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_dblgrave.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_dieresis-cy.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_dieresis.glif     |   4 +-
 .../glyphs/U_dieresisacute.glif                    |   6 +-
 .../glyphs/U_dieresiscaron.glif                    |   6 +-
 .../glyphs/U_dieresisgrave.glif                    |   6 +-
 .../glyphs/U_dieresismacron.glif                   |   6 +-
 src/Cantarell-Light.ufo/glyphs/U_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_grave.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_hookabove.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_horn.glif         |   6 +-
 src/Cantarell-Light.ufo/glyphs/U_hornacute.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_horndotbelow.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_horngrave.glif    |   4 +-
 .../glyphs/U_hornhookabove.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_horntilde.glif    |   4 +-
 .../glyphs/U_hungarumlaut-cy.glif                  |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_hungarumlaut.glif |   4 +-
 .../glyphs/U_invertedbreve.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_macron-cy.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_macron.glif       |   4 +-
 .../glyphs/U_macrondieresis.glif                   |   6 +-
 src/Cantarell-Light.ufo/glyphs/U_ogonek.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_ring.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_short-cy.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_straight-cy.glif  |   4 +-
 .../glyphs/U_straightstroke-cy.glif                |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_tilde.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_tildeacute.glif   |   6 +-
 src/Cantarell-Light.ufo/glyphs/V_.glif             |  31 +-
 src/Cantarell-Light.ufo/glyphs/V_e-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/W_.glif             |  39 +-
 src/Cantarell-Light.ufo/glyphs/W_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/W_circumflex.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/W_dieresis.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/W_e-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/W_grave.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/X_.glif             |  35 +-
 src/Cantarell-Light.ufo/glyphs/Y_.glif             |  37 +-
 src/Cantarell-Light.ufo/glyphs/Y_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif        |  58 +-
 src/Cantarell-Light.ufo/glyphs/Y_circumflex.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/Y_dieresis.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/Y_dotaccent.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/Y_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/Y_eru-cy.glif       |  60 +-
 .../glyphs/Y_erudieresis-cy.glif                   |   4 +-
 src/Cantarell-Light.ufo/glyphs/Y_grave.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/Y_hookabove.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/Y_i-cy.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/Y_macron.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/Y_tilde.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif     |  68 ++-
 src/Cantarell-Light.ufo/glyphs/Z_.glif             |   3 -
 src/Cantarell-Light.ufo/glyphs/Z_e-cy.glif         |  90 +--
 .../glyphs/Z_edescender-cy.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/Z_edieresis-cy.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/Z_he-cy.glif        |  50 +-
 src/Cantarell-Light.ufo/glyphs/Z_hebreve-cy.glif   |   4 +-
 .../glyphs/Z_hedescender-cy.glif                   |  17 +-
 .../glyphs/Z_hedieresis-cy.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/_currencyvstem.glif |   8 +-
 .../glyphs/_descenderreverse-cy.case.glif          |   6 +-
 .../glyphs/_descenderreversed-cy.glif              |   8 +-
 src/Cantarell-Light.ufo/glyphs/_o.numero.glif      |  24 -
 src/Cantarell-Light.ufo/glyphs/_typoquote.glif     |   8 +-
 src/Cantarell-Light.ufo/glyphs/a-cy.glif           |   3 +-
 src/Cantarell-Light.ufo/glyphs/a.glif              |  91 +--
 src/Cantarell-Light.ufo/glyphs/aacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/abreve-cy.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/abreve.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/abreveacute.glif    |   5 +-
 src/Cantarell-Light.ufo/glyphs/abrevedotbelow.glif |   6 +-
 src/Cantarell-Light.ufo/glyphs/abrevegrave.glif    |   5 +-
 .../glyphs/abrevehookabove.glif                    |   5 +-
 src/Cantarell-Light.ufo/glyphs/abrevetilde.glif    |   5 +-
 src/Cantarell-Light.ufo/glyphs/acaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/acircumflex.glif    |   4 +-
 .../glyphs/acircumflexacute.glif                   |  20 +-
 .../glyphs/acircumflexdotbelow.glif                |   6 +-
 .../glyphs/acircumflexgrave.glif                   |  20 +-
 .../glyphs/acircumflexhookabove.glif               |  20 +-
 .../glyphs/acircumflextilde.glif                   |  20 +-
 src/Cantarell-Light.ufo/glyphs/acute.glif          |  10 +-
 .../glyphs/acutecomb_dotaccentcomb.glif            |  18 -
 src/Cantarell-Light.ufo/glyphs/adblgrave.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/adieresis-cy.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/adieresis.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/adotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/ae.glif             | 140 ++---
 src/Cantarell-Light.ufo/glyphs/aeacute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/agrave.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ahookabove.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/aie-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/ainvertedbreve.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/amacron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/ampersand.glif      |  78 +--
 src/Cantarell-Light.ufo/glyphs/aogonek.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/apostrophemod.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/approxequal.glif    |  88 +--
 src/Cantarell-Light.ufo/glyphs/approxequal.tf.glif |  50 --
 src/Cantarell-Light.ufo/glyphs/aring.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/aringacute.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/asciicircum.glif    |  16 +-
 src/Cantarell-Light.ufo/glyphs/asciitilde.glif     |  48 +-
 src/Cantarell-Light.ufo/glyphs/asterisk.glif       |  56 +-
 src/Cantarell-Light.ufo/glyphs/at.glif             | 140 ++---
 src/Cantarell-Light.ufo/glyphs/atilde.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/b.glif              |  79 +--
 src/Cantarell-Light.ufo/glyphs/backslash.glif      |  12 +-
 src/Cantarell-Light.ufo/glyphs/bar.glif            |  18 +-
 src/Cantarell-Light.ufo/glyphs/be-cy.glif          |  74 ++-
 src/Cantarell-Light.ufo/glyphs/blackC_ircle.glif   |   3 -
 src/Cantarell-Light.ufo/glyphs/blank.glif          |  29 +-
 src/Cantarell-Light.ufo/glyphs/braceleft.glif      |  66 +--
 src/Cantarell-Light.ufo/glyphs/braceright.glif     |  12 +-
 src/Cantarell-Light.ufo/glyphs/bracketleft.glif    |  18 +-
 src/Cantarell-Light.ufo/glyphs/bracketright.glif   |  12 +-
 src/Cantarell-Light.ufo/glyphs/breve.glif          |  10 +-
 .../glyphs/brevecomb-cy.case.glif                  |   2 +-
 src/Cantarell-Light.ufo/glyphs/brevecomb-cy.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/brevecomb.case.glif |   2 +-
 .../glyphs/brevecomb_acutecomb.case.glif           |  13 -
 .../glyphs/brevecomb_acutecomb.glif                |  13 -
 .../glyphs/brevecomb_gravecomb.case.glif           |  13 -
 .../glyphs/brevecomb_gravecomb.glif                |  13 -
 .../glyphs/brevecomb_hookabovecomb.case.glif       |  13 -
 .../glyphs/brevecomb_hookabovecomb.glif            |  13 -
 .../glyphs/brevecomb_tildecomb.case.glif           |  13 -
 .../glyphs/brevecomb_tildecomb.glif                |  13 -
 .../glyphs/breveinvertedcomb.case.glif             |   2 +-
 src/Cantarell-Light.ufo/glyphs/brokenbar.glif      |  26 +-
 src/Cantarell-Light.ufo/glyphs/bullet.glif         |  23 +-
 src/Cantarell-Light.ufo/glyphs/bulletoperator.glif |  10 +-
 .../glyphs/bulletoperator.tf.glif                  |  20 -
 src/Cantarell-Light.ufo/glyphs/c.glif              |  61 +-
 src/Cantarell-Light.ufo/glyphs/cacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/caron.glif          |  10 +-
 .../glyphs/caroncomb.loclV_I_E_T_.glif             |   4 +-
 .../glyphs/caroncomb_dotaccentcomb.glif            |  18 -
 src/Cantarell-Light.ufo/glyphs/ccaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ccedilla.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/ccedillaacute.glif  |   6 +-
 src/Cantarell-Light.ufo/glyphs/ccircumflex.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/cdotaccent.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/cedi.glif           |  53 +-
 src/Cantarell-Light.ufo/glyphs/cedilla.glif        |  10 +-
 src/Cantarell-Light.ufo/glyphs/cent.glif           |  10 +-
 src/Cantarell-Light.ufo/glyphs/che-cy.glif         |  48 +-
 .../glyphs/chedescender-cy.glif                    |  11 +-
 src/Cantarell-Light.ufo/glyphs/chedieresis-cy.glif |   4 +-
 .../glyphs/chekhakassian-cy.glif                   |   4 +-
 .../glyphs/cheverticalstroke-cy.glif               |  58 +-
 src/Cantarell-Light.ufo/glyphs/circumflex.glif     |  10 +-
 src/Cantarell-Light.ufo/glyphs/circumflexcomb.glif |   2 +-
 .../glyphs/circumflexcomb.loclV_I_E_T_.glif        |   2 +-
 .../glyphs/circumflexcomb_acutecomb.case.glif      |  18 -
 .../glyphs/circumflexcomb_acutecomb.glif           |  18 -
 .../glyphs/circumflexcomb_gravecomb.case.glif      |  13 -
 .../glyphs/circumflexcomb_gravecomb.glif           |  18 -
 .../glyphs/circumflexcomb_hookabovecomb.case.glif  |  13 -
 .../glyphs/circumflexcomb_hookabovecomb.glif       |  13 -
 .../glyphs/circumflexcomb_tildecomb.case.glif      |  13 -
 .../glyphs/circumflexcomb_tildecomb.glif           |  13 -
 src/Cantarell-Light.ufo/glyphs/colon.glif          |   2 +
 src/Cantarell-Light.ufo/glyphs/colonsign.glif      |  69 ++-
 src/Cantarell-Light.ufo/glyphs/comma.glif          |  16 +-
 .../glyphs/commaturnedabovecomb.glif               |   8 +-
 src/Cantarell-Light.ufo/glyphs/commaturnedmod.glif |   4 +-
 .../glyphs/commercialM_inusS_ign.glif              |  64 ++-
 .../glyphs/commercialM_inusS_ign.tf.glif           |  40 --
 src/Cantarell-Light.ufo/glyphs/contents.plist      | 140 +----
 src/Cantarell-Light.ufo/glyphs/copyright.glif      | 108 ++--
 src/Cantarell-Light.ufo/glyphs/currency.glif       |  88 +--
 src/Cantarell-Light.ufo/glyphs/d.glif              |  83 +--
 src/Cantarell-Light.ufo/glyphs/dagger.glif         |  30 +-
 src/Cantarell-Light.ufo/glyphs/daggerdbl.glif      |  54 +-
 src/Cantarell-Light.ufo/glyphs/dblgravecomb.glif   |  12 +-
 src/Cantarell-Light.ufo/glyphs/dcaron.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/dcroat.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ddotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/de-cy.glif          |  46 +-
 src/Cantarell-Light.ufo/glyphs/degree.glif         |  56 +-
 .../glyphs/descender-cy.case.glif                  |   6 +-
 src/Cantarell-Light.ufo/glyphs/descender-cy.glif   |   6 +-
 src/Cantarell-Light.ufo/glyphs/dieresis.glif       |  10 +-
 .../glyphs/dieresisbelowcomb.glif                  |  28 +-
 src/Cantarell-Light.ufo/glyphs/dieresiscomb.glif   |  28 +-
 .../glyphs/dieresiscomb.loclV_I_E_T_.glif          |  28 +-
 .../glyphs/dieresiscomb_acutecomb.glif             |  18 -
 .../glyphs/dieresiscomb_caroncomb.glif             |  18 -
 .../glyphs/dieresiscomb_gravecomb.glif             |  18 -
 .../glyphs/dieresiscomb_macroncomb.glif            |  18 -
 src/Cantarell-Light.ufo/glyphs/divide.glif         |  66 ++-
 src/Cantarell-Light.ufo/glyphs/divide.tf.glif      |  40 --
 src/Cantarell-Light.ufo/glyphs/divisionslash.glif  |  15 +-
 .../glyphs/divisionslash.tf.glif                   |  12 -
 src/Cantarell-Light.ufo/glyphs/dje-cy.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/dlinebelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/dollar.glif         |  59 +-
 src/Cantarell-Light.ufo/glyphs/dong.glif           |  58 +-
 src/Cantarell-Light.ufo/glyphs/dotaccent.glif      |  10 +-
 .../glyphs/dotaccentcomb_macroncomb.glif           |  13 -
 src/Cantarell-Light.ufo/glyphs/doubleprimemod.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/downA_rrow.glif     |  15 +-
 src/Cantarell-Light.ufo/glyphs/dzcaron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/dze-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/dzhe-cy.glif        |  30 +-
 src/Cantarell-Light.ufo/glyphs/e-cy.glif           |  74 +--
 src/Cantarell-Light.ufo/glyphs/e.glif              |  83 +--
 src/Cantarell-Light.ufo/glyphs/eacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ebreve.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ecaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ecedillabreve.glif  |   6 +-
 src/Cantarell-Light.ufo/glyphs/ecircumflex.glif    |   4 +-
 .../glyphs/ecircumflexacute.glif                   |  20 +-
 .../glyphs/ecircumflexdotbelow.glif                |   6 +-
 .../glyphs/ecircumflexgrave.glif                   |  20 +-
 .../glyphs/ecircumflexhookabove.glif               |  20 +-
 .../glyphs/ecircumflextilde.glif                   |  20 +-
 src/Cantarell-Light.ufo/glyphs/edblgrave.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/edieresis.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/edotaccent.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/edotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/ef-cy.glif          | 122 ++--
 src/Cantarell-Light.ufo/glyphs/egrave.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ehookabove.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/eight.dnom.glif     |  99 ++--
 src/Cantarell-Light.ufo/glyphs/eight.glif          |  90 +--
 src/Cantarell-Light.ufo/glyphs/eight.numr.glif     |   2 +-
 src/Cantarell-Light.ufo/glyphs/eight.osf.glif      |  98 ++--
 src/Cantarell-Light.ufo/glyphs/eight.tf.glif       |  47 +-
 src/Cantarell-Light.ufo/glyphs/eightinferior.glif  |   2 +-
 src/Cantarell-Light.ufo/glyphs/eightsuperior.glif  |   2 +-
 src/Cantarell-Light.ufo/glyphs/einvertedbreve.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/el-cy.glif          |  44 +-
 src/Cantarell-Light.ufo/glyphs/ellipsis.glif       |  14 +-
 src/Cantarell-Light.ufo/glyphs/em-cy.glif          |  36 +-
 src/Cantarell-Light.ufo/glyphs/emacron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/emacronacute.glif   |   5 +-
 src/Cantarell-Light.ufo/glyphs/emacrongrave.glif   |   5 +-
 src/Cantarell-Light.ufo/glyphs/emdash.glif         |  11 +-
 src/Cantarell-Light.ufo/glyphs/emptyset.glif       |  58 +-
 src/Cantarell-Light.ufo/glyphs/emquad.glif         |   7 -
 src/Cantarell-Light.ufo/glyphs/emspace.glif        |   1 +
 src/Cantarell-Light.ufo/glyphs/en-cy.glif          |  32 +-
 src/Cantarell-Light.ufo/glyphs/endash.glif         |  10 +-
 src/Cantarell-Light.ufo/glyphs/endescender-cy.glif |   6 +-
 src/Cantarell-Light.ufo/glyphs/eng.glif            |  64 +--
 src/Cantarell-Light.ufo/glyphs/enghe-cy.glif       |  42 +-
 src/Cantarell-Light.ufo/glyphs/enquad.glif         |   7 -
 src/Cantarell-Light.ufo/glyphs/enspace.glif        |   1 +
 src/Cantarell-Light.ufo/glyphs/eogonek.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/equal.glif          |  24 +-
 src/Cantarell-Light.ufo/glyphs/equal.tf.glif       |  18 -
 src/Cantarell-Light.ufo/glyphs/equivalence.glif    |  34 +-
 src/Cantarell-Light.ufo/glyphs/equivalence.tf.glif |  24 -
 src/Cantarell-Light.ufo/glyphs/er-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/ereversed-cy.glif   |  68 +--
 src/Cantarell-Light.ufo/glyphs/es-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/esdescender-cy.glif |   2 +-
 src/Cantarell-Light.ufo/glyphs/estimated.glif      |  62 +-
 src/Cantarell-Light.ufo/glyphs/eth.glif            |  74 +--
 src/Cantarell-Light.ufo/glyphs/etilde.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/euro.glif           |  76 +--
 src/Cantarell-Light.ufo/glyphs/exclam.glif         |  34 +-
 src/Cantarell-Light.ufo/glyphs/exclamdown.glif     |  12 +-
 src/Cantarell-Light.ufo/glyphs/f.glif              |  49 +-
 src/Cantarell-Light.ufo/glyphs/f_f.glif            |  16 -
 src/Cantarell-Light.ufo/glyphs/f_f_i.glif          |  16 -
 src/Cantarell-Light.ufo/glyphs/f_f_l.glif          |  16 -
 src/Cantarell-Light.ufo/glyphs/fi.glif             |   4 +-
 src/Cantarell-Light.ufo/glyphs/figuredash.glif     |  16 +-
 src/Cantarell-Light.ufo/glyphs/figurespace.glif    |   8 +-
 .../glyphs/firsttonechinese.glif                   |   4 +-
 src/Cantarell-Light.ufo/glyphs/fita-cy.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/five.dnom.glif      |  71 ++-
 src/Cantarell-Light.ufo/glyphs/five.glif           |  64 +--
 src/Cantarell-Light.ufo/glyphs/five.numr.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/five.osf.glif       |  72 +--
 src/Cantarell-Light.ufo/glyphs/five.tf.glif        |  34 +-
 src/Cantarell-Light.ufo/glyphs/five.tosf.glif      |  48 --
 src/Cantarell-Light.ufo/glyphs/fiveeighths.glif    |   6 +-
 src/Cantarell-Light.ufo/glyphs/fiveinferior.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/fivesixths.glif     |   6 +-
 src/Cantarell-Light.ufo/glyphs/fivesuperior.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/fl.glif             |   4 +-
 src/Cantarell-Light.ufo/glyphs/florin.glif         |  68 ++-
 src/Cantarell-Light.ufo/glyphs/four.dnom.glif      |  35 +-
 src/Cantarell-Light.ufo/glyphs/four.glif           |  14 +-
 src/Cantarell-Light.ufo/glyphs/four.numr.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/four.osf.glif       |  34 +-
 src/Cantarell-Light.ufo/glyphs/four.tosf.glif      |  29 -
 src/Cantarell-Light.ufo/glyphs/fourfifths.glif     |   6 +-
 src/Cantarell-Light.ufo/glyphs/fourinferior.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/foursuperior.glif   |   2 +-
 .../glyphs/fourthtonechinese.glif                  |   4 +-
 src/Cantarell-Light.ufo/glyphs/fraction.glif       |  10 +-
 src/Cantarell-Light.ufo/glyphs/franc.glif          |  29 +-
 src/Cantarell-Light.ufo/glyphs/g.glif              | 103 ++--
 src/Cantarell-Light.ufo/glyphs/gbreve.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/gcaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/gcircumflex.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/gcommaaccent.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/gdotaccent.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/ge-cy.glif          |  20 +-
 src/Cantarell-Light.ufo/glyphs/gedescender-cy.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/germandbls.glif     |  86 +--
 .../glyphs/ghemiddlehook-cy.glif                   |  56 +-
 src/Cantarell-Light.ufo/glyphs/ghestroke-cy.glif   |  28 +-
 src/Cantarell-Light.ufo/glyphs/gheupturn-cy.glif   |  26 +-
 src/Cantarell-Light.ufo/glyphs/gje-cy.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/gmacron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/grave.glif          |  10 +-
 src/Cantarell-Light.ufo/glyphs/greater.glif        |  24 +-
 src/Cantarell-Light.ufo/glyphs/greater.tf.glif     |  16 -
 src/Cantarell-Light.ufo/glyphs/greaterequal.glif   |  32 +-
 .../glyphs/greaterequal.tf.glif                    |  22 -
 src/Cantarell-Light.ufo/glyphs/guarani.glif        |  58 +-
 src/Cantarell-Light.ufo/glyphs/guillemetleft.glif  |  30 +-
 src/Cantarell-Light.ufo/glyphs/guillemetright.glif |  38 +-
 src/Cantarell-Light.ufo/glyphs/guilsinglleft.glif  |  16 +-
 src/Cantarell-Light.ufo/glyphs/guilsinglright.glif |  24 +-
 src/Cantarell-Light.ufo/glyphs/h.glif              |  59 +-
 src/Cantarell-Light.ufo/glyphs/ha-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/hadescender-cy.glif |   9 +-
 src/Cantarell-Light.ufo/glyphs/hairspace.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/hardsign-cy.glif    |  54 +-
 src/Cantarell-Light.ufo/glyphs/hbar.glif           |   4 +-
 src/Cantarell-Light.ufo/glyphs/hbrevebelow.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/hcircumflex.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/hdotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/horizontalbar.glif  |   8 -
 src/Cantarell-Light.ufo/glyphs/hryvnia.glif        |  64 ++-
 src/Cantarell-Light.ufo/glyphs/hungarumlaut.glif   |  10 +-
 .../glyphs/hungarumlautcomb.case.glif              |  12 +-
 src/Cantarell-Light.ufo/glyphs/hyphen.glif         |  13 +-
 src/Cantarell-Light.ufo/glyphs/hyphentwo.glif      |   8 -
 src/Cantarell-Light.ufo/glyphs/i-cy.glif           |   2 +-
 src/Cantarell-Light.ufo/glyphs/i.glif              |   8 +-
 src/Cantarell-Light.ufo/glyphs/ia-cy.glif          |  58 +-
 src/Cantarell-Light.ufo/glyphs/iacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ibreve.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/icaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/icircumflex.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/idblgrave.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/idieresis-cy.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/idieresis.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/idieresisacute.glif |   5 +-
 src/Cantarell-Light.ufo/glyphs/idotaccent.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/idotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/idotless.glif       |  27 +-
 src/Cantarell-Light.ufo/glyphs/ie-cy.glif          |   3 +-
 src/Cantarell-Light.ufo/glyphs/iebreve-cy.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/iegrave-cy.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/igrave.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ihookabove.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/ii-cy.glif          |  30 +-
 src/Cantarell-Light.ufo/glyphs/iigrave-cy.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/iinvertedbreve.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/iishort-cy.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/imacron-cy.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/imacron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/increment.glif      |  20 +-
 src/Cantarell-Light.ufo/glyphs/infinity.glif       |  74 +--
 src/Cantarell-Light.ufo/glyphs/integral.glif       |  66 +--
 src/Cantarell-Light.ufo/glyphs/io-cy.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/iogonek.glif        |   6 +-
 src/Cantarell-Light.ufo/glyphs/itilde.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/iu-cy.glif          |  72 +--
 src/Cantarell-Light.ufo/glyphs/izhitsa-cy.glif     |  32 +-
 src/Cantarell-Light.ufo/glyphs/j.glif              |   7 +-
 src/Cantarell-Light.ufo/glyphs/jacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/jcircumflex.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/jdotless.glif       |  35 +-
 src/Cantarell-Light.ufo/glyphs/je-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/k.glif              |  37 +-
 src/Cantarell-Light.ufo/glyphs/ka-cy.glif          |  34 +-
 src/Cantarell-Light.ufo/glyphs/kabashkir-cy.glif   |  42 +-
 src/Cantarell-Light.ufo/glyphs/kacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/kadescender-cy.glif |  11 +-
 .../glyphs/kaverticalstroke-cy.glif                |  32 +-
 src/Cantarell-Light.ufo/glyphs/kcommaaccent.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/kgreenlandic.glif   |  24 +-
 src/Cantarell-Light.ufo/glyphs/kip.glif            |  38 +-
 src/Cantarell-Light.ufo/glyphs/kje-cy.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/l.glif              |  53 +-
 src/Cantarell-Light.ufo/glyphs/l.ss01.glif         |  25 +
 src/Cantarell-Light.ufo/glyphs/lacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/layerinfo.plist     | 144 +----
 src/Cantarell-Light.ufo/glyphs/lcaron.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/lcommaaccent.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/ldot.glif           |   4 +-
 src/Cantarell-Light.ufo/glyphs/ldotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/leftA_rrow.glif     |  15 +-
 .../glyphs/leftanglebracket-math.glif              |  16 +-
 src/Cantarell-Light.ufo/glyphs/less.glif           |  12 +-
 src/Cantarell-Light.ufo/glyphs/less.tf.glif        |   7 -
 src/Cantarell-Light.ufo/glyphs/lessequal.glif      |  12 +-
 src/Cantarell-Light.ufo/glyphs/lessequal.tf.glif   |   7 -
 src/Cantarell-Light.ufo/glyphs/lira.glif           |  74 +--
 src/Cantarell-Light.ufo/glyphs/liraT_urkish.glif   |  47 +-
 src/Cantarell-Light.ufo/glyphs/literS_ign.glif     |  70 +--
 src/Cantarell-Light.ufo/glyphs/lj.glif             |   4 +-
 src/Cantarell-Light.ufo/glyphs/lje-cy.glif         |  80 +--
 src/Cantarell-Light.ufo/glyphs/llinebelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/logicalnot.glif     |  24 +-
 src/Cantarell-Light.ufo/glyphs/logicalnot.tf.glif  |  18 -
 src/Cantarell-Light.ufo/glyphs/lozenge.glif        |  28 +-
 src/Cantarell-Light.ufo/glyphs/lslash.glif         |  15 +-
 src/Cantarell-Light.ufo/glyphs/m.glif              |  91 +--
 src/Cantarell-Light.ufo/glyphs/macron.glif         |  10 +-
 .../glyphs/macroncomb_acutecomb.glif               |  18 -
 .../glyphs/macroncomb_dieresiscomb.glif            |  13 -
 .../glyphs/macroncomb_gravecomb.glif               |  18 -
 src/Cantarell-Light.ufo/glyphs/manat.glif          |  52 +-
 src/Cantarell-Light.ufo/glyphs/mdotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/micro.glif          |  56 +-
 src/Cantarell-Light.ufo/glyphs/minus.glif          |  16 +-
 src/Cantarell-Light.ufo/glyphs/minus.tf.glif       |  12 -
 src/Cantarell-Light.ufo/glyphs/minute.glif         |   7 +-
 src/Cantarell-Light.ufo/glyphs/multiply.glif       |  24 +-
 src/Cantarell-Light.ufo/glyphs/multiply.tf.glif    |  18 -
 src/Cantarell-Light.ufo/glyphs/n.glif              |  51 +-
 src/Cantarell-Light.ufo/glyphs/nacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/naira.glif          |  55 +-
 src/Cantarell-Light.ufo/glyphs/nbspace.glif        |  13 -
 src/Cantarell-Light.ufo/glyphs/ncaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ncommaaccent.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/ndotaccent.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/ndotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/nine.dnom.glif      |  87 ++-
 src/Cantarell-Light.ufo/glyphs/nine.glif           |  12 +-
 src/Cantarell-Light.ufo/glyphs/nine.numr.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/nine.osf.glif       |  86 +--
 src/Cantarell-Light.ufo/glyphs/nine.tf.glif        |  41 +-
 src/Cantarell-Light.ufo/glyphs/nineinferior.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/ninesuperior.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/nj.glif             |   4 +-
 src/Cantarell-Light.ufo/glyphs/nje-cy.glif         |  70 ++-
 src/Cantarell-Light.ufo/glyphs/nlinebelow.glif     |   4 +-
 .../glyphs/nonbreakinghyphen.glif                  |  16 -
 src/Cantarell-Light.ufo/glyphs/notequal.glif       |  34 +-
 src/Cantarell-Light.ufo/glyphs/notequal.tf.glif    |  24 -
 src/Cantarell-Light.ufo/glyphs/notidentical.glif   |  42 +-
 .../glyphs/notidentical.tf.glif                    |  30 -
 src/Cantarell-Light.ufo/glyphs/ntilde.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/numbersign.glif     |  40 +-
 src/Cantarell-Light.ufo/glyphs/numero.glif         |   8 +-
 src/Cantarell-Light.ufo/glyphs/o-cy.glif           |   3 +-
 src/Cantarell-Light.ufo/glyphs/o.glif              |  63 +-
 src/Cantarell-Light.ufo/glyphs/oacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/obarred-cy.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/obreve.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ocaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ocircumflex.glif    |   4 +-
 .../glyphs/ocircumflexacute.glif                   |  20 +-
 .../glyphs/ocircumflexdotbelow.glif                |   6 +-
 .../glyphs/ocircumflexgrave.glif                   |  20 +-
 .../glyphs/ocircumflexhookabove.glif               |  20 +-
 .../glyphs/ocircumflextilde.glif                   |  20 +-
 src/Cantarell-Light.ufo/glyphs/odblgrave.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/odieresis-cy.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/odieresis.glif      |   4 +-
 .../glyphs/odieresismacron.glif                    |   5 +-
 .../glyphs/odotaccentmacron.glif                   |   5 +-
 src/Cantarell-Light.ufo/glyphs/odotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/oe.glif             | 116 ++--
 src/Cantarell-Light.ufo/glyphs/ogonek.glif         |  10 +-
 src/Cantarell-Light.ufo/glyphs/ograve.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ohookabove.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/ohorn.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/ohornacute.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/ohorndotbelow.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/ohorngrave.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/ohornhookabove.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/ohorntilde.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/ohungarumlaut.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/oinvertedbreve.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/omacron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/omacronacute.glif   |   5 +-
 src/Cantarell-Light.ufo/glyphs/omacrongrave.glif   |   5 +-
 src/Cantarell-Light.ufo/glyphs/one.dnom.glif       |  33 +-
 src/Cantarell-Light.ufo/glyphs/one.glif            |  24 +-
 src/Cantarell-Light.ufo/glyphs/one.numr.glif       |   2 +-
 src/Cantarell-Light.ufo/glyphs/one.osf.glif        |  32 +-
 src/Cantarell-Light.ufo/glyphs/one.tf.glif         |  24 +-
 src/Cantarell-Light.ufo/glyphs/one.tosf.glif       |  31 -
 src/Cantarell-Light.ufo/glyphs/oneeighth.glif      |   6 +-
 src/Cantarell-Light.ufo/glyphs/onefifth.glif       |   6 +-
 src/Cantarell-Light.ufo/glyphs/onefraction.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/onehalf.glif        |   6 +-
 src/Cantarell-Light.ufo/glyphs/oneinferior.glif    |   2 +-
 src/Cantarell-Light.ufo/glyphs/oneninth.glif       |   6 +-
 src/Cantarell-Light.ufo/glyphs/onequarter.glif     |   6 +-
 src/Cantarell-Light.ufo/glyphs/oneseventh.glif     |   6 +-
 src/Cantarell-Light.ufo/glyphs/onesixth.glif       |   6 +-
 src/Cantarell-Light.ufo/glyphs/onesuperior.glif    |   2 +-
 src/Cantarell-Light.ufo/glyphs/onetenth.glif       |   8 +-
 src/Cantarell-Light.ufo/glyphs/onethird.glif       |   6 +-
 src/Cantarell-Light.ufo/glyphs/oogonek.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/ordfeminine.glif    |  76 +--
 src/Cantarell-Light.ufo/glyphs/ordmasculine.glif   |  50 +-
 src/Cantarell-Light.ufo/glyphs/oslash.glif         |  68 ++-
 src/Cantarell-Light.ufo/glyphs/oslashacute.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/otilde.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/otildeacute.glif    |   5 +-
 src/Cantarell-Light.ufo/glyphs/otildedieresis.glif |   5 +-
 src/Cantarell-Light.ufo/glyphs/otildemacron.glif   |   5 +-
 src/Cantarell-Light.ufo/glyphs/p.glif              |  79 +--
 src/Cantarell-Light.ufo/glyphs/palochka-cy.glif    |   2 +-
 src/Cantarell-Light.ufo/glyphs/paragraph.glif      |  38 +-
 src/Cantarell-Light.ufo/glyphs/parenleft.glif      |  30 +-
 src/Cantarell-Light.ufo/glyphs/parenright.glif     |  12 +-
 src/Cantarell-Light.ufo/glyphs/partialdiff.glif    |  78 +--
 src/Cantarell-Light.ufo/glyphs/pe-cy.glif          |  24 +-
 src/Cantarell-Light.ufo/glyphs/percent.glif        | 112 ++--
 src/Cantarell-Light.ufo/glyphs/periodcentered.glif |  10 +-
 .../glyphs/periodcentered.loclC_A_T_.case.glif     |   2 +-
 .../glyphs/periodcentered.loclC_A_T_.glif          |  24 +-
 src/Cantarell-Light.ufo/glyphs/perthousand.glif    | 114 ++--
 src/Cantarell-Light.ufo/glyphs/peseta.glif         |  49 +-
 src/Cantarell-Light.ufo/glyphs/peso.glif           |  82 +--
 src/Cantarell-Light.ufo/glyphs/pi.glif             |  50 +-
 src/Cantarell-Light.ufo/glyphs/plus.glif           |  26 +-
 src/Cantarell-Light.ufo/glyphs/plus.tf.glif        |  18 -
 src/Cantarell-Light.ufo/glyphs/plusminus.glif      |  32 +-
 src/Cantarell-Light.ufo/glyphs/plusminus.tf.glif   |  24 -
 src/Cantarell-Light.ufo/glyphs/primeR_eversed.glif |   7 +-
 src/Cantarell-Light.ufo/glyphs/primemod.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/product.glif        |  26 +-
 .../glyphs/punctuationspace.glif                   |   4 +-
 src/Cantarell-Light.ufo/glyphs/q.glif              |  79 +--
 src/Cantarell-Light.ufo/glyphs/qa-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/question.glif       |  70 +--
 src/Cantarell-Light.ufo/glyphs/questiondown.glif   |  12 +-
 src/Cantarell-Light.ufo/glyphs/quotedbl.glif       |  10 +-
 src/Cantarell-Light.ufo/glyphs/quotedblbase.glif   |  10 +-
 src/Cantarell-Light.ufo/glyphs/quotedblleft.glif   |  10 +-
 src/Cantarell-Light.ufo/glyphs/quotedblright.glif  |  12 +-
 src/Cantarell-Light.ufo/glyphs/quoteleft.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/quoteright.glif     |   8 +-
 src/Cantarell-Light.ufo/glyphs/quotesinglbase.glif |   8 +-
 src/Cantarell-Light.ufo/glyphs/quotesingle.glif    |  10 +-
 src/Cantarell-Light.ufo/glyphs/r.glif              |  53 +-
 src/Cantarell-Light.ufo/glyphs/racute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/radical.glif        |  20 +-
 src/Cantarell-Light.ufo/glyphs/ratio.glif          |  12 +-
 src/Cantarell-Light.ufo/glyphs/rcaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/rcommaaccent.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/rdblgrave.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/rdotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/registered.glif     | 108 ++--
 src/Cantarell-Light.ufo/glyphs/rightA_rrow.glif    |  25 +-
 .../glyphs/rightanglebracket-math.glif             |  24 +-
 src/Cantarell-Light.ufo/glyphs/ring.glif           |  10 +-
 src/Cantarell-Light.ufo/glyphs/ringhalfleft.glif   |  12 +-
 src/Cantarell-Light.ufo/glyphs/ringhalfright.glif  |  30 +-
 src/Cantarell-Light.ufo/glyphs/rinvertedbreve.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/rlinebelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/ruble.glif          |  60 +-
 src/Cantarell-Light.ufo/glyphs/rupeeI_ndian.glif   |  68 ++-
 src/Cantarell-Light.ufo/glyphs/s.glif              |  73 ++-
 src/Cantarell-Light.ufo/glyphs/sacute.glif         |   4 +-
 .../glyphs/sacutedotaccent.glif                    |  20 +-
 src/Cantarell-Light.ufo/glyphs/saltillo.glif       |  12 +-
 src/Cantarell-Light.ufo/glyphs/scaron.glif         |   4 +-
 .../glyphs/scarondotaccent.glif                    |   5 +-
 src/Cantarell-Light.ufo/glyphs/scedilla.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/schwa-cy.glif       |   2 +-
 src/Cantarell-Light.ufo/glyphs/schwa.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/scircumflex.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/scommaaccent.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/sdotaccent.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/sdotbelow.glif      |   4 +-
 .../glyphs/sdotbelowdotaccent.glif                 |   6 +-
 src/Cantarell-Light.ufo/glyphs/second.glif         |  17 +-
 .../glyphs/secondtonechinese.glif                  |   4 +-
 src/Cantarell-Light.ufo/glyphs/section.glif        | 106 ++--
 src/Cantarell-Light.ufo/glyphs/semicolon.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/seven.dnom.glif     |  27 +-
 src/Cantarell-Light.ufo/glyphs/seven.glif          |  18 +-
 src/Cantarell-Light.ufo/glyphs/seven.numr.glif     |   2 +-
 src/Cantarell-Light.ufo/glyphs/seven.osf.glif      |  26 +-
 src/Cantarell-Light.ufo/glyphs/seven.tf.glif       |  16 +-
 src/Cantarell-Light.ufo/glyphs/seven.tosf.glif     |  25 -
 src/Cantarell-Light.ufo/glyphs/seveneighths.glif   |   6 +-
 src/Cantarell-Light.ufo/glyphs/seveninferior.glif  |   2 +-
 src/Cantarell-Light.ufo/glyphs/sevensuperior.glif  |   2 +-
 src/Cantarell-Light.ufo/glyphs/sha-cy.glif         |  31 +-
 src/Cantarell-Light.ufo/glyphs/shcha-cy.glif       |  35 +-
 src/Cantarell-Light.ufo/glyphs/shha-cy.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/six.dnom.glif       |  87 ++-
 src/Cantarell-Light.ufo/glyphs/six.glif            |  78 +--
 src/Cantarell-Light.ufo/glyphs/six.numr.glif       |   2 +-
 src/Cantarell-Light.ufo/glyphs/six.osf.glif        |  86 +--
 src/Cantarell-Light.ufo/glyphs/six.tf.glif         |  41 +-
 src/Cantarell-Light.ufo/glyphs/sixinferior.glif    |   2 +-
 src/Cantarell-Light.ufo/glyphs/sixsuperior.glif    |   2 +-
 src/Cantarell-Light.ufo/glyphs/slash.glif          |  10 +-
 src/Cantarell-Light.ufo/glyphs/softhyphen.glif     |   8 -
 src/Cantarell-Light.ufo/glyphs/softsign-cy.glif    |  44 +-
 src/Cantarell-Light.ufo/glyphs/space.glif          |   6 +-
 src/Cantarell-Light.ufo/glyphs/sterling.glif       |  66 ++-
 src/Cantarell-Light.ufo/glyphs/summation.glif      |  26 +-
 src/Cantarell-Light.ufo/glyphs/t.glif              |  53 +-
 src/Cantarell-Light.ufo/glyphs/tbar.glif           |   4 +-
 src/Cantarell-Light.ufo/glyphs/tcaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/tcedilla.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/tcommaaccent.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/tdieresis.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/tdotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/te-cy.glif          |  25 +-
 src/Cantarell-Light.ufo/glyphs/tenge.glif          |  24 +-
 src/Cantarell-Light.ufo/glyphs/thorn.glif          |  62 +-
 src/Cantarell-Light.ufo/glyphs/three.dnom.glif     |  93 ++-
 src/Cantarell-Light.ufo/glyphs/three.glif          |  86 +--
 src/Cantarell-Light.ufo/glyphs/three.numr.glif     |   2 +-
 src/Cantarell-Light.ufo/glyphs/three.osf.glif      |  90 +--
 src/Cantarell-Light.ufo/glyphs/three.tf.glif       |  43 +-
 src/Cantarell-Light.ufo/glyphs/three.tosf.glif     |  57 --
 src/Cantarell-Light.ufo/glyphs/threeeighths.glif   |   6 +-
 src/Cantarell-Light.ufo/glyphs/threefifths.glif    |   6 +-
 src/Cantarell-Light.ufo/glyphs/threeinferior.glif  |   2 +-
 src/Cantarell-Light.ufo/glyphs/threequarters.glif  |   6 +-
 src/Cantarell-Light.ufo/glyphs/threesuperior.glif  |   2 +-
 src/Cantarell-Light.ufo/glyphs/tilde.glif          |  10 +-
 .../glyphs/tildecomb_acutecomb.glif                |  18 -
 .../glyphs/tildecomb_dieresiscomb.glif             |  18 -
 .../glyphs/tildecomb_macroncomb.glif               |  18 -
 src/Cantarell-Light.ufo/glyphs/tlinebelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/trademark.glif      |  50 +-
 src/Cantarell-Light.ufo/glyphs/tripleprime.glif    |  11 +-
 src/Cantarell-Light.ufo/glyphs/tse-cy.glif         |  30 +-
 src/Cantarell-Light.ufo/glyphs/tshe-cy.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/tugrik.glif         |  30 +-
 src/Cantarell-Light.ufo/glyphs/two.dnom.glif       |  59 +-
 src/Cantarell-Light.ufo/glyphs/two.glif            |  50 +-
 src/Cantarell-Light.ufo/glyphs/two.numr.glif       |   2 +-
 src/Cantarell-Light.ufo/glyphs/two.osf.glif        |  58 +-
 src/Cantarell-Light.ufo/glyphs/two.tf.glif         |  27 +-
 src/Cantarell-Light.ufo/glyphs/two.tosf.glif       |  41 --
 src/Cantarell-Light.ufo/glyphs/twofifths.glif      |   6 +-
 src/Cantarell-Light.ufo/glyphs/twoinferior.glif    |   2 +-
 src/Cantarell-Light.ufo/glyphs/twosuperior.glif    |   2 +-
 src/Cantarell-Light.ufo/glyphs/twothirds.glif      |   6 +-
 src/Cantarell-Light.ufo/glyphs/u-cy.glif           |   3 +-
 src/Cantarell-Light.ufo/glyphs/u.glif              |  63 +-
 src/Cantarell-Light.ufo/glyphs/uacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ubreve.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ucaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ucircumflex.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/udblgrave.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/udieresis-cy.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/udieresis.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/udieresisacute.glif |   5 +-
 src/Cantarell-Light.ufo/glyphs/udieresiscaron.glif |   5 +-
 src/Cantarell-Light.ufo/glyphs/udieresisgrave.glif |   5 +-
 .../glyphs/udieresismacron.glif                    |   5 +-
 src/Cantarell-Light.ufo/glyphs/udotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/ugrave.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhookabove.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhorn.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhornacute.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhorndotbelow.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhorngrave.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhornhookabove.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhorntilde.glif     |   4 +-
 .../glyphs/uhungarumlaut-cy.glif                   |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhungarumlaut.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/uinvertedbreve.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/umacron-cy.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/umacron.glif        |   4 +-
 .../glyphs/umacrondieresis.glif                    |   5 +-
 src/Cantarell-Light.ufo/glyphs/underscore.glif     |  10 +-
 src/Cantarell-Light.ufo/glyphs/uogonek.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/upA_rrow.glif       |  31 +-
 src/Cantarell-Light.ufo/glyphs/uring.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/ushort-cy.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/ustraight-cy.glif   |  10 +-
 .../glyphs/ustraightstroke-cy.glif                 |   2 +-
 src/Cantarell-Light.ufo/glyphs/utilde.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/utildeacute.glif    |   5 +-
 src/Cantarell-Light.ufo/glyphs/v.glif              |  31 +-
 src/Cantarell-Light.ufo/glyphs/ve-cy.glif          |  72 +--
 .../glyphs/verticallineabovecomb.glif              |   4 +-
 .../glyphs/verticallinelowmod.glif                 |   4 +-
 .../glyphs/verticallinemod.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/w.glif              |  47 +-
 src/Cantarell-Light.ufo/glyphs/wacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/wcircumflex.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/wdieresis.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/we-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/wgrave.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/whiteC_ircle.glif   |  11 +-
 src/Cantarell-Light.ufo/glyphs/won.glif            |  53 +-
 src/Cantarell-Light.ufo/glyphs/x.glif              |  33 +-
 src/Cantarell-Light.ufo/glyphs/y.glif              |  41 +-
 src/Cantarell-Light.ufo/glyphs/yacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/yat-cy.glif         |  56 +-
 src/Cantarell-Light.ufo/glyphs/ycircumflex.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/ydieresis.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/ydotaccent.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/ydotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/yen.glif            |  40 +-
 src/Cantarell-Light.ufo/glyphs/yeru-cy.glif        |  56 +-
 .../glyphs/yerudieresis-cy.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/ygrave.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/yhookabove.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/yi-cy.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/ymacron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/ytilde.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/yusbig-cy.glif      |  64 ++-
 src/Cantarell-Light.ufo/glyphs/z.glif              |  33 +-
 src/Cantarell-Light.ufo/glyphs/zacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/zcaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/zdotaccent.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/zdotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/ze-cy.glif          |  90 +--
 src/Cantarell-Light.ufo/glyphs/zedescender-cy.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/zedieresis-cy.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/zero.dnom.glif      |  61 +-
 src/Cantarell-Light.ufo/glyphs/zero.glif           |  50 +-
 src/Cantarell-Light.ufo/glyphs/zero.numr.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/zero.osf.glif       |  60 +-
 src/Cantarell-Light.ufo/glyphs/zero.osf.zero.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/zero.tf.glif        |  30 +-
 src/Cantarell-Light.ufo/glyphs/zero.tf.zero.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/zero.tosf.glif      |  44 --
 src/Cantarell-Light.ufo/glyphs/zero.tosf.zero.glif |  16 -
 src/Cantarell-Light.ufo/glyphs/zero.zero.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/zeroinferior.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/zerosuperior.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/zerothird.glif      |   6 +-
 src/Cantarell-Light.ufo/glyphs/zhe-cy.glif         |  52 +-
 src/Cantarell-Light.ufo/glyphs/zhebreve-cy.glif    |   4 +-
 .../glyphs/zhedescender-cy.glif                    |  11 +-
 src/Cantarell-Light.ufo/glyphs/zhedieresis-cy.glif |   4 +-
 src/Cantarell-Light.ufo/layercontents.plist        |  32 ++
 src/Cantarell-Light.ufo/lib.plist                  | 296 +---------
 src/Cantarell-Regular.ufo/features.fea             | 209 ++-----
 src/Cantarell-Regular.ufo/fontinfo.plist           |  14 +-
 .../glyphs.F_inal B_ent/be-cy.glif                 |  47 ++
 .../glyphs.F_inal B_ent/contents.plist             |   8 +
 .../glyphs.F_inal B_ent/layerinfo.plist            |  13 +
 .../glyphs.J_un 8 19, 20_47/contents.plist         |  22 +
 .../glyphs.J_un 8 19, 20_47/eight.tf.glif          |  61 ++
 .../glyphs.J_un 8 19, 20_47/five.tf.glif           |  48 ++
 .../glyphs.J_un 8 19, 20_47/four.tf.glif           |  29 +
 .../glyphs.J_un 8 19, 20_47/layerinfo.plist        |  27 +
 .../nine.tf.glif}                                  |   2 +-
 .../glyphs.J_un 8 19, 20_47/seven.tf.glif          |  25 +
 .../six.tf.glif}                                   |   4 +-
 .../glyphs.J_un 8 19, 20_47/three.tf.glif          |  57 ++
 .../glyphs.J_un 8 19, 20_47/two.tf.glif            |  41 ++
 .../glyphs.J_un 8 19, 20_55/contents.plist         |   8 +
 .../glyphs.J_un 8 19, 20_55/layerinfo.plist        |  13 +
 .../glyphs.J_un 8 19, 20_55/zero.tf.glif           |  44 ++
 .../glyphs.M_ay 5 19, 13_08/contents.plist         |  24 +
 .../glyphs.M_ay 5 19, 13_08/eight.glif             |  53 ++
 .../glyphs.M_ay 5 19, 13_08/five.glif              |  40 ++
 .../glyphs.M_ay 5 19, 13_08/four.glif              |  21 +
 .../glyphs.M_ay 5 19, 13_08/layerinfo.plist        |  29 +
 .../glyphs.M_ay 5 19, 13_08/nine.glif}             |  12 +-
 .../glyphs.M_ay 5 19, 13_08/one.glif               |  23 +
 .../glyphs.M_ay 5 19, 13_08/seven.glif             |  17 +
 .../glyphs.M_ay 5 19, 13_08/three.glif             |  51 ++
 .../glyphs.M_ay 5 19, 13_08/two.glif               |  33 ++
 .../glyphs.M_ay 5 19, 13_08/zero.glif              |  42 ++
 .../glyphs.M_ay 5 19, 18_34/contents.plist         |   8 +
 .../glyphs.M_ay 5 19, 18_34/layerinfo.plist        |  13 +
 .../glyphs.M_ay 5 19, 18_34/six.glif               |  47 ++
 .../glyphs.O_utline/S_hcha-cy.glif                 |  37 ++
 .../glyphs.O_utline/contents.plist                 |  10 +
 .../glyphs.O_utline/layerinfo.plist                |  15 +
 .../glyphs.O_utline/shcha-cy.glif                  |  44 ++
 .../glyphs.S_lanted/contents.plist                 |   8 +
 .../glyphs.S_lanted/el-cy.glif                     |  42 ++
 .../glyphs.S_lanted/layerinfo.plist                |  13 +
 .../glyphs.S_teeper/be-cy.glif                     |  43 ++
 .../glyphs.S_teeper/contents.plist                 |   8 +
 .../glyphs.S_teeper/layerinfo.plist                |  13 +
 .../glyphs.T_emplate/florin.glif                   |   2 +
 src/Cantarell-Regular.ufo/glyphs.W_avy/be-cy.glif  |  47 ++
 .../glyphs.W_avy/contents.plist                    |   8 +
 .../glyphs.W_avy/layerinfo.plist                   |  13 +
 src/Cantarell-Regular.ufo/glyphs/A_-cy.glif        |   2 +-
 src/Cantarell-Regular.ufo/glyphs/A_.glif           |  41 +-
 src/Cantarell-Regular.ufo/glyphs/A_E_.glif         |  56 +-
 src/Cantarell-Regular.ufo/glyphs/A_E_acute.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/A_acute.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/A_breve-cy.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/A_breve.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif |   5 +-
 .../glyphs/A_brevedotbelow.glif                    |   6 +-
 src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif |   5 +-
 .../glyphs/A_brevehookabove.glif                   |   5 +-
 src/Cantarell-Regular.ufo/glyphs/A_brevetilde.glif |   5 +-
 src/Cantarell-Regular.ufo/glyphs/A_caron.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif |   4 +-
 .../glyphs/A_circumflexacute.glif                  |  20 +-
 .../glyphs/A_circumflexdotbelow.glif               |   6 +-
 .../glyphs/A_circumflexgrave.glif                  |  20 +-
 .../glyphs/A_circumflexhookabove.glif              |  20 +-
 .../glyphs/A_circumflextilde.glif                  |   5 +-
 src/Cantarell-Regular.ufo/glyphs/A_dblgrave.glif   |   4 +-
 .../glyphs/A_dieresis-cy.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/A_grave.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/A_ie-cy.glif      |   2 +-
 .../glyphs/A_invertedbreve.glif                    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/A_macron.glif     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/A_ring.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/A_tilde.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/B_.glif           |  83 +--
 src/Cantarell-Regular.ufo/glyphs/B_e-cy.glif       |  54 +-
 src/Cantarell-Regular.ufo/glyphs/C_.glif           |  67 +--
 src/Cantarell-Regular.ufo/glyphs/C_acute.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/C_caron.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif    |   4 +-
 .../glyphs/C_cedillaacute.glif                     |   6 +-
 src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif |   4 +-
 src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/C_he-cy.glif      |  52 +-
 .../glyphs/C_hedescender-cy.glif                   |   8 +-
 .../glyphs/C_hedieresis-cy.glif                    |   4 +-
 .../glyphs/C_hekhakassian-cy.glif                  |   4 +-
 .../glyphs/C_heverticalstroke-cy.glif              |  58 +-
 src/Cantarell-Regular.ufo/glyphs/D_.glif           |  55 +-
 src/Cantarell-Regular.ufo/glyphs/D_Z_caron.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/D_caron.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/D_croat.glif      |   2 +-
 src/Cantarell-Regular.ufo/glyphs/D_dotbelow.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/D_e-cy.glif       |  46 +-
 src/Cantarell-Regular.ufo/glyphs/D_je-cy.glif      |  64 ++-
 src/Cantarell-Regular.ufo/glyphs/D_linebelow.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/D_zcaron.glif     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/D_ze-cy.glif      |   2 +-
 src/Cantarell-Regular.ufo/glyphs/D_zhe-cy.glif     |  34 +-
 src/Cantarell-Regular.ufo/glyphs/E_-cy.glif        |  70 ++-
 src/Cantarell-Regular.ufo/glyphs/E_.glif           |  53 +-
 src/Cantarell-Regular.ufo/glyphs/E_acute.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_breve.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_caron.glif      |   4 +-
 .../glyphs/E_cedillabreve.glif                     |   6 +-
 src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif |   4 +-
 .../glyphs/E_circumflexacute.glif                  |  20 +-
 .../glyphs/E_circumflexdotbelow.glif               |   6 +-
 .../glyphs/E_circumflexgrave.glif                  |  20 +-
 .../glyphs/E_circumflexhookabove.glif              |  20 +-
 .../glyphs/E_circumflextilde.glif                  |   5 +-
 src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_f-cy.glif       |  64 ++-
 src/Cantarell-Regular.ufo/glyphs/E_grave.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif  |   4 +-
 .../glyphs/E_invertedbreve.glif                    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_l-cy.glif       |  48 +-
 src/Cantarell-Regular.ufo/glyphs/E_m-cy.glif       |   2 +-
 src/Cantarell-Regular.ufo/glyphs/E_macron.glif     |   4 +-
 .../glyphs/E_macronacute.glif                      |   6 +-
 .../glyphs/E_macrongrave.glif                      |   6 +-
 src/Cantarell-Regular.ufo/glyphs/E_n-cy.glif       |   4 +-
 .../glyphs/E_ndescender-cy.glif                    |   8 +-
 src/Cantarell-Regular.ufo/glyphs/E_ng.glif         |  46 +-
 src/Cantarell-Regular.ufo/glyphs/E_nghe-cy.glif    |  42 +-
 src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif       |   2 +-
 .../glyphs/E_reversed-cy.glif                      |  72 +--
 src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif       |   2 +-
 .../glyphs/E_sdescender-cy.glif                    |   2 +-
 src/Cantarell-Regular.ufo/glyphs/E_th.glif         |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_tilde.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/F_.glif           |  41 +-
 src/Cantarell-Regular.ufo/glyphs/F_ita-cy.glif     |   2 +-
 src/Cantarell-Regular.ufo/glyphs/G_.glif           |  77 +--
 src/Cantarell-Regular.ufo/glyphs/G_breve.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/G_caron.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif |   4 +-
 .../glyphs/G_commaaccent.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/G_e-cy.glif       |  24 +-
 .../glyphs/G_edescender-cy.glif                    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/G_ermandbls.glif  |  76 +--
 .../glyphs/G_hemiddlehook-cy.glif                  |  60 +-
 .../glyphs/G_hestroke-cy.glif                      |  30 +-
 .../glyphs/G_heupturn-cy.glif                      |  26 +-
 src/Cantarell-Regular.ufo/glyphs/G_je-cy.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/G_macron.glif     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/H_.glif           |  49 +-
 src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif       |   4 +-
 .../glyphs/H_adescender-cy.glif                    |  10 +-
 src/Cantarell-Regular.ufo/glyphs/H_ardsign-cy.glif |  56 +-
 src/Cantarell-Regular.ufo/glyphs/H_bar.glif        |   4 +-
 src/Cantarell-Regular.ufo/glyphs/H_brevebelow.glif |   4 +-
 src/Cantarell-Regular.ufo/glyphs/H_circumflex.glif |   4 +-
 src/Cantarell-Regular.ufo/glyphs/H_dotbelow.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_-cy.glif        |   2 +-
 src/Cantarell-Regular.ufo/glyphs/I_.glif           |  27 +-
 src/Cantarell-Regular.ufo/glyphs/I_a-cy.glif       |  64 ++-
 src/Cantarell-Regular.ufo/glyphs/I_acute.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_breve.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_caron.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_circumflex.glif |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_dblgrave.glif   |   4 +-
 .../glyphs/I_dieresis-cy.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_dieresis.glif   |   4 +-
 .../glyphs/I_dieresisacute.glif                    |   6 +-
 src/Cantarell-Regular.ufo/glyphs/I_dotaccent.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_dotbelow.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif       |   3 +-
 src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_grave.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_hookabove.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_i-cy.glif       |  38 +-
 src/Cantarell-Regular.ufo/glyphs/I_igrave-cy.glif  |   4 +-
 .../glyphs/I_invertedbreve.glif                    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_ishort-cy.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_macron-cy.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_macron.glif     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_ogonek.glif     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_tilde.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_u-cy.glif       |  76 +--
 src/Cantarell-Regular.ufo/glyphs/I_zhitsa-cy.glif  |  36 +-
 src/Cantarell-Regular.ufo/glyphs/J_.glif           |  41 +-
 src/Cantarell-Regular.ufo/glyphs/J_acute.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/J_circumflex.glif |   4 +-
 src/Cantarell-Regular.ufo/glyphs/J_e-cy.glif       |   2 +-
 src/Cantarell-Regular.ufo/glyphs/K_.glif           |  37 +-
 src/Cantarell-Regular.ufo/glyphs/K_a-cy.glif       |  42 +-
 .../glyphs/K_abashkir-cy.glif                      |  42 +-
 src/Cantarell-Regular.ufo/glyphs/K_acute.glif      |   4 +-
 .../glyphs/K_adescender-cy.glif                    |  10 +-
 .../glyphs/K_averticalstroke-cy.glif               |  48 +-
 .../glyphs/K_commaaccent.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/K_je-cy.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/L_.glif           |  33 +-
 src/Cantarell-Regular.ufo/glyphs/L_J_.glif         |   4 +-
 src/Cantarell-Regular.ufo/glyphs/L_acute.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/L_caron.glif      |   4 +-
 .../glyphs/L_commaaccent.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/L_dot.glif        |   4 +-
 src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/L_j.glif          |   4 +-
 src/Cantarell-Regular.ufo/glyphs/L_je-cy.glif      |  80 +--
 src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/L_slash.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/M_.glif           |  47 +-
 src/Cantarell-Regular.ufo/glyphs/M_dotbelow.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/N_.glif           |  41 +-
 src/Cantarell-Regular.ufo/glyphs/N_J_.glif         |   4 +-
 src/Cantarell-Regular.ufo/glyphs/N_acute.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/N_caron.glif      |   4 +-
 .../glyphs/N_commaaccent.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/N_dotaccent.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/N_dotbelow.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/N_j.glif          |   4 +-
 src/Cantarell-Regular.ufo/glyphs/N_je-cy.glif      |  70 ++-
 src/Cantarell-Regular.ufo/glyphs/N_linebelow.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/N_tilde.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/O_-cy.glif        |   3 +-
 src/Cantarell-Regular.ufo/glyphs/O_.glif           |  73 +--
 src/Cantarell-Regular.ufo/glyphs/O_E_.glif         |  92 ++-
 src/Cantarell-Regular.ufo/glyphs/O_acute.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/O_barred-cy.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/O_breve.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/O_caron.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/O_circumflex.glif |   4 +-
 .../glyphs/O_circumflexacute.glif                  |  20 +-
 .../glyphs/O_circumflexdotbelow.glif               |   6 +-
 .../glyphs/O_circumflexgrave.glif                  |  20 +-
 .../glyphs/O_circumflexhookabove.glif              |  20 +-
 .../glyphs/O_circumflextilde.glif                  |   5 +-
 src/Cantarell-Regular.ufo/glyphs/O_dblgrave.glif   |   4 +-
 .../glyphs/O_dieresis-cy.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/O_dieresis.glif   |   4 +-
 .../glyphs/O_dieresismacron.glif                   |   6 +-
 .../glyphs/O_dotaccentmacron.glif                  |   6 +-
 src/Cantarell-Regular.ufo/glyphs/O_dotbelow.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/O_grave.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/O_hm.glif         |  66 +--
 src/Cantarell-Regular.ufo/glyphs/O_hookabove.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/O_horn.glif       |   8 +-
 src/Cantarell-Regular.ufo/glyphs/O_hornacute.glif  |   4 +-
 .../glyphs/O_horndotbelow.glif                     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/O_horngrave.glif  |   4 +-
 .../glyphs/O_hornhookabove.glif                    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/O_horntilde.glif  |   4 +-
 .../glyphs/O_hungarumlaut.glif                     |   4 +-
 .../glyphs/O_invertedbreve.glif                    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/O_macron.glif     |   4 +-
 .../glyphs/O_macronacute.glif                      |   6 +-
 .../glyphs/O_macrongrave.glif                      |   6 +-
 src/Cantarell-Regular.ufo/glyphs/O_ogonek.glif     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/O_slash.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/O_slashacute.glif |   4 +-
 src/Cantarell-Regular.ufo/glyphs/O_tilde.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/O_tildeacute.glif |   6 +-
 .../glyphs/O_tildedieresis.glif                    |   6 +-
 .../glyphs/O_tildemacron.glif                      |   6 +-
 src/Cantarell-Regular.ufo/glyphs/P_.glif           |  59 +-
 src/Cantarell-Regular.ufo/glyphs/P_alochka-cy.glif |   2 +-
 src/Cantarell-Regular.ufo/glyphs/P_e-cy.glif       |  28 +-
 src/Cantarell-Regular.ufo/glyphs/Q_.glif           |  71 +--
 src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif       |   2 +-
 src/Cantarell-Regular.ufo/glyphs/R_.glif           |  67 ++-
 src/Cantarell-Regular.ufo/glyphs/R_acute.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/R_caron.glif      |   4 +-
 .../glyphs/R_commaaccent.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif   |   4 +-
 .../glyphs/R_invertedbreve.glif                    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/S_.glif           |  73 ++-
 src/Cantarell-Regular.ufo/glyphs/S_acute.glif      |   4 +-
 .../glyphs/S_acutedotaccent.glif                   |   6 +-
 src/Cantarell-Regular.ufo/glyphs/S_altillo.glif    |  12 +-
 src/Cantarell-Regular.ufo/glyphs/S_caron.glif      |   4 +-
 .../glyphs/S_carondotaccent.glif                   |   6 +-
 src/Cantarell-Regular.ufo/glyphs/S_cedilla.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/S_chwa-cy.glif    |   2 +-
 src/Cantarell-Regular.ufo/glyphs/S_chwa.glif       |  70 +--
 src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif |   4 +-
 .../glyphs/S_commaaccent.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif   |   4 +-
 .../glyphs/S_dotbelowdotaccent.glif                |   6 +-
 src/Cantarell-Regular.ufo/glyphs/S_ha-cy.glif      |  35 +-
 src/Cantarell-Regular.ufo/glyphs/S_hcha-cy.glif    |  39 +-
 src/Cantarell-Regular.ufo/glyphs/S_hha-cy.glif     |  48 +-
 src/Cantarell-Regular.ufo/glyphs/S_oftsign-cy.glif |  48 +-
 src/Cantarell-Regular.ufo/glyphs/T_.glif           |  35 +-
 src/Cantarell-Regular.ufo/glyphs/T_bar.glif        |   4 +-
 src/Cantarell-Regular.ufo/glyphs/T_caron.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/T_cedilla.glif    |   4 +-
 .../glyphs/T_commaaccent.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/T_dotbelow.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/T_e-cy.glif       |   3 +-
 src/Cantarell-Regular.ufo/glyphs/T_horn.glif       |  48 +-
 src/Cantarell-Regular.ufo/glyphs/T_linebelow.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/T_se-cy.glif      |  34 +-
 src/Cantarell-Regular.ufo/glyphs/T_she-cy.glif     |  60 +-
 src/Cantarell-Regular.ufo/glyphs/U_-cy.glif        |  24 +-
 src/Cantarell-Regular.ufo/glyphs/U_.glif           |  55 +-
 src/Cantarell-Regular.ufo/glyphs/U_acute.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/U_breve.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/U_caron.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif |   4 +-
 src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif   |   4 +-
 .../glyphs/U_dieresis-cy.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif   |   4 +-
 .../glyphs/U_dieresisacute.glif                    |   6 +-
 .../glyphs/U_dieresiscaron.glif                    |   6 +-
 .../glyphs/U_dieresisgrave.glif                    |   6 +-
 .../glyphs/U_dieresismacron.glif                   |   6 +-
 src/Cantarell-Regular.ufo/glyphs/U_dotbelow.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/U_grave.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/U_horn.glif       |   8 +-
 src/Cantarell-Regular.ufo/glyphs/U_hornacute.glif  |   4 +-
 .../glyphs/U_horndotbelow.glif                     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif  |   4 +-
 .../glyphs/U_hornhookabove.glif                    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif  |   4 +-
 .../glyphs/U_hungarumlaut-cy.glif                  |   4 +-
 .../glyphs/U_hungarumlaut.glif                     |   4 +-
 .../glyphs/U_invertedbreve.glif                    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/U_macron-cy.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/U_macron.glif     |   4 +-
 .../glyphs/U_macrondieresis.glif                   |   6 +-
 src/Cantarell-Regular.ufo/glyphs/U_ogonek.glif     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/U_ring.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/U_short-cy.glif   |   4 +-
 .../glyphs/U_straight-cy.glif                      |   2 +-
 .../glyphs/U_straightstroke-cy.glif                |   2 +-
 src/Cantarell-Regular.ufo/glyphs/U_tilde.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif |   6 +-
 src/Cantarell-Regular.ufo/glyphs/V_.glif           |  31 +-
 src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif       |   2 +-
 src/Cantarell-Regular.ufo/glyphs/W_.glif           |  47 +-
 src/Cantarell-Regular.ufo/glyphs/W_acute.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/W_circumflex.glif |   4 +-
 src/Cantarell-Regular.ufo/glyphs/W_dieresis.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/W_e-cy.glif       |   2 +-
 src/Cantarell-Regular.ufo/glyphs/W_grave.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/X_.glif           |  43 +-
 src/Cantarell-Regular.ufo/glyphs/Y_.glif           |  37 +-
 src/Cantarell-Regular.ufo/glyphs/Y_acute.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_at-cy.glif      |  58 +-
 src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif |   4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_eru-cy.glif     |  60 +-
 .../glyphs/Y_erudieresis-cy.glif                   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_grave.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_i-cy.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_macron.glif     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_usbig-cy.glif   |  68 ++-
 src/Cantarell-Regular.ufo/glyphs/Z_.glif           |  33 +-
 src/Cantarell-Regular.ufo/glyphs/Z_acute.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/Z_caron.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/Z_e-cy.glif       |  90 +--
 .../glyphs/Z_edescender-cy.glif                    |   4 +-
 .../glyphs/Z_edieresis-cy.glif                     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/Z_he-cy.glif      |  50 +-
 src/Cantarell-Regular.ufo/glyphs/Z_hebreve-cy.glif |   4 +-
 .../glyphs/Z_hedescender-cy.glif                   |  10 +-
 .../glyphs/Z_hedieresis-cy.glif                    |   4 +-
 .../glyphs/_currencyvstem.glif                     |   8 +-
 .../glyphs/_descenderreverse-cy.case.glif          |   6 +-
 .../glyphs/_descenderreversed-cy.glif              |   2 +-
 src/Cantarell-Regular.ufo/glyphs/_o.numero.glif    |  16 -
 src/Cantarell-Regular.ufo/glyphs/_typoquote.glif   |   8 +-
 src/Cantarell-Regular.ufo/glyphs/a-cy.glif         |   1 -
 src/Cantarell-Regular.ufo/glyphs/a.glif            |   9 +-
 src/Cantarell-Regular.ufo/glyphs/abreve-cy.glif    |   2 +-
 src/Cantarell-Regular.ufo/glyphs/abreveacute.glif  |   3 +-
 src/Cantarell-Regular.ufo/glyphs/abrevegrave.glif  |   3 +-
 .../glyphs/abrevehookabove.glif                    |   3 +-
 src/Cantarell-Regular.ufo/glyphs/abrevetilde.glif  |   3 +-
 .../glyphs/acircumflexacute.glif                   |  18 +-
 .../glyphs/acircumflexgrave.glif                   |  18 +-
 .../glyphs/acircumflexhookabove.glif               |  18 +-
 .../glyphs/acircumflextilde.glif                   |   3 +-
 src/Cantarell-Regular.ufo/glyphs/acute.glif        |  10 +-
 .../glyphs/acutecomb_dotaccentcomb.glif            |  18 -
 src/Cantarell-Regular.ufo/glyphs/adieresis-cy.glif |   2 +-
 src/Cantarell-Regular.ufo/glyphs/ae.glif           |  80 +--
 src/Cantarell-Regular.ufo/glyphs/ampersand.glif    |  78 +--
 .../glyphs/apostrophemod.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/approxequal.glif  |  88 +--
 .../glyphs/approxequal.tf.glif                     |  50 --
 src/Cantarell-Regular.ufo/glyphs/asciicircum.glif  |  24 +-
 src/Cantarell-Regular.ufo/glyphs/asciitilde.glif   |  48 +-
 src/Cantarell-Regular.ufo/glyphs/asterisk.glif     |  44 +-
 src/Cantarell-Regular.ufo/glyphs/b.glif            |  27 +-
 src/Cantarell-Regular.ufo/glyphs/backslash.glif    |  12 +-
 src/Cantarell-Regular.ufo/glyphs/bar.glif          |  18 +-
 src/Cantarell-Regular.ufo/glyphs/be-cy.glif        |  74 ++-
 src/Cantarell-Regular.ufo/glyphs/blackC_ircle.glif |  29 +-
 src/Cantarell-Regular.ufo/glyphs/blank.glif        |  29 +-
 src/Cantarell-Regular.ufo/glyphs/braceleft.glif    |  66 +--
 src/Cantarell-Regular.ufo/glyphs/braceright.glif   |  12 +-
 src/Cantarell-Regular.ufo/glyphs/bracketleft.glif  |  10 +-
 src/Cantarell-Regular.ufo/glyphs/bracketright.glif |  12 +-
 src/Cantarell-Regular.ufo/glyphs/breve.glif        |  10 +-
 .../glyphs/brevecomb-cy.case.glif                  |   2 +-
 src/Cantarell-Regular.ufo/glyphs/brevecomb-cy.glif |  12 +-
 .../glyphs/brevecomb_acutecomb.case.glif           |  13 -
 .../glyphs/brevecomb_acutecomb.glif                |  13 -
 .../glyphs/brevecomb_gravecomb.case.glif           |  13 -
 .../glyphs/brevecomb_gravecomb.glif                |  13 -
 .../glyphs/brevecomb_hookabovecomb.case.glif       |  13 -
 .../glyphs/brevecomb_hookabovecomb.glif            |  13 -
 .../glyphs/brevecomb_tildecomb.case.glif           |  13 -
 .../glyphs/brevecomb_tildecomb.glif                |  13 -
 src/Cantarell-Regular.ufo/glyphs/brokenbar.glif    |  26 +-
 src/Cantarell-Regular.ufo/glyphs/bullet.glif       |  23 +-
 .../glyphs/bulletoperator.glif                     |  10 +-
 .../glyphs/bulletoperator.tf.glif                  |  20 -
 src/Cantarell-Regular.ufo/glyphs/c.glif            |  61 +-
 src/Cantarell-Regular.ufo/glyphs/cacute.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/caron.glif        |  10 +-
 .../glyphs/caroncomb.loclV_I_E_T_.glif             |   4 +-
 .../glyphs/caroncomb_dotaccentcomb.glif            |  18 -
 src/Cantarell-Regular.ufo/glyphs/ccaron.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ccedilla.glif     |   4 +-
 .../glyphs/ccedillaacute.glif                      |   6 +-
 src/Cantarell-Regular.ufo/glyphs/ccircumflex.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/cdotaccent.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/cedi.glif         |  53 +-
 src/Cantarell-Regular.ufo/glyphs/cedilla.glif      |  10 +-
 src/Cantarell-Regular.ufo/glyphs/cent.glif         |  10 +-
 src/Cantarell-Regular.ufo/glyphs/che-cy.glif       |  48 +-
 .../glyphs/chedescender-cy.glif                    |   6 +-
 .../glyphs/chedieresis-cy.glif                     |   4 +-
 .../glyphs/chekhakassian-cy.glif                   |   2 +-
 .../glyphs/cheverticalstroke-cy.glif               |  58 +-
 src/Cantarell-Regular.ufo/glyphs/circumflex.glif   |  10 +-
 .../glyphs/circumflexcomb.glif                     |   2 +-
 .../glyphs/circumflexcomb.loclV_I_E_T_.glif        |   2 +-
 .../glyphs/circumflexcomb_acutecomb.case.glif      |  13 -
 .../glyphs/circumflexcomb_acutecomb.glif           |  18 -
 .../glyphs/circumflexcomb_gravecomb.case.glif      |  13 -
 .../glyphs/circumflexcomb_gravecomb.glif           |  18 -
 .../glyphs/circumflexcomb_hookabovecomb.case.glif  |  13 -
 .../glyphs/circumflexcomb_hookabovecomb.glif       |  13 -
 .../glyphs/circumflexcomb_tildecomb.case.glif      |  13 -
 .../glyphs/circumflexcomb_tildecomb.glif           |  13 -
 src/Cantarell-Regular.ufo/glyphs/colon.glif        |   4 +-
 src/Cantarell-Regular.ufo/glyphs/colonsign.glif    |  69 ++-
 src/Cantarell-Regular.ufo/glyphs/comma.glif        |  18 +-
 .../glyphs/commaturnedabovecomb.glif               |   8 +-
 .../glyphs/commaturnedmod.glif                     |   4 +-
 .../glyphs/commercialM_inusS_ign.glif              |  64 ++-
 .../glyphs/commercialM_inusS_ign.tf.glif           |  40 --
 src/Cantarell-Regular.ufo/glyphs/contents.plist    | 140 +----
 src/Cantarell-Regular.ufo/glyphs/copyright.glif    | 108 ++--
 src/Cantarell-Regular.ufo/glyphs/currency.glif     |  88 +--
 src/Cantarell-Regular.ufo/glyphs/d.glif            |  25 +-
 src/Cantarell-Regular.ufo/glyphs/dagger.glif       |  30 +-
 src/Cantarell-Regular.ufo/glyphs/daggerdbl.glif    |  54 +-
 .../glyphs/dblgravecomb.case.glif                  |  16 +-
 src/Cantarell-Regular.ufo/glyphs/dblgravecomb.glif |  12 +-
 src/Cantarell-Regular.ufo/glyphs/de-cy.glif        |  46 +-
 src/Cantarell-Regular.ufo/glyphs/degree.glif       |  56 +-
 .../glyphs/descender-cy.case.glif                  |   6 +-
 src/Cantarell-Regular.ufo/glyphs/dieresis.glif     |  10 +-
 .../glyphs/dieresisbelowcomb.glif                  |  28 +-
 src/Cantarell-Regular.ufo/glyphs/dieresiscomb.glif |  28 +-
 .../glyphs/dieresiscomb.loclV_I_E_T_.glif          |  28 +-
 .../glyphs/dieresiscomb_acutecomb.glif             |  18 -
 .../glyphs/dieresiscomb_caroncomb.glif             |  18 -
 .../glyphs/dieresiscomb_gravecomb.glif             |  18 -
 .../glyphs/dieresiscomb_macroncomb.glif            |  18 -
 src/Cantarell-Regular.ufo/glyphs/divide.glif       |  66 ++-
 src/Cantarell-Regular.ufo/glyphs/divide.tf.glif    |  40 --
 .../glyphs/divisionslash.glif                      |  15 +-
 .../glyphs/divisionslash.tf.glif                   |  12 -
 src/Cantarell-Regular.ufo/glyphs/dollar.glif       |  59 +-
 src/Cantarell-Regular.ufo/glyphs/dong.glif         |  58 +-
 src/Cantarell-Regular.ufo/glyphs/dotaccent.glif    |  10 +-
 .../glyphs/dotaccentcomb_macroncomb.glif           |  13 -
 .../glyphs/doubleprimemod.glif                     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/downA_rrow.glif   |  15 +-
 src/Cantarell-Regular.ufo/glyphs/dzhe-cy.glif      |   4 +
 src/Cantarell-Regular.ufo/glyphs/e-cy.glif         |  74 +--
 src/Cantarell-Regular.ufo/glyphs/e.glif            |  81 +--
 src/Cantarell-Regular.ufo/glyphs/eacute.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ebreve.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ecaron.glif       |   4 +-
 .../glyphs/ecedillabreve.glif                      |   6 +-
 src/Cantarell-Regular.ufo/glyphs/ecircumflex.glif  |   4 +-
 .../glyphs/ecircumflexacute.glif                   |  20 +-
 .../glyphs/ecircumflexdotbelow.glif                |   6 +-
 .../glyphs/ecircumflexgrave.glif                   |  20 +-
 .../glyphs/ecircumflexhookabove.glif               |  20 +-
 .../glyphs/ecircumflextilde.glif                   |   5 +-
 src/Cantarell-Regular.ufo/glyphs/edblgrave.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/edieresis.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/edotaccent.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/edotbelow.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ef-cy.glif        | 118 ++--
 src/Cantarell-Regular.ufo/glyphs/egrave.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ehookabove.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/eight.dnom.glif   |  97 ++--
 src/Cantarell-Regular.ufo/glyphs/eight.glif        |  90 +--
 src/Cantarell-Regular.ufo/glyphs/eight.numr.glif   |   2 +-
 src/Cantarell-Regular.ufo/glyphs/eight.osf.glif    |  98 ++--
 src/Cantarell-Regular.ufo/glyphs/eight.tf.glif     |  47 +-
 src/Cantarell-Regular.ufo/glyphs/eight.tosf.glif   |  61 --
 .../glyphs/eightinferior.glif                      |   2 +-
 .../glyphs/eightsuperior.glif                      |   2 +-
 .../glyphs/einvertedbreve.glif                     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/el-cy.glif        |  44 +-
 src/Cantarell-Regular.ufo/glyphs/ellipsis.glif     |  14 +-
 src/Cantarell-Regular.ufo/glyphs/em-cy.glif        |   4 +
 src/Cantarell-Regular.ufo/glyphs/emacron.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/emacronacute.glif |   5 +-
 src/Cantarell-Regular.ufo/glyphs/emacrongrave.glif |   5 +-
 src/Cantarell-Regular.ufo/glyphs/emdash.glif       |  11 +-
 src/Cantarell-Regular.ufo/glyphs/emptyset.glif     |  58 +-
 src/Cantarell-Regular.ufo/glyphs/emquad.glif       |   7 -
 src/Cantarell-Regular.ufo/glyphs/emspace.glif      |   1 +
 src/Cantarell-Regular.ufo/glyphs/en-cy.glif        |   6 +-
 src/Cantarell-Regular.ufo/glyphs/endash.glif       |  10 +-
 .../glyphs/endescender-cy.glif                     |   6 +-
 src/Cantarell-Regular.ufo/glyphs/eng.glif          |  14 +-
 src/Cantarell-Regular.ufo/glyphs/enghe-cy.glif     |  20 +-
 src/Cantarell-Regular.ufo/glyphs/enquad.glif       |   7 -
 src/Cantarell-Regular.ufo/glyphs/enspace.glif      |   1 +
 src/Cantarell-Regular.ufo/glyphs/eogonek.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/equal.glif        |  24 +-
 src/Cantarell-Regular.ufo/glyphs/equal.tf.glif     |  18 -
 src/Cantarell-Regular.ufo/glyphs/equivalence.glif  |  34 +-
 .../glyphs/equivalence.tf.glif                     |  24 -
 src/Cantarell-Regular.ufo/glyphs/ereversed-cy.glif |  68 +--
 src/Cantarell-Regular.ufo/glyphs/es-cy.glif        |   2 +-
 .../glyphs/esdescender-cy.glif                     |   2 +-
 src/Cantarell-Regular.ufo/glyphs/estimated.glif    |  62 +-
 src/Cantarell-Regular.ufo/glyphs/etilde.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/euro.glif         |  76 +--
 src/Cantarell-Regular.ufo/glyphs/exclam.glif       |  34 +-
 src/Cantarell-Regular.ufo/glyphs/exclamdown.glif   |  12 +-
 src/Cantarell-Regular.ufo/glyphs/f.glif            |   3 -
 src/Cantarell-Regular.ufo/glyphs/f_f.glif          |  16 -
 src/Cantarell-Regular.ufo/glyphs/f_f_i.glif        |  16 -
 src/Cantarell-Regular.ufo/glyphs/f_f_l.glif        |  16 -
 src/Cantarell-Regular.ufo/glyphs/fi.glif           |   2 +-
 src/Cantarell-Regular.ufo/glyphs/figuredash.glif   |  16 +-
 src/Cantarell-Regular.ufo/glyphs/figurespace.glif  |   8 +-
 .../glyphs/firsttonechinese.glif                   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/fita-cy.glif      |   2 +-
 src/Cantarell-Regular.ufo/glyphs/five.dnom.glif    |  71 ++-
 src/Cantarell-Regular.ufo/glyphs/five.glif         |  64 +--
 src/Cantarell-Regular.ufo/glyphs/five.numr.glif    |   2 +-
 src/Cantarell-Regular.ufo/glyphs/five.osf.glif     |  72 +--
 src/Cantarell-Regular.ufo/glyphs/five.tf.glif      |  34 +-
 src/Cantarell-Regular.ufo/glyphs/five.tosf.glif    |  48 --
 src/Cantarell-Regular.ufo/glyphs/fiveeighths.glif  |   6 +-
 src/Cantarell-Regular.ufo/glyphs/fiveinferior.glif |   2 +-
 src/Cantarell-Regular.ufo/glyphs/fivesixths.glif   |   6 +-
 src/Cantarell-Regular.ufo/glyphs/fivesuperior.glif |   2 +-
 src/Cantarell-Regular.ufo/glyphs/fl.glif           |   2 +-
 src/Cantarell-Regular.ufo/glyphs/florin.glif       |  68 ++-
 src/Cantarell-Regular.ufo/glyphs/four.dnom.glif    |  33 +-
 src/Cantarell-Regular.ufo/glyphs/four.glif         |  26 +-
 src/Cantarell-Regular.ufo/glyphs/four.numr.glif    |   2 +-
 src/Cantarell-Regular.ufo/glyphs/four.osf.glif     |  34 +-
 src/Cantarell-Regular.ufo/glyphs/four.tf.glif      |  24 +-
 src/Cantarell-Regular.ufo/glyphs/four.tosf.glif    |  29 -
 src/Cantarell-Regular.ufo/glyphs/fourfifths.glif   |   6 +-
 src/Cantarell-Regular.ufo/glyphs/fourinferior.glif |   2 +-
 src/Cantarell-Regular.ufo/glyphs/foursuperior.glif |   2 +-
 .../glyphs/fourthtonechinese.glif                  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/fraction.glif     |  10 +-
 src/Cantarell-Regular.ufo/glyphs/franc.glif        |  29 +-
 src/Cantarell-Regular.ufo/glyphs/g.glif            |  11 +-
 src/Cantarell-Regular.ufo/glyphs/ge-cy.glif        |   4 +-
 .../glyphs/gedescender-cy.glif                     |   2 +-
 src/Cantarell-Regular.ufo/glyphs/germandbls.glif   |   6 +
 .../glyphs/ghemiddlehook-cy.glif                   |  38 +-
 src/Cantarell-Regular.ufo/glyphs/ghestroke-cy.glif |  28 +-
 src/Cantarell-Regular.ufo/glyphs/gheupturn-cy.glif |  10 +-
 src/Cantarell-Regular.ufo/glyphs/gje-cy.glif       |   2 +-
 src/Cantarell-Regular.ufo/glyphs/grave.glif        |  10 +-
 src/Cantarell-Regular.ufo/glyphs/greater.glif      |  24 +-
 src/Cantarell-Regular.ufo/glyphs/greater.tf.glif   |  16 -
 src/Cantarell-Regular.ufo/glyphs/greaterequal.glif |  32 +-
 .../glyphs/greaterequal.tf.glif                    |  22 -
 src/Cantarell-Regular.ufo/glyphs/guarani.glif      |  58 +-
 .../glyphs/guillemetleft.glif                      |  30 +-
 .../glyphs/guillemetright.glif                     |  38 +-
 .../glyphs/guilsinglleft.glif                      |  16 +-
 .../glyphs/guilsinglright.glif                     |  24 +-
 src/Cantarell-Regular.ufo/glyphs/h.glif            |  23 +-
 src/Cantarell-Regular.ufo/glyphs/ha-cy.glif        |   2 +-
 .../glyphs/hadescender-cy.glif                     |   6 +-
 src/Cantarell-Regular.ufo/glyphs/hardsign-cy.glif  |  54 +-
 .../glyphs/horizontalbar.glif                      |   8 -
 src/Cantarell-Regular.ufo/glyphs/hryvnia.glif      |  64 ++-
 src/Cantarell-Regular.ufo/glyphs/hungarumlaut.glif |  10 +-
 .../glyphs/hungarumlautcomb.case.glif              |  12 +-
 src/Cantarell-Regular.ufo/glyphs/hyphen.glif       |  13 +-
 src/Cantarell-Regular.ufo/glyphs/hyphentwo.glif    |   8 -
 src/Cantarell-Regular.ufo/glyphs/i-cy.glif         |   2 +-
 src/Cantarell-Regular.ufo/glyphs/i.glif            |   8 +-
 src/Cantarell-Regular.ufo/glyphs/ia-cy.glif        |  58 +-
 src/Cantarell-Regular.ufo/glyphs/iacute.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ibreve.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/icaron.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/icircumflex.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/idblgrave.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/idieresis.glif    |   4 +-
 .../glyphs/idieresisacute.glif                     |   5 +-
 src/Cantarell-Regular.ufo/glyphs/idotaccent.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/idotbelow.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/idotless.glif     |  27 +-
 src/Cantarell-Regular.ufo/glyphs/ie-cy.glif        |   3 +-
 src/Cantarell-Regular.ufo/glyphs/iebreve-cy.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/iegrave-cy.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/igrave.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ihookabove.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ii-cy.glif        |   4 +
 .../glyphs/iinvertedbreve.glif                     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/imacron.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/increment.glif    |  20 +-
 src/Cantarell-Regular.ufo/glyphs/infinity.glif     |  74 +--
 src/Cantarell-Regular.ufo/glyphs/integral.glif     |  66 +--
 src/Cantarell-Regular.ufo/glyphs/io-cy.glif        |   4 +-
 src/Cantarell-Regular.ufo/glyphs/iogonek.glif      |   6 +-
 src/Cantarell-Regular.ufo/glyphs/itilde.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/iu-cy.glif        |   6 +-
 src/Cantarell-Regular.ufo/glyphs/izhitsa-cy.glif   |  32 +-
 src/Cantarell-Regular.ufo/glyphs/j.glif            |   7 +-
 src/Cantarell-Regular.ufo/glyphs/jacute.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/jcircumflex.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/jdotless.glif     |  35 +-
 src/Cantarell-Regular.ufo/glyphs/je-cy.glif        |   2 +-
 src/Cantarell-Regular.ufo/glyphs/k.glif            |  21 +-
 src/Cantarell-Regular.ufo/glyphs/ka-cy.glif        |  38 +-
 src/Cantarell-Regular.ufo/glyphs/kabashkir-cy.glif |  42 +-
 .../glyphs/kadescender-cy.glif                     |   6 +-
 .../glyphs/kaverticalstroke-cy.glif                |  40 +-
 src/Cantarell-Regular.ufo/glyphs/kgreenlandic.glif |  12 +-
 src/Cantarell-Regular.ufo/glyphs/kip.glif          |  38 +-
 src/Cantarell-Regular.ufo/glyphs/kje-cy.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/l.glif            |  53 +-
 src/Cantarell-Regular.ufo/glyphs/l.ss01.glif       |  25 +
 src/Cantarell-Regular.ufo/glyphs/lacute.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/layerinfo.plist   | 146 +----
 src/Cantarell-Regular.ufo/glyphs/lcaron.glif       |   2 +-
 src/Cantarell-Regular.ufo/glyphs/lcommaaccent.glif |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ldot.glif         |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ldotbelow.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/leftA_rrow.glif   |  15 +-
 .../glyphs/leftanglebracket-math.glif              |  12 +-
 src/Cantarell-Regular.ufo/glyphs/less.glif         |  12 +-
 src/Cantarell-Regular.ufo/glyphs/less.tf.glif      |   7 -
 src/Cantarell-Regular.ufo/glyphs/lessequal.glif    |  12 +-
 src/Cantarell-Regular.ufo/glyphs/lessequal.tf.glif |   7 -
 src/Cantarell-Regular.ufo/glyphs/lira.glif         |  74 +--
 src/Cantarell-Regular.ufo/glyphs/liraT_urkish.glif |  49 +-
 src/Cantarell-Regular.ufo/glyphs/literS_ign.glif   |  70 +--
 src/Cantarell-Regular.ufo/glyphs/lj.glif           |   4 +-
 src/Cantarell-Regular.ufo/glyphs/lje-cy.glif       |  80 +--
 src/Cantarell-Regular.ufo/glyphs/llinebelow.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/logicalnot.glif   |  24 +-
 .../glyphs/logicalnot.tf.glif                      |  18 -
 src/Cantarell-Regular.ufo/glyphs/lozenge.glif      |  28 +-
 src/Cantarell-Regular.ufo/glyphs/lslash.glif       |  15 +-
 src/Cantarell-Regular.ufo/glyphs/m.glif            |  47 +-
 src/Cantarell-Regular.ufo/glyphs/macron.glif       |  10 +-
 .../glyphs/macroncomb_acutecomb.glif               |  18 -
 .../glyphs/macroncomb_dieresiscomb.glif            |  13 -
 .../glyphs/macroncomb_gravecomb.glif               |  18 -
 src/Cantarell-Regular.ufo/glyphs/manat.glif        |  52 +-
 src/Cantarell-Regular.ufo/glyphs/micro.glif        |  56 +-
 src/Cantarell-Regular.ufo/glyphs/minus.glif        |  16 +-
 src/Cantarell-Regular.ufo/glyphs/minus.tf.glif     |  12 -
 src/Cantarell-Regular.ufo/glyphs/minute.glif       |   7 +-
 src/Cantarell-Regular.ufo/glyphs/multiply.glif     |  24 +-
 src/Cantarell-Regular.ufo/glyphs/multiply.tf.glif  |  18 -
 src/Cantarell-Regular.ufo/glyphs/n.glif            |  17 +-
 src/Cantarell-Regular.ufo/glyphs/naira.glif        |  55 +-
 src/Cantarell-Regular.ufo/glyphs/nbspace.glif      |  13 -
 src/Cantarell-Regular.ufo/glyphs/nine.dnom.glif    |  85 ++-
 src/Cantarell-Regular.ufo/glyphs/nine.glif         |  12 +-
 src/Cantarell-Regular.ufo/glyphs/nine.numr.glif    |   2 +-
 src/Cantarell-Regular.ufo/glyphs/nine.osf.glif     |  86 +--
 src/Cantarell-Regular.ufo/glyphs/nine.tf.glif      |  41 +-
 src/Cantarell-Regular.ufo/glyphs/nineinferior.glif |   2 +-
 src/Cantarell-Regular.ufo/glyphs/ninesuperior.glif |   2 +-
 src/Cantarell-Regular.ufo/glyphs/nj.glif           |   2 +-
 src/Cantarell-Regular.ufo/glyphs/nje-cy.glif       |  54 +-
 .../glyphs/nonbreakinghyphen.glif                  |  16 -
 src/Cantarell-Regular.ufo/glyphs/notequal.glif     |  34 +-
 src/Cantarell-Regular.ufo/glyphs/notequal.tf.glif  |  24 -
 src/Cantarell-Regular.ufo/glyphs/notidentical.glif |  42 +-
 .../glyphs/notidentical.tf.glif                    |  30 -
 src/Cantarell-Regular.ufo/glyphs/numbersign.glif   |  40 +-
 src/Cantarell-Regular.ufo/glyphs/numero.glif       |  10 +-
 src/Cantarell-Regular.ufo/glyphs/o-cy.glif         |   3 +-
 src/Cantarell-Regular.ufo/glyphs/o.glif            |  63 +-
 src/Cantarell-Regular.ufo/glyphs/oacute.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/obarred-cy.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/obreve.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ocaron.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ocircumflex.glif  |   4 +-
 .../glyphs/ocircumflexacute.glif                   |  20 +-
 .../glyphs/ocircumflexdotbelow.glif                |   6 +-
 .../glyphs/ocircumflexgrave.glif                   |  20 +-
 .../glyphs/ocircumflexhookabove.glif               |  20 +-
 .../glyphs/ocircumflextilde.glif                   |   5 +-
 src/Cantarell-Regular.ufo/glyphs/odblgrave.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/odieresis-cy.glif |   4 +-
 src/Cantarell-Regular.ufo/glyphs/odieresis.glif    |   4 +-
 .../glyphs/odieresismacron.glif                    |   5 +-
 .../glyphs/odotaccentmacron.glif                   |   5 +-
 src/Cantarell-Regular.ufo/glyphs/odotbelow.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/oe.glif           | 116 ++--
 src/Cantarell-Regular.ufo/glyphs/ogonek.glif       |  10 +-
 src/Cantarell-Regular.ufo/glyphs/ograve.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ohookabove.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ohorn.glif        |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ohornacute.glif   |   4 +-
 .../glyphs/ohorndotbelow.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ohorngrave.glif   |   4 +-
 .../glyphs/ohornhookabove.glif                     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ohorntilde.glif   |   4 +-
 .../glyphs/ohungarumlaut.glif                      |   4 +-
 .../glyphs/oinvertedbreve.glif                     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/omacron.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/omacronacute.glif |   5 +-
 src/Cantarell-Regular.ufo/glyphs/omacrongrave.glif |   5 +-
 src/Cantarell-Regular.ufo/glyphs/one.dnom.glif     |  31 +-
 src/Cantarell-Regular.ufo/glyphs/one.glif          |  24 +-
 src/Cantarell-Regular.ufo/glyphs/one.numr.glif     |   2 +-
 src/Cantarell-Regular.ufo/glyphs/one.osf.glif      |  32 +-
 src/Cantarell-Regular.ufo/glyphs/one.tf.glif       |  24 +-
 src/Cantarell-Regular.ufo/glyphs/one.tosf.glif     |  31 -
 src/Cantarell-Regular.ufo/glyphs/oneeighth.glif    |   6 +-
 src/Cantarell-Regular.ufo/glyphs/onefifth.glif     |   6 +-
 src/Cantarell-Regular.ufo/glyphs/onefraction.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/onehalf.glif      |   6 +-
 src/Cantarell-Regular.ufo/glyphs/oneinferior.glif  |   2 +-
 src/Cantarell-Regular.ufo/glyphs/oneninth.glif     |   6 +-
 src/Cantarell-Regular.ufo/glyphs/onequarter.glif   |   6 +-
 src/Cantarell-Regular.ufo/glyphs/oneseventh.glif   |   6 +-
 src/Cantarell-Regular.ufo/glyphs/onesixth.glif     |   6 +-
 src/Cantarell-Regular.ufo/glyphs/onesuperior.glif  |   2 +-
 src/Cantarell-Regular.ufo/glyphs/onetenth.glif     |   8 +-
 src/Cantarell-Regular.ufo/glyphs/onethird.glif     |   6 +-
 src/Cantarell-Regular.ufo/glyphs/oogonek.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/oslash.glif       |  68 ++-
 src/Cantarell-Regular.ufo/glyphs/oslashacute.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/otilde.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/otildeacute.glif  |   5 +-
 .../glyphs/otildedieresis.glif                     |   5 +-
 src/Cantarell-Regular.ufo/glyphs/otildemacron.glif |   5 +-
 src/Cantarell-Regular.ufo/glyphs/p.glif            |  25 +-
 src/Cantarell-Regular.ufo/glyphs/palochka-cy.glif  |   2 +-
 src/Cantarell-Regular.ufo/glyphs/paragraph.glif    |  38 +-
 src/Cantarell-Regular.ufo/glyphs/parenleft.glif    |  12 +-
 src/Cantarell-Regular.ufo/glyphs/parenright.glif   |  10 +-
 src/Cantarell-Regular.ufo/glyphs/partialdiff.glif  |  78 +--
 src/Cantarell-Regular.ufo/glyphs/pe-cy.glif        |   4 +
 src/Cantarell-Regular.ufo/glyphs/percent.glif      | 112 ++--
 src/Cantarell-Regular.ufo/glyphs/period.glif       |  26 +-
 .../glyphs/periodcentered.glif                     |  10 +-
 .../glyphs/periodcentered.loclC_A_T_.case.glif     |   2 +-
 src/Cantarell-Regular.ufo/glyphs/perthousand.glif  | 162 +++---
 src/Cantarell-Regular.ufo/glyphs/peseta.glif       |  49 +-
 src/Cantarell-Regular.ufo/glyphs/peso.glif         |  82 +--
 src/Cantarell-Regular.ufo/glyphs/plus.glif         |  26 +-
 src/Cantarell-Regular.ufo/glyphs/plus.tf.glif      |  18 -
 src/Cantarell-Regular.ufo/glyphs/plusminus.glif    |  32 +-
 src/Cantarell-Regular.ufo/glyphs/plusminus.tf.glif |  24 -
 .../glyphs/primeR_eversed.glif                     |   3 -
 src/Cantarell-Regular.ufo/glyphs/primemod.glif     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/product.glif      |  26 +-
 .../glyphs/punctuationspace.glif                   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/q.glif            |  25 +-
 src/Cantarell-Regular.ufo/glyphs/question.glif     |  24 +-
 src/Cantarell-Regular.ufo/glyphs/questiondown.glif |  12 +-
 src/Cantarell-Regular.ufo/glyphs/quotedbl.glif     |  14 +-
 src/Cantarell-Regular.ufo/glyphs/quotedblbase.glif |  10 +-
 src/Cantarell-Regular.ufo/glyphs/quotedblleft.glif |  10 +-
 .../glyphs/quotedblright.glif                      |  14 +-
 src/Cantarell-Regular.ufo/glyphs/quoteleft.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/quoteright.glif   |   8 +-
 .../glyphs/quotesinglbase.glif                     |   8 +-
 src/Cantarell-Regular.ufo/glyphs/quotesingle.glif  |  10 +-
 src/Cantarell-Regular.ufo/glyphs/r.glif            |   9 +-
 src/Cantarell-Regular.ufo/glyphs/radical.glif      |  20 +-
 src/Cantarell-Regular.ufo/glyphs/ratio.glif        |  12 +-
 src/Cantarell-Regular.ufo/glyphs/registered.glif   | 108 ++--
 src/Cantarell-Regular.ufo/glyphs/rightA_rrow.glif  |  25 +-
 .../glyphs/rightanglebracket-math.glif             |  24 +-
 src/Cantarell-Regular.ufo/glyphs/ring.glif         |  10 +-
 src/Cantarell-Regular.ufo/glyphs/ringhalfleft.glif |  12 +-
 .../glyphs/ringhalfright.glif                      |  30 +-
 src/Cantarell-Regular.ufo/glyphs/ruble.glif        |  60 +-
 src/Cantarell-Regular.ufo/glyphs/rupeeI_ndian.glif |  68 ++-
 src/Cantarell-Regular.ufo/glyphs/s.glif            |   3 -
 .../glyphs/sacutedotaccent.glif                    |  18 +-
 src/Cantarell-Regular.ufo/glyphs/saltillo.glif     |  12 +-
 .../glyphs/scarondotaccent.glif                    |   3 +-
 src/Cantarell-Regular.ufo/glyphs/schwa-cy.glif     |   2 +-
 src/Cantarell-Regular.ufo/glyphs/schwa.glif        |   4 +-
 src/Cantarell-Regular.ufo/glyphs/second.glif       |  17 +-
 .../glyphs/secondtonechinese.glif                  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/section.glif      | 106 ++--
 src/Cantarell-Regular.ufo/glyphs/semicolon.glif    |   6 +-
 src/Cantarell-Regular.ufo/glyphs/seven.dnom.glif   |  25 +-
 src/Cantarell-Regular.ufo/glyphs/seven.glif        |  18 +-
 src/Cantarell-Regular.ufo/glyphs/seven.numr.glif   |   2 +-
 src/Cantarell-Regular.ufo/glyphs/seven.osf.glif    |  26 +-
 src/Cantarell-Regular.ufo/glyphs/seven.tf.glif     |  16 +-
 src/Cantarell-Regular.ufo/glyphs/seven.tosf.glif   |  25 -
 src/Cantarell-Regular.ufo/glyphs/seveneighths.glif |   6 +-
 .../glyphs/seveninferior.glif                      |   2 +-
 .../glyphs/sevensuperior.glif                      |   2 +-
 src/Cantarell-Regular.ufo/glyphs/sha-cy.glif       |   5 +
 src/Cantarell-Regular.ufo/glyphs/shcha-cy.glif     |  35 +-
 src/Cantarell-Regular.ufo/glyphs/six.dnom.glif     |  85 ++-
 src/Cantarell-Regular.ufo/glyphs/six.glif          |  78 +--
 src/Cantarell-Regular.ufo/glyphs/six.numr.glif     |   2 +-
 src/Cantarell-Regular.ufo/glyphs/six.osf.glif      |  86 +--
 src/Cantarell-Regular.ufo/glyphs/six.tf.glif       |  41 +-
 src/Cantarell-Regular.ufo/glyphs/sixinferior.glif  |   2 +-
 src/Cantarell-Regular.ufo/glyphs/sixsuperior.glif  |   2 +-
 src/Cantarell-Regular.ufo/glyphs/softhyphen.glif   |   8 -
 src/Cantarell-Regular.ufo/glyphs/softsign-cy.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/space.glif        |   4 +-
 src/Cantarell-Regular.ufo/glyphs/sterling.glif     |  66 ++-
 src/Cantarell-Regular.ufo/glyphs/summation.glif    |  26 +-
 src/Cantarell-Regular.ufo/glyphs/t.glif            |  51 +-
 src/Cantarell-Regular.ufo/glyphs/tbar.glif         |   2 +-
 src/Cantarell-Regular.ufo/glyphs/tcaron.glif       |   2 +-
 src/Cantarell-Regular.ufo/glyphs/tcedilla.glif     |   2 +-
 src/Cantarell-Regular.ufo/glyphs/tcommaaccent.glif |   2 +-
 src/Cantarell-Regular.ufo/glyphs/tdieresis.glif    |   2 +-
 src/Cantarell-Regular.ufo/glyphs/tdotbelow.glif    |   2 +-
 src/Cantarell-Regular.ufo/glyphs/te-cy.glif        |  25 +-
 src/Cantarell-Regular.ufo/glyphs/tenge.glif        |  24 +-
 src/Cantarell-Regular.ufo/glyphs/thorn.glif        |  12 +-
 src/Cantarell-Regular.ufo/glyphs/three.dnom.glif   |  91 ++-
 src/Cantarell-Regular.ufo/glyphs/three.glif        |  86 +--
 src/Cantarell-Regular.ufo/glyphs/three.numr.glif   |   2 +-
 src/Cantarell-Regular.ufo/glyphs/three.osf.glif    |  90 +--
 src/Cantarell-Regular.ufo/glyphs/three.tf.glif     |  43 +-
 src/Cantarell-Regular.ufo/glyphs/three.tosf.glif   |  57 --
 src/Cantarell-Regular.ufo/glyphs/threeeighths.glif |   6 +-
 src/Cantarell-Regular.ufo/glyphs/threefifths.glif  |   6 +-
 .../glyphs/threeinferior.glif                      |   2 +-
 .../glyphs/threequarters.glif                      |   6 +-
 .../glyphs/threesuperior.glif                      |   2 +-
 src/Cantarell-Regular.ufo/glyphs/tilde.glif        |  10 +-
 .../glyphs/tildecomb_acutecomb.glif                |  18 -
 .../glyphs/tildecomb_dieresiscomb.glif             |  18 -
 .../glyphs/tildecomb_macroncomb.glif               |  18 -
 src/Cantarell-Regular.ufo/glyphs/tlinebelow.glif   |   2 +-
 src/Cantarell-Regular.ufo/glyphs/trademark.glif    |  50 +-
 src/Cantarell-Regular.ufo/glyphs/tripleprime.glif  |   3 -
 src/Cantarell-Regular.ufo/glyphs/tse-cy.glif       |  14 +-
 src/Cantarell-Regular.ufo/glyphs/tugrik.glif       |  30 +-
 src/Cantarell-Regular.ufo/glyphs/two.dnom.glif     |  57 +-
 src/Cantarell-Regular.ufo/glyphs/two.glif          |  50 +-
 src/Cantarell-Regular.ufo/glyphs/two.numr.glif     |   2 +-
 src/Cantarell-Regular.ufo/glyphs/two.osf.glif      |  58 +-
 src/Cantarell-Regular.ufo/glyphs/two.tf.glif       |  27 +-
 src/Cantarell-Regular.ufo/glyphs/two.tosf.glif     |  41 --
 src/Cantarell-Regular.ufo/glyphs/twofifths.glif    |   6 +-
 src/Cantarell-Regular.ufo/glyphs/twoinferior.glif  |   2 +-
 src/Cantarell-Regular.ufo/glyphs/twosuperior.glif  |   2 +-
 src/Cantarell-Regular.ufo/glyphs/twothirds.glif    |   6 +-
 src/Cantarell-Regular.ufo/glyphs/u-cy.glif         |   3 +-
 src/Cantarell-Regular.ufo/glyphs/u.glif            |  63 +-
 src/Cantarell-Regular.ufo/glyphs/uacute.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ubreve.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ucaron.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ucircumflex.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/udblgrave.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/udieresis-cy.glif |   4 +-
 src/Cantarell-Regular.ufo/glyphs/udieresis.glif    |   4 +-
 .../glyphs/udieresisacute.glif                     |   5 +-
 .../glyphs/udieresiscaron.glif                     |   5 +-
 .../glyphs/udieresisgrave.glif                     |   5 +-
 .../glyphs/udieresismacron.glif                    |   5 +-
 src/Cantarell-Regular.ufo/glyphs/udotbelow.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ugrave.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/uhookabove.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/uhorn.glif        |   4 +-
 src/Cantarell-Regular.ufo/glyphs/uhornacute.glif   |   4 +-
 .../glyphs/uhorndotbelow.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/uhorngrave.glif   |   4 +-
 .../glyphs/uhornhookabove.glif                     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/uhorntilde.glif   |   4 +-
 .../glyphs/uhungarumlaut-cy.glif                   |   4 +-
 .../glyphs/uhungarumlaut.glif                      |   4 +-
 .../glyphs/uinvertedbreve.glif                     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/umacron-cy.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/umacron.glif      |   4 +-
 .../glyphs/umacrondieresis.glif                    |   5 +-
 src/Cantarell-Regular.ufo/glyphs/underscore.glif   |  10 +-
 src/Cantarell-Regular.ufo/glyphs/uogonek.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/upA_rrow.glif     |  31 +-
 src/Cantarell-Regular.ufo/glyphs/uring.glif        |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ushort-cy.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ustraight-cy.glif |  22 +-
 .../glyphs/ustraightstroke-cy.glif                 |   4 +-
 src/Cantarell-Regular.ufo/glyphs/utilde.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/utildeacute.glif  |   5 +-
 src/Cantarell-Regular.ufo/glyphs/v.glif            |   9 +-
 src/Cantarell-Regular.ufo/glyphs/ve-cy.glif        |  46 +-
 .../glyphs/verticallineabovecomb.glif              |   4 +-
 .../glyphs/verticallinelowmod.glif                 |   4 +-
 .../glyphs/verticallinemod.glif                    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/w.glif            |  39 +-
 src/Cantarell-Regular.ufo/glyphs/wacute.glif       |   2 +-
 src/Cantarell-Regular.ufo/glyphs/wcircumflex.glif  |   2 +-
 src/Cantarell-Regular.ufo/glyphs/wdieresis.glif    |   2 +-
 src/Cantarell-Regular.ufo/glyphs/we-cy.glif        |   2 +-
 src/Cantarell-Regular.ufo/glyphs/wgrave.glif       |   2 +-
 src/Cantarell-Regular.ufo/glyphs/whiteC_ircle.glif |  61 +-
 src/Cantarell-Regular.ufo/glyphs/won.glif          |  53 +-
 src/Cantarell-Regular.ufo/glyphs/x.glif            |   3 -
 src/Cantarell-Regular.ufo/glyphs/y.glif            |  41 +-
 src/Cantarell-Regular.ufo/glyphs/yacute.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/yat-cy.glif       |  20 +-
 src/Cantarell-Regular.ufo/glyphs/ycircumflex.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ydieresis.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ydotaccent.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ydotbelow.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/yen.glif          |  44 +-
 src/Cantarell-Regular.ufo/glyphs/yeru-cy.glif      |  18 +-
 .../glyphs/yerudieresis-cy.glif                    |   2 +-
 src/Cantarell-Regular.ufo/glyphs/ygrave.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/yhookabove.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/yi-cy.glif        |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ymacron.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ytilde.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/yusbig-cy.glif    |  44 +-
 src/Cantarell-Regular.ufo/glyphs/z.glif            |   3 -
 src/Cantarell-Regular.ufo/glyphs/ze-cy.glif        |  90 +--
 .../glyphs/zedescender-cy.glif                     |   4 +-
 .../glyphs/zedieresis-cy.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/zero.dnom.glif    |  59 +-
 src/Cantarell-Regular.ufo/glyphs/zero.glif         |  58 +-
 src/Cantarell-Regular.ufo/glyphs/zero.numr.glif    |   2 +-
 src/Cantarell-Regular.ufo/glyphs/zero.osf.glif     |  60 +-
 .../glyphs/zero.osf.zero.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/zero.tf.glif      |  30 +-
 src/Cantarell-Regular.ufo/glyphs/zero.tf.zero.glif |   2 +-
 src/Cantarell-Regular.ufo/glyphs/zero.tosf.glif    |  44 --
 .../glyphs/zero.tosf.zero.glif                     |  16 -
 src/Cantarell-Regular.ufo/glyphs/zero.zero.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/zeroinferior.glif |   2 +-
 src/Cantarell-Regular.ufo/glyphs/zerosuperior.glif |   2 +-
 src/Cantarell-Regular.ufo/glyphs/zerothird.glif    |   6 +-
 src/Cantarell-Regular.ufo/glyphs/zhe-cy.glif       |  52 +-
 src/Cantarell-Regular.ufo/glyphs/zhebreve-cy.glif  |   4 +-
 .../glyphs/zhedescender-cy.glif                    |  11 +-
 .../glyphs/zhedieresis-cy.glif                     |   4 +-
 src/Cantarell-Regular.ufo/layercontents.plist      |  36 ++
 src/Cantarell-Regular.ufo/lib.plist                | 294 +---------
 src/Cantarell.designspace                          |  29 +-
 src/Cantarell.stylespace                           |   7 +
 src/Cantarell_autospace.py                         |  11 +-
 src/meson.build                                    |   3 +-
 3125 files changed, 33100 insertions(+), 29676 deletions(-)
---
diff --git a/.editorconfig b/.editorconfig
index 5a45e61c..82374422 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,7 +10,7 @@ insert_final_newline = true
 charset = utf-8
 end_of_line = lf
 
-[*.{yaml,yml,xml,plist,glif,designspace,stylespace,doap}]
+[*.{yaml,yml,xml,plist,glif,designspace,stylespace,doap,html}]
 indent_style = space
 indent_size = 2
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b46c4e89..3bf40c94 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,6 @@ image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/base:latest
 build:
   script:
     - dnf install -y libappstream-glib-devel gettext
-    - pip3 install --upgrade pip
     - pip3 install meson ninja -r requirements.txt
     - meson build
     - ninja -C build install
@@ -12,8 +11,7 @@ build:
     - python3 scripts/flip-prebuilt-on.py meson_options.txt
     - git add meson_options.txt
     - cp /usr/local/share/fonts/cantarell/*.otf prebuilt
-    - cp /usr/local/share/fonts/cantarell/*.ttf prebuilt
-    - git add prebuilt/*.otf prebuilt/*.ttf
+    - git add prebuilt/*.otf
     - git config --global user.email "you example com"
     - git config --global user.name "Your Name"
     - git commit -m "Make package with prebuilt binaries, ninja will dist them."
@@ -22,5 +20,4 @@ build:
     paths:
       - build/meson-dist
       - prebuilt/*.otf
-      - prebuilt/*.ttf
     expire_in: 7 days
diff --git a/NEWS b/NEWS
index 34ec95e1..1ac7cc8d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,22 +1,45 @@
-Next version:
-- Added variable font, TrueType flavor. No hinting for now.
+0.200:
+- (The design points below are mostly the result of design reviews by Alexei
+  Vanyashin, Jacques Le Bailly and Stephen Nixon, in no particular order).
+- Respacing of uppercase letters in the regular master and complete thin and
+  extra bold masters. Uppercase letters space better next to lowercase letters
+  now. Cyrillics are more consistently spaced.
+- Tweak numerals some. Especially the "one" and fractions.
+- Various tweaks to various shapes across the board, especially symbols. Braces
+  are curlier now. Detail tweaks to Cyrillics.
+- Basic mathy symbols and currency symbols now have tabular number width. I found
+  no advantage to having proportional variants.
+- Removed .tosf numerals. Fiddly work without clear purpose.
+- Experimental alternative form of "l" without the tail, contributed by Jacques
+  Le Bailly. Accessible via the ss01 feature.
+- Added variable font, CFF2 flavor. postscriptBlueFuzz is set to 1 explicitly
+  to avoid rounding issues with blue zone coverage in FreeType.
+- Removed f-ligatures without their own Unicode code points, as the design doesn't
+  currently need them. They were mainly added to fill up the Google glyph set.
+- The following glyphs now represent more than one Unicode code point to keep the
+  glyph view tidier:
+    emdash: U+2014, U+2015
+    emspace: U+2001, U+2003
+    enspace: U+2000, U+2002
+    hyphen: U+002D, U+00AD, U+2010, U+2011
+    space: U+0020, U+00A0
+  In PDFs where the generator removed the text stream, copy-paste may lead to the
+  others turning into the first. Meh.
+- Filled in hryvnia (U+20B4), tugrik (U+20AE) and tenge (U+20B8).
 - Static fonts use same rounding method as varLib uses for the variable font.
-- Set the UseTypoMetrics flag. This is recommended by the OpenType
-  specification but will result in line-height spacing problems in various
-  places, as the typo line height is generally ignored. May be reverted.
 - Fixed Ustraight-cy (U+04AE), ustraight-cy (U+04AF), Ustraightstroke-cy
   (U+04B0), ustraightstroke-cy (U+04B1), they didn't have a proper production
   name before and may not have been properly accessible.
 - Removed some building components that made it into the final font.
-- Fixed various production names of combined diacritics.
 - Limited anchor propagation to letters, excluding ligatures. Generate GDEF
   table properly.
 - Set one simple `gasp` table for hinted display for e.g. Windows.
 - Removed `ccmp` from the `aalt` lookup.
 - The OS/2 table fsType now says that no Digital Rights Management is applied
   to the fonts, the name table now says the fonts are OFL 1.1 licensed.
-- Internal housekeeping: Sources are in UFO and Designspace format now, with
-  various cleanups like removed unused layers.
+- Internal housekeeping: Sources are stored in the open UFO and Designspace format
+  now, with various cleanups like removed unused layers.
+- Internal housekeeping: Removed composite diacritics that served no design purpose.
 
 0.111
 - Fix the wrongly assigned OS/2 weight class values that e.g. led to Extra Bold
diff --git a/meson.build b/meson.build
index db4f7e2f..8d534493 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('cantarell-fonts', version : '0.111')
+project('cantarell-fonts', version : '0.200')
 
 datadir = join_paths(get_option('prefix'), get_option('datadir'))
 appdatadir = join_paths(datadir, 'metainfo')
diff --git a/prebuilt/meson.build b/prebuilt/meson.build
index a110d321..78ed3134 100644
--- a/prebuilt/meson.build
+++ b/prebuilt/meson.build
@@ -3,4 +3,4 @@ install_data('Cantarell-Light.otf', install_dir : fontsdir)
 install_data('Cantarell-Regular.otf', install_dir : fontsdir)
 install_data('Cantarell-Bold.otf', install_dir : fontsdir)
 install_data('Cantarell-ExtraBold.otf', install_dir : fontsdir)
-install_data('Cantarell-VF.ttf', install_dir : fontsdir)
+install_data('Cantarell-VF.otf', install_dir : fontsdir)
diff --git a/proofs/pi.py b/proofs/pi.py
new file mode 100644
index 00000000..ad993735
--- /dev/null
+++ b/proofs/pi.py
@@ -0,0 +1,22 @@
+from pathlib import Path
+
+pi_text = (Path(__file__).parent / "pi.txt").read_text()
+
+cantarell = installFont("/tmp/Cantarell-VF.otf")
+
+paper_format = "A4Landscape"
+border = 25
+gutter = border * 0.5
+pageWidth, pageHeight = sizes(paper_format)
+boxWidth = pageWidth - border * 2
+boxHeight = pageHeight - border * 2
+
+for wght in (100, 400, 800):
+    newPage(paper_format)
+    font(cantarell)
+    fontVariations(wght=wght)
+    if wght == 400:
+        fontSize(12)
+    else:
+        fontSize(18)
+    textBox(pi_text, (border, border, boxWidth, boxHeight))
diff --git a/proofs/pi.txt b/proofs/pi.txt
new file mode 100644
index 00000000..d07969dc
--- /dev/null
+++ b/proofs/pi.txt
@@ -0,0 +1 @@
+3.141592653589793238462643383279502884197169399375105820974944592307816406286208998628034825342117067982148086513282306647093844609550582231725359408128481117450284102701938521105559644622948954930381964428810975665933446128475648233786783165271201909145648566923460348610454326648213393607260249141273724587006606315588174881520920962829254091715364367892590360011330530548820466521384146951941511609433057270365759591953092186117381932611793105118548074462379962749567351885752724891227938183011949129833673362440656643086021394946395224737190702179860943702770539217176293176752384674818467669405132000568127145263560827785771342757789609173637178721468440901224953430146549585371050792279689258923542019956112129021960864034418159813629774771309960518707211349999998372978049951059731732816096318595024459455346908302642522308253344685035261931188171010003137838752886587533208381420617177669147303598253490428755468731159562863882353787593751957781857780532171226806613001927876611195
 90921642
 
01989380952572010654858632788659361533818279682303019520353018529689957736225994138912497217752834791315155748572424541506959508295331168617278558890750983817546374649393192550604009277016711390098488240128583616035637076601047101819429555961989467678374494482553797747268471040475346462080466842590694912933136770289891521047521620569660240580381501935112533824300355876402474964732639141992726042699227967823547816360093417216412199245863150302861829745557067498385054945885869269956909272107975093029553211653449872027559602364806654991198818347977535663698074265425278625518184175746728909777727938000816470600161452491921732172147723501414419735685481613611573525521334757418494684385233239073941433345477624168625189835694855620992192221842725502542568876717904946016534668049886272327917860857843838279679766814541009538837863609506800642251252051173929848960841284886269456042419652850222106611863067442786220391949450471237137869609563643719172874677646575739624138908658326459958
 13390478
 
02759009946576407895126946839835259570982582262052248940772671947826848260147699090264013639443745530506820349625245174939965143142980919065925093722169646151570985838741059788595977297549893016175392846813826868386894277415599185592524595395943104997252468084598727364469584865383673622262609912460805124388439045124413654976278079771569143599770012961608944169486855584840635342207222582848864815845602850601684273945226746767889525213852254995466672782398645659611635488623057745649803559363456817432411251507606947945109659609402522887971089314566913686722874894056010150330861792868092087476091782493858900971490967598526136554978189312978482168299894872265880485756401427047755513237964145152374623436454285844479526586782105114135473573952311342716610213596953623144295248493718711014576540359027993440374200731057853906219838744780847848968332144571386875194350643021845319104848100537061468067491927819119793995206141966342875444064374512371819217999839101591956181467514269123974
 89409071
 
86494231961567945208095146550225231603881930142093762137855956638937787083039069792077346722182562599661501421503068038447734549202605414665925201497442850732518666002132434088190710486331734649651453905796268561005508106658796998163574736384052571459102897064140110971206280439039759515677157700420337869936007230558763176359421873125147120532928191826186125867321579198414848829164470609575270695722091756711672291098169091528017350671274858322287183520935396572512108357915136988209144421006751033467110314126711136990865851639831501970165151168517143765761835155650884909989859982387345528331635507647918535893226185489632132933089857064204675259070915481416549859461637180270981994309924488957571282890592323326097299712084433573265489382391193259746366730583604142813883032038249037589852437441702913276561809377344403070746921120191302033038019762110110044929321516084244485963766983895228684783123552658213144957685726243344189303968642624341077322697802807318915441101044682325271
 62010526
 
522721116603966655730925471105578537634668206531098965269186205647693125705863566201855810072936065987648611791045334885034611365768675324944166803962657978771855608455296541266540853061434443185867697514566140680070023787765913440171274947042056223053899456131407112700040785473326993908145466464588079727082668306343285878569830523580893306575740679545716377525420211495576158140
diff --git a/proofs/print-characters-between-placeholders.py b/proofs/print-characters-between-placeholders.py
new file mode 100644
index 00000000..0d545f1a
--- /dev/null
+++ b/proofs/print-characters-between-placeholders.py
@@ -0,0 +1,10 @@
+placeholders = "noNO"
+cs = """₵¢₡¤$₫€ƒ₣₲₴₭₤₺₼₦₧₱₽₹£₸₮₩¥∙⁒∕≡≢+−×÷=≠><≥≤±≈~¬^∅∞∫Ω∆∏∑√∂µ%‰∶↑→↓←●○◊@&¶§©®™°′″|¦†ℓ‡℮№␣"""
+ccs = r""".,:;…!¡?¿·•*#/\(){}[]-–—‒_‚„“”‘’«»‹›‵‴"'⟨⟩"""
+
+
+def print_in_placeholders(characters, placeholders="noNO"):
+    strings = [[f"{p*2}{c}{p*2}" for c in characters] for p in placeholders]
+    for row in strings:
+        print("".join(row))
+        print()
diff --git a/proofs/spacing.py b/proofs/spacing.py
new file mode 100644
index 00000000..802ce0e8
--- /dev/null
+++ b/proofs/spacing.py
@@ -0,0 +1,102 @@
+basic_test = r"""nnonnoonoo nnannooaoo nnbnnooboo nncnnoocoo nndnnoodoo nnennooeoo nnfnnoofoo nngnnoogoo 
nnhnnoohoo nninnooioo nnjnnoojoo nnknnookoo nnlnnooloo nnmnnoomoo nnpnnoopoo nnqnnooqoo nnrnnooroo nnsnnoosoo 
nntnnootoo nnunnoouoo nnvnnoovoo nnwnnoowoo nnxnnooxoo nnynnooyoo nnznnoozoo
+
+HHOHHOOHOO HHAHHOOAOO HHBHHOOBOO HHCHHOOCOO HHDHHOODOO HHEHHOOEOO HHFHHOOFOO HHGHHOOGOO HHIHHOOIOO 
HHJHHOOJOO HHKHHOOKOO HHLHHOOLOO HHMHHOOMOO HHNHHOONOO HHPHHOOPOO HHQHHOOQOO HHRHHOOROO HHSHHOOSOO HHTHHOOTOO 
HHUHHOOUOO HHVHHOOVOO HHWHHOOWOO HHXHHOOXOO HHYHHOOYOO HHZHHOOZOO
+
+010N1N 020N2N 030N3N 040N4N 050N5N 060N6N 070N7N 080N8N 090N9N
+
+nn0nnnn1nnnn2nnnn3nnnn4nnnn5nnnn6nnnn7nnnn8nnnn9nn
+
+oo0oooo1oooo2oooo3oooo4oooo5oooo6oooo7oooo8oooo9oo
+
+NN0NNNN1NNNN2NNNN3NNNN4NNNN5NNNN6NNNN7NNNN8NNNN9NN
+
+OO0OOOO1OOOO2OOOO3OOOO4OOOO5OOOO6OOOO7OOOO8OOOO9OO
+
+000000100200300400500600700800900
+"""
+
+lc_text = "lynx tuft frogs, dolphins abduct by proxy the ever awkward klutz, dud, dummkopf, jinx snubnose 
filmgoer, orphan sgt. renfruw grudgek reyfus, md. sikh psych if halt tympany jewelry sri heh! twyer vs jojo 
pneu fylfot alcaaba son of nonplussed halfbreed bubbly playboy guggenheim daddy coccyx sgraffito effect, 
vacuum dirndle impossible attempt to disvalue, muzzle the afghan czech czar and exninja, bob bixby dvorak 
wood dhurrie savvy, dizzy eye aeon circumcision uvula scrungy picnic luxurious special type carbohydrate 
ovoid adzuki kumquat bomb? afterglows gold girl pygmy gnome lb. ankhs acme aggroupment akmed brouhha tv wt. 
ujjain ms. oz abacus mnemonics bhikku khaki bwana aorta embolism vivid owls often kvetch otherwise, wysiwyg 
densfort wright you’ve absorbed rhythm, put obstacle kyaks krieg kern wurst subject enmity equity coquet 
quorum pique tzetse hepzibah sulfhydryl briefcase ajax ehler kafka fjord elfship halfdressed jugful eggcup 
hummingbirds swingdevil bagpi
 pe legwo
 rk reproachful hunchback archknave baghdad wejh rijswijk rajbansi rajput ajdir okay weekday obfuscate 
subpoena liebknecht marcgravia ecbolic arcticward dickcissel pincpinc boldface maidkin adjective adcraft 
adman dwarfness applejack darkbrown kiln palzy always farmland flimflam unbossy nonlineal stepbrother lapdog 
stopgap sx countdown basketball beaujolais vb. flowchart aztec lazy bozo syrup tarzan annoying dyke yucky 
hawg gagzhukz cuzco squire when hiho mayhem nietzsche szasz gumdrop milk emplotment ambidextrously lacquer 
byway ecclesiastes stubchen hobgoblins crabmill aqua hawaii blvd. subquality byzantine empire debt obvious 
cervantes jekabzeel anecdote flicflac mechanicville bedbug couldn’t i’ve it’s they’ll they’d dpt. headquarter 
burkhardt xerxes atkins govt. ebenezer lg. lhama amtrak amway fixity axmen quumbabda upjohn hrumpf"
+
+uc_text = "LYNX TUFT FROGS, DOLPHINS ABDUCT BY PROXY THE EVER AWKWARD KLUTZ, DUD, DUMMKOPF, JINX SNUBNOSE 
FILMGOER, ORPHAN SGT. RENFRUW GRUDGEK REYFUS, MD. SIKH PSYCH IF HALT TYMPANY JEWELRY SRI HEH! TWYER VS JOJO 
PNEU FYLFOT ALCAABA SON OF NONPLUSSED HALFBREED BUBBLY PLAYBOY GUGGENHEIM DADDY COCCYX SGRAFFITO EFFECT, 
VACUUM DIRNDLE IMPOSSIBLE ATTEMPT TO DISVALUE, MUZZLE THE AFGHAN CZECH CZAR AND EXNINJA, BOB BIXBY DVORAK 
WOOD DHURRIE SAVVY, DIZZY EYE AEON CIRCUMCISION UVULA SCRUNGY PICNIC LUXURIOUS SPECIAL TYPE CARBOHYDRATE 
OVOID ADZUKI KUMQUAT BOMB? AFTERGLOWS GOLD GIRL PYGMY GNOME LB. ANKHS ACME AGGROUPMENT AKMED BROUHHA TV WT. 
UJJAIN MS. OZ ABACUS MNEMONICS BHIKKU KHAKI BWANA AORTA EMBOLISM VIVID OWLS OFTEN KVETCH OTHERWISE, WYSIWYG 
DENSFORT WRIGHT YOU’VE ABSORBED RHYTHM, PUT OBSTACLE KYAKS KRIEG KERN WURST SUBJECT ENMITY EQUITY COQUET 
QUORUM PIQUE TZETSE HEPZIBAH SULFHYDRYL BRIEFCASE AJAX EHLER KAFKA FJORD ELFSHIP HALFDRESSED JUGFUL EGGCUP 
HUMMINGBIRDS SWINGDEVIL BAGPI
 PE LEGWO
 RK REPROACHFUL HUNCHBACK ARCHKNAVE BAGHDAD WEJH RIJSWIJK RAJBANSI RAJPUT AJDIR OKAY WEEKDAY OBFUSCATE 
SUBPOENA LIEBKNECHT MARCGRAVIA ECBOLIC ARCTICWARD DICKCISSEL PINCPINC BOLDFACE MAIDKIN ADJECTIVE ADCRAFT 
ADMAN DWARFNESS APPLEJACK DARKBROWN KILN PALZY ALWAYS FARMLAND FLIMFLAM UNBOSSY NONLINEAL STEPBROTHER LAPDOG 
STOPGAP SX COUNTDOWN BASKETBALL BEAUJOLAIS VB. FLOWCHART AZTEC LAZY BOZO SYRUP TARZAN ANNOYING DYKE YUCKY 
HAWG GAGZHUKZ CUZCO SQUIRE WHEN HIHO MAYHEM NIETZSCHE SZASZ GUMDROP MILK EMPLOTMENT AMBIDEXTROUSLY LACQUER 
BYWAY ECCLESIASTES STUBCHEN HOBGOBLINS CRABMILL AQUA HAWAII BLVD. SUBQUALITY BYZANTINE EMPIRE DEBT OBVIOUS 
CERVANTES JEKABZEEL ANECDOTE FLICFLAC MECHANICVILLE BEDBUG COULDN’T I’VE IT’S THEY’LL THEY’D DPT. HEADQUARTER 
BURKHARDT XERXES ATKINS GOVT. EBENEZER LG. LHAMA AMTRAK AMWAY FIXITY AXMEN QUUMBABDA UPJOHN HRUMPF"
+
+ul_text = "Aaron Abraham Adam Aeneas Agfa Ahoy Aileen Akbar Alanon Americanism Anglican Aorta April Fool’s 
Day Aqua Lung (Tm.) Arabic Ash Wednesday Authorized Version Ave Maria Away Axel Ay Aztec Bhutan Bill Bjorn Bk 
Btu. Bvart Bzonga California Cb Cd Cervantes Chicago Clute City, Tx. Cmdr. Cnossus Coco Cracker State, 
Georgia Cs Ct. Cwacker Cyrano David Debra Dharma Diane Djakarta Dm Dnepr Doris Dudley Dwayne Dylan Dzerzhinsk 
Eames Ectomorph Eden Eerie Effingham, Il. Egypt Eiffel Tower Eject Ekland Elmore Entreaty Eolian Epstein 
Equine Erasmus Eskimo Ethiopia Europe Eva Ewan Exodus Jan van Eyck Ezra Fabian February Fhara Fifi Fjord 
Florida Fm France Fs Ft. Fury Fyn Gabriel Gc Gdynia Gehrig Ghana Gilligan Karl Gjellerup Gk. Glen Gm Gnosis 
Gp.E. Gregory Gs Gt. Br. Guinevere Gwathmey Gypsy Gzags Hebrew Hf Hg Hileah Horace Hrdlicka Hsia Hts. Hubert 
Hwang Hai Hyacinth Hz. Iaccoca Ibsen Iceland Idaho If Iggy Ihre Ijit Ike Iliad Immediate Innocent Ione 
Ipswitch Iquarus Ireland Is
 land It 
 Iud Ivert Iwerks Ixnay Iy Jasper Jenks Jherry Jill Jm Jn Jorge Jr. Julie Kerry Kharma Kiki Klear Koko Kruse 
Kusack Kylie Laboe Lb. Leslie Lhihane Llama Lorrie Lt. Lucy Lyle Madeira Mechanic Mg. Minnie Morrie Mr. Ms. 
Mt. Music My Nanny Nellie Nillie Novocane Null Nyack Oak Oblique Occarina Odd Oedipus Off Ogmane Ohio Oil Oj 
Oklahoma Olio Omni Only Oops Opera Oqu Order Ostra Ottmar Out Ovum Ow Ox Oyster Oz Parade Pd. Pepe Pfister 
Pg. Phil Pippi Pj Please Pneumonia Porridge Price Psalm Pt. Purple Pv Pw Pyre Qt. Quincy Radio Rd. Red Rhea 
Right Rj Roche Rr Rs Rt. Rural Rwanda Ryder Sacrifice Series Sgraffito Shirt Sister Skeet Slow Smore Snoop 
Soon Special Squire Sr St. Suzy Svelte Swiss Sy Szach Td Teach There Title Total Trust Tsena Tulip Twice 
Tyler Tzean Ua Udder Ue Uf Ugh Uh Ui Uk Ul Um Unkempt Uo Up Uq Ursula Use Utmost Uvula Uw Uxurious Uzßai 
Valerie Velour Vh Vicky Volvo Vs Water Were Where With World Wt. Wulk Wyler Xavier Xerox Xi Xylophone Yaboe 
Year Yipes Yo Ypsilant 
 Ys Yu Za
 bar’s Zero Zhane Zizi Zorro Zu Zy Don’t I’ll I’m I’se"
+
+misc_text = """Raptor's Blackbird micro-ATX POWER9 System Is Ready To Take Flight This Week
+Written by Michael Larabel in Hardware on 19 May 2019 at 08:00 AM EDT. 19 Comments
+The Raptor Blackbird supports up to 8-core 160W Sforza POWER9 CPUs, two DDR4 ECC modules, one PCI Express 
4.0 x16 slot (and one PCIe 4.0 x8), dual Gigabit Ethernet, 4 x SATA 3.0 ports, four USB 3.0 ports, and other 
standard connectivity.
+As I mentioned in my talk at Scale 17x
+NetBSD 8.1 RC1 Released With MDS Mitigations, Option To Turn Off SMT/HT, Driver Updates
+RadeonSI Primitive Culling Lands In Mesa 19.2
+Lenovo Hooks Up With Debian For DebConf 19
+Xfce 4.14 Sees Its Long-Awaited Pre-Release
+Linux 5.2-rc1 Kernel Released With Case-Insensitive EXT4, New Intel HW & RTW88 WiFi
+Linux's vmalloc Seeing "Large Performance Benefits" With 5.2 Kernel Changes
+SVT-AV1 0.5 Released As Intel's Speedy AV1 Video Encoder
+DXVK 1.2.1 Released With Game Fixes, Some Performance Improvements
+LibreOffice 6.3 Alpha Was Tagged This Week, Stable Expected In August
+Raptor's Blackbird micro-ATX POWER9 System Is Ready To Take Flight This Week
+A Look At The MDS Cost On Xeon, EPYC & Xeon Total Impact Of Affected CPU Vulnerabilities
+The Many Changes & Additions To Find With The Linux 5.2 Kernel
+The Performance Impact Of MDS / Zombieload Plus The Overall Cost Now Of Spectre/Meltdown/L1TF/MDS
+GeForce GTX 650 vs. GTX 1650 Performance For Linux Gaming, Performance-Per-Watt
+GCC 9 vs. Clang 8 C/C++ Compiler Performance On AMD Threadripper, Intel Core i9
+In the development branch (leading up to 3.34 this autumn) supported in GTK 4 from a 3.30.x version.
+Radeon ROCm 2.5 Released With rocThrust, AMD Infinity Fabric Link Support
+Ubuntu Touch Nearing Updated Unity 8 + Mir, But Not Yet Full Wayland
+AMD GCN Back-End In GCC Compiler Adds "-march=gfx906" Option For Vega 20
+RPM 4.15 With Better Performance & New Features Will Make It Into Fedora 31
+FreeBSD 11.3 Beta 3 Arrives With Various Fixes, Correct Battery Life Reporting
+Git 2.22 Released With Improvements Around Merge Handling, Other Small Enhancements
+WineD3D Optimistic In Their Yet To Be Proven Vulkan Backend, DXVK "Dead End"
+NVIDIA Firmware Blobs Get Updated To Help Some Pascal GPUs With Nouveau
+A Last Call To Celebrate Phoronix's 15th Birthday By Going Premium
+A Look At How The Linux Performance Has Evolved Since The AMD EPYC Launch
+LLVM/Clang 9.0 Merges Support For Intel "Cooperlake" CPU Target
+Mesa 19.2 RADV Driver Now Fully Supports EXT_sample_locations For Possible AA Benefits
+SUSE Reworking Btrfs File-System's Locking Code
+Amlogic Video Decode Driver Revised A Ninth Time In Pursuit Of The Linux Kernel
+Proton 4.2-6  Brings DXVK 1.2.1 Rebuild, Updated FAudio, Other Fixes
+LLVM's New Fortran Compiler Previously Called "f18" Will Take The Name Of Flang
+RHEL 7.7 Beta Comes With MDS/Zombieload Mitigations
+Google Stadia's E3 Event Reveals New Details For This Linux+Vulkan Gaming Service
+Benchmarking Five ~$30 USD Solid-State Drives Under Ubuntu Linux
+Mesa 19.2 Now Exposes The NVIDIA-Led EGL_EXT_platform_device Support
+GNOME 3.34's Mutter Adds Mouse Accessibility Support For X11/Wayland
+Benchmarks Of The Various Kernel Flavors Of Clear Linux
+Ubuntu Moving Ahead With Compressing Their Kernel Image Using LZ4
+QtCoAP Added To Qt 5.13 To Increase Its Relevance For Internet of Things
+KDE Has Made Much Progress On Usability/Productivity, But They're Still Aiming For More
+Debian's Anti-Harassment Team Continues Battling Community Issues In 2019
+Alyssa Rosenzweig Joins Collabora To Work On Panfrost Graphics Stack
+Intel Core i5 8400 vs. i5 9400F Meltdown/Spectre/L1TF/MDS Mitigation Impact
+AMD Sends In 2nd Round Of AMDGPU Radeon Driver Updates For Linux 5.3 - No Navi Yet
+Purism Talks Up The Librem 5 Smartphone Boot Speed, Price Increase Coming
+Mesa 19.1-RC5 Is Out With A Handful Of RADV & Intel/Iris Changes
+ATI R300 Gallium3D Driver Seeing A Big Performance Fix After Being Regressed For Years"""
+
+cantarell = installFont("/tmp/Cantarell-VF.otf")
+
+format = "A4Landscape"
+border = 25
+gutter = border * 0.5
+pageWidth, pageHeight = sizes(format)
+boxWidth = pageWidth - border * 2
+boxHeight = pageHeight - border * 2
+
+newPage(format)
+font(cantarell)
+fontVariations(wght=100)
+fontSize(20)
+textBox(basic_test, (border, border, boxWidth, boxHeight))
+
+newPage(format)
+font(cantarell)
+fontVariations(wght=100)
+fontSize(13)
+textBox(lc_text + "\n\n" + uc_text, (border, border, boxWidth, boxHeight))
+
+newPage(format)
+font(cantarell)
+fontVariations(wght=100)
+fontSize(13)
+textBox(ul_text+ "\n\n" + misc_text, (border, border, boxWidth, boxHeight))
diff --git a/proofs/test.html b/proofs/test.html
new file mode 100644
index 00000000..e8beedfe
--- /dev/null
+++ b/proofs/test.html
@@ -0,0 +1,368 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8">
+  <title>Cantarell Test Page</title>
+
+  <style type="text/css">
+    @font-face {
+      font-family: "Cantarell VF";
+      src: url("/tmp/Cantarell-VF.otf");
+    }
+
+    body {
+      font-family: "Cantarell VF", serif;
+    }
+
+    p {
+      word-break: break-word;
+    }
+
+    header {
+      position: fixed;
+      left: 75%;
+      background: white;
+    }
+  </style>
+</head>
+
+<body>
+  <header>
+    <div>Font size:
+      <input id="sizeSlider" min="8" max="144" step="1" value="12" type="range">
+      <span id="sizeResult" class="result" contenteditable="false">12</span>
+    </div>
+    <div>Weight:
+      <input id="wghtSlider" min="100" max="800" step="1" value="400" type="range">
+      <span id="wghtResult" class="result" contenteditable="false">400</span>
+    </div>
+  </header>
+
+  <h1>Cantarell Variable Font</h1>
+
+  <!-- Here is our page's main content -->
+  <main>
+
+    <!-- It contains an article -->
+    <article>
+      <h2>Basic spacing</h2>
+
+      <p class="proof" contenteditable="true">
+        nnonnoonoo nnannooaoo nnbnnooboo nncnnoocoo nndnnoodoo<br />
+        nnennooeoo nnfnnoofoo nngnnoogoo nnhnnoohoo nninnooioo<br />
+        nnjnnoojoo nnknnookoo nnlnnooloo nnmnnoomoo nnpnnoopoo<br />
+        nnqnnooqoo nnrnnooroo nnsnnoosoo nntnnootoo nnunnoouoo<br />
+        nnvnnoovoo nnwnnoowoo nnxnnooxoo nnynnooyoo nnznnoozoo
+      </p>
+
+      <p class="proof" contenteditable="true">
+        HHOHHOOHOO HHAHHOOAOO HHBHHOOBOO HHCHHOOCOO HHDHHOODOO<br />
+        HHEHHOOEOO HHFHHOOFOO HHGHHOOGOO HHIHHOOIOO HHJHHOOJOO<br />
+        HHKHHOOKOO HHLHHOOLOO HHMHHOOMOO HHNHHOONOO HHPHHOOPOO<br />
+        HHQHHOOQOO HHRHHOOROO HHSHHOOSOO HHTHHOOTOO HHUHHOOUOO<br />
+        HHVHHOOVOO HHWHHOOWOO HHXHHOOXOO HHYHHOOYOO HHZHHOOZOO
+      </p>
+
+      <p class="proof" contenteditable="true">
+        008088088 0010088188 0020088288 0030088388 0040088488
+        0050088588 0060088688 0070088788 0090088988
+      </p>
+
+      <p class="proof" contenteditable="true">
+        010N1N 020N2N 030N3N 040N4N 050N5N 060N6N 070N7N 080N8N 090N9N
+      </p>
+
+      <p class="proof" contenteditable="true">
+        nn0nnnn1nnnn2nnnn3nnnn4nnnn5nnnn6nnnn7nnnn8nnnn9nn<br /><br />
+        oo0oooo1oooo2oooo3oooo4oooo5oooo6oooo7oooo8oooo9oo<br /><br />
+        NN0NNNN1NNNN2NNNN3NNNN4NNNN5NNNN6NNNN7NNNN8NNNN9NN<br /><br />
+        OO0OOOO1OOOO2OOOO3OOOO4OOOO5OOOO6OOOO7OOOO8OOOO9OO<br /><br />
+        000000100200300400500600700800900
+      </p>
+
+      <p class="proof" contenteditable="true">
+        nn.nnoo.oo nn,nnoo,oo nn:nnoo:oo nn;nnoo;oo nn…nnoo…oo<br />
+        nn!nnoo!oo nn¡nnoo¡oo nn?nnoo?oo nn¿nnoo¿oo nn·nnoo·oo<br />
+        nn•nnoo•oo nn*nnoo*oo nn#nnoo#oo nn/nnoo/oo nn\nnoo\oo<br />
+        nn(nnoo(oo nn)nnoo)oo nn{nnoo{oo nn}nnoo}oo nn[nnoo[oo<br />
+        nn]nnoo]oo nn-nnoo-oo nn–nnoo–oo nn—nnoo—oo nn‒nnoo‒oo<br />
+        nn_nnoo_oo nn‚nnoo‚oo nn„nnoo„oo nn“nnoo“oo nn”nnoo”oo<br />
+        nn‘nnoo‘oo nn’nnoo’oo nn«nnoo«oo nn»nnoo»oo nn‹nnoo‹oo<br />
+        nn›nnoo›oo nn‵nnoo‵oo nn‴nnoo‴oo nn"nnoo"oo nn'nnoo'oo<br />
+        nn⟨nnoo⟨oo nn⟩nnoo⟩oo nnªnnooªoo nnºnnooºoo
+      </p>
+
+      <p class="proof" contenteditable="true">
+        HH.HHOO.OO HH,HHOO,OO HH:HHOO:OO HH;HHOO;OO HH…HHOO…OO<br />
+        HH!HHOO!OO HH¡HHOO¡OO HH?HHOO?OO HH¿HHOO¿OO HH·HHOO·OO<br />
+        HH•HHOO•OO HH*HHOO*OO HH#HHOO#OO HH/HHOO/OO HH\HHOO\OO<br />
+        HH(HHOO(OO HH)HHOO)OO HH{HHOO{OO HH}HHOO}OO HH[HHOO[OO<br />
+        HH]HHOO]OO HH-HHOO-OO HH–HHOO–OO HH—HHOO—OO HH‒HHOO‒OO<br />
+        HH_HHOO_OO HH‚HHOO‚OO HH„HHOO„OO HH“HHOO“OO HH”HHOO”OO<br />
+        HH‘HHOO‘OO HH’HHOO’OO HH«HHOO«OO HH»HHOO»OO HH‹HHOO‹OO<br />
+        HH›HHOO›OO HH‵HHOO‵OO HH‴HHOO‴OO HH"HHOO"OO HH'HHOO'OO<br />
+        HH⟨HHOO⟨OO HH⟩HHOO⟩OO HHªHHOOªOO HHºHHOOºOO<br />
+        <br />
+        Iŀlustració ceŀla<br />
+        COĿLEGI CEĿLA
+      </p>
+
+      <p class="proof" contenteditable="true">
+        (a) (b) (c) (d) (e) (f) (g) (h) (i) (j) (k) (l) (m) (n)<br />
+        (o) (p) (q) (r) (s) (t) (u) (v) (w) (x) (y) (z) (A) (B)<br />
+        (C) (D) (E) (F) (G) (H) (I) (J) (K) (L) (M) (N) (O) (P)<br />
+        (Q) (R) (S) (T) (U) (V) (W) (X) (Y) (Z)<br />
+        <br />
+        {a} {b} {c} {d} {e} {f} {g} {h} {i} {j} {k} {l} {m} {n}<br />
+        {o} {p} {q} {r} {s} {t} {u} {v} {w} {x} {y} {z} {A} {B}<br />
+        {C} {D} {E} {F} {G} {H} {I} {J} {K} {L} {M} {N} {O} {P}<br />
+        {Q} {R} {S} {T} {U} {V} {W} {X} {Y} {Z}<br />
+        <br />
+        [a] [b] [c] [d] [e] [f] [g] [h] [i] [j] [k] [l] [m] [n]<br />
+        [o] [p] [q] [r] [s] [t] [u] [v] [w] [x] [y] [z] [A] [B]<br />
+        [C] [D] [E] [F] [G] [H] [I] [J] [K] [L] [M] [N] [O] [P]<br />
+        [Q] [R] [S] [T] [U] [V] [W] [X] [Y] [Z]
+      </p>
+
+      <p class="proof" contenteditable="true">
+        ннаннооаоо ннбннообоо ннвнноовоо ннгнноогоо ннѓннооѓоо<br />
+        ннґннооґоо ннднноодоо нненнооеоо ннѐннооѐоо ннённооёоо<br />
+        ннжнноожоо ннзнноозоо нниннооиоо ннйнноойоо ннѝннооѝоо<br />
+        ннкнноокоо ннќннооќоо ннлнноолоо ннмнноомоо нннннооноо<br />
+        нноннооооо ннпнноопоо ннрнноороо ннснноосоо ннтнноотоо<br />
+        ннуннооуоо ннўннооўоо ннфнноофоо ннхнноохоо ннчнноочоо<br />
+        ннцннооцоо нншнноошоо ннщнноощоо ннџннооџоо нньннооьоо<br />
+        ннъннооъоо нныннооыоо ннљнноољоо ннњннооњоо ннѕннооѕоо<br />
+        ннєннооєоо ннэннооэоо нніннооіоо ннїннооїоо ннјнноојоо<br />
+        ннћннооћоо ннюннооюоо ннянноояоо ннђнноођоо ннѣннооѣоо<br />
+        ннѫннооѫоо ннѳннооѳоо ннѵннооѵоо ннғннооғоо ннҕннооҕоо<br />
+        ннҗннооҗоо ннҙннооҙоо ннқннооқоо ннҝннооҝоо ннҡннооҡоо<br />
+        ннңннооңоо ннҥннооҥоо ннҫннооҫоо ннүннооүоо ннұннооұоо<br />
+        ннҳннооҳоо ннҷннооҷоо ннҹннооҹоо ннһннооһоо ннӏннооӏоо<br />
+        ннӂннооӂоо ннӌннооӌоо ннӑннооӑоо ннӓннооӓоо ннӕннооӕоо<br />
+        ннӗннооӗоо ннәннооәоо ннӝннооӝоо ннӟннооӟоо ннӣннооӣоо<br />
+        ннӥннооӥоо ннӧннооӧоо ннөннооөоо ннӯннооӯоо ннӱннооӱоо<br />
+        ннӳннооӳоо ннӵннооӵоо ннӷннооӷоо ннӹннооӹоо ннԛннооԛоо<br />
+        ннԝннооԝоо
+      </p>
+
+      <p class="proof" contenteditable="true">
+        ННАННООАОО ННБННООБОО ННВННООВОО ННГННООГОО ННЃННООЃОО<br />
+        ННҐННООҐОО ННДННООДОО ННЕННООЕОО ННЀННООЀОО ННЁННООЁОО<br />
+        ННЖННООЖОО ННЗННООЗОО ННИННООИОО ННЙННООЙОО ННЍННООЍОО<br />
+        ННКННООКОО ННЌННООЌОО ННЛННООЛОО ННМННООМОО НННННООНОО<br />
+        ННОННООООО ННПННООПОО ННРННООРОО ННСННООСОО ННТННООТОО<br />
+        ННУННООУОО ННЎННООЎОО ННФННООФОО ННХННООХОО ННЧННООЧОО<br />
+        ННЦННООЦОО ННШННООШОО ННЩННООЩОО ННЏННООЏОО ННЬННООЬОО<br />
+        ННЪННООЪОО ННЫННООЫОО ННЉННООЉОО ННЊННООЊОО ННЅННООЅОО<br />
+        ННЄННООЄОО ННЭННООЭОО ННІННООІОО ННЇННООЇОО ННЈННООЈОО<br />
+        ННЋННООЋОО ННЮННООЮОО ННЯННООЯОО ННЂННООЂОО ННѢННООѢОО<br />
+        ННѪННООѪОО ННѲННООѲОО ННѴННООѴОО ННҒННООҒОО ННҔННООҔОО<br />
+        ННҖННООҖОО ННҘННООҘОО ННҚННООҚОО ННҜННООҜОО ННҠННООҠОО<br />
+        ННҢННООҢОО ННҤННООҤОО ННҪННООҪОО ННҮННООҮОО ННҰННООҰОО<br />
+        ННҲННООҲОО ННҶННООҶОО ННҸННООҸОО ННҺННООҺОО ННӀННООӀОО<br />
+        ННӁННООӁОО ННӋННООӋОО ННӐННООӐОО ННӒННООӒОО ННӔННООӔОО<br />
+        ННӖННООӖОО ННӘННООӘОО ННӜННООӜОО ННӞННООӞОО ННӢННООӢОО<br />
+        ННӤННООӤОО ННӦННООӦОО ННӨННООӨОО ННӮННООӮОО ННӰННООӰОО<br />
+        ННӲННООӲОО ННӴННООӴОО ННӶННООӶОО ННӸННООӸОО ННԚННООԚОО<br />
+        ННԜННООԜОО
+      </p>
+
+      <p class="proof" contenteditable="true" style="font-feature-settings: 'tnum';">
+        00₵00₵00 00¢00¢00 00₡00₡00 00¤00¤00 00$00$00 00₫00₫00 00€00€00<br />
+        00ƒ00ƒ00 00₣00₣00 00₲00₲00 00₴00₴00 00₭00₭00 00₤00₤00 00₺00₺00<br />
+        00₼00₼00 00₦00₦00 00₧00₧00 00₱00₱00 00₽00₽00 00₹00₹00 00£00£00<br />
+        00₸00₸00 00₮00₮00 00₩00₩00 00¥00¥00 00∙00∙00 00⁒00⁒00 00∕00∕00<br />
+        00≡00≡00 00≢00≢00 00+00+00 00−00−00 00×00×00 00÷00÷00 00=00=00<br />
+        00≠00≠00 00&gt;00&gt;00 00&lt;00&lt;00 00≥00≥00 00≤00≤00<br />
+        00±00±00 00≈00≈00 00~00~00 00¬00¬00 00^00^00
+      </p>
+
+      <p class="proof" contenteditable="true">
+        nn∅nnoo∅oo nn∞nnoo∞oo nn∫nnoo∫oo nnΩnnooΩoo nn∆nnoo∆oo nn∏nnoo∏oo<br />
+        nn∑nnoo∑oo nn√nnoo√oo nn∂nnoo∂oo nnµnnooµoo nn%nnoo%oo nn‰nnoo‰oo<br />
+        nn∶nnoo∶oo nn↑nnoo↑oo nn→nnoo→oo nn↓nnoo↓oo nn←nnoo←oo nn●nnoo●oo<br />
+        nn○nnoo○oo nn◊nnoo◊oo nn@nnoo@oo nn&nnoo&oo nn¶nnoo¶oo nn§nnoo§oo<br />
+        nn©nnoo©oo nn®nnoo®oo nn™nnoo™oo nn°nnoo°oo nn′nnoo′oo nn″nnoo″oo<br />
+        nn|nnoo|oo nn¦nnoo¦oo nn†nnoo†oo nnℓnnooℓoo nn‡nnoo‡oo nn℮nnoo℮oo<br />
+        nn№nnoo№oo nn␣nnoo␣oo nnπnnooπoo<br />
+        nn¨nn˙nn`nn´nn˝nnˆnnˇnn˘nn˚nn˜nn¯nn¸nn˛nn<br />
+        nnʼnnʻnnʺnnˉnnˋnnʹnnʿnnʾnnˊnnˌnnˈnn<br />
+        <br />
+        HH∅HHOO∅OO HH∞HHOO∞OO HH∫HHOO∫OO HHΩHHOOΩOO HH∆HHOO∆OO HH∏HHOO∏OO<br />
+        HH∑HHOO∑OO HH√HHOO√OO HH∂HHOO∂OO HHµHHOOµOO HH%HHOO%OO HH‰HHOO‰OO<br />
+        HH∶HHOO∶OO HH↑HHOO↑OO HH→HHOO→OO HH↓HHOO↓OO HH←HHOO←OO HH●HHOO●OO<br />
+        HH○HHOO○OO HH◊HHOO◊OO HH@HHOO@OO HH&HHOO&OO HH¶HHOO¶OO HH§HHOO§OO<br />
+        HH©HHOO©OO HH®HHOO®OO HH™HHOO™OO HH°HHOO°OO HH′HHOO′OO HH″HHOO″OO<br />
+        HH|HHOO|OO HH¦HHOO¦OO HH†HHOO†OO HHℓHHOOℓOO HH‡HHOO‡OO HH℮HHOO℮OO<br />
+        HH№HHOO№OO HH␣HHOO␣OO HHπHHOOπOO<br />
+        <br />
+        00∅00∅00 00∞00∞00 00∫00∫00 00Ω00Ω00 00∆00∆00 00∏00∏00 00∑00∑00<br />
+        00√00√00 00∂00∂00 00µ00µ00 00%00%00 00‰00‰00 00∶00∶00 00↑00↑00<br />
+        00→00→00 00↓00↓00 00←00←00 00●00●00 00○00○00 00◊00◊00 00@00@00<br />
+        00&00&00 00¶00¶00 00§00§00 00©00©00 00®00®00 00™00™00 00°00°00<br />
+        00′00′00 00″00″00 00|00|00 00¦00¦00 00†00†00 00ℓ00ℓ00 00‡00‡00<br />
+        00℮00℮00 00№00№00 00␣00␣00 00π00π00
+      </p>
+
+      <h2>500 Digits of Pi</h2>
+
+      <p class="proof" contenteditable="true">
+        
31415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679821480865132823066470938446095505822317253594081284811174502841027019385211055596446229489549303819644288109756659334461284756482337867831652712019091456485669234603486104543266482133936072602491412737245870066063155881748815209209628292540917153643678925903600113305305488204665213841469519415116094330572703657595919530921861173819326117931051185480744623799627495673518857527248912279381830119491
+      </p>
+
+      <h2>Emil Ruder's Spacing Test - top and bottom paragraphs should match in overall color</h2>
+
+      <p class="proof" contenteditable="true">
+        bibel malhabile modo biegen peuple punibile blind qualifier
+        quindi damals quelle dinamica china quelque analiso schaden
+        salomon macchina schein sellier secondo lager sommier singolo
+        legion unique possibile mime unanime unico mohn usuel legge
+        nagel abonner unione puder agir punizione quälen aiglon dunque
+        huldigen allégir quando geduld alliance uomini
+        <br /><br />
+        vertrag crainte screw verwalter croyant science verzicht
+        fratricide sketchy vorrede frivolité story yankee instruction
+        take zwetschge lyre treaty zypresse navette tricycle fraktur
+        nocturne typograph kraft pervertir vanity raffeln presto
+        victory reaktion prévoyant vivacity rekord priorité wayward
+        revolte proscrire efficiency tritt raviver without trotzkopf
+        tactilité through tyrann arrêt known
+      </p>
+
+      <h2>Kern King</h2>
+
+      <p class="proof" contenteditable="true">
+        lynx tuft frogs, dolphins abduct by proxy the ever awkward
+        klutz, dud, dummkopf, jinx snubnose filmgoer, orphan sgt.
+        renfruw grudgek reyfus, md. sikh psych if halt tympany jewelry
+        sri heh! twyer vs jojo pneu fylfot alcaaba son of nonplussed
+        halfbreed bubbly playboy guggenheim daddy coccyx sgraffito
+        effect, vacuum dirndle impossible attempt to disvalue, muzzle
+        the afghan czech czar and exninja, bob bixby dvorak wood
+        dhurrie savvy, dizzy eye aeon circumcision uvula scrungy picnic
+        luxurious special type carbohydrate ovoid adzuki kumquat bomb?
+        afterglows gold girl pygmy gnome lb. ankhs acme aggroupment
+        akmed brouhha tv wt. ujjain ms. oz abacus mnemonics bhikku
+        khaki bwana aorta embolism vivid owls often kvetch otherwise,
+        wysiwyg densfort wright you’ve absorbed rhythm, put obstacle
+        kyaks krieg kern wurst subject enmity equity coquet quorum
+        pique tzetse hepzibah sulfhydryl briefcase ajax ehler kafka
+        fjord elfship halfdressed jugful eggcup hummingbirds swingdevil
+        bagpipe legwork reproachful hunchback archknave baghdad wejh
+        rijswijk rajbansi rajput ajdir okay weekday obfuscate subpoena
+        liebknecht marcgravia ecbolic arcticward dickcissel pincpinc
+        boldface maidkin adjective adcraft adman dwarfness applejack
+        darkbrown kiln palzy always farmland flimflam unbossy nonlineal
+        stepbrother lapdog stopgap sx countdown basketball beaujolais
+        vb. flowchart aztec lazy bozo syrup tarzan annoying dyke yucky
+        hawg gagzhukz cuzco squire when hiho mayhem nietzsche szasz
+        gumdrop milk emplotment ambidextrously lacquer byway
+        ecclesiastes stubchen hobgoblins crabmill aqua hawaii blvd.
+        subquality byzantine empire debt obvious cervantes jekabzeel
+        anecdote flicflac mechanicville bedbug couldn’t i’ve it’s
+        they’ll they’d dpt. headquarter burkhardt xerxes atkins govt.
+        ebenezer lg. lhama amtrak amway fixity axmen quumbabda upjohn
+        hrumpf
+      </p>
+
+      <p class="proof" contenteditable="true">
+        LYNX TUFT FROGS, DOLPHINS ABDUCT BY PROXY THE EVER AWKWARD
+        KLUTZ, DUD, DUMMKOPF, JINX SNUBNOSE FILMGOER, ORPHAN SGT.
+        RENFRUW GRUDGEK REYFUS, MD. SIKH PSYCH IF HALT TYMPANY JEWELRY
+        SRI HEH! TWYER VS JOJO PNEU FYLFOT ALCAABA SON OF NONPLUSSED
+        HALFBREED BUBBLY PLAYBOY GUGGENHEIM DADDY COCCYX SGRAFFITO
+        EFFECT, VACUUM DIRNDLE IMPOSSIBLE ATTEMPT TO DISVALUE, MUZZLE
+        THE AFGHAN CZECH CZAR AND EXNINJA, BOB BIXBY DVORAK WOOD
+        DHURRIE SAVVY, DIZZY EYE AEON CIRCUMCISION UVULA SCRUNGY PICNIC
+        LUXURIOUS SPECIAL TYPE CARBOHYDRATE OVOID ADZUKI KUMQUAT BOMB?
+        AFTERGLOWS GOLD GIRL PYGMY GNOME LB. ANKHS ACME AGGROUPMENT
+        AKMED BROUHHA TV WT. UJJAIN MS. OZ ABACUS MNEMONICS BHIKKU
+        KHAKI BWANA AORTA EMBOLISM VIVID OWLS OFTEN KVETCH OTHERWISE,
+        WYSIWYG DENSFORT WRIGHT YOU’VE ABSORBED RHYTHM, PUT OBSTACLE
+        KYAKS KRIEG KERN WURST SUBJECT ENMITY EQUITY COQUET QUORUM
+        PIQUE TZETSE HEPZIBAH SULFHYDRYL BRIEFCASE AJAX EHLER KAFKA
+        FJORD ELFSHIP HALFDRESSED JUGFUL EGGCUP HUMMINGBIRDS SWINGDEVIL
+        BAGPIPE LEGWORK REPROACHFUL HUNCHBACK ARCHKNAVE BAGHDAD WEJH
+        RIJSWIJK RAJBANSI RAJPUT AJDIR OKAY WEEKDAY OBFUSCATE SUBPOENA
+        LIEBKNECHT MARCGRAVIA ECBOLIC ARCTICWARD DICKCISSEL PINCPINC
+        BOLDFACE MAIDKIN ADJECTIVE ADCRAFT ADMAN DWARFNESS APPLEJACK
+        DARKBROWN KILN PALZY ALWAYS FARMLAND FLIMFLAM UNBOSSY NONLINEAL
+        STEPBROTHER LAPDOG STOPGAP SX COUNTDOWN BASKETBALL BEAUJOLAIS
+        VB. FLOWCHART AZTEC LAZY BOZO SYRUP TARZAN ANNOYING DYKE YUCKY
+        HAWG GAGZHUKZ CUZCO SQUIRE WHEN HIHO MAYHEM NIETZSCHE SZASZ
+        GUMDROP MILK EMPLOTMENT AMBIDEXTROUSLY LACQUER BYWAY
+        ECCLESIASTES STUBCHEN HOBGOBLINS CRABMILL AQUA HAWAII BLVD.
+        SUBQUALITY BYZANTINE EMPIRE DEBT OBVIOUS CERVANTES JEKABZEEL
+        ANECDOTE FLICFLAC MECHANICVILLE BEDBUG COULDN’T I’VE IT’S
+        THEY’LL THEY’D DPT. HEADQUARTER BURKHARDT XERXES ATKINS GOVT.
+        EBENEZER LG. LHAMA AMTRAK AMWAY FIXITY AXMEN QUUMBABDA UPJOHN
+        HRUMPF
+      </p>
+
+      <p class="proof" contenteditable="true">
+        Aaron Abraham Adam Aeneas Agfa Ahoy Aileen Akbar Alanon
+        Americanism Anglican Aorta April Fool’s Day Aqua Lung (Tm.)
+        Arabic Ash Wednesday Authorized Version Ave Maria Away Axel Ay
+        Aztec Bhutan Bill Bjorn Bk Btu. Bvart Bzonga California Cb Cd
+        Cervantes Chicago Clute City, Tx. Cmdr. Cnossus Coco Cracker
+        State, Georgia Cs Ct. Cwacker Cyrano David Debra Dharma Diane
+        Djakarta Dm Dnepr Doris Dudley Dwayne Dylan Dzerzhinsk Eames
+        Ectomorph Eden Eerie Effingham, Il. Egypt Eiffel Tower Eject
+        Ekland Elmore Entreaty Eolian Epstein Equine Erasmus Eskimo
+        Ethiopia Europe Eva Ewan Exodus Jan van Eyck Ezra Fabian
+        February Fhara Fifi Fjord Florida Fm France Fs Ft. Fury Fyn
+        Gabriel Gc Gdynia Gehrig Ghana Gilligan Karl Gjellerup Gk. Glen
+        Gm Gnosis Gp.E. Gregory Gs Gt. Br. Guinevere Gwathmey Gypsy
+        Gzags Hebrew Hf Hg Hileah Horace Hrdlicka Hsia Hts. Hubert
+        Hwang Hai Hyacinth Hz. Iaccoca Ibsen Iceland Idaho If Iggy Ihre
+        Ijit Ike Iliad Immediate Innocent Ione Ipswitch Iquarus Ireland
+        Island It Iud Ivert Iwerks Ixnay Iy Jasper Jenks Jherry Jill Jm
+        Jn Jorge Jr. Julie Kerry Kharma Kiki Klear Koko Kruse Kusack
+        Kylie Laboe Lb. Leslie Lhihane Llama Lorrie Lt. Lucy Lyle
+        Madeira Mechanic Mg. Minnie Morrie Mr. Ms. Mt. Music My Nanny
+        Nellie Nillie Novocane Null Nyack Oak Oblique Occarina Odd
+        Oedipus Off Ogmane Ohio Oil Oj Oklahoma Olio Omni Only Oops
+        Opera Oqu Order Ostra Ottmar Out Ovum Ow Ox Oyster Oz Parade
+        Pd. Pepe Pfister Pg. Phil Pippi Pj Please Pneumonia Porridge
+        Price Psalm Pt. Purple Pv Pw Pyre Qt. Quincy Radio Rd. Red Rhea
+        Right Rj Roche Rr Rs Rt. Rural Rwanda Ryder Sacrifice Series
+        Sgraffito Shirt Sister Skeet Slow Smore Snoop Soon Special
+        Squire Sr St. Suzy Svelte Swiss Sy Szach Td Teach There Title
+        Total Trust Tsena Tulip Twice Tyler Tzean Ua Udder Ue Uf Ugh Uh
+        Ui Uk Ul Um Unkempt Uo Up Uq Ursula Use Utmost Uvula Uw
+        Uxurious Uzßai Valerie Velour Vh Vicky Volvo Vs Water Were
+        Where With World Wt. Wulk Wyler Xavier Xerox Xi Xylophone Yaboe
+        Year Yipes Yo Ypsilant Ys Yu Zabar’s Zero Zhane Zizi Zorro Zu
+        Zy Don’t I’ll I’m I’se
+      </p>
+
+    </article>
+
+  </main>
+
+  <script>
+    let font_size = 12;
+    let wght = 400;
+
+    document.getElementById('wghtSlider').addEventListener('input', function () {
+      wght = document.getElementById('wghtSlider').value;
+      document.querySelectorAll(".proof").forEach(element => {
+        element.style.fontVariationSettings = `'wght' ${wght}`;
+      });
+      document.getElementById("wghtResult").innerHTML = wght;
+    })
+
+    document.getElementById('sizeSlider').addEventListener('input', function () {
+      font_size = document.getElementById('sizeSlider').value;
+      document.querySelectorAll(".proof").forEach(element => {
+        element.style.fontSize = `${font_size}pt`;
+      });
+      document.getElementById("sizeResult").innerHTML = font_size;
+    })
+  </script>
+
+</body>
+
+</html>
diff --git a/requirements-dev.in b/requirements-dev.in
index eb19029a..ed130e40 100644
--- a/requirements-dev.in
+++ b/requirements-dev.in
@@ -1,6 +1,5 @@
 -r requirements.txt
 
--e git+https://github.com/googlefonts/glyphsLib.git@5a369f34a2bf96403e637b39f88566d6ab8b3264#egg=glyphsLib
-
+glyphsLib
 mypy
 pylint
diff --git a/requirements-dev.txt b/requirements-dev.txt
index d63ca626..baf7a180 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -4,31 +4,35 @@
 #
 #    pip-compile requirements-dev.in
 #
--e git+https://github.com/googlefonts/glyphsLib.git@5a369f34a2bf96403e637b39f88566d6ab8b3264#egg=glyphsLib
 appdirs==1.4.3
-astroid==2.2.5            # via pylint
-attrs==19.1.0
-booleanoperations==0.8.2
+astroid==2.3.3            # via pylint
+attrs==19.3.0
+booleanoperations==0.9.0
 cattrs==0.9.0
-compreffor==0.4.6.post1
-cu2qu==1.6.5
-defcon==0.6.0
-fontmath==0.5.0
-fonttools[lxml,ufo,unicode]==3.41.2
-fs==2.4.5
-isort==4.3.20             # via pylint
-lazy-object-proxy==1.4.1  # via astroid
-lxml==4.3.3
+compreffor==0.5.0
+cu2qu==1.6.6
+fontmath==0.5.2
+fonttools[ufo,unicode]==4.2.2
+fs==2.4.11
+glyphslib==5.1.0
+isort==4.3.21             # via pylint
+lazy-object-proxy==1.4.3  # via astroid
 mccabe==0.6.1             # via pylint
-mypy-extensions==0.4.1    # via mypy
-mypy==0.701
-psautohint==1.9.2
-pyclipper==1.1.0.post1
-pylint==2.3.1
-pytz==2019.1
-six==1.12.0
-statmake==0.1.2
-typed-ast==1.3.5          # via astroid, mypy
-ufo2ft==2.9.0b1
-ufolib2==0.3.2.post2
-wrapt==1.11.1             # via astroid
+mypy-extensions==0.4.3    # via mypy
+mypy==0.750
+psautohint==2.0.0
+pyclipper==1.1.0.post3
+pylint==2.4.4
+pytz==2019.3
+six==1.13.0
+skia-pathops==0.2.1
+statmake==0.2.0
+typed-ast==1.4.0          # via astroid, mypy
+typing-extensions==3.7.4.1  # via mypy
+ufo2ft==2.11.1
+ufolib2==0.5.1
+unicodedata2==12.1.0      # via fonttools
+wrapt==1.11.2             # via astroid
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools
diff --git a/requirements.in b/requirements.in
index 8723511a..cf2f206a 100644
--- a/requirements.in
+++ b/requirements.in
@@ -1,7 +1,8 @@
 attrs>=18.2
 fontMath>=0.5.0
-fontTools>=3.39.0
+fontTools>=4.0.0
 psautohint>=1.8.0
-statmake
-ufoLib2>=0.3.2.post2
-ufo2ft>=2.9.0b1
+statmake>=0.1.3
+ufoLib2>=0.4.0
+ufo2ft>=2.9.0
+skia-pathops
diff --git a/requirements.txt b/requirements.txt
index a990e430..f2e9604f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,20 +5,22 @@
 #    pip-compile requirements.in
 #
 appdirs==1.4.3            # via fs
-attrs==19.1.0
-booleanoperations==0.8.2  # via ufo2ft
+attrs==19.3.0
+booleanoperations==0.9.0  # via ufo2ft
 cattrs==0.9.0             # via statmake
-compreffor==0.4.6.post1   # via ufo2ft
-cu2qu==1.6.5              # via ufo2ft
-defcon==0.6.0             # via ufo2ft
-fontmath==0.5.0
-fonttools[lxml,ufo,unicode]==3.41.2
-fs==2.4.5                 # via fonttools
-lxml==4.3.3               # via fonttools
-psautohint==1.9.2
-pyclipper==1.1.0.post1    # via booleanoperations
-pytz==2019.1              # via fs
-six==1.12.0               # via fs
-statmake==0.1.2
-ufo2ft==2.9.0b1
-ufolib2==0.3.2.post2
+compreffor==0.5.0         # via ufo2ft
+cu2qu==1.6.6              # via ufo2ft
+fontmath==0.5.2
+fonttools[ufo]==4.2.2
+fs==2.4.11                # via fonttools
+psautohint==2.0.0
+pyclipper==1.1.0.post3    # via booleanoperations
+pytz==2019.3              # via fs
+six==1.13.0               # via fs
+skia-pathops==0.2.1
+statmake==0.2.0
+ufo2ft==2.11.1
+ufolib2==0.5.1
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools
diff --git a/scripts/instantiator.py b/scripts/instantiator.py
index 73732273..360e3041 100644
--- a/scripts/instantiator.py
+++ b/scripts/instantiator.py
@@ -1,7 +1,24 @@
-#!/bin/env python3
+# This code is based on ufoProcessor code, which is licensed as follows:
+# Copyright (c) 2017-2018 LettError and Erik van Blokland
+# All rights reserved.
 #
-# This code is based on ufoProcessor code, see LICENSE_ufoProcessor, and is itself
-# MIT-licensed.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 """Module for generating static font instances.
 
@@ -12,28 +29,39 @@ instance computation directly and exclusively.
 
 At the time of this writing, varLib lacks support for anisotropic (x, y) locations and
 extrapolation.
-
-See the `scripts/make-static-fonts.py` script for how to use it.
 """
 
-from pathlib import Path
+import copy
+import logging
+import typing
 from typing import Any, Dict, List, Mapping, Set, Tuple, Union
 
 import attr
 import fontMath
 import fontTools.designspaceLib as designspaceLib
 import fontTools.misc.fixedTools
-import fontTools.ufoLib as ufoLib
 import fontTools.varLib as varLib
 import ufoLib2
 
-FontMathObject = Union[fontMath.MathGlyph, fontMath.MathInfo, fontMath.MathKerning]
-Location = Mapping[str, float]
+logger = logging.getLogger(__name__)
 
 # Use the same rounding function used by varLib to round things for the variable font
 # to reduce differences between the variable and static instances.
 fontMath.mathFunctions.setRoundIntegerFunction(fontTools.misc.fixedTools.otRound)
 
+# Stand-in type for any of the fontMath classes we use.
+FontMathObject = Union[fontMath.MathGlyph, fontMath.MathInfo, fontMath.MathKerning]
+
+# MutatorMath-style location mapping type, i.e.
+# `{"wght": 1.0, "wdth": 0.0, "bleep": 0.5}`.
+# LocationKey is a Location turned into a tuple so we can use it as a dict key.
+Location = Mapping[str, float]
+LocationKey = Tuple[Tuple[str, float], ...]
+
+# Type of mapping of axes to their minimum, default and maximum values, i.e.
+# `{"wght": (100.0, 400.0, 900.0), "wdth": (75.0, 100.0, 100.0)}`.
+AxisBounds = Dict[str, Tuple[float, float, float]]
+
 # For mapping `wdth` axis user values to the OS2 table's width class field.
 WDTH_VALUE_TO_OS2_WIDTH_CLASS = {
     50: 1,
@@ -47,17 +75,95 @@ WDTH_VALUE_TO_OS2_WIDTH_CLASS = {
     200: 9,
 }
 
+# Font info fields that are not interpolated and should be copied from the
+# default font to the instance.
+#
+# fontMath at the time of this writing handles the following attributes:
+# https://github.com/robotools/fontMath/blob/0.5.0/Lib/fontMath/mathInfo.py#L360-L422
+#
+# From the attributes that are left, we skip instance-specific ones on purpose:
+# - guidelines
+# - postscriptFontName
+# - styleMapFamilyName
+# - styleMapStyleName
+# - styleName
+# - openTypeNameCompatibleFullName
+# - openTypeNamePreferredFamilyName
+# - openTypeNamePreferredSubfamilyName
+# - openTypeNameUniqueID
+# - openTypeNameWWSFamilyName
+# - openTypeNameWWSSubfamilyName
+# - openTypeOS2Panose
+# - postscriptFullName
+# - postscriptUniqueID
+# - woffMetadataUniqueID
+#
+# Some, we skip because they are deprecated:
+# - macintoshFONDFamilyID
+# - macintoshFONDName
+# - year
+#
+# This means we implicitly require the `stylename` attribute in the Designspace
+# `<instance>` element.
+UFO_INFO_ATTRIBUTES_TO_COPY_TO_INSTANCES = {
+    "copyright",
+    "familyName",
+    "note",
+    "openTypeGaspRangeRecords",
+    "openTypeHeadCreated",
+    "openTypeHeadFlags",
+    "openTypeNameDescription",
+    "openTypeNameDesigner",
+    "openTypeNameDesignerURL",
+    "openTypeNameLicense",
+    "openTypeNameLicenseURL",
+    "openTypeNameManufacturer",
+    "openTypeNameManufacturerURL",
+    "openTypeNameRecords",
+    "openTypeNameSampleText",
+    "openTypeNameVersion",
+    "openTypeOS2CodePageRanges",
+    "openTypeOS2FamilyClass",
+    "openTypeOS2Selection",
+    "openTypeOS2Type",
+    "openTypeOS2UnicodeRanges",
+    "openTypeOS2VendorID",
+    "postscriptDefaultCharacter",
+    "postscriptForceBold",
+    "postscriptIsFixedPitch",
+    "postscriptWindowsCharacterSet",
+    "trademark",
+    "versionMajor",
+    "versionMinor",
+    "woffMajorVersion",
+    "woffMetadataCopyright",
+    "woffMetadataCredits",
+    "woffMetadataDescription",
+    "woffMetadataExtensions",
+    "woffMetadataLicense",
+    "woffMetadataLicensee",
+    "woffMetadataTrademark",
+    "woffMetadataVendor",
+    "woffMinorVersion",
+}
+
+
+# Custom exception for this module
+class InstantiatorError(Exception):
+    pass
+
 
 @attr.s(auto_attribs=True, frozen=True, slots=True)
 class Instantiator:
     """Data class that holds all necessary information to generate a static
     font instance object at an arbitary location within the design space."""
 
-    axis_bounds: Dict[str, Tuple[float, float, float]]  # Design space!
+    axis_bounds: AxisBounds  # Design space!
     copy_feature_text: str
-    copy_groups: Mapping[str, List[str]]
+    copy_nonkerning_groups: Mapping[str, List[str]]
     copy_info: ufoLib2.objects.Info
     copy_lib: Mapping[str, Any]
+    default_design_location: Location
     designspace_rules: List[designspaceLib.RuleDescriptor]
     glyph_mutators: Mapping[str, "Variator"]
     glyph_name_to_unicodes: Dict[str, List[int]]
@@ -65,7 +171,7 @@ class Instantiator:
     kerning_mutator: "Variator"
     round_geometry: bool
     skip_export_glyphs: List[str]
-    weight_width_axes: Mapping[str, designspaceLib.AxisDescriptor]
+    special_axes: Mapping[str, designspaceLib.AxisDescriptor]
 
     @classmethod
     def from_designspace(
@@ -75,10 +181,16 @@ class Instantiator:
     ):
         """Instantiates a new data class from a Designspace object."""
         if designspace.default is None:
-            raise ValueError(
+            raise InstantiatorError(
                 "Can't generate UFOs from this designspace: no default font."
             )
 
+        if any(anisotropic(instance.location) for instance in designspace.instances):
+            raise InstantiatorError(
+                "The Designspace contains anisotropic instance locations, which are "
+                "not supported by varLib."
+            )
+
         designspace.loadSourceFonts(ufoLib2.Font.open)
 
         glyph_names: Set[str] = set()
@@ -86,9 +198,9 @@ class Instantiator:
             glyph_names.update(source.font.keys())
 
         # Construct Variators
-        axis_bounds: Dict[str, Tuple[float, float, float]] = {}  # Design space!
+        axis_bounds: AxisBounds = {}  # Design space!
         axis_order: List[str] = []
-        weight_width_axes = {}
+        special_axes = {}
         for axis in designspace.axes:
             axis_order.append(axis.name)
             axis_bounds[axis.name] = (
@@ -96,8 +208,9 @@ class Instantiator:
                 axis.map_forward(axis.default),
                 axis.map_forward(axis.maximum),
             )
-            if axis.tag in ("wght", "wdth"):
-                weight_width_axes[axis.tag] = axis
+            # Some axes relate to existing OpenType fields and get special attention.
+            if axis.tag in {"wght", "wdth", "slnt"}:
+                special_axes[axis.tag] = axis
 
         masters_info = collect_info_masters(designspace, axis_bounds)
         info_mutator = Variator.from_masters(masters_info, axis_order)
@@ -115,11 +228,15 @@ class Instantiator:
 
         # Construct defaults to copy over
         copy_feature_text: str = default_font.features.text
-        copy_groups: Mapping[str, List[str]] = default_font.groups
+        copy_nonkerning_groups: Mapping[str, List[str]] = {
+            key: glyph_names
+            for key, glyph_names in default_font.groups.items()
+            if not key.startswith(("public.kern1.", "public.kern2."))
+        }  # Kerning groups are taken care of by the kerning Variator.
         copy_info: ufoLib2.objects.Info = default_font.info
         copy_lib: Mapping[str, Any] = default_font.lib
 
-        # The list of glyphs not to export and decompose where used as a component is
+        # The list of glyphs-not-to-export-and-decompose-where-used-as-a-component is
         # supposed to be taken from the Designspace when a Designspace is used as the
         # starting point of the compilation process. It should be exported to all
         # instance libs, where the ufo2ft compilation functions will pick it up.
@@ -128,9 +245,10 @@ class Instantiator:
         return cls(
             axis_bounds,
             copy_feature_text,
-            copy_groups,
+            copy_nonkerning_groups,
             copy_info,
             copy_lib,
+            designspace.default.location,
             designspace.rules,
             glyph_mutators,
             glyph_name_to_unicodes,
@@ -138,52 +256,138 @@ class Instantiator:
             kerning_mutator,
             round_geometry,
             skip_export_glyphs,
-            weight_width_axes,
+            special_axes,
         )
 
     def generate_instance(
         self, instance: designspaceLib.InstanceDescriptor
     ) -> ufoLib2.Font:
-        """Generate a font object for an InstanceDescriptor."""
-        font = ufoLib2.Font()
-
-        location = instance.location
-        if anisotropic(location):
-            raise ValueError(
+        """Generate an interpolated instance font object for an
+        InstanceDescriptor."""
+        if anisotropic(instance.location):
+            raise InstantiatorError(
                 f"Instance {instance.familyName}-"
                 f"{instance.styleName}: Anisotropic location "
                 f"{instance.location} not supported by varLib."
             )
-        location_normalized = normalize_design_location(location, self.axis_bounds)
+
+        font = ufoLib2.Font()
+
+        # Instances may leave out locations that match the default source, so merge
+        # default location with the instance's location.
+        location = {**self.default_design_location, **instance.location}
+        location_normalized = varLib.models.normalizeLocation(
+            location, self.axis_bounds
+        )
 
         # Kerning
-        if instance.kerning:
-            kerning_instance = self.kerning_mutator.instance_at(location_normalized)
-            kerning_instance.extractKerning(font)
+        kerning_instance = self.kerning_mutator.instance_at(location_normalized)
+        if self.round_geometry:
+            kerning_instance.round()
+        kerning_instance.extractKerning(font)
 
         # Info
+        self._generate_instance_info(instance, location_normalized, location, font)
+
+        # Non-kerning groups. Kerning groups have been taken care of by the kerning
+        # instance.
+        for key, glyph_names in self.copy_nonkerning_groups.items():
+            font.groups[key] = [name for name in glyph_names]
+
+        # Features
+        font.features.text = self.copy_feature_text
+
+        # Lib
+        #  1. Copy the default lib to the instance.
+        font.lib = typing.cast(dict, copy.deepcopy(self.copy_lib))
+        #  2. Copy the Designspace's skipExportGlyphs list over to the UFO to
+        #     make sure it wins over the default UFO one.
+        font.lib["public.skipExportGlyphs"] = [name for name in self.skip_export_glyphs]
+        #  3. Write _design_ location to instance's lib.
+        font.lib["designspace.location"] = [loc for loc in location.items()]
+
+        # Glyphs
+        for glyph_name, glyph_mutator in self.glyph_mutators.items():
+            glyph = font.newGlyph(glyph_name)
+
+            try:
+                glyph_instance = glyph_mutator.instance_at(location_normalized)
+
+                if self.round_geometry:
+                    glyph_instance = glyph_instance.round()
+
+                # onlyGeometry=True does not set name and unicodes, in ufoLib2 we can't
+                # modify a glyph's name. Copy unicodes from default font.
+                glyph_instance.extractGlyph(glyph, onlyGeometry=True)
+            except Exception as e:
+                # TODO: Figure out what exceptions fontMath/varLib can throw.
+                # By default, explode if we cannot generate a glyph instance for
+                # whatever reason (usually outline incompatibility)...
+                if glyph_name not in self.skip_export_glyphs:
+                    raise InstantiatorError(
+                        f"Failed to generate instance of glyph '{glyph_name}'."
+                    ) from e
+
+                # ...except if the glyph is in public.skipExportGlyphs and would
+                # therefore be removed from the compiled font anyway. There's not much
+                # we can do except leave it empty in the instance and tell the user.
+                logger.warning(
+                    "Failed to generate instance of glyph '%s', which is marked as "
+                    "non-exportable. Glyph will be left empty. Failure reason: %s",
+                    glyph_name,
+                    e,
+                )
+
+            glyph.unicodes = [uv for uv in self.glyph_name_to_unicodes[glyph_name]]
+
+        # Process rules
+        glyph_names_list = self.glyph_mutators.keys()
+        glyph_names_list_renamed = designspaceLib.processRules(
+            self.designspace_rules, location, glyph_names_list
+        )
+        for name_old, name_new in zip(glyph_names_list, glyph_names_list_renamed):
+            if name_old != name_new:
+                swap_glyph_names(font, name_old, name_new)
+
+        return font
+
+    def _generate_instance_info(
+        self,
+        instance: designspaceLib.InstanceDescriptor,
+        location_normalized: Location,
+        location: Location,
+        font: ufoLib2.Font,
+    ) -> None:
+        """Generate fontinfo related attributes.
+
+        Separate, as fontinfo treatment is more extensive than the rest.
+        """
         info_instance = self.info_mutator.instance_at(location_normalized)
         if self.round_geometry:
             info_instance = info_instance.round()
         info_instance.extractInfo(font.info)
 
-        # Copy metadata from sources marked with `<copy info="1">` etc.
-        for attribute in ufoLib.fontInfoAttributesVersion3:
-            if hasattr(info_instance, attribute):
-                continue  # Skip mutated attributes.
+        # Copy non-interpolating metadata from the default font.
+        for attribute in UFO_INFO_ATTRIBUTES_TO_COPY_TO_INSTANCES:
             if hasattr(self.copy_info, attribute):
-                setattr(font.info, attribute, getattr(self.copy_info, attribute))
-        for key, value in self.copy_lib.items():
-            font.lib[key] = value
-        font.lib["public.skipExportGlyphs"] = self.skip_export_glyphs
-        for key, value in self.copy_groups.items():
-            font.groups[key] = value
-        font.features.text = self.copy_feature_text
+                setattr(
+                    font.info,
+                    attribute,
+                    copy.deepcopy(getattr(self.copy_info, attribute)),
+                )
 
         # TODO: multilingual names to replace possibly existing name records.
         if instance.familyName:
             font.info.familyName = instance.familyName
-        if instance.styleName:
+        if instance.styleName is None:
+            logger.warning(
+                "The given instance or instance at location %s is missing the "
+                "stylename attribute, which is required. Copying over the styleName "
+                "from the default font, which is probably wrong.",
+                location,
+            )
+            font.info.styleName = self.copy_info.styleName
+        else:
             font.info.styleName = instance.styleName
         if instance.postScriptFontName:
             font.info.postscriptFontName = instance.postScriptFontName
@@ -194,78 +398,49 @@ class Instantiator:
 
         # If the masters haven't set the OS/2 weight and width class, use the
         # user-space values ("input") of the axis mapping in the Designspace file for
-        # weight and width axes, if they exist.
-        if info_instance.openTypeOS2WeightClass is None:
-            if "wght" in self.weight_width_axes:
-                weight_axis = self.weight_width_axes["wght"]
-                weight_axis_instance_location = instance.location[weight_axis.name]
-                font.info.openTypeOS2WeightClass = fontTools.misc.fixedTools.otRound(
-                    weight_axis.map_backward(weight_axis_instance_location)
-                )
-        if info_instance.openTypeOS2WidthClass is None:
-            if "wdth" in self.weight_width_axes:
-                width_axis = self.weight_width_axes["wdth"]
-                width_axis_instance_location = instance.location[width_axis.name]
-                width_value = width_axis.map_backward(width_axis_instance_location)
-                width_class = int(
-                    varLib.models.piecewiseLinearMap(
-                        width_value, WDTH_VALUE_TO_OS2_WIDTH_CLASS
-                    )
-                )
-                font.info.openTypeOS2WidthClass = width_class
-
-        # Glyphs
-        for glyph_name, glyph_mutator in self.glyph_mutators.items():
-            glyph = font.newGlyph(glyph_name)
-
-            glyph_instance = glyph_mutator.instance_at(location_normalized)
-            if self.round_geometry:
-                glyph_instance = glyph_instance.round()
-
-            # onlyGeometry=True does not set name and unicodes, in ufoLib2 we can't
-            # modify a glyph's name. Copy unicodes from default font.
-            glyph_instance.extractGlyph(glyph, onlyGeometry=True)
-            glyph.unicodes = self.glyph_name_to_unicodes[glyph_name]
+        # weight and width axes, if they exist. The slnt axis' value maps 1:1 to
+        # italicAngle. Clamp the values to the valid ranges.
+        if info_instance.openTypeOS2WeightClass is None and "wght" in self.special_axes:
+            weight_axis = self.special_axes["wght"]
+            font.info.openTypeOS2WeightClass = weight_class_from_wght_value(
+                weight_axis.map_backward(location[weight_axis.name])
+            )
+        if info_instance.openTypeOS2WidthClass is None and "wdth" in self.special_axes:
+            width_axis = self.special_axes["wdth"]
+            font.info.openTypeOS2WidthClass = width_class_from_wdth_value(
+                width_axis.map_backward(location[width_axis.name])
+            )
+        if info_instance.italicAngle is None and "slnt" in self.special_axes:
+            slant_axis = self.special_axes["slnt"]
+            font.info.italicAngle = italic_angle_from_slnt_value(
+                slant_axis.map_backward(location[slant_axis.name])
+            )
 
-        # Process rules
-        glyph_names_list = self.glyph_mutators.keys()
-        resultNames = designspaceLib.processRules(
-            self.designspace_rules, location, glyph_names_list
-        )
-        for oldName, newName in zip(glyph_names_list, resultNames):
-            if oldName != newName:
-                swapGlyphNames(font, oldName, newName)
 
-        font.lib["designspace.location"] = list(instance.location.items())
-
-        return font
+def location_to_key(location: Location) -> LocationKey:
+    """Converts a Location into a sorted tuple so it can be used as a dict
+    key."""
+    return tuple(sorted(location.items()))
 
 
 def anisotropic(location: Location) -> bool:
-    for v in location.values():
-        if isinstance(v, tuple):
-            return True
-    return False
-
-
-def normalize_design_location(
-    design_space_location: Location,
-    design_space_axis_bounds: Dict[str, Tuple[float, float, float]],
-) -> Location:
-    return varLib.models.normalizeLocation(
-        design_space_location, design_space_axis_bounds
-    )
+    """Tests if any single location value is a MutatorMath-style anisotropic
+    value, i.e. is a tuple of (x, y)."""
+    return any(isinstance(v, tuple) for v in location.values())
 
 
 def collect_info_masters(
-    designspace, axis_bounds
+    designspace: designspaceLib.DesignSpaceDocument, axis_bounds: AxisBounds
 ) -> List[Tuple[Location, FontMathObject]]:
     """Return master Info objects wrapped by MathInfo."""
     locations_and_masters = []
     for source in designspace.sources:
         if source.layerName is not None:
-            continue
-        normalized_location = normalize_design_location(source.location, axis_bounds)
+            continue  # No font info in source layers.
+
+        normalized_location = varLib.models.normalizeLocation(
+            source.location, axis_bounds
+        )
         locations_and_masters.append(
             (normalized_location, fontMath.MathInfo(source.font.info))
         )
@@ -274,142 +449,183 @@ def collect_info_masters(
 
 
 def collect_kerning_masters(
-    designspace, axis_bounds
+    designspace: designspaceLib.DesignSpaceDocument, axis_bounds: AxisBounds
 ) -> List[Tuple[Location, FontMathObject]]:
     """Return master kerning objects wrapped by MathKerning."""
     locations_and_masters = []
     for source in designspace.sources:
         if source.layerName is not None:
             continue  # No kerning in source layers.
-        if not source.muteKerning:
-            # This assumes that groups of all sources are the same.
-            normalized_location = normalize_design_location(
-                source.location, axis_bounds
-            )
-            locations_and_masters.append(
-                (
-                    normalized_location,
-                    fontMath.MathKerning(source.font.kerning, source.font.groups),
-                )
+
+        # This assumes that groups of all sources are the same.
+        normalized_location = varLib.models.normalizeLocation(
+            source.location, axis_bounds
+        )
+        locations_and_masters.append(
+            (
+                normalized_location,
+                fontMath.MathKerning(source.font.kerning, source.font.groups),
             )
+        )
 
     return locations_and_masters
 
 
 def collect_glyph_masters(
-    designspace, glyph_name, axis_bounds
+    designspace: designspaceLib.DesignSpaceDocument,
+    glyph_name: str,
+    axis_bounds: AxisBounds,
 ) -> List[Tuple[Location, FontMathObject]]:
-    """Return master glyph objects for glyph_name wrapped by MathGlyph."""
+    """Return master glyph objects for glyph_name wrapped by MathGlyph.
+
+    Note: skips empty source glyphs if the default glyph is not empty to almost match
+    what ufoProcessor is doing. In e.g. Mutator Sans, the 'S.closed' glyph is left
+    empty in one source layer. One could treat this as a source error, but ufoProcessor
+    specifically has code to skip that empty glyph and carry on.
+    """
     locations_and_masters = []
-    for source in designspace.sources:
-        if glyph_name in source.mutedGlyphNames:
-            continue
+    default_glyph_empty = False
+    other_glyph_empty = False
 
-        if source.layerName is None:
-            # Source font.
+    for source in designspace.sources:
+        if source.layerName is None:  # Source font.
             source_layer = source.font.layers.defaultLayer
-        else:
-            # Source layer.
+        else:  # Source layer.
             source_layer = source.font.layers[source.layerName]
-            if glyph_name not in source_layer:
-                # Sparse source layer, skip for this glyph.
-                continue
 
+        # Sparse fonts do not and layers may not contain every glyph.
         if glyph_name not in source_layer:
             continue
 
         source_glyph = source_layer[glyph_name]
 
-        # XXX: What to do about a glyphs lib key? Any useful data that should be
-        # copied from master to all instances? `public.verticalOrigin`, does it
-        # interpolate? `public.postscript.hints`?
-        source_glyph.lib.clear()
+        if not (source_glyph.contours or source_glyph.components):
+            if source is designspace.findDefault():
+                default_glyph_empty = True
+            else:
+                other_glyph_empty = True
 
-        normalized_location = normalize_design_location(source.location, axis_bounds)
+        normalized_location = varLib.models.normalizeLocation(
+            source.location, axis_bounds
+        )
         locations_and_masters.append(
             (normalized_location, fontMath.MathGlyph(source_glyph))
         )
 
+    # Filter out empty glyphs if the default glyph is not empty.
+    if not default_glyph_empty and other_glyph_empty:
+        locations_and_masters = [
+            (l, m) for l, m in locations_and_masters if m.contours or m.components
+        ]
+
     return locations_and_masters
 
 
-def swapGlyphNames(font, oldName, newName, swapNameExtension="_______________swap"):
-    # In font swap the glyphs oldName and newName.
-    # Also swap the names in components in order to preserve appearance.
-    # Also swap the names in font groups.
-    if oldName not in font or newName not in font:
-        return
-    swapName = oldName + swapNameExtension
-    # park the old glyph
-    if not swapName in font:
-        font.newGlyph(swapName)
-    # swap the outlines
-    font[swapName].clear()
-    p = font[swapName].getPointPen()
-    font[oldName].drawPoints(p)
-    font[swapName].width = font[oldName].width
-    # lib?
-    font[oldName].clear()
-    p = font[oldName].getPointPen()
-    font[newName].drawPoints(p)
-    font[oldName].width = font[newName].width
-
-    font[newName].clear()
-    p = font[newName].getPointPen()
-    font[swapName].drawPoints(p)
-    font[newName].width = font[swapName].width
-
-    # remap the components
-    for g in font:
-        for c in g.components:
-            if c.baseGlyph == oldName:
-                c.baseGlyph = swapName
-            continue
-    for g in font:
-        for c in g.components:
-            if c.baseGlyph == newName:
-                c.baseGlyph = oldName
-            continue
+def width_class_from_wdth_value(wdth_user_value) -> int:
+    """Return the OS/2 width class from the wdth axis user value.
+
+    The OpenType 1.8.3 specification states:
+
+        When mapping from 'wdth' values to usWidthClass, interpolate fractional
+        values between the mapped values and then round, and clamp to the range
+        1 to 9.
+
+    "Mapped values" probably means the in-percent numbers layed out for the OS/2
+    width class, so we are forcing these numerical semantics on the user values
+    of the wdth axis.
+    """
+    width_user_value = min(max(wdth_user_value, 50), 200)
+    width_user_value_mapped = varLib.models.piecewiseLinearMap(
+        width_user_value, WDTH_VALUE_TO_OS2_WIDTH_CLASS
+    )
+    return fontTools.misc.fixedTools.otRound(width_user_value_mapped)
+
+
+def weight_class_from_wght_value(wght_user_value) -> int:
+    """Return the OS/2 weight class from the wght axis user value."""
+    weight_user_value = min(max(wght_user_value, 1), 1000)
+    return fontTools.misc.fixedTools.otRound(weight_user_value)
+
+
+def italic_angle_from_slnt_value(slnt_user_value) -> Union[int, float]:
+    """Return the italic angle from the slnt axis user value."""
+    slant_user_value = min(max(slnt_user_value, -90), 90)
+    return slant_user_value
+
+
+def swap_glyph_names(font: ufoLib2.Font, name_old: str, name_new: str):
+    """Swap two existing glyphs in the default layer of a font (outlines,
+    width, component references, kerning references, group membership).
+
+    The idea behind swapping instead of overwriting is explained in
+    https://github.com/fonttools/fonttools/tree/master/Doc/source/designspaceLib#ufo-instances.
+    We need to keep the old glyph around in case any other glyph references
+    it; glyphs that are not explicitly substituted by rules should not be
+    affected by the rule application.
+
+    The .unicodes are not swapped. The rules mechanism is supposed to swap
+    glyphs, not characters.
+    """
+
+    if name_old not in font or name_new not in font:
+        raise InstantiatorError(
+            f"Cannot swap glyphs '{name_old}' and '{name_new}', as either or both are "
+            "missing."
+        )
+
+    # 1. Swap outlines and glyph width. Ignore lib content and other properties.
+    glyph_swap = ufoLib2.objects.Glyph(name="temporary_swap_glyph")
+    glyph_old = font[name_old]
+    glyph_new = font[name_new]
+
+    p = glyph_swap.getPointPen()
+    glyph_old.drawPoints(p)
+    glyph_swap.width = glyph_old.width
+
+    glyph_old.clear()
+    p = glyph_old.getPointPen()
+    glyph_new.drawPoints(p)
+    glyph_old.width = glyph_new.width
+
+    glyph_new.clear()
+    p = glyph_new.getPointPen()
+    glyph_swap.drawPoints(p)
+    glyph_new.width = glyph_swap.width
+
+    # 2. Remap components.
     for g in font:
         for c in g.components:
-            if c.baseGlyph == swapName:
-                c.baseGlyph = newName
+            if c.baseGlyph == name_old:
+                c.baseGlyph = name_new
+            elif c.baseGlyph == name_new:
+                c.baseGlyph = name_old
 
-    # change the names in groups
-    # the shapes will swap, that will invalidate the kerning
-    # so the names need to swap in the kerning as well.
-    newKerning = {}
+    # 3. Swap literal names in kerning.
+    kerning_new = {}
     for first, second in font.kerning.keys():
         value = font.kerning[(first, second)]
-        if first == oldName:
-            first = newName
-        elif first == newName:
-            first = oldName
-        if second == oldName:
-            second = newName
-        elif second == newName:
-            second = oldName
-        newKerning[(first, second)] = value
-    font.kerning.clear()
-    font.kerning.update(newKerning)
-
-    for groupName, members in font.groups.items():
-        newMembers = []
-        for name in members:
-            if name == oldName:
-                newMembers.append(newName)
-            elif name == newName:
-                newMembers.append(oldName)
+        if first == name_old:
+            first = name_new
+        elif first == name_new:
+            first = name_old
+        if second == name_old:
+            second = name_new
+        elif second == name_new:
+            second = name_old
+        kerning_new[(first, second)] = value
+    font.kerning = kerning_new
+
+    # 4. Swap names in groups.
+    for group_name, group_members in font.groups.items():
+        group_members_new = []
+        for name in group_members:
+            if name == name_old:
+                group_members_new.append(name_new)
+            elif name == name_new:
+                group_members_new.append(name_old)
             else:
-                newMembers.append(name)
-        font.groups[groupName] = newMembers
-
-    remove = []
-    for g in font:
-        if g.name.find(swapNameExtension) != -1:
-            remove.append(g.name)
-    for r in remove:
-        del font[r]
+                group_members_new.append(name)
+        font.groups[group_name] = group_members_new
 
 
 @attr.s(auto_attribs=True, frozen=True, slots=True)
@@ -424,6 +640,7 @@ class Variator:
     """
 
     masters: List[FontMathObject]
+    location_to_master: Mapping[LocationKey, FontMathObject]
     model: varLib.models.VariationModel
 
     @classmethod
@@ -432,12 +649,31 @@ class Variator:
     ):
         masters = []
         master_locations = []
+        location_to_master = {}
         for normalized_location, master in items:
             master_locations.append(normalized_location)
             masters.append(master)
+            location_to_master[location_to_key(normalized_location)] = master
         model = varLib.models.VariationModel(master_locations, axis_order)
 
-        return cls(masters, model)
+        return cls(masters, location_to_master, model)
 
     def instance_at(self, normalized_location: Location) -> FontMathObject:
+        """Return a FontMathObject for the specified location ready to be
+        inflated.
+
+        If an instance location matches a master location, this method
+        returns the master data instead of running through varLib. This
+        is both an optimization _and_ it enables having a Designspace
+        with instances matching their masters without requiring them to
+        be compatible. Glyphs.app works this way; it will only generate
+        a font from an instance, but compatibility is only required if
+        there is actual interpolation to be done. This enables us to
+        store incompatible bare masters in one Designspace and having
+        arbitrary instance data applied to them.
+        """
+        normalized_location_key = location_to_key(normalized_location)
+        if normalized_location_key in self.location_to_master:
+            return copy.deepcopy(self.location_to_master[normalized_location_key])
+
         return self.model.interpolateFromMasters(normalized_location, self.masters)
diff --git a/scripts/make-static-fonts.py b/scripts/make-static-fonts.py
index 3645e62d..7b2a9c17 100644
--- a/scripts/make-static-fonts.py
+++ b/scripts/make-static-fonts.py
@@ -25,7 +25,13 @@ def generate_and_write_autohinted_instance(
     # instance.save(output_dir / f"{file_stem}.ufo", overwrite=True)
 
     # 4. Compile and write instance OTF to disk.
-    instance_font = ufo2ft.compileOTF(instance, removeOverlaps=True, inplace=True)
+    instance_font = ufo2ft.compileOTF(
+        instance,
+        removeOverlaps=True,
+        overlapsBackend="pathops",
+        inplace=True,
+        useProductionNames=True,
+    )
     output_path = output_dir / f"{file_stem}.otf"
     instance_font.save(output_path)
 
diff --git a/scripts/make-variable-font.py b/scripts/make-variable-font.py
index e31cba32..e8a0f89d 100644
--- a/scripts/make-variable-font.py
+++ b/scripts/make-variable-font.py
@@ -6,6 +6,7 @@
 # sequentially.
 
 import argparse
+import subprocess
 from pathlib import Path
 
 import fontTools.designspaceLib
@@ -22,12 +23,14 @@ parser.add_argument(
 parser.add_argument(
     "stylespace_path", type=Path, help="The path to the Stylespace file."
 )
+parser.add_argument("psautohint_path", type=Path, help="The path to psautohint.")
 parser.add_argument("output_path", type=Path, help="The variable TTF output path.")
 args = parser.parse_args()
 
 designspace_path = args.designspace_path.resolve()
 stylespace_path = args.stylespace_path.resolve()
 output_path = args.output_path.resolve()
+psautohint_path = args.psautohint_path.resolve()
 
 
 # 1. Load Designspace and filter out instances that are marked as non-exportable.
@@ -38,12 +41,15 @@ designspace.instances = [
     s for s in designspace.instances if s.lib.get("com.schriftgestaltung.export", True)
 ]
 
-# 2. Compile variable TTF from the masters.
-varfont = ufo2ft.compileVariableTTF(designspace, inplace=True)
+# 2. Compile variable OTF from the masters.
+varfont = ufo2ft.compileVariableCFF2(designspace, inplace=True, useProductionNames=True)
 
 # 3. Generate STAT table.
 stylespace = statmake.classes.Stylespace.from_file(stylespace_path)
 statmake.lib.apply_stylespace_to_variable_font(stylespace, varfont, {})
 
-
+# External tools after this point.
 varfont.save(output_path)
+
+# 4. Autohint
+subprocess.run([psautohint_path, str(output_path)])
diff --git a/src/Cantarell-Bold.ufo/features.fea b/src/Cantarell-Bold.ufo/features.fea
index 07a3eaaf..81c2a25c 100644
--- a/src/Cantarell-Bold.ufo/features.fea
+++ b/src/Cantarell-Bold.ufo/features.fea
@@ -4,25 +4,25 @@
 # Prefix: Languagesystems
 # automatic
 languagesystem DFLT dflt;
+
 languagesystem latn dflt;
-languagesystem cyrl dflt;
-languagesystem latn NLD;
-languagesystem latn CAT;
 languagesystem latn ROM;
 languagesystem latn MOL;
 languagesystem latn KAZ;
+languagesystem latn TAT;
 languagesystem latn TRK;
 languagesystem latn CRT;
 languagesystem latn AZE;
-languagesystem cyrl TAT;
+languagesystem latn NLD;
+languagesystem latn CAT;
 
 
 # Prefix: GDEF
 table GDEF {
   GlyphClassDef
-    [A Aacute Abreve Abreveacute Abrevedotbelow Abrevegrave Abrevehookabove Abrevetilde Acaron Acircumflex 
Acircumflexacute Acircumflexdotbelow Acircumflexgrave Acircumflexhookabove Acircumflextilde Adblgrave 
Adieresis Adotbelow Agrave Ahookabove Ainvertedbreve Amacron Aogonek Aring Aringacute Atilde AE AEacute B C 
Cacute Ccaron Ccedilla Ccedillaacute Ccircumflex Cdotaccent D Eth Dcaron Dcroat Ddotbelow Dlinebelow E Eacute 
Ebreve Ecaron Ecedillabreve Ecircumflex Ecircumflexacute Ecircumflexdotbelow Ecircumflexgrave 
Ecircumflexhookabove Ecircumflextilde Edblgrave Edieresis Edotaccent Edotbelow Egrave Ehookabove 
Einvertedbreve Emacron Emacronacute Emacrongrave Eogonek Etilde F G Gbreve Gcaron Gcircumflex Gcommaaccent 
Gdotaccent Gmacron H Hbar Hbrevebelow Hcircumflex Hdotbelow I Iacute Ibreve Icaron Icircumflex Idblgrave 
Idieresis Idieresisacute Idotaccent Idotbelow Igrave Ihookabove Iinvertedbreve Imacron Iogonek Itilde J 
Jacute Jcircumflex K Kacute Kcommaaccent L Lacute Lcaro
 n Lcomma
 accent Ldotbelow Llinebelow Lslash M Mdotbelow N Nacute Ncaron Ncommaaccent Ndotaccent Ndotbelow Nlinebelow 
Ntilde O Oacute Obreve Ocaron Ocircumflex Ocircumflexacute Ocircumflexdotbelow Ocircumflexgrave 
Ocircumflexhookabove Ocircumflextilde Odblgrave Odieresis Odieresismacron Odotaccentmacron Odotbelow Ograve 
Ohookabove Ohorn Ohornacute Ohorndotbelow Ohorngrave Ohornhookabove Ohorntilde Ohungarumlaut Oinvertedbreve 
Omacron Omacronacute Omacrongrave Oogonek Oslash Oslashacute Otilde Otildeacute Otildedieresis Otildemacron 
OE P Q R Racute Rcaron Rcommaaccent Rdblgrave Rdotbelow Rinvertedbreve Rlinebelow S Sacute Sacutedotaccent 
Scaron Scarondotaccent Scedilla Scircumflex Scommaaccent Sdotaccent Sdotbelow Sdotbelowdotaccent Schwa T Tbar 
Tcaron Tcedilla Tcommaaccent Tdotbelow Tlinebelow U Uacute Ubreve Ucaron Ucircumflex Udblgrave Udieresis 
Udieresisacute Udieresiscaron Udieresisgrave Udieresismacron Udotbelow Ugrave Uhookabove Uhorn Uhornacute 
Uhorndotbelow Uhorngrave Uhornhoo
 kabove U
 horntilde Uhungarumlaut Uinvertedbreve Umacron Umacrondieresis Uogonek Uring Utilde Utildeacute V W Wacute 
Wcircumflex Wdieresis Wgrave X Y Yacute Ycircumflex Ydieresis Ydotaccent Ydotbelow Ygrave Yhookabove Ymacron 
Ytilde Z Zacute Zcaron Zdotaccent Zdotbelow a aacute abreve abreveacute abrevedotbelow abrevegrave 
abrevehookabove abrevetilde acaron acircumflex acircumflexacute acircumflexdotbelow acircumflexgrave 
acircumflexhookabove acircumflextilde adblgrave adieresis adotbelow agrave ahookabove ainvertedbreve amacron 
aogonek aring aringacute atilde ae aeacute b c cacute ccaron ccedilla ccedillaacute ccircumflex cdotaccent d 
dcaron dcroat ddotbelow dlinebelow e eacute ebreve ecaron ecedillabreve ecircumflex ecircumflexacute 
ecircumflexdotbelow ecircumflexgrave ecircumflexhookabove ecircumflextilde edblgrave edieresis edotaccent 
edotbelow egrave ehookabove einvertedbreve emacron emacronacute emacrongrave eogonek etilde schwa f g gbreve 
gcaron gcircumflex gcommaaccent gdotacc
 ent gmac
 ron h hbar hbrevebelow hcircumflex hdotbelow i idotless iacute ibreve icaron icircumflex idblgrave idieresis 
idieresisacute idotaccent idotbelow igrave ihookabove iinvertedbreve imacron iogonek itilde j jdotless jacute 
jcircumflex k kacute kcommaaccent l lacute lcaron lcommaaccent ldotbelow llinebelow lslash m mdotbelow n 
nacute ncaron ncommaaccent ndotaccent ndotbelow nlinebelow ntilde o oacute obreve ocaron ocircumflex 
ocircumflexacute ocircumflexdotbelow ocircumflexgrave ocircumflexhookabove ocircumflextilde odblgrave 
odieresis odieresismacron odotaccentmacron odotbelow ograve ohookabove ohorn ohornacute ohorndotbelow 
ohorngrave ohornhookabove ohorntilde ohungarumlaut oinvertedbreve omacron omacronacute omacrongrave oogonek 
oslash oslashacute otilde otildeacute otildedieresis otildemacron oe p q r racute rcaron rcommaaccent 
rdblgrave rdotbelow rinvertedbreve rlinebelow s sacute sacutedotaccent scaron scarondotaccent scedilla 
scircumflex scommaaccent sdotaccent sdotbelow s
 dotbelow
 dotaccent t tbar tcaron tcedilla tcommaaccent tdieresis tdotbelow tlinebelow u uacute ubreve ucaron 
ucircumflex udblgrave udieresis udieresisacute udieresiscaron udieresisgrave udieresismacron udotbelow ugrave 
uhookabove uhorn uhornacute uhorndotbelow uhorngrave uhornhookabove uhorntilde uhungarumlaut uinvertedbreve 
umacron umacrondieresis uogonek uring utilde utildeacute v w wacute wcircumflex wdieresis wgrave x y yacute 
ycircumflex ydieresis ydotaccent ydotbelow ygrave yhookabove ymacron ytilde z zacute zcaron zdotaccent 
zdotbelow A-cy Ve-cy Ge-cy Gje-cy Ie-cy Iegrave-cy Io-cy Zhe-cy Ze-cy Ii-cy Iishort-cy Iigrave-cy Ka-cy 
Kje-cy Em-cy En-cy O-cy Pe-cy Er-cy Es-cy Te-cy U-cy Ushort-cy Ha-cy Che-cy Hardsign-cy Yeru-cy Dze-cy 
Ereversed-cy I-cy Yi-cy Je-cy Iu-cy Ia-cy Fita-cy Zhedescender-cy Zedescender-cy Kadescender-cy 
Endescender-cy Esdescender-cy Ustraight-cy Ustraightstroke-cy Hadescender-cy Chedescender-cy Palochka-cy 
Zhebreve-cy Chekhakassian-cy Abreve-cy Adieresis-cy 
 Aie-cy I
 ebreve-cy Schwa-cy Zhedieresis-cy Zedieresis-cy Imacron-cy Idieresis-cy Odieresis-cy Obarred-cy Umacron-cy 
Udieresis-cy Uhungarumlaut-cy Chedieresis-cy Gedescender-cy Yerudieresis-cy Qa-cy We-cy a-cy ge-cy gje-cy 
ie-cy iegrave-cy io-cy zhe-cy ze-cy ii-cy iishort-cy iigrave-cy ka-cy kje-cy en-cy o-cy pe-cy er-cy es-cy 
te-cy u-cy ushort-cy ha-cy che-cy yeru-cy dze-cy e-cy ereversed-cy i-cy yi-cy je-cy tshe-cy iu-cy ia-cy 
dje-cy fita-cy zhedescender-cy zedescender-cy kadescender-cy endescender-cy esdescender-cy ustraight-cy 
ustraightstroke-cy hadescender-cy chedescender-cy shha-cy palochka-cy zhebreve-cy chekhakassian-cy abreve-cy 
adieresis-cy aie-cy iebreve-cy schwa-cy zhedieresis-cy zedieresis-cy imacron-cy idieresis-cy odieresis-cy 
obarred-cy umacron-cy udieresis-cy uhungarumlaut-cy chedieresis-cy gedescender-cy yerudieresis-cy qa-cy 
we-cy], # Base
+    [A Aacute Abreve Abreveacute Abrevedotbelow Abrevegrave Abrevehookabove Abrevetilde Acaron Acircumflex 
Acircumflexacute Acircumflexdotbelow Acircumflexgrave Acircumflexhookabove Acircumflextilde Adblgrave 
Adieresis Adotbelow Agrave Ahookabove Ainvertedbreve Amacron Aogonek Aring Aringacute Atilde AE AEacute B C 
Cacute Ccaron Ccedilla Ccedillaacute Ccircumflex Cdotaccent D Eth Dcaron Dcroat Ddotbelow Dlinebelow E Eacute 
Ebreve Ecaron Ecedillabreve Ecircumflex Ecircumflexacute Ecircumflexdotbelow Ecircumflexgrave 
Ecircumflexhookabove Ecircumflextilde Edblgrave Edieresis Edotaccent Edotbelow Egrave Ehookabove 
Einvertedbreve Emacron Emacronacute Emacrongrave Eogonek Etilde F G Gbreve Gcaron Gcircumflex Gcommaaccent 
Gdotaccent Gmacron H Hbar Hbrevebelow Hcircumflex Hdotbelow I Iacute Ibreve Icaron Icircumflex Idblgrave 
Idieresis Idieresisacute Idotaccent Idotbelow Igrave Ihookabove Iinvertedbreve Imacron Iogonek Itilde J 
Jacute Jcircumflex K Kacute Kcommaaccent L Lacute Lcaro
 n Lcomma
 accent Ldotbelow Llinebelow Lslash M Mdotbelow N Nacute Ncaron Ncommaaccent Ndotaccent Ndotbelow Nlinebelow 
Ntilde O Oacute Obreve Ocaron Ocircumflex Ocircumflexacute Ocircumflexdotbelow Ocircumflexgrave 
Ocircumflexhookabove Ocircumflextilde Odblgrave Odieresis Odieresismacron Odotaccentmacron Odotbelow Ograve 
Ohookabove Ohorn Ohornacute Ohorndotbelow Ohorngrave Ohornhookabove Ohorntilde Ohungarumlaut Oinvertedbreve 
Omacron Omacronacute Omacrongrave Oogonek Oslash Oslashacute Otilde Otildeacute Otildedieresis Otildemacron 
OE P Q R Racute Rcaron Rcommaaccent Rdblgrave Rdotbelow Rinvertedbreve Rlinebelow S Sacute Sacutedotaccent 
Scaron Scarondotaccent Scedilla Scircumflex Scommaaccent Sdotaccent Sdotbelow Sdotbelowdotaccent Schwa T Tbar 
Tcaron Tcedilla Tcommaaccent Tdotbelow Tlinebelow U Uacute Ubreve Ucaron Ucircumflex Udblgrave Udieresis 
Udieresisacute Udieresiscaron Udieresisgrave Udieresismacron Udotbelow Ugrave Uhookabove Uhorn Uhornacute 
Uhorndotbelow Uhorngrave Uhornhoo
 kabove U
 horntilde Uhungarumlaut Uinvertedbreve Umacron Umacrondieresis Uogonek Uring Utilde Utildeacute V W Wacute 
Wcircumflex Wdieresis Wgrave X Y Yacute Ycircumflex Ydieresis Ydotaccent Ydotbelow Ygrave Yhookabove Ymacron 
Ytilde Z Zacute Zcaron Zdotaccent Zdotbelow a aacute abreve abreveacute abrevedotbelow abrevegrave 
abrevehookabove abrevetilde acaron acircumflex acircumflexacute acircumflexdotbelow acircumflexgrave 
acircumflexhookabove acircumflextilde adblgrave adieresis adotbelow agrave ahookabove ainvertedbreve amacron 
aogonek aring aringacute atilde ae aeacute b c cacute ccaron ccedilla ccedillaacute ccircumflex cdotaccent d 
dcaron dcroat ddotbelow dlinebelow e eacute ebreve ecaron ecedillabreve ecircumflex ecircumflexacute 
ecircumflexdotbelow ecircumflexgrave ecircumflexhookabove ecircumflextilde edblgrave edieresis edotaccent 
edotbelow egrave ehookabove einvertedbreve emacron emacronacute emacrongrave eogonek etilde schwa f g gbreve 
gcaron gcircumflex gcommaaccent gdotacc
 ent gmac
 ron h hbar hbrevebelow hcircumflex hdotbelow i idotless iacute ibreve icaron icircumflex idblgrave idieresis 
idieresisacute idotaccent idotbelow igrave ihookabove iinvertedbreve imacron iogonek itilde j jdotless jacute 
jcircumflex k kacute kcommaaccent l lacute lcaron lcommaaccent ldotbelow llinebelow lslash m mdotbelow n 
nacute ncaron ncommaaccent ndotaccent ndotbelow nlinebelow ntilde o oacute obreve ocaron ocircumflex 
ocircumflexacute ocircumflexdotbelow ocircumflexgrave ocircumflexhookabove ocircumflextilde odblgrave 
odieresis odieresismacron odotaccentmacron odotbelow ograve ohookabove ohorn ohornacute ohorndotbelow 
ohorngrave ohornhookabove ohorntilde ohungarumlaut oinvertedbreve omacron omacronacute omacrongrave oogonek 
oslash oslashacute otilde otildeacute otildedieresis otildemacron oe p q r racute rcaron rcommaaccent 
rdblgrave rdotbelow rinvertedbreve rlinebelow s sacute sacutedotaccent scaron scarondotaccent scedilla 
scircumflex scommaaccent sdotaccent sdotbelow s
 dotbelow
 dotaccent t tbar tcaron tcedilla tcommaaccent tdieresis tdotbelow tlinebelow u uacute ubreve ucaron 
ucircumflex udblgrave udieresis udieresisacute udieresiscaron udieresisgrave udieresismacron udotbelow ugrave 
uhookabove uhorn uhornacute uhorndotbelow uhorngrave uhornhookabove uhorntilde uhungarumlaut uinvertedbreve 
umacron umacrondieresis uogonek uring utilde utildeacute v w wacute wcircumflex wdieresis wgrave x y yacute 
ycircumflex ydieresis ydotaccent ydotbelow ygrave yhookabove ymacron ytilde z zacute zcaron zdotaccent 
zdotbelow l.ss01 A-cy Ve-cy Ge-cy Gje-cy Ie-cy Iegrave-cy Io-cy Zhe-cy Ze-cy Ii-cy Iishort-cy Iigrave-cy 
Ka-cy Kje-cy Em-cy En-cy O-cy Pe-cy Er-cy Es-cy Te-cy U-cy Ushort-cy Ha-cy Che-cy Sha-cy Shcha-cy Hardsign-cy 
Yeru-cy Dze-cy Ereversed-cy I-cy Yi-cy Je-cy Iu-cy Ia-cy Fita-cy Zhedescender-cy Zedescender-cy 
Kadescender-cy Endescender-cy Esdescender-cy Ustraight-cy Ustraightstroke-cy Hadescender-cy Chedescender-cy 
Palochka-cy Zhebreve-cy Chekhakassian-cy 
 Abreve-c
 y Adieresis-cy Aie-cy Iebreve-cy Schwa-cy Zhedieresis-cy Zedieresis-cy Imacron-cy Idieresis-cy Odieresis-cy 
Obarred-cy Umacron-cy Udieresis-cy Uhungarumlaut-cy Chedieresis-cy Gedescender-cy Yerudieresis-cy Qa-cy We-cy 
a-cy ge-cy gje-cy ie-cy iegrave-cy io-cy zhe-cy ze-cy ii-cy iishort-cy iigrave-cy ka-cy kje-cy en-cy o-cy 
pe-cy er-cy es-cy u-cy ushort-cy ha-cy che-cy sha-cy shcha-cy yeru-cy dze-cy e-cy ereversed-cy i-cy yi-cy 
je-cy tshe-cy iu-cy ia-cy dje-cy fita-cy zhedescender-cy zedescender-cy kadescender-cy endescender-cy 
esdescender-cy ustraight-cy ustraightstroke-cy hadescender-cy chedescender-cy shha-cy palochka-cy zhebreve-cy 
chekhakassian-cy abreve-cy adieresis-cy aie-cy iebreve-cy schwa-cy zhedieresis-cy zedieresis-cy imacron-cy 
idieresis-cy odieresis-cy obarred-cy umacron-cy udieresis-cy uhungarumlaut-cy chedieresis-cy gedescender-cy 
yerudieresis-cy qa-cy we-cy], # Base
     , # Liga
-    [dieresiscomb dieresiscomb_gravecomb dieresiscomb_acutecomb dieresiscomb_caroncomb 
dieresiscomb_macroncomb dotaccentcomb dotaccentcomb_macroncomb gravecomb acutecomb acutecomb_dotaccentcomb 
hungarumlautcomb caroncomb.alt circumflexcomb caroncomb caroncomb_dotaccentcomb brevecomb ringcomb 
ringcomb_acutecomb tildecomb tildecomb_dieresiscomb tildecomb_acutecomb tildecomb_macroncomb macroncomb 
macroncomb_dieresiscomb macroncomb_gravecomb macroncomb_acutecomb hookabovecomb verticallineabovecomb 
dblgravecomb breveinvertedcomb commaturnedabovecomb horncomb dotbelowcomb dieresisbelowcomb commaaccentcomb 
cedillacomb ogonekcomb verticallinebelowcomb brevebelowcomb macronbelowcomb strokeshortcomb strokelongcomb 
slashshortcomb slashlongcomb dieresiscomb.case dotaccentcomb.case gravecomb.case acutecomb.case 
hungarumlautcomb.case circumflexcomb.case caroncomb.case brevecomb.case ringcomb.case ringcomb_acutecomb.case 
tildecomb.case macroncomb.case hookabovecomb.case dblgravecomb.case b
 reveinve
 rtedcomb.case strokeshortcomb.case slashshortcomb.case slashlongcomb.case macroncomb.narrow.case 
ogonekcomb.tall.case dieresiscomb.loclVIET dotaccentcomb.loclVIET gravecomb.loclVIET acutecomb.loclVIET 
circumflexcomb.loclVIET caroncomb.loclVIET brevecomb.loclVIET tildecomb.loclVIET macroncomb.loclVIET 
hookabovecomb.loclVIET macroncomb.narrow ogonekcomb.narrow macronbelowcomb.narrow ogonekcomb.tall 
brevecomb-cy descender-cy brevecomb-cy.case descender-cy.case descender-cy.strait brevecomb_acutecomb 
brevecomb_gravecomb brevecomb_hookabovecomb brevecomb_tildecomb circumflexcomb_acutecomb 
circumflexcomb_gravecomb circumflexcomb_hookabovecomb circumflexcomb_tildecomb brevecomb_acutecomb.case 
brevecomb_gravecomb.case brevecomb_hookabovecomb.case brevecomb_tildecomb.case circumflexcomb_acutecomb.case 
circumflexcomb_gravecomb.case circumflexcomb_hookabovecomb.case circumflexcomb_tildecomb.case], # Mark
+    [dieresiscomb dotaccentcomb gravecomb acutecomb hungarumlautcomb caroncomb.alt circumflexcomb caroncomb 
brevecomb ringcomb ringcomb_acutecomb tildecomb macroncomb hookabovecomb verticallineabovecomb dblgravecomb 
breveinvertedcomb commaturnedabovecomb horncomb dotbelowcomb dieresisbelowcomb commaaccentcomb cedillacomb 
ogonekcomb verticallinebelowcomb brevebelowcomb macronbelowcomb strokeshortcomb strokelongcomb slashshortcomb 
slashlongcomb dieresiscomb.case dotaccentcomb.case gravecomb.case acutecomb.case hungarumlautcomb.case 
circumflexcomb.case caroncomb.case brevecomb.case ringcomb.case ringcomb_acutecomb.case tildecomb.case 
macroncomb.case hookabovecomb.case dblgravecomb.case breveinvertedcomb.case strokeshortcomb.case 
slashshortcomb.case slashlongcomb.case macroncomb.narrow.case ogonekcomb.tall.case dieresiscomb.loclVIET 
dotaccentcomb.loclVIET gravecomb.loclVIET acutecomb.loclVIET circumflexcomb.loclVIET caroncomb.loclVIET 
brevecomb.loclVIET tildecomb.loclVIET macron
 comb.loc
 lVIET hookabovecomb.loclVIET macroncomb.narrow ogonekcomb.narrow macronbelowcomb.narrow ogonekcomb.tall 
brevecomb-cy descender-cy brevecomb-cy.case descender-cy.case descender-cy.strait], # Mark
     ;
 } GDEF;
 
@@ -43,6 +43,8 @@ feature tnum;
 feature onum;
 feature case;
 feature zero;
+feature salt;
+feature ss01;
 
 } aalt;
 
@@ -53,8 +55,8 @@ lookup ccmp_Other_1 {
        @CombiningNonTopAccents = [brevebelowcomb cedillacomb dieresisbelowcomb dotbelowcomb macronbelowcomb 
ogonekcomb verticallinebelowcomb horncomb slashlongcomb slashshortcomb strokelongcomb strokeshortcomb];
        sub [i j]' @CombiningTopAccents by [idotless jdotless];
        sub [i j]' @CombiningNonTopAccents @CombiningTopAccents by [idotless jdotless];
-       @Markscomb = [dieresiscomb dotaccentcomb gravecomb acutecomb hungarumlautcomb circumflexcomb 
caroncomb brevecomb ringcomb ringcomb_acutecomb tildecomb macroncomb hookabovecomb dblgravecomb 
breveinvertedcomb strokeshortcomb slashshortcomb slashlongcomb macroncomb.narrow ogonekcomb.tall brevecomb-cy 
descender-cy brevecomb_acutecomb brevecomb_gravecomb brevecomb_hookabovecomb brevecomb_tildecomb 
circumflexcomb_acutecomb circumflexcomb_gravecomb circumflexcomb_hookabovecomb circumflexcomb_tildecomb];
-       @MarkscombCase = [dieresiscomb.case dotaccentcomb.case gravecomb.case acutecomb.case 
hungarumlautcomb.case circumflexcomb.case caroncomb.case brevecomb.case ringcomb.case ringcomb_acutecomb.case 
tildecomb.case macroncomb.case hookabovecomb.case dblgravecomb.case breveinvertedcomb.case 
strokeshortcomb.case slashshortcomb.case slashlongcomb.case macroncomb.narrow.case ogonekcomb.tall.case 
brevecomb-cy.case descender-cy.case brevecomb_acutecomb.case brevecomb_gravecomb.case 
brevecomb_hookabovecomb.case brevecomb_tildecomb.case circumflexcomb_acutecomb.case 
circumflexcomb_gravecomb.case circumflexcomb_hookabovecomb.case circumflexcomb_tildecomb.case];
+       @Markscomb = [dieresiscomb dotaccentcomb gravecomb acutecomb hungarumlautcomb circumflexcomb 
caroncomb brevecomb ringcomb ringcomb_acutecomb tildecomb macroncomb hookabovecomb dblgravecomb 
breveinvertedcomb strokeshortcomb slashshortcomb slashlongcomb macroncomb.narrow ogonekcomb.tall brevecomb-cy 
descender-cy];
+       @MarkscombCase = [dieresiscomb.case dotaccentcomb.case gravecomb.case acutecomb.case 
hungarumlautcomb.case circumflexcomb.case caroncomb.case brevecomb.case ringcomb.case ringcomb_acutecomb.case 
tildecomb.case macroncomb.case hookabovecomb.case dblgravecomb.case breveinvertedcomb.case 
strokeshortcomb.case slashshortcomb.case slashlongcomb.case macroncomb.narrow.case ogonekcomb.tall.case 
brevecomb-cy.case descender-cy.case];
        sub @Markscomb @Markscomb' by @MarkscombCase;
        sub @Uppercase @Markscomb' by @MarkscombCase;
 } ccmp_Other_1;
@@ -66,79 +68,47 @@ lookup ccmp_Other_2 {
 
 lookup ccmp_Other_3 {
        lookupflag 0;
-       sub acutecomb dotaccentcomb by acutecomb_dotaccentcomb;
-       sub caroncomb dotaccentcomb by caroncomb_dotaccentcomb;
-       sub dieresiscomb acutecomb by dieresiscomb_acutecomb;
-       sub dieresiscomb caroncomb by dieresiscomb_caroncomb;
-       sub dieresiscomb gravecomb by dieresiscomb_gravecomb;
-       sub dieresiscomb macroncomb by dieresiscomb_macroncomb;
-       sub dotaccentcomb macroncomb by dotaccentcomb_macroncomb;
-       sub macroncomb acutecomb by macroncomb_acutecomb;
-       sub macroncomb dieresiscomb by macroncomb_dieresiscomb;
-       sub macroncomb gravecomb by macroncomb_gravecomb;
        sub ringcomb acutecomb by ringcomb_acutecomb;
        sub ringcomb.case acutecomb.case by ringcomb_acutecomb.case;
-       sub tildecomb acutecomb by tildecomb_acutecomb;
-       sub tildecomb dieresiscomb by tildecomb_dieresiscomb;
-       sub tildecomb macroncomb by tildecomb_macroncomb;
 } ccmp_Other_3;
 
-lookup ccmp_latn_1 {
-       lookupflag 0;
-       sub brevecomb acutecomb by brevecomb_acutecomb;
-       sub brevecomb.case acutecomb.case by brevecomb_acutecomb.case;
-       sub brevecomb gravecomb by brevecomb_gravecomb;
-       sub brevecomb.case gravecomb.case by brevecomb_gravecomb.case;
-       sub brevecomb hookabovecomb by brevecomb_hookabovecomb;
-       sub brevecomb.case hookabovecomb.case by brevecomb_hookabovecomb.case;
-       sub brevecomb tildecomb by brevecomb_tildecomb;
-       sub brevecomb.case tildecomb.case by brevecomb_tildecomb.case;
-       sub circumflexcomb acutecomb by circumflexcomb_acutecomb;
-       sub circumflexcomb.case acutecomb.case by circumflexcomb_acutecomb.case;
-       sub circumflexcomb gravecomb by circumflexcomb_gravecomb;
-       sub circumflexcomb.case gravecomb.case by circumflexcomb_gravecomb.case;
-       sub circumflexcomb hookabovecomb by circumflexcomb_hookabovecomb;
-       sub circumflexcomb.case hookabovecomb.case by circumflexcomb_hookabovecomb.case;
-       sub circumflexcomb tildecomb by circumflexcomb_tildecomb;
-       sub circumflexcomb.case tildecomb.case by circumflexcomb_tildecomb.case;
-} ccmp_latn_1;
-
-script latn;
-lookup ccmp_latn_1;
-
 } ccmp;
 
 feature locl {
 # automatic
-script latn;
-language NLD;
-sub iacute j' by jacute;
-sub Iacute J' by Jacute;
-language CAT;
-sub l periodcentered' l by periodcentered.loclCAT;
-sub L periodcentered' L by periodcentered.loclCAT.case;
-language ROM;
-sub Scedilla by Scommaaccent;
-sub scedilla by scommaaccent;
-sub Tcedilla by Tcommaaccent;
-sub tcedilla by tcommaaccent;
-language MOL;
-sub Scedilla by Scommaaccent;
-sub scedilla by scommaaccent;
-sub Tcedilla by Tcommaaccent;
-sub tcedilla by tcommaaccent;
-language KAZ;
-sub i by idotaccent;
-language TRK;
-sub i by idotaccent;
-language CRT;
-sub i by idotaccent;
-language AZE;
-sub i by idotaccent;
-
-script cyrl;
-language TAT;
-sub i by idotaccent;
+lookup locl_latn_0 {
+       script latn;
+       language ROM;
+       sub Scedilla by Scommaaccent;
+       sub scedilla by scommaaccent;
+       sub Tcedilla by Tcommaaccent;
+       sub tcedilla by tcommaaccent;
+       language MOL;
+       sub Scedilla by Scommaaccent;
+       sub scedilla by scommaaccent;
+       sub Tcedilla by Tcommaaccent;
+       sub tcedilla by tcommaaccent;
+       language KAZ;
+       sub i by idotaccent;
+       language TAT;
+       sub i by idotaccent;
+       language TRK;
+       sub i by idotaccent;
+       language CRT;
+       sub i by idotaccent;
+       language AZE;
+       sub i by idotaccent;
+} locl_latn_0;
+
+lookup locl_latn_1 {
+       script latn;
+       language NLD;
+       sub iacute j' by jacute;
+       sub Iacute J' by Jacute;
+       language CAT;
+       sub l periodcentered' l by periodcentered.loclCAT;
+       sub L periodcentered' L by periodcentered.loclCAT.case;
+} locl_latn_1;
 
 } locl;
 
@@ -267,34 +237,6 @@ sub six.tf by six;
 sub seven.tf by seven;
 sub eight.tf by eight;
 sub nine.tf by nine;
-sub bulletoperator.tf by bulletoperator;
-sub commercialMinusSign.tf by commercialMinusSign;
-sub divisionslash.tf by divisionslash;
-sub equivalence.tf by equivalence;
-sub notidentical.tf by notidentical;
-sub plus.tf by plus;
-sub minus.tf by minus;
-sub multiply.tf by multiply;
-sub divide.tf by divide;
-sub equal.tf by equal;
-sub notequal.tf by notequal;
-sub greater.tf by greater;
-sub less.tf by less;
-sub greaterequal.tf by greaterequal;
-sub lessequal.tf by lessequal;
-sub plusminus.tf by plusminus;
-sub approxequal.tf by approxequal;
-sub logicalnot.tf by logicalnot;
-sub zero.tosf by zero.osf;
-sub one.tosf by one.osf;
-sub two.tosf by two.osf;
-sub three.tosf by three.osf;
-sub four.tosf by four.osf;
-sub five.tosf by five.osf;
-sub six.tosf by six.osf;
-sub seven.tosf by seven.osf;
-sub eight.tosf by eight.osf;
-sub nine.tosf by nine.osf;
 
 } pnum;
 
@@ -310,49 +252,11 @@ sub six by six.tf;
 sub seven by seven.tf;
 sub eight by eight.tf;
 sub nine by nine.tf;
-sub bulletoperator by bulletoperator.tf;
-sub commercialMinusSign by commercialMinusSign.tf;
-sub divisionslash by divisionslash.tf;
-sub equivalence by equivalence.tf;
-sub notidentical by notidentical.tf;
-sub plus by plus.tf;
-sub minus by minus.tf;
-sub multiply by multiply.tf;
-sub divide by divide.tf;
-sub equal by equal.tf;
-sub notequal by notequal.tf;
-sub greater by greater.tf;
-sub less by less.tf;
-sub greaterequal by greaterequal.tf;
-sub lessequal by lessequal.tf;
-sub plusminus by plusminus.tf;
-sub approxequal by approxequal.tf;
-sub logicalnot by logicalnot.tf;
-sub zero.osf by zero.tosf;
-sub one.osf by one.tosf;
-sub two.osf by two.tosf;
-sub three.osf by three.tosf;
-sub four.osf by four.tosf;
-sub five.osf by five.tosf;
-sub six.osf by six.tosf;
-sub seven.osf by seven.tosf;
-sub eight.osf by eight.tosf;
-sub nine.osf by nine.tosf;
 
 } tnum;
 
 feature onum {
 # automatic
-sub zero.tf by zero.tosf;
-sub one.tf by one.tosf;
-sub two.tf by two.tosf;
-sub three.tf by three.tosf;
-sub four.tf by four.tosf;
-sub five.tf by five.tosf;
-sub six.tf by six.tosf;
-sub seven.tf by seven.tosf;
-sub eight.tf by eight.tosf;
-sub nine.tf by nine.tosf;
 sub zero by zero.osf;
 sub one by one.osf;
 sub two by two.osf;
@@ -391,22 +295,12 @@ sub macroncomb.narrow by macroncomb.narrow.case;
 sub ogonekcomb.tall by ogonekcomb.tall.case;
 sub brevecomb-cy by brevecomb-cy.case;
 sub descender-cy by descender-cy.case;
-sub brevecomb_acutecomb by brevecomb_acutecomb.case;
-sub brevecomb_gravecomb by brevecomb_gravecomb.case;
-sub brevecomb_hookabovecomb by brevecomb_hookabovecomb.case;
-sub brevecomb_tildecomb by brevecomb_tildecomb.case;
-sub circumflexcomb_acutecomb by circumflexcomb_acutecomb.case;
-sub circumflexcomb_gravecomb by circumflexcomb_gravecomb.case;
-sub circumflexcomb_hookabovecomb by circumflexcomb_hookabovecomb.case;
-sub circumflexcomb_tildecomb by circumflexcomb_tildecomb.case;
 
 } case;
 
 feature liga {
 # automatic
-sub f f i by f_f_i;
-sub f f l by f_f_l;
-sub f f by f_f;
+lookupflag IgnoreMarks;
 sub f i by fi;
 sub f l by fl;
 
@@ -414,9 +308,20 @@ sub f l by fl;
 
 feature zero {
 # automatic
+sub zero by zero.zero;
 sub zero.osf by zero.osf.zero;
 sub zero.tf by zero.tf.zero;
-sub zero.tosf by zero.tosf.zero;
-sub zero by zero.zero;
 
 } zero;
+
+feature salt {
+# automatic
+sub l by l.ss01;
+
+} salt;
+
+feature ss01 {
+# automatic
+sub l by l.ss01;
+
+} ss01;
diff --git a/src/Cantarell-Bold.ufo/fontinfo.plist b/src/Cantarell-Bold.ufo/fontinfo.plist
index 40557924..f4a5a9f7 100644
--- a/src/Cantarell-Bold.ufo/fontinfo.plist
+++ b/src/Cantarell-Bold.ufo/fontinfo.plist
@@ -12,8 +12,6 @@
     <integer>-217</integer>
     <key>familyName</key>
     <string>Cantarell</string>
-    <key>guidelines</key>
-    <array/>
     <key>italicAngle</key>
     <integer>0</integer>
     <key>openTypeHeadCreated</key>
@@ -39,6 +37,8 @@
     </array>
     <key>openTypeOS2VendorID</key>
     <string>ABAT</string>
+    <key>postscriptBlueFuzz</key>
+    <integer>1</integer>
     <key>postscriptBlueScale</key>
     <real>0.0625</real>
     <key>postscriptBlueValues</key>
@@ -52,10 +52,6 @@
       <integer>739</integer>
       <integer>749</integer>
     </array>
-    <key>postscriptFamilyBlues</key>
-    <array/>
-    <key>postscriptFamilyOtherBlues</key>
-    <array/>
     <key>postscriptOtherBlues</key>
     <array>
       <integer>-232</integer>
@@ -80,7 +76,7 @@
     <key>versionMajor</key>
     <integer>0</integer>
     <key>versionMinor</key>
-    <integer>111</integer>
+    <integer>200</integer>
     <key>xHeight</key>
     <integer>490</integer>
   </dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs.F_inal B_ent/be-cy.glif b/src/Cantarell-Bold.ufo/glyphs.F_inal 
B_ent/be-cy.glif
new file mode 100644
index 00000000..582a1479
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.F_inal B_ent/be-cy.glif     
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="be-cy" format="2">
+  <advance width="567"/>
+  <unicode hex="0431"/>
+  <outline>
+    <contour>
+      <point x="297" y="-10" type="curve" smooth="yes"/>
+      <point x="452" y="-10"/>
+      <point x="548" y="85"/>
+      <point x="548" y="244" type="curve" smooth="yes"/>
+      <point x="548" y="382"/>
+      <point x="476" y="466"/>
+      <point x="353" y="466" type="curve" smooth="yes"/>
+      <point x="266" y="466"/>
+      <point x="199" y="421"/>
+      <point x="159" y="335" type="curve"/>
+      <point x="202" y="275" type="line"/>
+      <point x="229" y="309"/>
+      <point x="266" y="329"/>
+      <point x="300" y="329" type="curve" smooth="yes"/>
+      <point x="350" y="329"/>
+      <point x="380" y="293"/>
+      <point x="380" y="231" type="curve" smooth="yes"/>
+      <point x="380" y="171"/>
+      <point x="353" y="133"/>
+      <point x="305" y="133" type="curve" smooth="yes"/>
+      <point x="236" y="133"/>
+      <point x="196" y="211"/>
+      <point x="196" y="354" type="curve" smooth="yes"/>
+      <point x="196" y="503"/>
+      <point x="225" y="545"/>
+      <point x="351" y="573" type="curve" smooth="yes"/>
+      <point x="396" y="583"/>
+      <point x="440" y="583"/>
+      <point x="485" y="603" type="curve"/>
+      <point x="447" y="753" type="line"/>
+      <point x="400" y="732"/>
+      <point x="354" y="730"/>
+      <point x="307" y="719" type="curve" smooth="yes"/>
+      <point x="104" y="670"/>
+      <point x="30" y="572"/>
+      <point x="30" y="354" type="curve" smooth="yes"/>
+      <point x="30" y="112"/>
+      <point x="120" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.F_inal B_ent/contents.plist b/src/Cantarell-Bold.ufo/glyphs.F_inal 
B_ent/contents.plist
new file mode 100644
index 00000000..1ae1e5b4
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.F_inal B_ent/contents.plist 
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>be-cy</key>
+    <string>be-cy.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.F_inal B_ent/layerinfo.plist 
b/src/Cantarell-Bold.ufo/glyphs.F_inal B_ent/layerinfo.plist
new file mode 100644
index 00000000..18c10c28
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.F_inal B_ent/layerinfo.plist        
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>20B9F1EA-ECDB-4474-AAD3-3324E5E1BF06</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.be-cy</key>
+      <integer>5</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/contents.plist 
b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/contents.plist
new file mode 100644
index 00000000..8b006235
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/contents.plist     
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>eight.tf</key>
+    <string>eight.tf.glif</string>
+    <key>five.tf</key>
+    <string>five.tf.glif</string>
+    <key>four.tf</key>
+    <string>four.tf.glif</string>
+    <key>nine.tf</key>
+    <string>nine.tf.glif</string>
+    <key>seven.tf</key>
+    <string>seven.tf.glif</string>
+    <key>six.tf</key>
+    <string>six.tf.glif</string>
+    <key>three.tf</key>
+    <string>three.tf.glif</string>
+    <key>two.tf</key>
+    <string>two.tf.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/eight.tf.glif 
b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/eight.tf.glif
new file mode 100644
index 00000000..eaf84137
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/eight.tf.glif      
@@ -0,0 +1,61 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="eight.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="286" y="-10" type="curve" smooth="yes"/>
+      <point x="451" y="-10"/>
+      <point x="561" y="76"/>
+      <point x="561" y="203" type="curve" smooth="yes"/>
+      <point x="561" y="433"/>
+      <point x="204" y="379"/>
+      <point x="204" y="502" type="curve" smooth="yes"/>
+      <point x="204" y="539"/>
+      <point x="237" y="566"/>
+      <point x="288" y="566" type="curve" smooth="yes"/>
+      <point x="339" y="566"/>
+      <point x="373" y="539"/>
+      <point x="373" y="497" type="curve" smooth="yes"/>
+      <point x="373" y="455"/>
+      <point x="337" y="424"/>
+      <point x="283" y="419" type="curve"/>
+      <point x="399" y="359" type="line"/>
+      <point x="489" y="393"/>
+      <point x="539" y="456"/>
+      <point x="539" y="529" type="curve" smooth="yes"/>
+      <point x="539" y="634"/>
+      <point x="439" y="704"/>
+      <point x="297" y="704" type="curve" smooth="yes"/>
+      <point x="141" y="704"/>
+      <point x="38" y="619"/>
+      <point x="38" y="493" type="curve" smooth="yes"/>
+      <point x="38" y="257"/>
+      <point x="395" y="311"/>
+      <point x="395" y="193" type="curve" smooth="yes"/>
+      <point x="395" y="155"/>
+      <point x="357" y="128"/>
+      <point x="297" y="128" type="curve" smooth="yes"/>
+      <point x="230" y="128"/>
+      <point x="186" y="162"/>
+      <point x="186" y="215" type="curve" smooth="yes"/>
+      <point x="186" y="263"/>
+      <point x="224" y="292"/>
+      <point x="291" y="294" type="curve"/>
+      <point x="194" y="357" type="line"/>
+      <point x="85" y="337"/>
+      <point x="20" y="273"/>
+      <point x="20" y="183" type="curve" smooth="yes"/>
+      <point x="20" y="68"/>
+      <point x="129" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/five.tf.glif b/src/Cantarell-Bold.ufo/glyphs.J_un 
8 19, 20_46/five.tf.glif
new file mode 100644
index 00000000..fc33deeb
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/five.tf.glif       
@@ -0,0 +1,48 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="five.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="250" y="-10" type="curve" smooth="yes"/>
+      <point x="435" y="-10"/>
+      <point x="554" y="80"/>
+      <point x="554" y="230" type="curve" smooth="yes"/>
+      <point x="554" y="362"/>
+      <point x="458" y="436"/>
+      <point x="287" y="436" type="curve" smooth="yes"/>
+      <point x="244" y="436"/>
+      <point x="221" y="431"/>
+      <point x="199" y="418" type="curve"/>
+      <point x="242" y="365" type="line"/>
+      <point x="251" y="543" type="line"/>
+      <point x="517" y="543" type="line"/>
+      <point x="517" y="694" type="line"/>
+      <point x="82" y="694" type="line"/>
+      <point x="64" y="287" type="line"/>
+      <point x="108" y="295"/>
+      <point x="164" y="301"/>
+      <point x="206" y="301" type="curve" smooth="yes"/>
+      <point x="312" y="301"/>
+      <point x="374" y="268"/>
+      <point x="374" y="212" type="curve" smooth="yes"/>
+      <point x="374" y="165"/>
+      <point x="329" y="140"/>
+      <point x="249" y="140" type="curve" smooth="yes"/>
+      <point x="189" y="140"/>
+      <point x="119" y="154"/>
+      <point x="68" y="178" type="curve"/>
+      <point x="21" y="42" type="line"/>
+      <point x="89" y="8"/>
+      <point x="167" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/four.tf.glif b/src/Cantarell-Bold.ufo/glyphs.J_un 
8 19, 20_46/four.tf.glif
new file mode 100644
index 00000000..7520a9df
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/four.tf.glif       
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="four.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="298" y="-5" type="line"/>
+      <point x="464" y="-5" type="line"/>
+      <point x="464" y="694" type="line"/>
+      <point x="303" y="694" type="line"/>
+      <point x="-4" y="215" type="line"/>
+      <point x="-4" y="124" type="line"/>
+      <point x="580" y="124" type="line"/>
+      <point x="580" y="270" type="line"/>
+      <point x="81" y="272" type="line"/>
+      <point x="131" y="217" type="line"/>
+      <point x="319" y="534" type="line"/>
+      <point x="298" y="583" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/layerinfo.plist 
b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/layerinfo.plist
new file mode 100644
index 00000000..2ad1b7b9
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/layerinfo.plist    
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>EE6BF218-3EC2-4719-A13B-F6E4879C6679</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.eight.tf</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.five.tf</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.four.tf</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.nine.tf</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.seven.tf</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.six.tf</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.three.tf</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.two.tf</key>
+      <integer>3</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nine.tosf.glif b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 
20_46/nine.tf.glif
similarity index 97%
rename from src/Cantarell-Bold.ufo/glyphs/nine.tosf.glif
rename to src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/nine.tf.glif
index 3405ed5d..4c6435df 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nine.tosf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/nine.tf.glif       
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<glyph name="nine.tosf" format="2">
+<glyph name="nine.tf" format="2">
   <advance width="580"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/seven.tf.glif 
b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/seven.tf.glif
new file mode 100644
index 00000000..0bda52ac
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/seven.tf.glif      
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="seven.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="83" y="0" type="line"/>
+      <point x="266" y="0" type="line"/>
+      <point x="563" y="590" type="line"/>
+      <point x="563" y="694" type="line"/>
+      <point x="19" y="694" type="line"/>
+      <point x="19" y="544" type="line"/>
+      <point x="410" y="544" type="line"/>
+      <point x="383" y="587" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/six.tosf.glif b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 
20_46/six.tf.glif
similarity index 95%
rename from src/Cantarell-Bold.ufo/glyphs/six.tosf.glif
rename to src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/six.tf.glif
index 40bfc68f..f132ae34 100644
--- a/src/Cantarell-Bold.ufo/glyphs/six.tosf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/six.tf.glif        
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<glyph name="six.tosf" format="2">
+<glyph name="six.tf" format="2">
   <advance width="580"/>
   <outline>
     <contour>
@@ -49,8 +49,6 @@
       <dict>
         <key>monoWidth</key>
         <integer>580</integer>
-        <key>weight</key>
-        <integer>-1</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/three.tf.glif 
b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/three.tf.glif
new file mode 100644
index 00000000..56c252e5
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/three.tf.glif      
@@ -0,0 +1,57 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="three.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="244" y="-10" type="curve" smooth="yes"/>
+      <point x="433" y="-10"/>
+      <point x="559" y="71"/>
+      <point x="559" y="194" type="curve" smooth="yes"/>
+      <point x="559" y="290"/>
+      <point x="486" y="360"/>
+      <point x="376" y="370" type="curve"/>
+      <point x="350" y="360" type="line"/>
+      <point x="452" y="359"/>
+      <point x="519" y="422"/>
+      <point x="519" y="518" type="curve" smooth="yes"/>
+      <point x="519" y="634"/>
+      <point x="424" y="704"/>
+      <point x="269" y="704" type="curve" smooth="yes"/>
+      <point x="185" y="704"/>
+      <point x="102" y="684"/>
+      <point x="24" y="643" type="curve"/>
+      <point x="64" y="514" type="line"/>
+      <point x="127" y="541"/>
+      <point x="183" y="556"/>
+      <point x="234" y="556" type="curve" smooth="yes"/>
+      <point x="297" y="556"/>
+      <point x="339" y="531"/>
+      <point x="339" y="494" type="curve" smooth="yes"/>
+      <point x="339" y="445"/>
+      <point x="271" y="415"/>
+      <point x="158" y="415" type="curve"/>
+      <point x="158" y="285" type="line"/>
+      <point x="294" y="285"/>
+      <point x="379" y="252"/>
+      <point x="379" y="199" type="curve" smooth="yes"/>
+      <point x="379" y="160"/>
+      <point x="332" y="138"/>
+      <point x="251" y="138" type="curve" smooth="yes"/>
+      <point x="186" y="138"/>
+      <point x="116" y="152"/>
+      <point x="59" y="175" type="curve"/>
+      <point x="19" y="40" type="line"/>
+      <point x="94" y="5"/>
+      <point x="161" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/two.tf.glif b/src/Cantarell-Bold.ufo/glyphs.J_un 
8 19, 20_46/two.tf.glif
new file mode 100644
index 00000000..7d8f7fd7
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/two.tf.glif        
@@ -0,0 +1,41 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="two.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="43" y="0" type="line"/>
+      <point x="549" y="0" type="line"/>
+      <point x="549" y="150" type="line"/>
+      <point x="246" y="150" type="line"/>
+      <point x="248" y="114" type="line"/>
+      <point x="436" y="244"/>
+      <point x="529" y="368"/>
+      <point x="529" y="489" type="curve" smooth="yes"/>
+      <point x="529" y="619"/>
+      <point x="424" y="704"/>
+      <point x="263" y="704" type="curve" smooth="yes"/>
+      <point x="172" y="704"/>
+      <point x="85" y="676"/>
+      <point x="17" y="621" type="curve"/>
+      <point x="61" y="494" type="line"/>
+      <point x="119" y="533"/>
+      <point x="176" y="553"/>
+      <point x="229" y="553" type="curve" smooth="yes"/>
+      <point x="302" y="553"/>
+      <point x="349" y="516"/>
+      <point x="349" y="462" type="curve" smooth="yes"/>
+      <point x="349" y="376"/>
+      <point x="236" y="272"/>
+      <point x="43" y="122" type="curve"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_55/contents.plist 
b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_55/contents.plist
new file mode 100644
index 00000000..7b74aabe
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_55/contents.plist     
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>zero.tf</key>
+    <string>zero.tf.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_55/layerinfo.plist 
b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_55/layerinfo.plist
new file mode 100644
index 00000000..bde9041d
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_55/layerinfo.plist    
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>18EF844F-5B1D-4F8E-AD2A-49C1B78FE60C</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.zero.tf</key>
+      <integer>5</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_55/zero.tf.glif b/src/Cantarell-Bold.ufo/glyphs.J_un 
8 19, 20_55/zero.tf.glif
new file mode 100644
index 00000000..ac86fef2
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_55/zero.tf.glif       
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="zero.tf" format="2">
+  <advance width="580"/>
+  <anchor x="292" y="345" name="slash"/>
+  <outline>
+    <contour>
+      <point x="288" y="-10" type="curve" smooth="yes"/>
+      <point x="454" y="-10"/>
+      <point x="565" y="136"/>
+      <point x="565" y="349" type="curve" smooth="yes"/>
+      <point x="565" y="562"/>
+      <point x="455" y="704"/>
+      <point x="292" y="704" type="curve" smooth="yes"/>
+      <point x="127" y="704"/>
+      <point x="15" y="560"/>
+      <point x="15" y="344" type="curve" smooth="yes"/>
+      <point x="15" y="133"/>
+      <point x="125" y="-10"/>
+    </contour>
+    <contour>
+      <point x="291" y="138" type="curve" smooth="yes"/>
+      <point x="230" y="138"/>
+      <point x="188" y="222"/>
+      <point x="188" y="349" type="curve" smooth="yes"/>
+      <point x="188" y="474"/>
+      <point x="229" y="556"/>
+      <point x="289" y="556" type="curve" smooth="yes"/>
+      <point x="350" y="556"/>
+      <point x="392" y="471"/>
+      <point x="392" y="343" type="curve" smooth="yes"/>
+      <point x="392" y="220"/>
+      <point x="351" y="138"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 19_56/contents.plist 
b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 19_56/contents.plist
new file mode 100644
index 00000000..bbfa3e7f
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 19_56/contents.plist    
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>six</key>
+    <string>six.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 19_56/layerinfo.plist 
b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 19_56/layerinfo.plist
new file mode 100644
index 00000000..f579659c
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 19_56/layerinfo.plist   
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>26887125-F45C-43C5-BF68-A1B718CE16D0</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.six</key>
+      <integer>4</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 19_56/six.glif b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 
19, 19_56/six.glif
new file mode 100644
index 00000000..02839bf6
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 19_56/six.glif  
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="six" format="2">
+  <advance width="592"/>
+  <unicode hex="0036"/>
+  <outline>
+    <contour>
+      <point x="302" y="-10" type="curve" smooth="yes"/>
+      <point x="461" y="-10"/>
+      <point x="567" y="87"/>
+      <point x="567" y="232" type="curve" smooth="yes"/>
+      <point x="567" y="362"/>
+      <point x="485" y="449"/>
+      <point x="361" y="449" type="curve" smooth="yes"/>
+      <point x="269" y="449"/>
+      <point x="198" y="399"/>
+      <point x="156" y="303" type="curve"/>
+      <point x="195" y="257" type="line"/>
+      <point x="224" y="292"/>
+      <point x="265" y="314"/>
+      <point x="307" y="314" type="curve" smooth="yes"/>
+      <point x="362" y="314"/>
+      <point x="403" y="273"/>
+      <point x="403" y="219" type="curve" smooth="yes"/>
+      <point x="403" y="168"/>
+      <point x="366" y="131"/>
+      <point x="314" y="131" type="curve" smooth="yes"/>
+      <point x="237" y="131"/>
+      <point x="186" y="215"/>
+      <point x="186" y="344" type="curve" smooth="yes"/>
+      <point x="186" y="483"/>
+      <point x="254" y="561"/>
+      <point x="374" y="561" type="curve" smooth="yes"/>
+      <point x="419" y="561"/>
+      <point x="474" y="550"/>
+      <point x="514" y="532" type="curve"/>
+      <point x="558" y="661" type="line"/>
+      <point x="503" y="689"/>
+      <point x="437" y="704"/>
+      <point x="363" y="704" type="curve" smooth="yes"/>
+      <point x="150" y="704"/>
+      <point x="26" y="562"/>
+      <point x="26" y="330" type="curve" smooth="yes"/>
+      <point x="26" y="107"/>
+      <point x="127" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 19_57/contents.plist 
b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 19_57/contents.plist
new file mode 100644
index 00000000..d21fcaa4
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 19_57/contents.plist    
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>five</key>
+    <string>five.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 19_57/five.glif b/src/Cantarell-Bold.ufo/glyphs.M_ay 
11 19, 19_57/five.glif
new file mode 100644
index 00000000..5eb1775c
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 19_57/five.glif 
@@ -0,0 +1,40 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="five" format="2">
+  <advance width="564"/>
+  <unicode hex="0035"/>
+  <outline>
+    <contour>
+      <point x="243" y="-10" type="curve" smooth="yes"/>
+      <point x="426" y="-10"/>
+      <point x="543" y="80"/>
+      <point x="543" y="230" type="curve" smooth="yes"/>
+      <point x="543" y="362"/>
+      <point x="449" y="436"/>
+      <point x="281" y="436" type="curve" smooth="yes"/>
+      <point x="238" y="436"/>
+      <point x="216" y="431"/>
+      <point x="196" y="418" type="curve"/>
+      <point x="224" y="365" type="line"/>
+      <point x="232" y="543" type="line"/>
+      <point x="506" y="543" type="line"/>
+      <point x="506" y="694" type="line"/>
+      <point x="78" y="694" type="line"/>
+      <point x="60" y="287" type="line"/>
+      <point x="103" y="295"/>
+      <point x="158" y="301"/>
+      <point x="199" y="301" type="curve" smooth="yes"/>
+      <point x="303" y="301"/>
+      <point x="363" y="268"/>
+      <point x="363" y="212" type="curve" smooth="yes"/>
+      <point x="363" y="165"/>
+      <point x="320" y="140"/>
+      <point x="242" y="140" type="curve" smooth="yes"/>
+      <point x="182" y="140"/>
+      <point x="115" y="154"/>
+      <point x="65" y="178" type="curve"/>
+      <point x="18" y="42" type="line"/>
+      <point x="85" y="8"/>
+      <point x="161" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 19_57/layerinfo.plist 
b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 19_57/layerinfo.plist
new file mode 100644
index 00000000..c01ff506
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 19_57/layerinfo.plist   
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>023F7E08-2F01-40DF-9355-BBA3A316C5F7</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.five</key>
+      <integer>4</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_04/contents.plist 
b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_04/contents.plist
new file mode 100644
index 00000000..6eadc60a
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_04/contents.plist    
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>three</key>
+    <string>three.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_04/layerinfo.plist 
b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_04/layerinfo.plist
new file mode 100644
index 00000000..186251ec
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_04/layerinfo.plist   
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>319A8E36-E7CC-4D6E-9C1B-143A8B32526A</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.three</key>
+      <integer>5</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_04/three.glif b/src/Cantarell-Bold.ufo/glyphs.M_ay 
11 19, 20_04/three.glif
new file mode 100644
index 00000000..eae0c533
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_04/three.glif        
@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="three" format="2">
+  <advance width="564"/>
+  <unicode hex="0033"/>
+  <outline>
+    <contour>
+      <point x="236" y="-10" type="curve" smooth="yes"/>
+      <point x="423" y="-10"/>
+      <point x="546" y="71"/>
+      <point x="546" y="194" type="curve" smooth="yes"/>
+      <point x="546" y="290"/>
+      <point x="475" y="360"/>
+      <point x="368" y="370" type="curve"/>
+      <point x="342" y="360" type="line"/>
+      <point x="442" y="359"/>
+      <point x="507" y="422"/>
+      <point x="507" y="518" type="curve" smooth="yes"/>
+      <point x="507" y="634"/>
+      <point x="415" y="704"/>
+      <point x="261" y="704" type="curve" smooth="yes"/>
+      <point x="179" y="704"/>
+      <point x="97" y="684"/>
+      <point x="21" y="643" type="curve"/>
+      <point x="60" y="514" type="line"/>
+      <point x="122" y="541"/>
+      <point x="176" y="556"/>
+      <point x="225" y="556" type="curve" smooth="yes"/>
+      <point x="287" y="556"/>
+      <point x="327" y="532"/>
+      <point x="327" y="492" type="curve" smooth="yes"/>
+      <point x="327" y="444"/>
+      <point x="272" y="415"/>
+      <point x="180" y="415" type="curve" smooth="yes"/>
+      <point x="152" y="415" type="line"/>
+      <point x="152" y="285" type="line"/>
+      <point x="180" y="285" type="line" smooth="yes"/>
+      <point x="296" y="285"/>
+      <point x="366" y="253"/>
+      <point x="366" y="200" type="curve" smooth="yes"/>
+      <point x="366" y="159"/>
+      <point x="321" y="138"/>
+      <point x="243" y="138" type="curve" smooth="yes"/>
+      <point x="182" y="138"/>
+      <point x="114" y="151"/>
+      <point x="56" y="175" type="curve"/>
+      <point x="16" y="40" type="line"/>
+      <point x="90" y="5"/>
+      <point x="154" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_09/contents.plist 
b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_09/contents.plist
new file mode 100644
index 00000000..6d468fdb
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_09/contents.plist    
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>eight</key>
+    <string>eight.glif</string>
+    <key>six</key>
+    <string>six.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_09/eight.glif b/src/Cantarell-Bold.ufo/glyphs.M_ay 
11 19, 20_09/eight.glif
new file mode 100644
index 00000000..79f1e552
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_09/eight.glif        
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="eight" format="2">
+  <advance width="592"/>
+  <unicode hex="0038"/>
+  <outline>
+    <contour>
+      <point x="298" y="-10" type="curve" smooth="yes"/>
+      <point x="468" y="-10"/>
+      <point x="580" y="76"/>
+      <point x="580" y="203" type="curve" smooth="yes"/>
+      <point x="580" y="429"/>
+      <point x="212" y="374"/>
+      <point x="212" y="502" type="curve" smooth="yes"/>
+      <point x="212" y="539"/>
+      <point x="246" y="566"/>
+      <point x="300" y="566" type="curve" smooth="yes"/>
+      <point x="354" y="566"/>
+      <point x="389" y="539"/>
+      <point x="389" y="497" type="curve" smooth="yes"/>
+      <point x="389" y="454"/>
+      <point x="351" y="424"/>
+      <point x="295" y="419" type="curve"/>
+      <point x="412" y="359" type="line"/>
+      <point x="505" y="393"/>
+      <point x="557" y="455"/>
+      <point x="557" y="529" type="curve" smooth="yes"/>
+      <point x="557" y="634"/>
+      <point x="455" y="704"/>
+      <point x="309" y="704" type="curve" smooth="yes"/>
+      <point x="149" y="704"/>
+      <point x="44" y="619"/>
+      <point x="44" y="493" type="curve" smooth="yes"/>
+      <point x="44" y="262"/>
+      <point x="412" y="316"/>
+      <point x="412" y="193" type="curve" smooth="yes"/>
+      <point x="412" y="155"/>
+      <point x="373" y="128"/>
+      <point x="309" y="128" type="curve" smooth="yes"/>
+      <point x="239" y="128"/>
+      <point x="193" y="162"/>
+      <point x="193" y="215" type="curve" smooth="yes"/>
+      <point x="193" y="264"/>
+      <point x="233" y="292"/>
+      <point x="303" y="294" type="curve"/>
+      <point x="204" y="357" type="line"/>
+      <point x="92" y="337"/>
+      <point x="25" y="273"/>
+      <point x="25" y="183" type="curve" smooth="yes"/>
+      <point x="25" y="68"/>
+      <point x="136" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_09/layerinfo.plist 
b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_09/layerinfo.plist
new file mode 100644
index 00000000..832ebb4d
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_09/layerinfo.plist   
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>0CEB5DE9-249B-4630-BFDD-711C633350B5</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.eight</key>
+      <integer>6</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.six</key>
+      <integer>6</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_09/six.glif b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 
19, 20_09/six.glif
new file mode 100644
index 00000000..e6184737
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_09/six.glif  
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="six" format="2">
+  <advance width="598"/>
+  <unicode hex="0036"/>
+  <outline>
+    <contour>
+      <point x="306" y="-10" type="curve" smooth="yes"/>
+      <point x="466" y="-10"/>
+      <point x="572" y="87"/>
+      <point x="572" y="232" type="curve" smooth="yes"/>
+      <point x="572" y="362"/>
+      <point x="489" y="446"/>
+      <point x="365" y="446" type="curve" smooth="yes"/>
+      <point x="273" y="446"/>
+      <point x="200" y="402"/>
+      <point x="157" y="315" type="curve"/>
+      <point x="200" y="255" type="line"/>
+      <point x="229" y="289"/>
+      <point x="270" y="309"/>
+      <point x="311" y="309" type="curve" smooth="yes"/>
+      <point x="367" y="309"/>
+      <point x="404" y="273"/>
+      <point x="404" y="219" type="curve" smooth="yes"/>
+      <point x="404" y="167"/>
+      <point x="370" y="133"/>
+      <point x="318" y="133" type="curve" smooth="yes"/>
+      <point x="242" y="133"/>
+      <point x="199" y="211"/>
+      <point x="199" y="344" type="curve" smooth="yes"/>
+      <point x="199" y="487"/>
+      <point x="260" y="564"/>
+      <point x="374" y="564" type="curve" smooth="yes"/>
+      <point x="419" y="564"/>
+      <point x="476" y="552"/>
+      <point x="517" y="534" type="curve"/>
+      <point x="561" y="663" type="line"/>
+      <point x="508" y="689"/>
+      <point x="442" y="704"/>
+      <point x="367" y="704" type="curve" smooth="yes"/>
+      <point x="146" y="704"/>
+      <point x="29" y="569"/>
+      <point x="29" y="330" type="curve" smooth="yes"/>
+      <point x="29" y="107"/>
+      <point x="130" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_10/contents.plist 
b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_10/contents.plist
new file mode 100644
index 00000000..79a03ee5
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_10/contents.plist    
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>five</key>
+    <string>five.glif</string>
+    <key>four</key>
+    <string>four.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_10/five.glif b/src/Cantarell-Bold.ufo/glyphs.M_ay 
11 19, 20_10/five.glif
new file mode 100644
index 00000000..d56797ba
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_10/five.glif 
@@ -0,0 +1,40 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="five" format="2">
+  <advance width="566"/>
+  <unicode hex="0035"/>
+  <outline>
+    <contour>
+      <point x="243" y="-10" type="curve" smooth="yes"/>
+      <point x="426" y="-10"/>
+      <point x="543" y="80"/>
+      <point x="543" y="230" type="curve" smooth="yes"/>
+      <point x="543" y="362"/>
+      <point x="449" y="436"/>
+      <point x="281" y="436" type="curve" smooth="yes"/>
+      <point x="238" y="436"/>
+      <point x="216" y="431"/>
+      <point x="196" y="418" type="curve"/>
+      <point x="239" y="365" type="line"/>
+      <point x="247" y="543" type="line"/>
+      <point x="506" y="543" type="line"/>
+      <point x="506" y="694" type="line"/>
+      <point x="78" y="694" type="line"/>
+      <point x="60" y="287" type="line"/>
+      <point x="103" y="295"/>
+      <point x="158" y="301"/>
+      <point x="199" y="301" type="curve" smooth="yes"/>
+      <point x="303" y="301"/>
+      <point x="363" y="268"/>
+      <point x="363" y="212" type="curve" smooth="yes"/>
+      <point x="363" y="165"/>
+      <point x="320" y="140"/>
+      <point x="242" y="140" type="curve" smooth="yes"/>
+      <point x="182" y="140"/>
+      <point x="115" y="154"/>
+      <point x="65" y="178" type="curve"/>
+      <point x="18" y="42" type="line"/>
+      <point x="85" y="8"/>
+      <point x="161" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_10/four.glif b/src/Cantarell-Bold.ufo/glyphs.M_ay 
11 19, 20_10/four.glif
new file mode 100644
index 00000000..cb39c6cf
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_10/four.glif 
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="four" format="2">
+  <advance width="622"/>
+  <unicode hex="0034"/>
+  <outline>
+    <contour>
+      <point x="322" y="-5" type="line"/>
+      <point x="491" y="-5" type="line"/>
+      <point x="491" y="694" type="line"/>
+      <point x="327" y="694" type="line"/>
+      <point x="4" y="215" type="line"/>
+      <point x="4" y="124" type="line"/>
+      <point x="613" y="124" type="line"/>
+      <point x="613" y="270" type="line"/>
+      <point x="92" y="272" type="line"/>
+      <point x="142" y="217" type="line"/>
+      <point x="343" y="534" type="line"/>
+      <point x="322" y="583" type="line"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_10/layerinfo.plist 
b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_10/layerinfo.plist
new file mode 100644
index 00000000..9b3b99f5
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_10/layerinfo.plist   
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>C041F9A1-8268-4C82-8BA1-3C04C1272B64</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.five</key>
+      <integer>6</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.four</key>
+      <integer>5</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_11/contents.plist 
b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_11/contents.plist
new file mode 100644
index 00000000..54802fec
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_11/contents.plist    
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>two</key>
+    <string>two.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_11/layerinfo.plist 
b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_11/layerinfo.plist
new file mode 100644
index 00000000..ad0b861c
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_11/layerinfo.plist   
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>99085EAD-8DB1-4632-A858-6FA8A028F091</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.two</key>
+      <integer>5</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_11/two.glif b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 
19, 20_11/two.glif
new file mode 100644
index 00000000..008b0ba1
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_11/two.glif  
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="two" format="2">
+  <advance width="554"/>
+  <unicode hex="0032"/>
+  <outline>
+    <contour>
+      <point x="38" y="0" type="line"/>
+      <point x="528" y="0" type="line"/>
+      <point x="528" y="150" type="line"/>
+      <point x="242" y="150" type="line"/>
+      <point x="243" y="114" type="line"/>
+      <point x="421" y="244"/>
+      <point x="510" y="368"/>
+      <point x="510" y="489" type="curve" smooth="yes"/>
+      <point x="510" y="619"/>
+      <point x="408" y="704"/>
+      <point x="251" y="704" type="curve" smooth="yes"/>
+      <point x="161" y="704"/>
+      <point x="79" y="676"/>
+      <point x="12" y="621" type="curve"/>
+      <point x="56" y="494" type="line"/>
+      <point x="112" y="533"/>
+      <point x="167" y="553"/>
+      <point x="217" y="553" type="curve" smooth="yes"/>
+      <point x="286" y="553"/>
+      <point x="330" y="516"/>
+      <point x="330" y="462" type="curve" smooth="yes"/>
+      <point x="330" y="376"/>
+      <point x="219" y="272"/>
+      <point x="38" y="122" type="curve"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_12/contents.plist 
b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_12/contents.plist
new file mode 100644
index 00000000..72f2723d
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_12/contents.plist    
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>zero</key>
+    <string>zero.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_12/layerinfo.plist 
b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_12/layerinfo.plist
new file mode 100644
index 00000000..91eff6b2
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_12/layerinfo.plist   
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>459E4086-DF3C-46A4-83E6-55AC0073C0B9</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.zero</key>
+      <integer>5</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_12/zero.glif b/src/Cantarell-Bold.ufo/glyphs.M_ay 
11 19, 20_12/zero.glif
new file mode 100644
index 00000000..2a34dc01
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 11 19, 20_12/zero.glif 
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="zero" format="2">
+  <advance width="640"/>
+  <unicode hex="0030"/>
+  <anchor x="322" y="345" name="slash"/>
+  <outline>
+    <contour>
+      <point x="318" y="-10" type="curve" smooth="yes"/>
+      <point x="494" y="-10"/>
+      <point x="613" y="134"/>
+      <point x="613" y="351" type="curve" smooth="yes"/>
+      <point x="613" y="563"/>
+      <point x="496" y="704"/>
+      <point x="323" y="704" type="curve" smooth="yes"/>
+      <point x="146" y="704"/>
+      <point x="27" y="560"/>
+      <point x="27" y="344" type="curve" smooth="yes"/>
+      <point x="27" y="132"/>
+      <point x="144" y="-10"/>
+    </contour>
+    <contour>
+      <point x="322" y="138" type="curve" smooth="yes"/>
+      <point x="251" y="138"/>
+      <point x="205" y="223"/>
+      <point x="205" y="350" type="curve" smooth="yes"/>
+      <point x="205" y="474"/>
+      <point x="251" y="556"/>
+      <point x="319" y="556" type="curve" smooth="yes"/>
+      <point x="388" y="556"/>
+      <point x="435" y="471"/>
+      <point x="435" y="343" type="curve" smooth="yes"/>
+      <point x="435" y="220"/>
+      <point x="389" y="138"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/contents.plist 
b/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/contents.plist
new file mode 100644
index 00000000..5b3651e1
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/contents.plist     
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>eight</key>
+    <string>eight.glif</string>
+    <key>nine</key>
+    <string>nine.glif</string>
+    <key>one</key>
+    <string>one.glif</string>
+    <key>seven</key>
+    <string>seven.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/eight.glif b/src/Cantarell-Bold.ufo/glyphs.M_ay 5 
19, 13_08/eight.glif
new file mode 100644
index 00000000..cfae2555
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/eight.glif 
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="eight" format="2">
+  <advance width="603"/>
+  <unicode hex="0038"/>
+  <outline>
+    <contour>
+      <point x="298" y="-10" type="curve" smooth="yes"/>
+      <point x="468" y="-10"/>
+      <point x="580" y="76"/>
+      <point x="580" y="203" type="curve" smooth="yes"/>
+      <point x="580" y="434"/>
+      <point x="212" y="379"/>
+      <point x="212" y="502" type="curve" smooth="yes"/>
+      <point x="212" y="539"/>
+      <point x="246" y="566"/>
+      <point x="300" y="566" type="curve" smooth="yes"/>
+      <point x="354" y="566"/>
+      <point x="389" y="539"/>
+      <point x="389" y="497" type="curve" smooth="yes"/>
+      <point x="389" y="454"/>
+      <point x="351" y="424"/>
+      <point x="295" y="419" type="curve"/>
+      <point x="412" y="359" type="line"/>
+      <point x="505" y="393"/>
+      <point x="557" y="455"/>
+      <point x="557" y="529" type="curve" smooth="yes"/>
+      <point x="557" y="634"/>
+      <point x="455" y="704"/>
+      <point x="309" y="704" type="curve" smooth="yes"/>
+      <point x="149" y="704"/>
+      <point x="44" y="619"/>
+      <point x="44" y="493" type="curve" smooth="yes"/>
+      <point x="44" y="257"/>
+      <point x="412" y="311"/>
+      <point x="412" y="193" type="curve" smooth="yes"/>
+      <point x="412" y="155"/>
+      <point x="373" y="128"/>
+      <point x="309" y="128" type="curve" smooth="yes"/>
+      <point x="239" y="128"/>
+      <point x="193" y="162"/>
+      <point x="193" y="215" type="curve" smooth="yes"/>
+      <point x="193" y="264"/>
+      <point x="233" y="292"/>
+      <point x="303" y="294" type="curve"/>
+      <point x="204" y="357" type="line"/>
+      <point x="92" y="337"/>
+      <point x="25" y="273"/>
+      <point x="25" y="183" type="curve" smooth="yes"/>
+      <point x="25" y="68"/>
+      <point x="136" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist 
b/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist
new file mode 100644
index 00000000..c5b08129
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist    
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>D4AE1721-94F7-4594-8DB9-C2B30AA4422E</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.eight</key>
+      <integer>5</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.nine</key>
+      <integer>5</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.one</key>
+      <integer>5</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.seven</key>
+      <integer>5</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs/f_f.glif b/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/nine.glif
similarity index 53%
rename from src/Cantarell-Bold.ufo/glyphs/f_f.glif
rename to src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/nine.glif
index 89115405..3c9699b5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/f_f.glif
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/nine.glif  
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<glyph name="f_f" format="2">
-  <advance width="766"/>
+<glyph name="nine" format="2">
+  <advance width="600"/>
+  <unicode hex="0039"/>
   <outline>
-    <component base="f"/>
-    <component base="f" xOffset="383"/>
+    <component base="six" xScale="-1" yScale="-1" xOffset="601" yOffset="694"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>f</string>
+      <string>=|six</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
-      <string>f</string>
+      <string>=|six</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/one.glif b/src/Cantarell-Bold.ufo/glyphs.M_ay 5 
19, 13_08/one.glif
new file mode 100644
index 00000000..fd323d2e
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/one.glif   
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="one" format="2">
+  <advance width="492"/>
+  <unicode hex="0031"/>
+  <outline>
+    <contour>
+      <point x="178" y="131" type="line"/>
+      <point x="351" y="131" type="line"/>
+      <point x="351" y="694" type="line"/>
+      <point x="248" y="694" type="line"/>
+      <point x="9" y="556" type="line"/>
+      <point x="74" y="432" type="line"/>
+      <point x="232" y="514" type="line"/>
+      <point x="178" y="569" type="line"/>
+    </contour>
+    <contour>
+      <point x="44" y="0" type="line"/>
+      <point x="485" y="0" type="line"/>
+      <point x="485" y="148" type="line"/>
+      <point x="44" y="148" type="line"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/seven.glif b/src/Cantarell-Bold.ufo/glyphs.M_ay 5 
19, 13_08/seven.glif
new file mode 100644
index 00000000..43badede
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/seven.glif 
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="seven" format="2">
+  <advance width="531"/>
+  <unicode hex="0037"/>
+  <outline>
+    <contour>
+      <point x="65" y="0" type="line"/>
+      <point x="247" y="0" type="line"/>
+      <point x="524" y="590" type="line"/>
+      <point x="524" y="694" type="line"/>
+      <point x="9" y="694" type="line"/>
+      <point x="9" y="544" type="line"/>
+      <point x="370" y="544" type="line"/>
+      <point x="344" y="587" type="line"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.O_utline/S_hcha-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs.O_utline/S_hcha-cy.glif
new file mode 100644
index 00000000..bc6fa307
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.O_utline/S_hcha-cy.glif
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="Shcha-cy" format="2">
+  <advance width="1127"/>
+  <unicode hex="0429"/>
+  <outline>
+    <contour>
+      <point x="951" y="-187" type="line"/>
+      <point x="1113" y="-187" type="line"/>
+      <point x="1113" y="151" type="line"/>
+      <point x="241" y="151" type="line"/>
+      <point x="241" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="951" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="451" y="72" type="line"/>
+      <point x="621" y="72" type="line"/>
+      <point x="621" y="694" type="line"/>
+      <point x="451" y="694" type="line"/>
+    </contour>
+    <contour>
+      <point x="832" y="72" type="line"/>
+      <point x="1002" y="72" type="line"/>
+      <point x="1002" y="694" type="line"/>
+      <point x="832" y="694" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Tse-cy</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.O_utline/contents.plist 
b/src/Cantarell-Bold.ufo/glyphs.O_utline/contents.plist
new file mode 100644
index 00000000..99caaef1
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.O_utline/contents.plist
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>Shcha-cy</key>
+    <string>S_hcha-cy.glif</string>
+    <key>shcha-cy</key>
+    <string>shcha-cy.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.O_utline/layerinfo.plist 
b/src/Cantarell-Bold.ufo/glyphs.O_utline/layerinfo.plist
new file mode 100644
index 00000000..7a9041e4
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.O_utline/layerinfo.plist
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>0D3BB173-27E2-4765-8DD8-5184598C7BC3</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.Shcha-cy</key>
+      <integer>5</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.shcha-cy</key>
+      <integer>4</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.O_utline/shcha-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs.O_utline/shcha-cy.glif
new file mode 100644
index 00000000..0e07e20c
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.O_utline/shcha-cy.glif
@@ -0,0 +1,46 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="shcha-cy" format="2">
+  <advance width="897"/>
+  <unicode hex="0449"/>
+  <outline>
+    <contour>
+      <point x="730" y="-135" type="line"/>
+      <point x="886" y="-135" type="line"/>
+      <point x="886" y="133" type="line"/>
+      <point x="222" y="133" type="line"/>
+      <point x="222" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="730" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="355" y="68" type="line"/>
+      <point x="515" y="68" type="line"/>
+      <point x="515" y="490" type="line"/>
+      <point x="355" y="490" type="line"/>
+    </contour>
+    <contour>
+      <point x="651" y="68" type="line"/>
+      <point x="810" y="68" type="line"/>
+      <point x="810" y="490" type="line"/>
+      <point x="651" y="490" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>height</key>
+        <integer>70</integer>
+        <key>weight</key>
+        <integer>-10</integer>
+        <key>width</key>
+        <integer>80</integer>
+      </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>tse-cy</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.S_lanted/contents.plist 
b/src/Cantarell-Bold.ufo/glyphs.S_lanted/contents.plist
new file mode 100644
index 00000000..71cd4196
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.S_lanted/contents.plist
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>el-cy</key>
+    <string>el-cy.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.S_lanted/el-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs.S_lanted/el-cy.glif
new file mode 100644
index 00000000..b390cd6d
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.S_lanted/el-cy.glif
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="el-cy" format="2">
+  <advance width="591"/>
+  <unicode hex="043B"/>
+  <outline>
+    <contour>
+      <point x="93" y="-10" type="curve" smooth="yes"/>
+      <point x="189" y="-10"/>
+      <point x="247" y="54"/>
+      <point x="263" y="160" type="curve" smooth="yes"/>
+      <point x="292" y="351" type="line"/>
+      <point x="363" y="351" type="line"/>
+      <point x="363" y="0" type="line"/>
+      <point x="529" y="0" type="line"/>
+      <point x="529" y="491" type="line"/>
+      <point x="149" y="491" type="line"/>
+      <point x="114" y="194" type="line" smooth="yes"/>
+      <point x="108" y="144"/>
+      <point x="90" y="115"/>
+      <point x="58" y="115" type="curve" smooth="yes"/>
+      <point x="44" y="115"/>
+      <point x="30" y="120"/>
+      <point x="17" y="129" type="curve"/>
+      <point x="-10" y="22" type="line"/>
+      <point x="19" y="1"/>
+      <point x="55" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>height</key>
+        <integer>70</integer>
+        <key>weight</key>
+        <integer>-10</integer>
+        <key>width</key>
+        <integer>80</integer>
+      </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.S_lanted/layerinfo.plist 
b/src/Cantarell-Bold.ufo/glyphs.S_lanted/layerinfo.plist
new file mode 100644
index 00000000..b1d6ab50
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.S_lanted/layerinfo.plist
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>8D21F401-7C45-49CC-BC03-4D94DFE511BF</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.el-cy</key>
+      <integer>0</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.S_teeper/be-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs.S_teeper/be-cy.glif
new file mode 100644
index 00000000..886cb9ce
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.S_teeper/be-cy.glif
@@ -0,0 +1,43 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="be-cy" format="2">
+  <advance width="567"/>
+  <unicode hex="0431"/>
+  <outline>
+    <contour>
+      <point x="297" y="-10" type="curve" smooth="yes"/>
+      <point x="452" y="-10"/>
+      <point x="548" y="85"/>
+      <point x="548" y="244" type="curve" smooth="yes"/>
+      <point x="548" y="382"/>
+      <point x="476" y="466"/>
+      <point x="353" y="466" type="curve" smooth="yes"/>
+      <point x="266" y="466"/>
+      <point x="199" y="421"/>
+      <point x="159" y="335" type="curve"/>
+      <point x="195" y="267" type="line"/>
+      <point x="220" y="306"/>
+      <point x="259" y="329"/>
+      <point x="300" y="329" type="curve" smooth="yes"/>
+      <point x="350" y="329"/>
+      <point x="380" y="293"/>
+      <point x="380" y="231" type="curve" smooth="yes"/>
+      <point x="380" y="171"/>
+      <point x="353" y="133"/>
+      <point x="305" y="133" type="curve" smooth="yes"/>
+      <point x="236" y="133"/>
+      <point x="192" y="211"/>
+      <point x="192" y="354" type="curve" smooth="yes"/>
+      <point x="192" y="501"/>
+      <point x="223" y="540"/>
+      <point x="369" y="575" type="curve" smooth="yes"/>
+      <point x="485" y="603" type="line"/>
+      <point x="447" y="753" type="line"/>
+      <point x="334" y="726" type="line" smooth="yes"/>
+      <point x="108" y="672"/>
+      <point x="30" y="577"/>
+      <point x="30" y="354" type="curve" smooth="yes"/>
+      <point x="30" y="112"/>
+      <point x="120" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.S_teeper/contents.plist 
b/src/Cantarell-Bold.ufo/glyphs.S_teeper/contents.plist
new file mode 100644
index 00000000..1ae1e5b4
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.S_teeper/contents.plist
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>be-cy</key>
+    <string>be-cy.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.S_teeper/layerinfo.plist 
b/src/Cantarell-Bold.ufo/glyphs.S_teeper/layerinfo.plist
new file mode 100644
index 00000000..e5bd6592
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.S_teeper/layerinfo.plist
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>2D4A24FE-0A85-4656-AEFA-74AEC4BE7B3C</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.be-cy</key>
+      <integer>6</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.T_emplate/florin.glif 
b/src/Cantarell-Bold.ufo/glyphs.T_emplate/florin.glif
index 6ca96652..c43603cb 100644
--- a/src/Cantarell-Bold.ufo/glyphs.T_emplate/florin.glif
+++ b/src/Cantarell-Bold.ufo/glyphs.T_emplate/florin.glif
@@ -8,6 +8,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>0</integer>
diff --git a/src/Cantarell-Bold.ufo/glyphs.W_avy/be-cy.glif b/src/Cantarell-Bold.ufo/glyphs.W_avy/be-cy.glif
new file mode 100644
index 00000000..26f16ad3
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.W_avy/be-cy.glif
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="be-cy" format="2">
+  <advance width="567"/>
+  <unicode hex="0431"/>
+  <outline>
+    <contour>
+      <point x="297" y="-10" type="curve" smooth="yes"/>
+      <point x="452" y="-10"/>
+      <point x="548" y="85"/>
+      <point x="548" y="244" type="curve" smooth="yes"/>
+      <point x="548" y="382"/>
+      <point x="476" y="466"/>
+      <point x="353" y="466" type="curve" smooth="yes"/>
+      <point x="266" y="466"/>
+      <point x="199" y="421"/>
+      <point x="159" y="335" type="curve"/>
+      <point x="202" y="275" type="line"/>
+      <point x="229" y="309"/>
+      <point x="266" y="329"/>
+      <point x="300" y="329" type="curve" smooth="yes"/>
+      <point x="350" y="329"/>
+      <point x="380" y="293"/>
+      <point x="380" y="231" type="curve" smooth="yes"/>
+      <point x="380" y="171"/>
+      <point x="353" y="133"/>
+      <point x="305" y="133" type="curve" smooth="yes"/>
+      <point x="236" y="133"/>
+      <point x="196" y="211"/>
+      <point x="196" y="354" type="curve" smooth="yes"/>
+      <point x="196" y="488"/>
+      <point x="221" y="524"/>
+      <point x="331" y="547" type="curve" smooth="yes"/>
+      <point x="412" y="564"/>
+      <point x="468" y="588"/>
+      <point x="495" y="617" type="curve"/>
+      <point x="437" y="754" type="line"/>
+      <point x="399" y="727"/>
+      <point x="345" y="707"/>
+      <point x="281" y="696" type="curve" smooth="yes"/>
+      <point x="98" y="664"/>
+      <point x="30" y="566"/>
+      <point x="30" y="335" type="curve" smooth="yes"/>
+      <point x="30" y="109"/>
+      <point x="122" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.W_avy/contents.plist 
b/src/Cantarell-Bold.ufo/glyphs.W_avy/contents.plist
new file mode 100644
index 00000000..1ae1e5b4
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.W_avy/contents.plist
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>be-cy</key>
+    <string>be-cy.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.W_avy/layerinfo.plist 
b/src/Cantarell-Bold.ufo/glyphs.W_avy/layerinfo.plist
new file mode 100644
index 00000000..21dfbdbc
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.W_avy/layerinfo.plist
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>0FC0FFD8-4C06-4803-8EEB-ABA78DBB7A82</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.be-cy</key>
+      <integer>0</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_-cy.glif b/src/Cantarell-Bold.ufo/glyphs/A_-cy.glif
index 893e252a..929ee251 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="A-cy" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <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 980ece01..0b8cb090 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_.glif
@@ -1,29 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="A" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="0041"/>
-  <note>
-A
-</note>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
+  <anchor x="345" y="0" name="bottom"/>
+  <anchor x="651" y="10" name="ogonek"/>
+  <anchor x="345" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="1" y="0" type="line"/>
-      <point x="186" y="0" type="line"/>
-      <point x="370" y="620" type="line"/>
-      <point x="322" y="620" type="line"/>
-      <point x="515" y="0" type="line"/>
-      <point x="706" y="0" type="line"/>
-      <point x="469" y="694" type="line"/>
-      <point x="248" y="694" type="line"/>
+      <point x="-7" y="0" type="line"/>
+      <point x="178" y="0" type="line"/>
+      <point x="362" y="620" type="line"/>
+      <point x="314" y="620" type="line"/>
+      <point x="507" y="0" type="line"/>
+      <point x="698" y="0" type="line"/>
+      <point x="461" y="694" type="line"/>
+      <point x="240" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="194" y="143" type="line"/>
-      <point x="512" y="143" type="line"/>
-      <point x="476" y="299" type="line"/>
-      <point x="229" y="299" type="line"/>
+      <point x="186" y="143" type="line"/>
+      <point x="504" y="143" type="line"/>
+      <point x="468" y="299" type="line"/>
+      <point x="221" y="299" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_E_.glif b/src/Cantarell-Bold.ufo/glyphs/A_E_.glif
index 5e694b37..38d72e29 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_E_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_E_.glif
@@ -1,45 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="AE" format="2">
-  <advance width="1023"/>
+  <advance width="1022"/>
   <unicode hex="00C6"/>
-  <anchor x="548" y="0" name="bottom"/>
-  <anchor x="548" y="694" name="top"/>
+  <anchor x="542" y="0" name="bottom"/>
+  <anchor x="542" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="-4" y="0" type="line"/>
-      <point x="186" y="0" type="line"/>
-      <point x="576" y="694" type="line"/>
-      <point x="413" 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="202" y="149" type="line"/>
-      <point x="520" y="149" type="line"/>
-      <point x="520" y="305" type="line"/>
-      <point x="202" 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="480" y="0" type="line"/>
-      <point x="653" y="0" type="line"/>
-      <point x="653" y="694" type="line"/>
-      <point x="480" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="560" y="0" type="line"/>
-      <point x="978" y="0" type="line"/>
-      <point x="978" y="152" type="line"/>
-      <point x="560" y="152" type="line"/>
-    </contour>
-    <contour>
-      <point x="560" y="278" type="line"/>
-      <point x="950" y="278" type="line"/>
-      <point x="950" y="430" type="line"/>
-      <point x="560" y="430" type="line"/>
-    </contour>
-    <contour>
-      <point x="560" y="542" type="line"/>
-      <point x="978" y="542" type="line"/>
-      <point x="978" y="694" type="line"/>
-      <point x="560" y="694" type="line"/>
+      <point x="474" y="0" type="line"/>
+      <point x="972" y="0" type="line"/>
+      <point x="972" y="152" type="line"/>
+      <point x="647" y="152" type="line"/>
+      <point x="647" y="278" type="line"/>
+      <point x="944" y="278" type="line"/>
+      <point x="944" y="430" type="line"/>
+      <point x="647" y="430" type="line"/>
+      <point x="647" y="542" type="line"/>
+      <point x="972" y="542" type="line"/>
+      <point x="972" y="694" type="line"/>
+      <point x="474" 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 68a6d46c..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="1023"/>
+  <advance width="1022"/>
   <unicode hex="01FC"/>
   <outline>
     <component base="AE"/>
-    <component base="acutecomb.case" xOffset="469"/>
+    <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 0aec4cac..3338db44 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aacute" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="00C1"/>
   <outline>
     <component base="A"/>
-    <component base="acutecomb.case" xOffset="274"/>
+    <component base="acutecomb.case" xOffset="266"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_breve-cy.glif b/src/Cantarell-Bold.ufo/glyphs/A_breve-cy.glif
index 4af7cc47..c197b5cb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_breve-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_breve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreve-cy" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="04D0"/>
   <outline>
     <component base="A-cy"/>
-    <component base="brevecomb-cy.case" xOffset="120"/>
+    <component base="brevecomb-cy.case" xOffset="112"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_breve.glif b/src/Cantarell-Bold.ufo/glyphs/A_breve.glif
index 98ac3bcf..8ca2225c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_breve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreve" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="0102"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.case" xOffset="120"/>
+    <component base="brevecomb.case" xOffset="112"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_breveacute.glif b/src/Cantarell-Bold.ufo/glyphs/A_breveacute.glif
index a54e07d1..fa460c8e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_breveacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_breveacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreveacute" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1EAE"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_acutecomb.case" xOffset="157" yOffset="4"/>
+    <component base="brevecomb.loclVIET" xOffset="120" yOffset="204"/>
+    <component base="acutecomb.loclVIET" xOffset="259" 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 e15fecf9..cc53a58c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_brevedotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_brevedotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevedotbelow" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1EB6"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="203"/>
-    <component base="brevecomb.case" xOffset="120"/>
+    <component base="dotbelowcomb" xOffset="195"/>
+    <component base="brevecomb.case" xOffset="112"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_brevegrave.glif b/src/Cantarell-Bold.ufo/glyphs/A_brevegrave.glif
index 791f8f80..9cd43ec4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_brevegrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_brevegrave.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevegrave" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1EB0"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_gravecomb.case" xOffset="154" yOffset="4"/>
+    <component base="brevecomb.loclVIET" xOffset="120" yOffset="204"/>
+    <component base="gravecomb.loclVIET" xOffset="169" 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 6822653f..8924b6e8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_brevehookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_brevehookabove.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevehookabove" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1EB2"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_hookabovecomb.case" xOffset="157" yOffset="4"/>
+    <component base="brevecomb.loclVIET" xOffset="120" yOffset="204"/>
+    <component base="hookabovecomb.loclVIET" xOffset="192" 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 43c31bc9..042dca38 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_brevetilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_brevetilde.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevetilde" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1EB4"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_tildecomb.case" xOffset="135" yOffset="4"/>
+    <component base="brevecomb.loclVIET" xOffset="120" yOffset="204"/>
+    <component base="tildecomb.loclVIET" xOffset="127" 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 5e9eaf68..14d9308a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acaron" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="01CD"/>
   <outline>
     <component base="A"/>
-    <component base="caroncomb.case" xOffset="139"/>
+    <component base="caroncomb.case" xOffset="131"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/A_circumflex.glif
index a1afe515..cfc7958e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflex" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="00C2"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.case" xOffset="154"/>
+    <component base="circumflexcomb.case" xOffset="146"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_circumflexacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_circumflexacute.glif
index a4aac8f5..67ed1433 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_circumflexacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_circumflexacute.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexacute" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1EA4"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="166" yOffset="4"/>
+    <component base="circumflexcomb.loclVIET" xOffset="141" yOffset="204"/>
+    <component base="acutecomb.loclVIET" xOffset="436" yOffset="327"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_circumflexdotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_circumflexdotbelow.glif
index 6669e245..fff26cf0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_circumflexdotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexdotbelow" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1EAC"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="203"/>
-    <component base="circumflexcomb.case" xOffset="154"/>
+    <component base="dotbelowcomb" xOffset="195"/>
+    <component base="circumflexcomb.case" xOffset="146"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_circumflexgrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_circumflexgrave.glif
index 7692ba3c..b86c0de9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_circumflexgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_circumflexgrave.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexgrave" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1EA6"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="166" yOffset="4"/>
+    <component base="circumflexcomb.loclVIET" xOffset="141" yOffset="204"/>
+    <component base="gravecomb.loclVIET" xOffset="346" yOffset="327"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_circumflexhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_circumflexhookabove.glif
index ade16912..0ecfb0a5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_circumflexhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_circumflexhookabove.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexhookabove" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1EA8"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="166" yOffset="4"/>
+    <component base="circumflexcomb.loclVIET" xOffset="141" yOffset="204"/>
+    <component base="hookabovecomb.loclVIET" xOffset="369" yOffset="326"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_circumflextilde.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_circumflextilde.glif
index 469bf630..41ce5dcc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_circumflextilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_circumflextilde.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflextilde" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1EAA"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="146" yOffset="4"/>
+    <component base="circumflexcomb.loclVIET" xOffset="141" yOffset="204"/>
+    <component base="tildecomb.loclVIET" xOffset="127" yOffset="344"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>tildecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_dblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/A_dblgrave.glif
index 6e239ed6..7fe7e3b1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_dblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adblgrave" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="0200"/>
   <outline>
     <component base="A"/>
-    <component base="dblgravecomb.case" xOffset="70"/>
+    <component base="dblgravecomb.case" xOffset="62"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_dieresis-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_dieresis-cy.glif
index 793a6039..90dcd6dc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_dieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_dieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adieresis-cy" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="04D2"/>
   <outline>
     <component base="A-cy"/>
-    <component base="dieresiscomb.case" xOffset="78"/>
+    <component base="dieresiscomb.case" xOffset="70"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_dieresis.glif b/src/Cantarell-Bold.ufo/glyphs/A_dieresis.glif
index 005d4e4f..284ea73b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_dieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adieresis" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="00C4"/>
   <outline>
     <component base="A"/>
-    <component base="dieresiscomb.case" xOffset="78"/>
+    <component base="dieresiscomb.case" xOffset="70"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/A_dotbelow.glif
index 20cb1856..63a10f46 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adotbelow" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1EA0"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="203"/>
+    <component base="dotbelowcomb" xOffset="195"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_grave.glif b/src/Cantarell-Bold.ufo/glyphs/A_grave.glif
index 2cd765ab..a69a10d4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_grave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Agrave" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="00C0"/>
   <outline>
     <component base="A"/>
-    <component base="gravecomb.case" xOffset="124"/>
+    <component base="gravecomb.case" xOffset="116"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_hookabove.glif b/src/Cantarell-Bold.ufo/glyphs/A_hookabove.glif
index a728d454..bf48c740 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_hookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ahookabove" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1EA2"/>
   <outline>
     <component base="A"/>
-    <component base="hookabovecomb.case" xOffset="198"/>
+    <component base="hookabovecomb.case" xOffset="190"/>
   </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 a70af3bb..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="1023"/>
+  <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 62dd6318..0923167e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_invertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ainvertedbreve" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="0202"/>
   <outline>
     <component base="A"/>
-    <component base="breveinvertedcomb.case" xOffset="122"/>
+    <component base="breveinvertedcomb.case" xOffset="114"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_macron.glif b/src/Cantarell-Bold.ufo/glyphs/A_macron.glif
index 49789068..df78d7c4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_macron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Amacron" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="0100"/>
   <outline>
     <component base="A"/>
-    <component base="macroncomb.case" xOffset="114"/>
+    <component base="macroncomb.case" xOffset="106"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_ogonek.glif b/src/Cantarell-Bold.ufo/glyphs/A_ogonek.glif
index 25a38703..0daa6343 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_ogonek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aogonek" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="0104"/>
   <outline>
     <component base="A"/>
-    <component base="ogonekcomb" xOffset="199"/>
+    <component base="ogonekcomb" xOffset="191"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_ring.glif b/src/Cantarell-Bold.ufo/glyphs/A_ring.glif
index d832502f..1e6fe981 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_ring.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_ring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aring" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="00C5"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb.case" xOffset="187"/>
+    <component base="ringcomb.case" xOffset="179"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_ringacute.glif b/src/Cantarell-Bold.ufo/glyphs/A_ringacute.glif
index 3e162adc..3cf7f20f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_ringacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_ringacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aringacute" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="01FA"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb_acutecomb.case" xOffset="192"/>
+    <component base="ringcomb_acutecomb.case" xOffset="184"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_tilde.glif b/src/Cantarell-Bold.ufo/glyphs/A_tilde.glif
index 2c3166b6..fee1730d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_tilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Atilde" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="00C3"/>
   <outline>
     <component base="A"/>
-    <component base="tildecomb.case" xOffset="124"/>
+    <component base="tildecomb.case" xOffset="116"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/B_.glif b/src/Cantarell-Bold.ufo/glyphs/B_.glif
index 2e4dd3ad..20468de2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/B_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/B_.glif
@@ -1,48 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="B" format="2">
-  <advance width="652"/>
+  <advance width="670"/>
   <unicode hex="0042"/>
-  <note>
-B
-</note>
-  <anchor x="318" y="0" name="bottom"/>
-  <anchor x="318" y="694" name="top"/>
+  <anchor x="322" y="0" name="bottom"/>
+  <anchor x="322" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="343" y="0" type="line" smooth="yes"/>
-      <point x="518" y="0"/>
-      <point x="634" y="91"/>
-      <point x="634" y="227" type="curve" smooth="yes"/>
-      <point x="634" y="350"/>
-      <point x="545" y="424"/>
-      <point x="394" y="424" type="curve" smooth="yes"/>
-      <point x="180" y="424" type="line"/>
-      <point x="180" y="292" type="line"/>
-      <point x="356" y="292" type="line" smooth="yes"/>
-      <point x="418" y="292"/>
-      <point x="454" y="260"/>
-      <point x="454" y="210" type="curve" smooth="yes"/>
-      <point x="454" y="161"/>
-      <point x="424" y="136"/>
-      <point x="366" y="136" type="curve" smooth="yes"/>
-      <point x="237" y="136" type="line"/>
-      <point x="237" y="558" type="line"/>
-      <point x="305" y="558" type="line" smooth="yes"/>
-      <point x="363" y="558"/>
-      <point x="401" y="530"/>
-      <point x="401" y="488" type="curve" smooth="yes"/>
-      <point x="401" y="450"/>
-      <point x="370" y="418"/>
-      <point x="314" y="401" type="curve"/>
-      <point x="448" y="374" type="line"/>
-      <point x="525" y="394"/>
-      <point x="575" y="457"/>
-      <point x="575" y="531" type="curve" smooth="yes"/>
-      <point x="575" y="638"/>
-      <point x="486" y="694"/>
-      <point x="315" y="694" type="curve" smooth="yes"/>
-      <point x="67" 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>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/B_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/B_e-cy.glif
index f4d7a745..90fb4035 100644
--- a/src/Cantarell-Bold.ufo/glyphs/B_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/B_e-cy.glif
@@ -1,31 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Be-cy" format="2">
-  <advance width="637"/>
+  <advance width="646"/>
   <unicode hex="0411"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="331" y="0" type="line" smooth="yes"/>
-      <point x="504" y="0"/>
-      <point x="622" y="94"/>
-      <point x="622" y="232" type="curve" smooth="yes"/>
-      <point x="622" y="357"/>
-      <point x="531" y="434"/>
-      <point x="382" y="434" type="curve" smooth="yes"/>
-      <point x="180" y="434" type="line"/>
-      <point x="180" y="302" type="line"/>
-      <point x="344" y="302" type="line" smooth="yes"/>
-      <point x="403" y="302"/>
-      <point x="442" y="268"/>
-      <point x="442" y="215" type="curve" smooth="yes"/>
-      <point x="442" y="164"/>
-      <point x="410" y="136"/>
-      <point x="354" y="136" type="curve" smooth="yes"/>
-      <point x="237" y="136" type="line"/>
-      <point x="237" y="543" type="line"/>
-      <point x="542" y="543" type="line"/>
-      <point x="542" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="335" y="0" type="line" smooth="yes"/>
+      <point x="508" y="0"/>
+      <point x="626" y="94"/>
+      <point x="626" y="232" type="curve" smooth="yes"/>
+      <point x="626" y="357"/>
+      <point x="535" y="434"/>
+      <point x="386" y="434" type="curve" smooth="yes"/>
+      <point x="184" y="434" type="line"/>
+      <point x="184" y="302" type="line"/>
+      <point x="348" y="302" type="line" smooth="yes"/>
+      <point x="407" y="302"/>
+      <point x="446" y="268"/>
+      <point x="446" y="215" type="curve" smooth="yes"/>
+      <point x="446" y="164"/>
+      <point x="414" y="136"/>
+      <point x="358" y="136" type="curve" smooth="yes"/>
+      <point x="241" y="136" type="line"/>
+      <point x="241" y="543" type="line"/>
+      <point x="546" y="543" type="line"/>
+      <point x="546" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Softsign-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_.glif b/src/Cantarell-Bold.ufo/glyphs/C_.glif
index 58f98969..54d8bcce 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_.glif
@@ -1,40 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="C" format="2">
-  <advance width="624"/>
+  <advance width="636"/>
   <unicode hex="0043"/>
-  <note>
-C
-</note>
-  <anchor x="349" y="0" name="bottom"/>
-  <anchor x="349" y="694" name="top"/>
+  <anchor x="360" y="0" name="bottom"/>
+  <anchor x="360" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="383" y="-10" type="curve" smooth="yes"/>
-      <point x="459" y="-10"/>
-      <point x="545" y="10"/>
-      <point x="598" y="39" type="curve"/>
-      <point x="560" y="164" type="line"/>
-      <point x="520" y="150"/>
-      <point x="469" y="142"/>
-      <point x="425" y="142" type="curve" smooth="yes"/>
-      <point x="285" y="142"/>
-      <point x="205" y="224"/>
-      <point x="205" y="359" type="curve" smooth="yes"/>
-      <point x="205" y="486"/>
-      <point x="276" y="551"/>
-      <point x="403" y="551" type="curve" smooth="yes"/>
-      <point x="458" y="551"/>
-      <point x="521" y="541"/>
-      <point x="559" y="525" type="curve"/>
-      <point x="607" y="661" type="line"/>
-      <point x="540" y="690"/>
-      <point x="475" y="704"/>
-      <point x="405" y="704" type="curve" smooth="yes"/>
-      <point x="181" y="704"/>
-      <point x="25" y="560"/>
-      <point x="25" y="342" type="curve" smooth="yes"/>
-      <point x="25" y="131"/>
-      <point x="171" 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>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_acute.glif b/src/Cantarell-Bold.ufo/glyphs/C_acute.glif
index 6f3be76b..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="624"/>
+  <advance width="636"/>
   <unicode hex="0106"/>
   <outline>
     <component base="C"/>
-    <component base="acutecomb.case" xOffset="270"/>
+    <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 ead3409d..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="624"/>
+  <advance width="636"/>
   <unicode hex="010C"/>
   <outline>
     <component base="C"/>
-    <component base="caroncomb.case" xOffset="135"/>
+    <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 89f04157..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="624"/>
+  <advance width="636"/>
   <unicode hex="00C7"/>
   <outline>
     <component base="C"/>
-    <component base="cedillacomb" xOffset="191"/>
+    <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 1ebfcd89..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="624"/>
+  <advance width="636"/>
   <unicode hex="1E08"/>
   <outline>
     <component base="C"/>
-    <component base="cedillacomb" xOffset="191"/>
-    <component base="acutecomb.case" xOffset="270"/>
+    <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 3dae54a2..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="624"/>
+  <advance width="636"/>
   <unicode hex="0108"/>
   <outline>
     <component base="C"/>
-    <component base="circumflexcomb.case" xOffset="150"/>
+    <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 ec6c2877..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="624"/>
+  <advance width="636"/>
   <unicode hex="010A"/>
   <outline>
     <component base="C"/>
-    <component base="dotaccentcomb.case" xOffset="204"/>
+    <component base="dotaccentcomb.case" xOffset="215"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_he-cy.glif b/src/Cantarell-Bold.ufo/glyphs/C_he-cy.glif
index 1ee1deee..5bbd6abc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_he-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_he-cy.glif
@@ -1,33 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Che-cy" format="2">
-  <advance width="654"/>
+  <advance width="662"/>
   <unicode hex="0427"/>
-  <anchor x="554" y="0" name="bottomright"/>
-  <anchor x="328" y="694" name="top"/>
+  <anchor x="528" y="0" name="bottomright"/>
+  <anchor x="332" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="246" y="239" type="curve" smooth="yes"/>
-      <point x="327" y="239"/>
-      <point x="410" y="270"/>
-      <point x="460" y="318" type="curve"/>
-      <point x="439" y="421" type="line"/>
-      <point x="399" y="400"/>
-      <point x="351" y="389"/>
-      <point x="307" y="389" type="curve" smooth="yes"/>
-      <point x="240" y="389"/>
-      <point x="202" y="415"/>
-      <point x="202" y="470" type="curve" smooth="yes"/>
-      <point x="202" y="694" type="line"/>
-      <point x="30" y="694" type="line"/>
-      <point x="30" y="441" type="line" smooth="yes"/>
-      <point x="30" y="314"/>
-      <point x="116" y="239"/>
+      <point x="250" y="239" type="curve" smooth="yes"/>
+      <point x="331" y="239"/>
+      <point x="414" y="270"/>
+      <point x="464" y="318" type="curve"/>
+      <point x="443" y="421" type="line"/>
+      <point x="403" y="400"/>
+      <point x="355" y="389"/>
+      <point x="311" y="389" type="curve" smooth="yes"/>
+      <point x="244" y="389"/>
+      <point x="206" y="415"/>
+      <point x="206" y="470" type="curve" smooth="yes"/>
+      <point x="206" y="694" type="line"/>
+      <point x="34" y="694" type="line"/>
+      <point x="34" y="441" type="line" smooth="yes"/>
+      <point x="34" y="314"/>
+      <point x="120" y="239"/>
     </contour>
     <contour>
-      <point x="417" y="0" type="line"/>
-      <point x="587" y="0" type="line"/>
-      <point x="587" y="694" type="line"/>
-      <point x="417" y="694" type="line"/>
+      <point x="421" y="0" type="line"/>
+      <point x="591" y="0" type="line"/>
+      <point x="591" y="694" type="line"/>
+      <point x="421" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_hedescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/C_hedescender-cy.glif
index 0a4573c6..e9d77593 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_hedescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_hedescender-cy.glif
@@ -1,13 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chedescender-cy" format="2">
-  <advance width="728"/>
+  <advance width="706"/>
   <unicode hex="04B6"/>
   <outline>
     <component base="Che-cy"/>
-    <component base="descender-cy.case" xOffset="458"/>
+    <component base="descender-cy.case" xOffset="432"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Che-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Tse-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_hedieresis-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/C_hedieresis-cy.glif
index d17c78f7..07d6c93c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_hedieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_hedieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chedieresis-cy" format="2">
-  <advance width="654"/>
+  <advance width="662"/>
   <unicode hex="04F4"/>
   <outline>
     <component base="Che-cy"/>
-    <component base="dieresiscomb.case" xOffset="53"/>
+    <component base="dieresiscomb.case" xOffset="57"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_hekhakassian-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/C_hekhakassian-cy.glif
index bdbf8a9b..a24d9e65 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_hekhakassian-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_hekhakassian-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chekhakassian-cy" format="2">
-  <advance width="654"/>
+  <advance width="662"/>
   <unicode hex="04CB"/>
   <outline>
     <component base="Che-cy"/>
-    <component base="_descenderreverse-cy.case" xOffset="353"/>
+    <component base="_descenderreverse-cy.case" xOffset="340"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_heverticalstroke-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/C_heverticalstroke-cy.glif
index 0a2447fb..61ea53b7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_heverticalstroke-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_heverticalstroke-cy.glif
@@ -1,37 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cheverticalstroke-cy" format="2">
-  <advance width="674"/>
+  <advance width="682"/>
   <unicode hex="04B8"/>
   <outline>
     <contour>
-      <point x="257" y="239" type="curve" smooth="yes"/>
-      <point x="342" y="239"/>
-      <point x="425" y="268"/>
-      <point x="483" y="318" type="curve"/>
-      <point x="459" y="421" type="line"/>
-      <point x="416" y="400"/>
-      <point x="368" y="389"/>
-      <point x="318" y="389" type="curve" smooth="yes"/>
-      <point x="242" y="389"/>
-      <point x="202" y="415"/>
-      <point x="202" y="470" type="curve" smooth="yes"/>
-      <point x="202" y="694" type="line"/>
-      <point x="30" y="694" type="line"/>
-      <point x="30" y="441" type="line" smooth="yes"/>
-      <point x="30" y="314"/>
-      <point x="119" y="239"/>
+      <point x="261" y="239" type="curve" smooth="yes"/>
+      <point x="346" y="239"/>
+      <point x="429" y="268"/>
+      <point x="487" y="318" type="curve"/>
+      <point x="463" y="421" type="line"/>
+      <point x="420" y="400"/>
+      <point x="372" y="389"/>
+      <point x="322" y="389" type="curve" smooth="yes"/>
+      <point x="246" y="389"/>
+      <point x="206" y="415"/>
+      <point x="206" y="470" type="curve" smooth="yes"/>
+      <point x="206" y="694" type="line"/>
+      <point x="34" y="694" type="line"/>
+      <point x="34" y="441" type="line" smooth="yes"/>
+      <point x="34" y="314"/>
+      <point x="123" y="239"/>
     </contour>
     <contour>
-      <point x="273" y="130" type="line"/>
-      <point x="374" y="130" type="line"/>
-      <point x="374" y="516" type="line"/>
-      <point x="273" y="516" type="line"/>
+      <point x="277" y="130" type="line"/>
+      <point x="378" y="130" type="line"/>
+      <point x="378" y="516" type="line"/>
+      <point x="277" y="516" type="line"/>
     </contour>
     <contour>
-      <point x="437" y="0" type="line"/>
-      <point x="607" y="0" type="line"/>
-      <point x="607" y="694" type="line"/>
-      <point x="437" y="694" type="line"/>
+      <point x="441" y="0" type="line"/>
+      <point x="611" y="0" type="line"/>
+      <point x="611" y="694" type="line"/>
+      <point x="441" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Che-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_.glif b/src/Cantarell-Bold.ufo/glyphs/D_.glif
index 833a638a..5ca29451 100644
--- a/src/Cantarell-Bold.ufo/glyphs/D_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/D_.glif
@@ -1,35 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="D" format="2">
-  <advance width="734"/>
+  <advance width="750"/>
   <unicode hex="0044"/>
-  <note>
-D
-</note>
-  <anchor x="358" y="0" name="bottom"/>
-  <anchor x="176" y="344" name="center"/>
-  <anchor x="335" 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="67" y="0" type="line"/>
-      <point x="314" y="0" type="line" smooth="yes"/>
-      <point x="552" y="0"/>
-      <point x="709" y="143"/>
-      <point x="709" y="361" type="curve" smooth="yes"/>
-      <point x="709" y="570"/>
-      <point x="567" y="694"/>
-      <point x="327" y="694" type="curve" smooth="yes"/>
-      <point x="67" 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="237" y="149" type="line"/>
-      <point x="237" y="545" type="line"/>
-      <point x="317" y="545" type="line" smooth="yes"/>
-      <point x="450" y="545"/>
-      <point x="529" y="469"/>
-      <point x="529" y="341" type="curve" smooth="yes"/>
-      <point x="529" y="217"/>
-      <point x="460" y="149"/>
-      <point x="334" 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>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_Z_caron.glif b/src/Cantarell-Bold.ufo/glyphs/D_Z_caron.glif
index bf78bb06..9259153d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/D_Z_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/D_Z_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="DZcaron" format="2">
-  <advance width="1384"/>
+  <advance width="1417"/>
   <unicode hex="01C4"/>
   <outline>
     <component base="D"/>
-    <component base="Zcaron" xOffset="734"/>
+    <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 1cff80ca..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="734"/>
+  <advance width="750"/>
   <unicode hex="010E"/>
   <outline>
     <component base="D"/>
-    <component base="caroncomb.case" xOffset="121"/>
+    <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 71d96efc..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="734"/>
+  <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 3f13e7a7..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="734"/>
+  <advance width="750"/>
   <unicode hex="1E0C"/>
   <outline>
     <component base="D"/>
-    <component base="dotbelowcomb" xOffset="208"/>
+    <component base="dotbelowcomb" xOffset="212"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/D_e-cy.glif
index 84887b05..c79c1012 100644
--- a/src/Cantarell-Bold.ufo/glyphs/D_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/D_e-cy.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="De-cy" format="2">
-  <advance width="830"/>
+  <advance width="803"/>
   <unicode hex="0414"/>
   <outline>
     <contour>
-      <point x="81" y="89" type="line"/>
-      <point x="245" y="90"/>
-      <point x="331" y="184"/>
-      <point x="331" y="364" type="curve" smooth="yes"/>
-      <point x="331" y="545" type="line"/>
-      <point x="516" y="545" type="line"/>
-      <point x="516" y="70" type="line"/>
-      <point x="687" y="70" type="line"/>
-      <point x="687" y="694" type="line"/>
-      <point x="165" y="694" type="line"/>
-      <point x="165" y="360" type="line" smooth="yes"/>
-      <point x="165" y="223"/>
-      <point x="127" y="151"/>
-      <point x="55" y="150" type="curve"/>
+      <point x="82" y="89" type="line"/>
+      <point x="247" y="90"/>
+      <point x="334" y="185"/>
+      <point x="334" y="364" type="curve" smooth="yes"/>
+      <point x="334" y="545" type="line"/>
+      <point x="517" y="545" type="line"/>
+      <point x="517" y="70" type="line"/>
+      <point x="688" y="70" type="line"/>
+      <point x="688" y="694" type="line"/>
+      <point x="168" y="694" type="line"/>
+      <point x="168" y="360" type="line" smooth="yes"/>
+      <point x="168" y="225"/>
+      <point x="129" y="151"/>
+      <point x="56" y="150" type="curve"/>
     </contour>
     <contour>
-      <point x="10" y="-187" type="line"/>
-      <point x="172" y="-187" type="line"/>
-      <point x="172" y="0" type="line"/>
-      <point x="657" y="0" type="line"/>
-      <point x="657" y="-187" type="line"/>
-      <point x="820" y="-187" type="line"/>
-      <point x="820" y="151" type="line"/>
-      <point x="10" y="151" type="line"/>
+      <point x="14" y="-187" type="line"/>
+      <point x="176" y="-187" type="line"/>
+      <point x="176" y="0" type="line"/>
+      <point x="628" y="0" type="line"/>
+      <point x="626" y="-187" type="line"/>
+      <point x="789" y="-187" type="line"/>
+      <point x="789" y="151" type="line"/>
+      <point x="14" y="151" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_je-cy.glif b/src/Cantarell-Bold.ufo/glyphs/D_je-cy.glif
index b9f38761..b7ba97d9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/D_je-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/D_je-cy.glif
@@ -1,41 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dje-cy" format="2">
-  <advance width="805"/>
+  <advance width="815"/>
   <unicode hex="0402"/>
   <outline>
     <contour>
-      <point x="489" y="-10" type="line"/>
-      <point x="676" y="1"/>
-      <point x="790" y="97"/>
-      <point x="790" y="245" type="curve" smooth="yes"/>
-      <point x="790" y="375"/>
-      <point x="702" y="461"/>
-      <point x="569" y="461" type="curve" smooth="yes"/>
-      <point x="461" y="461"/>
-      <point x="365" y="404"/>
-      <point x="304" y="302" type="curve"/>
-      <point x="328" y="199" type="line"/>
-      <point x="366" y="266"/>
-      <point x="438" y="311"/>
-      <point x="509" y="311" type="curve" smooth="yes"/>
-      <point x="570" y="311"/>
-      <point x="611" y="280"/>
-      <point x="611" y="233" type="curve" smooth="yes"/>
-      <point x="611" y="178"/>
-      <point x="560" y="139"/>
-      <point x="475" y="128" type="curve"/>
+      <point x="493" y="-10" type="line"/>
+      <point x="680" y="1"/>
+      <point x="794" y="97"/>
+      <point x="794" y="245" type="curve" smooth="yes"/>
+      <point x="794" y="375"/>
+      <point x="706" y="461"/>
+      <point x="573" y="461" type="curve" smooth="yes"/>
+      <point x="465" y="461"/>
+      <point x="369" y="404"/>
+      <point x="308" y="302" type="curve"/>
+      <point x="332" y="199" type="line"/>
+      <point x="370" y="266"/>
+      <point x="442" y="311"/>
+      <point x="513" y="311" type="curve" smooth="yes"/>
+      <point x="574" y="311"/>
+      <point x="615" y="280"/>
+      <point x="615" y="233" type="curve" smooth="yes"/>
+      <point x="615" y="178"/>
+      <point x="564" y="139"/>
+      <point x="479" y="128" type="curve"/>
     </contour>
     <contour>
-      <point x="218" y="0" type="line"/>
-      <point x="388" y="0" type="line"/>
-      <point x="388" y="660" type="line"/>
-      <point x="218" y="660" type="line"/>
+      <point x="222" y="0" type="line"/>
+      <point x="392" y="0" type="line"/>
+      <point x="392" y="660" type="line"/>
+      <point x="222" y="660" type="line"/>
     </contour>
     <contour>
-      <point x="10" y="542" type="line"/>
-      <point x="618" y="542" type="line"/>
-      <point x="618" y="694" type="line"/>
-      <point x="10" y="694" type="line"/>
+      <point x="14" y="542" type="line"/>
+      <point x="622" y="542" type="line"/>
+      <point x="622" y="694" type="line"/>
+      <point x="14" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|Ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_linebelow.glif b/src/Cantarell-Bold.ufo/glyphs/D_linebelow.glif
index eee5ca31..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="734"/>
+  <advance width="750"/>
   <unicode hex="1E0E"/>
   <outline>
     <component base="D"/>
-    <component base="macronbelowcomb" xOffset="113"/>
+    <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 b3b58d9f..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="1224"/>
+  <advance width="1265"/>
   <unicode hex="01C5"/>
   <outline>
     <component base="D"/>
-    <component base="zcaron" xOffset="734"/>
+    <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 23186a9f..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="584"/>
+  <advance width="593"/>
   <unicode hex="0405"/>
   <outline>
     <component base="S"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_zhe-cy.glif b/src/Cantarell-Bold.ufo/glyphs/D_zhe-cy.glif
index 3143fbd4..d8bea54b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/D_zhe-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/D_zhe-cy.glif
@@ -1,21 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dzhe-cy" format="2">
-  <advance width="756"/>
+  <advance width="764"/>
   <unicode hex="040F"/>
   <outline>
     <contour>
-      <point x="302" y="-187" type="line"/>
-      <point x="464" y="-187" type="line"/>
-      <point x="464" y="0" type="line"/>
-      <point x="689" y="0" type="line"/>
-      <point x="689" y="694" type="line"/>
-      <point x="518" y="694" type="line"/>
-      <point x="518" y="151" type="line"/>
-      <point x="238" y="151" type="line"/>
-      <point x="238" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
-      <point x="67" y="0" type="line"/>
-      <point x="302" y="0" type="line"/>
+      <point x="306" y="-187" type="line"/>
+      <point x="468" y="-187" type="line"/>
+      <point x="468" y="0" type="line"/>
+      <point x="693" y="0" type="line"/>
+      <point x="693" y="694" type="line"/>
+      <point x="522" y="694" type="line"/>
+      <point x="522" y="151" type="line"/>
+      <point x="242" y="151" type="line"/>
+      <point x="242" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="306" y="0" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_-cy.glif b/src/Cantarell-Bold.ufo/glyphs/E_-cy.glif
index 328ef2eb..4c9daf8e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_-cy.glif
@@ -1,41 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="E-cy" format="2">
-  <advance width="636"/>
+  <advance width="652"/>
   <unicode hex="0404"/>
   <outline>
     <contour>
-      <point x="158" y="275" type="line"/>
-      <point x="525" y="275" type="line"/>
-      <point x="525" y="415" type="line"/>
-      <point x="158" y="415" type="line"/>
+      <point x="404" y="-10" type="curve" smooth="yes"/>
+      <point x="484" y="-10"/>
+      <point x="571" y="11"/>
+      <point x="624" y="39" type="curve"/>
+      <point x="586" y="164" type="line"/>
+      <point x="545" y="150"/>
+      <point x="490" y="142"/>
+      <point x="446" y="142" type="curve" smooth="yes"/>
+      <point x="302" y="142"/>
+      <point x="217" y="224"/>
+      <point x="217" y="359" type="curve" smooth="yes"/>
+      <point x="217" y="486"/>
+      <point x="292" y="551"/>
+      <point x="424" y="551" type="curve" smooth="yes"/>
+      <point x="475" y="551"/>
+      <point x="543" y="542"/>
+      <point x="585" y="525" type="curve"/>
+      <point x="633" y="661" type="line"/>
+      <point x="565" y="690"/>
+      <point x="497" y="704"/>
+      <point x="426" y="704" type="curve" smooth="yes"/>
+      <point x="198" y="704"/>
+      <point x="37" y="560"/>
+      <point x="37" y="342" type="curve" smooth="yes"/>
+      <point x="37" y="131"/>
+      <point x="187" y="-10"/>
     </contour>
     <contour>
-      <point x="392" y="-10" type="curve" smooth="yes"/>
-      <point x="472" y="-10"/>
-      <point x="559" y="11"/>
-      <point x="612" y="39" type="curve"/>
-      <point x="574" y="164" type="line"/>
-      <point x="533" y="150"/>
-      <point x="478" y="142"/>
-      <point x="434" y="142" type="curve" smooth="yes"/>
-      <point x="290" y="142"/>
-      <point x="205" y="224"/>
-      <point x="205" y="359" type="curve" smooth="yes"/>
-      <point x="205" y="486"/>
-      <point x="280" y="551"/>
-      <point x="412" y="551" type="curve" smooth="yes"/>
-      <point x="463" y="551"/>
-      <point x="531" y="542"/>
-      <point x="573" y="525" type="curve"/>
-      <point x="621" y="661" type="line"/>
-      <point x="553" y="690"/>
-      <point x="485" y="704"/>
-      <point x="414" y="704" type="curve" smooth="yes"/>
-      <point x="186" y="704"/>
-      <point x="25" y="560"/>
-      <point x="25" y="342" type="curve" smooth="yes"/>
-      <point x="25" y="131"/>
-      <point x="175" y="-10"/>
+      <point x="170" y="275" type="line"/>
+      <point x="537" y="275" type="line"/>
+      <point x="537" y="415" type="line"/>
+      <point x="170" y="415" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Es-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Es-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_.glif b/src/Cantarell-Bold.ufo/glyphs/E_.glif
index 2be05acc..47a69a4e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_.glif
@@ -1,38 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="E" format="2">
-  <advance width="610"/>
+  <advance width="619"/>
   <unicode hex="0045"/>
-  <note>
-E
-</note>
-  <anchor x="320" y="0" name="bottom"/>
-  <anchor x="518" y="10" name="ogonek"/>
-  <anchor x="313" y="694" name="top"/>
-  <anchor x="15" 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="67" y="0" type="line"/>
-      <point x="240" y="0" type="line"/>
-      <point x="240" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="147" y="0" type="line"/>
-      <point x="565" y="0" type="line"/>
-      <point x="565" y="152" type="line"/>
-      <point x="147" y="152" type="line"/>
-    </contour>
-    <contour>
-      <point x="147" y="276" type="line"/>
-      <point x="537" y="276" type="line"/>
-      <point x="537" y="428" type="line"/>
-      <point x="147" y="428" type="line"/>
-    </contour>
-    <contour>
-      <point x="147" y="542" type="line"/>
-      <point x="565" y="542" type="line"/>
-      <point x="565" y="694" type="line"/>
-      <point x="147" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="569" y="0" type="line"/>
+      <point x="569" y="152" type="line"/>
+      <point x="244" y="152" type="line"/>
+      <point x="244" y="276" type="line"/>
+      <point x="541" y="276" type="line"/>
+      <point x="541" y="428" type="line"/>
+      <point x="244" y="428" type="line"/>
+      <point x="244" y="542" type="line"/>
+      <point x="569" y="542" type="line"/>
+      <point x="569" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_acute.glif b/src/Cantarell-Bold.ufo/glyphs/E_acute.glif
index bbdbab4e..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="610"/>
+  <advance width="619"/>
   <unicode hex="00C9"/>
   <outline>
     <component base="E"/>
-    <component base="acutecomb.case" xOffset="234"/>
+    <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 e3c053fe..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="610"/>
+  <advance width="619"/>
   <unicode hex="0114"/>
   <outline>
     <component base="E"/>
-    <component base="brevecomb.case" xOffset="80"/>
+    <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 111e3506..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="610"/>
+  <advance width="619"/>
   <unicode hex="011A"/>
   <outline>
     <component base="E"/>
-    <component base="caroncomb.case" xOffset="99"/>
+    <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 a332589f..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="610"/>
+  <advance width="619"/>
   <unicode hex="1E1C"/>
   <outline>
     <component base="E"/>
-    <component base="cedillacomb" xOffset="162"/>
-    <component base="brevecomb.case" xOffset="80"/>
+    <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 19274220..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="610"/>
+  <advance width="619"/>
   <unicode hex="00CA"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.case" xOffset="114"/>
+    <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 2f24ab47..fcff2782 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflexacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflexacute.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexacute" format="2">
-  <advance width="610"/>
+  <advance width="619"/>
   <unicode hex="1EBE"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="126" yOffset="4"/>
+    <component base="circumflexcomb.loclVIET" xOffset="113" yOffset="204"/>
+    <component base="acutecomb.loclVIET" xOffset="408" yOffset="327"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflexdotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflexdotbelow.glif
index 6255fb0b..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="610"/>
+  <advance width="619"/>
   <unicode hex="1EC6"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="170"/>
-    <component base="circumflexcomb.case" xOffset="114"/>
+    <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 7734085f..800bc680 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflexgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflexgrave.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexgrave" format="2">
-  <advance width="610"/>
+  <advance width="619"/>
   <unicode hex="1EC0"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="126" yOffset="4"/>
+    <component base="circumflexcomb.loclVIET" xOffset="113" yOffset="204"/>
+    <component base="gravecomb.loclVIET" xOffset="318" yOffset="327"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflexhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflexhookabove.glif
index 6092e193..7c32500d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflexhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflexhookabove.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexhookabove" format="2">
-  <advance width="610"/>
+  <advance width="619"/>
   <unicode hex="1EC2"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="126" yOffset="4"/>
+    <component base="circumflexcomb.loclVIET" xOffset="113" yOffset="204"/>
+    <component base="hookabovecomb.loclVIET" xOffset="341" yOffset="326"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflextilde.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflextilde.glif
index df68d7e2..31bc8387 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflextilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflextilde.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflextilde" format="2">
-  <advance width="610"/>
+  <advance width="619"/>
   <unicode hex="1EC4"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="106" yOffset="4"/>
+    <component base="circumflexcomb.loclVIET" xOffset="113" yOffset="204"/>
+    <component base="tildecomb.loclVIET" xOffset="99" yOffset="344"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>tildecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_dblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/E_dblgrave.glif
index c2d6d046..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="610"/>
+  <advance width="619"/>
   <unicode hex="0204"/>
   <outline>
     <component base="E"/>
-    <component base="dblgravecomb.case" xOffset="30"/>
+    <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 09b53ec9..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="610"/>
+  <advance width="619"/>
   <unicode hex="00CB"/>
   <outline>
     <component base="E"/>
-    <component base="dieresiscomb.case" xOffset="38"/>
+    <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 b8f55595..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="610"/>
+  <advance width="619"/>
   <unicode hex="0116"/>
   <outline>
     <component base="E"/>
-    <component base="dotaccentcomb.case" xOffset="168"/>
+    <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 881e0c40..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="610"/>
+  <advance width="619"/>
   <unicode hex="1EB8"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="170"/>
+    <component base="dotbelowcomb" xOffset="174"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_f-cy.glif b/src/Cantarell-Bold.ufo/glyphs/E_f-cy.glif
index 8f037547..b8d389c9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_f-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_f-cy.glif
@@ -1,41 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ef-cy" format="2">
-  <advance width="814"/>
+  <advance width="822"/>
   <unicode hex="0424"/>
   <outline>
     <contour>
-      <point x="403" y="48" type="curve" smooth="yes"/>
-      <point x="649" y="48"/>
-      <point x="794" y="161"/>
-      <point x="794" y="351" type="curve" smooth="yes"/>
-      <point x="794" y="536"/>
-      <point x="652" y="646"/>
-      <point x="412" y="646" type="curve" smooth="yes"/>
-      <point x="166" y="646"/>
-      <point x="20" y="534"/>
-      <point x="20" y="344" type="curve" smooth="yes"/>
-      <point x="20" y="158"/>
-      <point x="162" y="48"/>
+      <point x="326" y="-20" type="line"/>
+      <point x="496" y="-20" type="line"/>
+      <point x="496" y="714" type="line"/>
+      <point x="326" y="714" type="line"/>
     </contour>
     <contour>
-      <point x="413" y="193" type="curve" smooth="yes"/>
-      <point x="273" y="193"/>
-      <point x="190" y="252"/>
-      <point x="190" y="351" type="curve" smooth="yes"/>
-      <point x="190" y="445"/>
-      <point x="269" y="501"/>
-      <point x="402" y="501" type="curve" smooth="yes"/>
-      <point x="542" y="501"/>
-      <point x="624" y="442"/>
-      <point x="624" y="343" type="curve" smooth="yes"/>
-      <point x="624" y="249"/>
-      <point x="546" y="193"/>
+      <point x="407" y="48" type="curve" smooth="yes"/>
+      <point x="653" y="48"/>
+      <point x="798" y="161"/>
+      <point x="798" y="351" type="curve" smooth="yes"/>
+      <point x="798" y="536"/>
+      <point x="656" y="646"/>
+      <point x="416" y="646" type="curve" smooth="yes"/>
+      <point x="170" y="646"/>
+      <point x="24" y="534"/>
+      <point x="24" y="344" type="curve" smooth="yes"/>
+      <point x="24" y="158"/>
+      <point x="166" y="48"/>
     </contour>
     <contour>
-      <point x="322" y="-20" type="line"/>
-      <point x="492" y="-20" type="line"/>
-      <point x="492" y="714" type="line"/>
-      <point x="322" y="714" type="line"/>
+      <point x="417" y="193" type="curve" smooth="yes"/>
+      <point x="277" y="193"/>
+      <point x="194" y="252"/>
+      <point x="194" y="351" type="curve" smooth="yes"/>
+      <point x="194" y="445"/>
+      <point x="273" y="501"/>
+      <point x="406" y="501" type="curve" smooth="yes"/>
+      <point x="546" y="501"/>
+      <point x="628" y="442"/>
+      <point x="628" y="343" type="curve" smooth="yes"/>
+      <point x="628" y="249"/>
+      <point x="550" y="193"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_grave.glif b/src/Cantarell-Bold.ufo/glyphs/E_grave.glif
index 832f6e7f..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="610"/>
+  <advance width="619"/>
   <unicode hex="00C8"/>
   <outline>
     <component base="E"/>
-    <component base="gravecomb.case" xOffset="84"/>
+    <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 fbead794..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="610"/>
+  <advance width="619"/>
   <unicode hex="1EBA"/>
   <outline>
     <component base="E"/>
-    <component base="hookabovecomb.case" xOffset="158"/>
+    <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 aa457686..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="610"/>
+  <advance width="619"/>
   <unicode hex="0206"/>
   <outline>
     <component base="E"/>
-    <component base="breveinvertedcomb.case" xOffset="82"/>
+    <component base="breveinvertedcomb.case" xOffset="86"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_l-cy.glif b/src/Cantarell-Bold.ufo/glyphs/E_l-cy.glif
index 006ebafb..b9313f55 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_l-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_l-cy.glif
@@ -1,29 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="El-cy" format="2">
-  <advance width="799"/>
+  <advance width="790"/>
   <unicode hex="041B"/>
   <outline>
     <contour>
-      <point x="150" y="-10" type="curve" smooth="yes"/>
-      <point x="300" y="-10"/>
-      <point x="373" y="86"/>
-      <point x="373" y="284" type="curve" smooth="yes"/>
-      <point x="373" y="543" type="line"/>
-      <point x="561" y="543" type="line"/>
-      <point x="561" y="0" type="line"/>
-      <point x="732" y="0" type="line"/>
-      <point x="732" y="694" type="line"/>
-      <point x="209" y="694" type="line"/>
-      <point x="209" y="250" type="line" smooth="yes"/>
-      <point x="209" y="181"/>
-      <point x="178" y="143"/>
-      <point x="121" y="143" type="curve" smooth="yes"/>
-      <point x="99" y="143"/>
-      <point x="76" y="149"/>
-      <point x="59" y="160" type="curve"/>
-      <point x="13" y="31" type="line"/>
-      <point x="50" y="4"/>
-      <point x="92" y="-10"/>
+      <point x="137" y="-10" type="curve" smooth="yes"/>
+      <point x="287" y="-10"/>
+      <point x="360" y="86"/>
+      <point x="360" y="284" type="curve" smooth="yes"/>
+      <point x="360" y="543" type="line"/>
+      <point x="548" y="543" type="line"/>
+      <point x="548" y="0" type="line"/>
+      <point x="719" y="0" type="line"/>
+      <point x="719" y="694" type="line"/>
+      <point x="196" y="694" type="line"/>
+      <point x="196" y="250" type="line" smooth="yes"/>
+      <point x="196" y="181"/>
+      <point x="165" y="143"/>
+      <point x="108" y="143" type="curve" smooth="yes"/>
+      <point x="86" y="143"/>
+      <point x="63" y="149"/>
+      <point x="46" y="160" type="curve"/>
+      <point x="0" y="31" type="line"/>
+      <point x="37" y="4"/>
+      <point x="79" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_m-cy.glif b/src/Cantarell-Bold.ufo/glyphs/E_m-cy.glif
index 260e16a2..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="892"/>
+  <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 d4695a59..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="610"/>
+  <advance width="619"/>
   <unicode hex="0112"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="74"/>
+    <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 39ccc9e5..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="610"/>
+  <advance width="619"/>
   <unicode hex="1E16"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="74"/>
-    <component base="acutecomb.case" xOffset="234" 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 3949a0c5..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="610"/>
+  <advance width="619"/>
   <unicode hex="1E14"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="74"/>
-    <component base="gravecomb.case" xOffset="84" 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 7478dee2..6661ad89 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_n-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_n-cy.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="En-cy" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="041D"/>
-  <anchor x="651" y="0" name="bottomright"/>
+  <anchor x="629" y="0" name="bottomright"/>
   <outline>
     <component base="H"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_ndescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_ndescender-cy.glif
index 47b9a487..19186fc1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_ndescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_ndescender-cy.glif
@@ -1,13 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Endescender-cy" format="2">
-  <advance width="810"/>
+  <advance width="807"/>
   <unicode hex="04A2"/>
   <outline>
     <component base="En-cy"/>
-    <component base="descender-cy.case" xOffset="555"/>
+    <component base="descender-cy.case" xOffset="533"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Tse-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_ng.glif b/src/Cantarell-Bold.ufo/glyphs/E_ng.glif
index d1c58b37..68b5bcca 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_ng.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_ng.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eng" format="2">
-  <advance width="785"/>
+  <advance width="793"/>
   <unicode hex="014A"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="230" y="0" type="line"/>
-      <point x="230" y="470" type="line"/>
-      <point x="218" y="460" type="line"/>
-      <point x="566" y="-37" type="line"/>
-      <point x="718" y="0" type="line"/>
-      <point x="718" y="694" type="line"/>
-      <point x="555" y="694" type="line"/>
-      <point x="553" y="216" type="line"/>
-      <point x="574" y="219" type="line"/>
-      <point x="259" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
+      <point x="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"/>
+      <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"/>
     </contour>
     <contour>
-      <point x="555" y="-243" type="line"/>
-      <point x="659" y="-213"/>
-      <point x="718" y="-121"/>
-      <point x="718" y="-13" type="curve" smooth="yes"/>
-      <point x="718" y="0" type="line"/>
-      <point x="555" y="0" type="line"/>
-      <point x="555" y="-25" type="line" smooth="yes"/>
-      <point x="555" y="-82"/>
-      <point x="535" y="-127"/>
-      <point x="500" y="-147" type="curve"/>
+      <point x="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_nghe-cy.glif b/src/Cantarell-Bold.ufo/glyphs/E_nghe-cy.glif
index 57a5ad68..2baf32d0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_nghe-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_nghe-cy.glif
@@ -1,31 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Enghe-cy" format="2">
-  <advance width="957"/>
+  <advance width="968"/>
   <unicode hex="04A4"/>
   <outline>
     <contour>
-      <point x="513" y="0" type="line"/>
-      <point x="689" y="0" type="line"/>
-      <point x="689" y="694" type="line"/>
-      <point x="513" y="694" type="line"/>
+      <point x="516" y="0" type="line"/>
+      <point x="692" y="0" type="line"/>
+      <point x="692" y="542" type="line"/>
+      <point x="954" y="542" type="line"/>
+      <point x="954" y="694" type="line"/>
+      <point x="516" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="68" y="0" type="line"/>
-      <point x="244" y="0" type="line"/>
-      <point x="244" y="694" type="line"/>
-      <point x="68" 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="223" y="274" type="line"/>
-      <point x="533" y="274" type="line"/>
-      <point x="533" y="430" type="line"/>
-      <point x="223" y="430" type="line"/>
-    </contour>
-    <contour>
-      <point x="513" y="542" type="line"/>
-      <point x="951" y="542" type="line"/>
-      <point x="951" y="694" type="line"/>
-      <point x="513" y="694" 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>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_ogonek.glif b/src/Cantarell-Bold.ufo/glyphs/E_ogonek.glif
index 544746b5..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="610"/>
+  <advance width="619"/>
   <unicode hex="0118"/>
   <anchor x="305" y="694" name="top"/>
   <outline>
     <component base="E"/>
-    <component base="ogonekcomb" xOffset="58"/>
+    <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 6151ce27..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="626"/>
+  <advance width="625"/>
   <unicode hex="0420"/>
   <outline>
     <component base="P"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_reversed-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_reversed-cy.glif
index a269d547..0c8285f0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_reversed-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_reversed-cy.glif
@@ -1,42 +1,50 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ereversed-cy" format="2">
-  <advance width="638"/>
+  <advance width="653"/>
   <unicode hex="042D"/>
-  <anchor x="319" y="694" name="top"/>
+  <anchor x="322" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="233" y="-10" type="curve" smooth="yes"/>
-      <point x="465" y="-10"/>
-      <point x="613" y="136"/>
-      <point x="613" y="350" type="curve" smooth="yes"/>
-      <point x="613" y="563"/>
-      <point x="467" y="704"/>
-      <point x="249" y="704" type="curve" smooth="yes"/>
-      <point x="170" y="704"/>
-      <point x="83" y="686"/>
-      <point x="25" y="655" type="curve"/>
-      <point x="63" y="530" type="line"/>
-      <point x="106" y="544"/>
-      <point x="162" y="552"/>
-      <point x="209" y="552" type="curve" smooth="yes"/>
-      <point x="356" y="552"/>
-      <point x="433" y="478"/>
-      <point x="433" y="335" type="curve" smooth="yes"/>
-      <point x="433" y="203"/>
-      <point x="371" y="143"/>
-      <point x="235" y="143" type="curve" smooth="yes"/>
-      <point x="178" y="143"/>
-      <point x="114" y="153"/>
-      <point x="64" y="169" type="curve"/>
-      <point x="16" y="33" type="line"/>
-      <point x="77" y="6"/>
-      <point x="157" y="-10"/>
+      <point x="236" y="-10" type="curve" smooth="yes"/>
+      <point x="468" y="-10"/>
+      <point x="616" y="136"/>
+      <point x="616" y="350" type="curve" smooth="yes"/>
+      <point x="616" y="563"/>
+      <point x="470" y="704"/>
+      <point x="252" y="704" type="curve" smooth="yes"/>
+      <point x="173" y="704"/>
+      <point x="86" y="686"/>
+      <point x="28" y="655" type="curve"/>
+      <point x="66" y="530" type="line"/>
+      <point x="109" y="544"/>
+      <point x="165" y="552"/>
+      <point x="212" y="552" type="curve" smooth="yes"/>
+      <point x="359" y="552"/>
+      <point x="436" y="478"/>
+      <point x="436" y="335" type="curve" smooth="yes"/>
+      <point x="436" y="203"/>
+      <point x="374" y="143"/>
+      <point x="238" y="143" type="curve" smooth="yes"/>
+      <point x="181" y="143"/>
+      <point x="117" y="153"/>
+      <point x="67" y="169" type="curve"/>
+      <point x="19" y="33" type="line"/>
+      <point x="80" y="6"/>
+      <point x="160" y="-10"/>
     </contour>
     <contour>
-      <point x="140" y="278" type="line"/>
-      <point x="456" y="278" type="line"/>
-      <point x="456" y="418" type="line"/>
-      <point x="140" y="418" type="line"/>
+      <point x="143" y="278" type="line"/>
+      <point x="459" y="278" type="line"/>
+      <point x="459" y="418" type="line"/>
+      <point x="143" y="418" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|Es-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|Es-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_s-cy.glif b/src/Cantarell-Bold.ufo/glyphs/E_s-cy.glif
index dd2838b4..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="624"/>
+  <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 113f8341..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="624"/>
+  <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 b31b1d3b..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="734"/>
+  <advance width="750"/>
   <unicode hex="00D0"/>
   <outline>
     <component base="D"/>
-    <component base="strokeshortcomb.case" xOffset="-39" 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 10ef98ff..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="610"/>
+  <advance width="619"/>
   <unicode hex="1EBC"/>
   <outline>
     <component base="E"/>
-    <component base="tildecomb.case" xOffset="84"/>
+    <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 bf8f3765..ff1738d2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/F_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/F_.glif
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="F" format="2">
-  <advance width="583"/>
+  <advance width="595"/>
   <unicode hex="0046"/>
-  <note>
-F
-</note>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="278" y="694" name="top"/>
+  <anchor x="175" y="0" name="bottom"/>
+  <anchor x="282" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="243" y="0" type="line"/>
-      <point x="243" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="147" y="257" type="line"/>
-      <point x="526" y="257" type="line"/>
-      <point x="526" y="409" type="line"/>
-      <point x="147" y="409" type="line"/>
-    </contour>
-    <contour>
-      <point x="147" y="542" type="line"/>
-      <point x="562" y="542" type="line"/>
-      <point x="562" y="694" type="line"/>
-      <point x="147" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="247" y="0" type="line"/>
+      <point x="247" y="257" type="line"/>
+      <point x="530" y="257" type="line"/>
+      <point x="530" y="409" type="line"/>
+      <point x="247" y="409" type="line"/>
+      <point x="247" y="542" type="line"/>
+      <point x="566" y="542" type="line"/>
+      <point x="566" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/F_ita-cy.glif b/src/Cantarell-Bold.ufo/glyphs/F_ita-cy.glif
index 35648400..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="760"/>
+  <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 8184a829..70625e1f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_.glif
@@ -1,45 +1,48 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="G" format="2">
-  <advance width="712"/>
+  <advance width="730"/>
   <unicode hex="0047"/>
-  <note>
-G
-</note>
-  <anchor x="351" y="0" name="bottom"/>
-  <anchor x="371" y="694" name="top"/>
+  <anchor x="363" y="0" name="bottom"/>
+  <anchor x="383" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="389" y="-10" type="curve" smooth="yes"/>
-      <point x="499" y="-10"/>
-      <point x="593" y="23"/>
-      <point x="671" y="89" type="curve"/>
-      <point x="671" y="411" type="line"/>
-      <point x="359" y="411" type="line"/>
-      <point x="359" y="265" type="line"/>
-      <point x="506" y="265" type="line"/>
-      <point x="506" y="79" type="line"/>
-      <point x="532" y="180" type="line"/>
-      <point x="509" y="155"/>
-      <point x="465" y="140"/>
-      <point x="410" y="140" type="curve" smooth="yes"/>
-      <point x="285" y="140"/>
-      <point x="207" y="221"/>
-      <point x="207" y="353" type="curve" smooth="yes"/>
-      <point x="207" y="482"/>
-      <point x="282" y="551"/>
-      <point x="423" y="551" type="curve" smooth="yes"/>
-      <point x="482" y="551"/>
-      <point x="551" y="540"/>
-      <point x="597" y="524" type="curve"/>
-      <point x="645" y="660" type="line"/>
-      <point x="586" y="688"/>
-      <point x="507" y="704"/>
-      <point x="428" y="704" type="curve" smooth="yes"/>
-      <point x="182" y="704"/>
-      <point x="25" y="556"/>
-      <point x="25" y="339" type="curve" smooth="yes"/>
-      <point x="25" y="130"/>
-      <point x="171" 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>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_breve.glif b/src/Cantarell-Bold.ufo/glyphs/G_breve.glif
index 9800cb33..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="712"/>
+  <advance width="730"/>
   <unicode hex="011E"/>
   <outline>
     <component base="G"/>
-    <component base="brevecomb.case" xOffset="138"/>
+    <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 4e55bd07..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="712"/>
+  <advance width="730"/>
   <unicode hex="01E6"/>
   <outline>
     <component base="G"/>
-    <component base="caroncomb.case" xOffset="157"/>
+    <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 75625c15..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="712"/>
+  <advance width="730"/>
   <unicode hex="011C"/>
   <outline>
     <component base="G"/>
-    <component base="circumflexcomb.case" xOffset="172"/>
+    <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 ebb5cfbd..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="712"/>
+  <advance width="730"/>
   <unicode hex="0122"/>
   <outline>
     <component base="G"/>
-    <component base="commaaccentcomb" xOffset="233"/>
+    <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 ab8c01bd..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="712"/>
+  <advance width="730"/>
   <unicode hex="0120"/>
   <outline>
     <component base="G"/>
-    <component base="dotaccentcomb.case" xOffset="226"/>
+    <component base="dotaccentcomb.case" xOffset="238"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/G_e-cy.glif
index bdd1eb2a..ee1f84de 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_e-cy.glif
@@ -1,17 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ge-cy" format="2">
-  <advance width="553"/>
+  <advance width="570"/>
   <unicode hex="0413"/>
-  <anchor x="187" y="0" name="bottomright"/>
-  <anchor x="284" y="694" name="top"/>
+  <anchor x="184" y="0" name="bottomright"/>
+  <anchor x="287" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="68" y="0" type="line"/>
-      <point x="244" y="0" type="line"/>
-      <point x="244" y="537" type="line"/>
-      <point x="553" y="537" type="line"/>
-      <point x="553" y="694" type="line"/>
-      <point x="68" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="247" y="0" type="line"/>
+      <point x="247" y="537" type="line"/>
+      <point x="556" y="537" type="line"/>
+      <point x="556" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_edescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/G_edescender-cy.glif
index ac8ed9d6..e36c0ca7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_edescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_edescender-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gedescender-cy" format="2">
-  <advance width="553"/>
+  <advance width="570"/>
   <unicode hex="04F6"/>
   <outline>
     <component base="Ge-cy"/>
-    <component base="descender-cy.case" xOffset="91"/>
+    <component base="descender-cy.case" xOffset="88"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_ermandbls.glif b/src/Cantarell-Bold.ufo/glyphs/G_ermandbls.glif
index d0792fe0..029b4a97 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_ermandbls.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_ermandbls.glif
@@ -1,46 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Germandbls" format="2">
-  <advance width="737"/>
+  <advance width="723"/>
   <unicode hex="1E9E"/>
   <outline>
     <contour>
-      <point x="447" y="-10" type="curve" smooth="yes"/>
-      <point x="601" y="-10"/>
-      <point x="707" y="79"/>
-      <point x="707" y="209" type="curve" smooth="yes"/>
-      <point x="707" y="318"/>
-      <point x="632" y="393"/>
-      <point x="506" y="410" type="curve"/>
-      <point x="567" y="384" type="line"/>
-      <point x="666" y="559" type="line"/>
-      <point x="619" y="649"/>
-      <point x="504" y="704"/>
-      <point x="370" y="704" type="curve" smooth="yes"/>
-      <point x="183" y="704"/>
-      <point x="63" y="596"/>
-      <point x="63" y="434" type="curve" smooth="yes"/>
-      <point x="63" y="0" type="line"/>
-      <point x="239" y="0" type="line"/>
-      <point x="239" y="434" type="line" smooth="yes"/>
-      <point x="239" y="507"/>
-      <point x="289" y="554"/>
-      <point x="365" y="554" type="curve" smooth="yes"/>
-      <point x="405" y="554"/>
-      <point x="437" y="541"/>
-      <point x="466" y="513" type="curve"/>
-      <point x="353" y="304" type="line"/>
-      <point x="455" y="289"/>
-      <point x="527" y="252"/>
-      <point x="527" y="200" type="curve" smooth="yes"/>
-      <point x="527" y="163"/>
-      <point x="493" y="140"/>
-      <point x="438" y="140" type="curve" smooth="yes"/>
-      <point x="403" y="140"/>
-      <point x="363" y="149"/>
-      <point x="331" y="164" type="curve"/>
-      <point x="279" y="28" type="line"/>
-      <point x="332" y="3"/>
-      <point x="389" y="-10"/>
+      <point x="441" y="-10" type="curve" smooth="yes"/>
+      <point x="595" y="-10"/>
+      <point x="701" y="79"/>
+      <point x="701" y="209" type="curve" smooth="yes"/>
+      <point x="701" y="318"/>
+      <point x="626" y="393"/>
+      <point x="500" y="410" type="curve"/>
+      <point x="561" y="384" type="line"/>
+      <point x="660" y="559" type="line"/>
+      <point x="613" y="649"/>
+      <point x="498" y="704"/>
+      <point x="364" y="704" type="curve" smooth="yes"/>
+      <point x="177" y="704"/>
+      <point x="57" y="596"/>
+      <point x="57" y="434" type="curve" smooth="yes"/>
+      <point x="57" y="0" type="line"/>
+      <point x="233" y="0" type="line"/>
+      <point x="233" y="434" type="line" smooth="yes"/>
+      <point x="233" y="507"/>
+      <point x="283" y="554"/>
+      <point x="359" y="554" type="curve" smooth="yes"/>
+      <point x="399" y="554"/>
+      <point x="431" y="541"/>
+      <point x="460" y="513" type="curve"/>
+      <point x="347" y="304" type="line"/>
+      <point x="449" y="289"/>
+      <point x="521" y="252"/>
+      <point x="521" y="200" type="curve" smooth="yes"/>
+      <point x="521" y="163"/>
+      <point x="487" y="140"/>
+      <point x="432" y="140" type="curve" smooth="yes"/>
+      <point x="397" y="140"/>
+      <point x="357" y="149"/>
+      <point x="325" y="164" type="curve"/>
+      <point x="273" y="28" type="line"/>
+      <point x="326" y="3"/>
+      <point x="383" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_hemiddlehook-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/G_hemiddlehook-cy.glif
index 77be3b64..1024d894 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_hemiddlehook-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_hemiddlehook-cy.glif
@@ -1,37 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ghemiddlehook-cy" format="2">
-  <advance width="688"/>
+  <advance width="696"/>
   <unicode hex="0494"/>
   <outline>
     <contour>
-      <point x="317" y="-246" type="line"/>
-      <point x="539" y="-205"/>
-      <point x="670" y="-68"/>
-      <point x="670" y="124" type="curve" smooth="yes"/>
-      <point x="670" y="293"/>
-      <point x="568" y="401"/>
-      <point x="409" y="401" type="curve" smooth="yes"/>
-      <point x="299" y="401"/>
-      <point x="199" y="349"/>
-      <point x="144" y="262" type="curve"/>
-      <point x="168" y="159" type="line"/>
-      <point x="202" y="214"/>
-      <point x="271" y="251"/>
-      <point x="341" y="251" type="curve" smooth="yes"/>
-      <point x="437" y="251"/>
-      <point x="496" y="188"/>
-      <point x="496" y="85" type="curve" smooth="yes"/>
-      <point x="496" y="-32"/>
-      <point x="421" y="-116"/>
-      <point x="296" y="-138" type="curve"/>
+      <point x="321" y="-246" type="line"/>
+      <point x="543" y="-205"/>
+      <point x="674" y="-68"/>
+      <point x="674" y="124" type="curve" smooth="yes"/>
+      <point x="674" y="293"/>
+      <point x="572" y="401"/>
+      <point x="413" y="401" type="curve" smooth="yes"/>
+      <point x="303" y="401"/>
+      <point x="203" y="349"/>
+      <point x="148" y="262" type="curve"/>
+      <point x="172" y="159" type="line"/>
+      <point x="206" y="214"/>
+      <point x="275" y="251"/>
+      <point x="345" y="251" type="curve" smooth="yes"/>
+      <point x="441" y="251"/>
+      <point x="500" y="188"/>
+      <point x="500" y="85" type="curve" smooth="yes"/>
+      <point x="500" y="-32"/>
+      <point x="425" y="-116"/>
+      <point x="300" y="-138" type="curve"/>
     </contour>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="237" y="0" type="line"/>
-      <point x="237" y="542" type="line"/>
-      <point x="542" y="542" type="line"/>
-      <point x="542" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="241" y="0" type="line"/>
+      <point x="241" y="542" type="line"/>
+      <point x="546" y="542" type="line"/>
+      <point x="546" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_hestroke-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/G_hestroke-cy.glif
index 190e2726..c560e90f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_hestroke-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_hestroke-cy.glif
@@ -1,21 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ghestroke-cy" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="0492"/>
   <outline>
     <contour>
-      <point x="105" y="0" type="line"/>
-      <point x="281" y="0" type="line"/>
-      <point x="281" y="542" type="line"/>
-      <point x="580" y="542" type="line"/>
-      <point x="580" y="694" type="line"/>
-      <point x="105" y="694" type="line"/>
+      <point x="87" y="0" type="line"/>
+      <point x="263" y="0" type="line"/>
+      <point x="263" y="542" type="line"/>
+      <point x="562" y="542" type="line"/>
+      <point x="562" y="694" type="line"/>
+      <point x="87" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="2" y="267" type="line"/>
-      <point x="433" y="267" type="line"/>
-      <point x="433" y="387" type="line"/>
-      <point x="2" y="387" type="line"/>
+      <point x="-16" y="267" type="line"/>
+      <point x="415" y="267" type="line"/>
+      <point x="415" y="387" type="line"/>
+      <point x="-16" y="387" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Eth</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_heupturn-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/G_heupturn-cy.glif
index 48a2c996..801021f4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_heupturn-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_heupturn-cy.glif
@@ -1,17 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gheupturn-cy" format="2">
-  <advance width="552"/>
+  <advance width="570"/>
   <unicode hex="0490"/>
   <outline>
     <contour>
-      <point x="68" y="0" type="line"/>
-      <point x="244" y="0" type="line"/>
-      <point x="244" y="542" type="line"/>
-      <point x="553" y="542" type="line"/>
-      <point x="553" y="860" type="line"/>
-      <point x="420" y="860" type="line"/>
-      <point x="420" y="694" type="line"/>
-      <point x="68" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="247" y="0" type="line"/>
+      <point x="247" y="542" type="line"/>
+      <point x="556" y="542" type="line"/>
+      <point x="556" y="860" type="line"/>
+      <point x="423" y="860" type="line"/>
+      <point x="423" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_je-cy.glif b/src/Cantarell-Bold.ufo/glyphs/G_je-cy.glif
index 959521e6..c4e899f7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_je-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_je-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gje-cy" format="2">
-  <advance width="553"/>
+  <advance width="570"/>
   <unicode hex="0403"/>
   <outline>
     <component base="Ge-cy"/>
-    <component base="acutecomb.case" xOffset="205"/>
+    <component base="acutecomb.case" xOffset="208"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_macron.glif b/src/Cantarell-Bold.ufo/glyphs/G_macron.glif
index 00c2ba6a..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="712"/>
+  <advance width="730"/>
   <unicode hex="1E20"/>
   <outline>
     <component base="G"/>
-    <component base="macroncomb.case" xOffset="132"/>
+    <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 ca4f6291..87215606 100644
--- a/src/Cantarell-Bold.ufo/glyphs/H_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/H_.glif
@@ -1,32 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="H" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="0048"/>
-  <note>
-H
-</note>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="7" 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="512" y="0" type="line"/>
-      <point x="688" y="0" type="line"/>
-      <point x="688" y="694" type="line"/>
-      <point x="512" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="243" y="0" type="line"/>
-      <point x="243" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="222" y="274" type="line"/>
-      <point x="532" y="274" type="line"/>
-      <point x="532" y="430" type="line"/>
-      <point x="222" y="430" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="247" y="0" type="line"/>
+      <point x="247" y="274" type="line"/>
+      <point x="516" y="274" 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"/>
+      <point x="516" y="430" type="line"/>
+      <point x="247" y="430" type="line"/>
+      <point x="247" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/H_a-cy.glif b/src/Cantarell-Bold.ufo/glyphs/H_a-cy.glif
index 8173abd4..8d4497d3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/H_a-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/H_a-cy.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ha-cy" format="2">
-  <advance width="672"/>
+  <advance width="652"/>
   <unicode hex="0425"/>
-  <anchor x="532" y="0" name="bottomright"/>
+  <anchor x="507" y="0" name="bottomright"/>
   <outline>
     <component base="X"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/H_adescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/H_adescender-cy.glif
index fb193094..04b1bc7d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/H_adescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/H_adescender-cy.glif
@@ -1,13 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hadescender-cy" format="2">
-  <advance width="712"/>
+  <advance width="685"/>
   <unicode hex="04B2"/>
   <outline>
-    <component base="Ha-cy" xOffset="5"/>
-    <component base="descender-cy.case" xOffset="441"/>
+    <component base="Ha-cy"/>
+    <component base="descender-cy.case" xOffset="411"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Ha-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Tse-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Bold.ufo/glyphs/H_ardsign-cy.glif b/src/Cantarell-Bold.ufo/glyphs/H_ardsign-cy.glif
index 30b8ad54..e0d08287 100644
--- a/src/Cantarell-Bold.ufo/glyphs/H_ardsign-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/H_ardsign-cy.glif
@@ -1,32 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hardsign-cy" format="2">
-  <advance width="744"/>
+  <advance width="751"/>
   <unicode hex="042A"/>
-  <anchor x="376" y="694" name="top"/>
+  <anchor x="380" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="187" y="0" type="line"/>
-      <point x="444" y="0" type="line" smooth="yes"/>
-      <point x="622" y="0"/>
-      <point x="727" y="90"/>
-      <point x="727" y="242" type="curve" smooth="yes"/>
-      <point x="727" y="369"/>
-      <point x="634" y="454"/>
-      <point x="495" y="454" type="curve" smooth="yes"/>
-      <point x="300" y="454" type="line"/>
-      <point x="300" y="322" type="line"/>
-      <point x="456" y="322" type="line" smooth="yes"/>
-      <point x="510" y="322"/>
-      <point x="547" y="283"/>
-      <point x="547" y="225" type="curve" smooth="yes"/>
-      <point x="547" y="169"/>
-      <point x="517" y="136"/>
-      <point x="467" y="136" type="curve" smooth="yes"/>
-      <point x="357" y="136" type="line"/>
-      <point x="357" y="694" type="line"/>
-      <point x="10" y="694" type="line"/>
-      <point x="10" y="543" type="line"/>
-      <point x="187" y="543" type="line"/>
+      <point x="191" y="0" type="line"/>
+      <point x="448" y="0" type="line" smooth="yes"/>
+      <point x="626" y="0"/>
+      <point x="731" y="90"/>
+      <point x="731" y="242" type="curve" smooth="yes"/>
+      <point x="731" y="369"/>
+      <point x="638" y="454"/>
+      <point x="499" y="454" type="curve" smooth="yes"/>
+      <point x="304" y="454" type="line"/>
+      <point x="304" y="322" type="line"/>
+      <point x="460" y="322" type="line" smooth="yes"/>
+      <point x="514" y="322"/>
+      <point x="551" y="283"/>
+      <point x="551" y="225" type="curve" smooth="yes"/>
+      <point x="551" y="169"/>
+      <point x="521" y="136"/>
+      <point x="471" y="136" type="curve" smooth="yes"/>
+      <point x="361" y="136" type="line"/>
+      <point x="361" y="694" type="line"/>
+      <point x="14" y="694" type="line"/>
+      <point x="14" y="543" type="line"/>
+      <point x="191" y="543" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|Ge-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Softsign-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/H_bar.glif b/src/Cantarell-Bold.ufo/glyphs/H_bar.glif
index db122da4..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="755"/>
+  <advance width="763"/>
   <unicode hex="0126"/>
   <outline>
     <component base="H"/>
-    <component base="strokelongcomb" xOffset="-63" 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 d245a2d8..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="755"/>
+  <advance width="763"/>
   <unicode hex="1E2A"/>
   <outline>
     <component base="H"/>
-    <component base="brevebelowcomb" xOffset="144"/>
+    <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 0c724021..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="755"/>
+  <advance width="763"/>
   <unicode hex="0124"/>
   <outline>
     <component base="H"/>
-    <component base="circumflexcomb.case" xOffset="178"/>
+    <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 4df9e4d3..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="755"/>
+  <advance width="763"/>
   <unicode hex="1E24"/>
   <outline>
     <component base="H"/>
-    <component base="dotbelowcomb" xOffset="227"/>
+    <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 a1c8cbd0..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="310"/>
+  <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 74b21189..7da31ea2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_.glif
@@ -1,20 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="I" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="0049"/>
-  <note>
-I
-</note>
-  <anchor x="155" y="0" name="bottom"/>
-  <anchor x="196" y="10" name="ogonek"/>
-  <anchor x="155" y="694" name="top"/>
-  <anchor x="24" 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="67" y="0" type="line"/>
-      <point x="243" y="0" type="line"/>
-      <point x="243" y="694" type="line"/>
-      <point x="67" 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>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_a-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_a-cy.glif
index a703a365..29f4737b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_a-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_a-cy.glif
@@ -1,40 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ia-cy" format="2">
-  <advance width="659"/>
+  <advance width="661"/>
   <unicode hex="042F"/>
-  <anchor x="327" y="694" name="top"/>
+  <anchor x="326" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="290" y="231" type="curve" smooth="yes"/>
-      <point x="470" y="231" type="line"/>
-      <point x="470" y="368" type="line"/>
-      <point x="314" y="368" type="line" smooth="yes"/>
-      <point x="257" y="368"/>
-      <point x="216" y="408"/>
-      <point x="216" y="466" type="curve" smooth="yes"/>
-      <point x="216" y="514"/>
-      <point x="245" y="543"/>
-      <point x="290" y="543" type="curve" smooth="yes"/>
-      <point x="470" y="543" type="line"/>
-      <point x="470" y="694" type="line"/>
-      <point x="314" y="694" type="line" smooth="yes"/>
-      <point x="148" y="694"/>
-      <point x="36" y="593"/>
-      <point x="36" y="443" type="curve" smooth="yes"/>
-      <point x="36" y="307"/>
-      <point x="127" y="231"/>
+      <point x="417" y="0" type="line"/>
+      <point x="590" y="0" type="line"/>
+      <point x="590" y="694" type="line"/>
+      <point x="313" y="694" type="line" smooth="yes"/>
+      <point x="147" y="694"/>
+      <point x="35" y="593"/>
+      <point x="35" y="443" type="curve" smooth="yes"/>
+      <point x="35" y="307"/>
+      <point x="126" y="231"/>
+      <point x="289" y="231" type="curve" smooth="yes"/>
+      <point x="469" y="231" type="line"/>
+      <point x="469" y="368" type="line"/>
+      <point x="313" y="368" type="line" smooth="yes"/>
+      <point x="256" y="368"/>
+      <point x="215" y="408"/>
+      <point x="215" y="466" type="curve" smooth="yes"/>
+      <point x="215" y="514"/>
+      <point x="244" y="543"/>
+      <point x="289" y="543" type="curve" smooth="yes"/>
+      <point x="417" y="543" type="line"/>
     </contour>
     <contour>
-      <point x="8" y="0" type="line"/>
-      <point x="216" y="0" type="line"/>
-      <point x="390" y="277" type="line"/>
-      <point x="207" y="277" type="line"/>
-    </contour>
-    <contour>
-      <point x="418" y="0" type="line"/>
-      <point x="591" y="0" type="line"/>
-      <point x="591" y="694" type="line"/>
-      <point x="418" y="694" type="line"/>
+      <point x="7" y="0" type="line"/>
+      <point x="215" y="0" type="line"/>
+      <point x="389" y="277" type="line"/>
+      <point x="206" y="277" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|R</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_acute.glif b/src/Cantarell-Bold.ufo/glyphs/I_acute.glif
index 48db76da..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="310"/>
+  <advance width="318"/>
   <unicode hex="00CD"/>
   <outline>
     <component base="I"/>
-    <component base="acutecomb.case" xOffset="76"/>
+    <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 7d60fb54..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="310"/>
+  <advance width="318"/>
   <unicode hex="012C"/>
   <outline>
     <component base="I"/>
-    <component base="brevecomb.case" xOffset="-78"/>
+    <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 330c4cde..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="310"/>
+  <advance width="318"/>
   <unicode hex="01CF"/>
   <outline>
     <component base="I"/>
-    <component base="caroncomb.case" xOffset="-59"/>
+    <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 b2b8b435..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="310"/>
+  <advance width="318"/>
   <unicode hex="00CE"/>
   <outline>
     <component base="I"/>
-    <component base="circumflexcomb.case" xOffset="-44"/>
+    <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 77902bc3..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="310"/>
+  <advance width="318"/>
   <unicode hex="0208"/>
   <outline>
     <component base="I"/>
-    <component base="dblgravecomb.case" xOffset="-128"/>
+    <component base="dblgravecomb.case" xOffset="-124"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_dieresis-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/I_dieresis-cy.glif
index d0b27f2f..221d3fbb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_dieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_dieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idieresis-cy" format="2">
-  <advance width="770"/>
+  <advance width="778"/>
   <unicode hex="04E4"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="dieresiscomb.case" xOffset="110"/>
+    <component base="dieresiscomb.case" xOffset="114"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_dieresis.glif b/src/Cantarell-Bold.ufo/glyphs/I_dieresis.glif
index 26564e14..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="310"/>
+  <advance width="318"/>
   <unicode hex="00CF"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-120"/>
+    <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 a31341c1..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="310"/>
+  <advance width="318"/>
   <unicode hex="1E2E"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-120"/>
-    <component base="acutecomb.case" xOffset="76" yOffset="212"/>
+    <component base="dieresiscomb.case" xOffset="-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 9fd4b7fe..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="310"/>
+  <advance width="318"/>
   <unicode hex="0130"/>
   <outline>
     <component base="I"/>
-    <component base="dotaccentcomb.case" xOffset="10"/>
+    <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 7718fc14..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="310"/>
+  <advance width="318"/>
   <unicode hex="1ECA"/>
   <outline>
     <component base="I"/>
-    <component base="dotbelowcomb" xOffset="5"/>
+    <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 cf41788e..c69045a1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ie-cy" format="2">
-  <advance width="610"/>
+  <advance width="619"/>
   <unicode hex="0415"/>
-  <anchor x="305" y="694" name="top"/>
   <outline>
     <component base="E"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif
index f8ade2d5..f0e7ff23 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iebreve-cy" format="2">
-  <advance width="610"/>
+  <advance width="619"/>
   <unicode hex="04D6"/>
   <outline>
     <component base="Ie-cy"/>
-    <component base="brevecomb-cy.case" xOffset="72"/>
+    <component base="brevecomb-cy.case" xOffset="84"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif
index eb287def..d1e4618e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iegrave-cy" format="2">
-  <advance width="610"/>
+  <advance width="619"/>
   <unicode hex="0400"/>
   <outline>
     <component base="Ie-cy"/>
-    <component base="gravecomb.case" xOffset="76"/>
+    <component base="gravecomb.case" xOffset="88"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_grave.glif b/src/Cantarell-Bold.ufo/glyphs/I_grave.glif
index 5130e873..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="310"/>
+  <advance width="318"/>
   <unicode hex="00CC"/>
   <outline>
     <component base="I"/>
-    <component base="gravecomb.case" xOffset="-74"/>
+    <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 a377e4a8..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="310"/>
+  <advance width="318"/>
   <unicode hex="1EC8"/>
   <outline>
     <component base="I"/>
-    <component base="hookabovecomb.case"/>
+    <component base="hookabovecomb.case" xOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_i-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_i-cy.glif
index 4d99f7e6..ae6b1c14 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_i-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_i-cy.glif
@@ -1,23 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ii-cy" format="2">
-  <advance width="770"/>
+  <advance width="778"/>
   <unicode hex="0418"/>
-  <anchor x="750" y="0" name="bottomright"/>
-  <anchor x="385" y="694" name="top"/>
+  <anchor x="754" y="0" name="bottomright"/>
+  <anchor x="389" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="254" y="0" type="line"/>
-      <point x="546" y="470" type="line"/>
-      <point x="531" y="480" type="line"/>
-      <point x="531" y="0" type="line"/>
-      <point x="703" y="0" type="line"/>
-      <point x="703" y="694" type="line"/>
-      <point x="512" y="694" type="line"/>
-      <point x="221" y="216" type="line"/>
-      <point x="239" y="206" type="line"/>
-      <point x="239" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="258" y="0" type="line"/>
+      <point x="550" y="470" type="line"/>
+      <point x="535" y="480" type="line"/>
+      <point x="535" y="0" type="line"/>
+      <point x="707" y="0" type="line"/>
+      <point x="707" y="694" type="line"/>
+      <point x="516" y="694" type="line"/>
+      <point x="225" y="216" type="line"/>
+      <point x="243" y="206" type="line"/>
+      <point x="243" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_igrave-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_igrave-cy.glif
index 587e0ab4..7f47d32a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_igrave-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_igrave-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iigrave-cy" format="2">
-  <advance width="770"/>
+  <advance width="778"/>
   <unicode hex="040D"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="gravecomb.case" xOffset="156"/>
+    <component base="gravecomb.case" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_invertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/I_invertedbreve.glif
index c2620e36..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="310"/>
+  <advance width="318"/>
   <unicode hex="020A"/>
   <outline>
     <component base="I"/>
-    <component base="breveinvertedcomb.case" xOffset="-76"/>
+    <component base="breveinvertedcomb.case" xOffset="-72"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_ishort-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_ishort-cy.glif
index ec54d230..9dff08bb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_ishort-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_ishort-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iishort-cy" format="2">
-  <advance width="770"/>
+  <advance width="778"/>
   <unicode hex="0419"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="brevecomb-cy.case" xOffset="152"/>
+    <component base="brevecomb-cy.case" xOffset="156"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_macron-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_macron-cy.glif
index 15968a3f..bfc8319a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_macron-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_macron-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Imacron-cy" format="2">
-  <advance width="770"/>
+  <advance width="778"/>
   <unicode hex="04E2"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="macroncomb.case" xOffset="146"/>
+    <component base="macroncomb.case" xOffset="150"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_macron.glif b/src/Cantarell-Bold.ufo/glyphs/I_macron.glif
index 48ff33f7..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="310"/>
+  <advance width="318"/>
   <unicode hex="012A"/>
   <outline>
     <component base="I"/>
-    <component base="macroncomb.narrow.case" xOffset="-55"/>
+    <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 f65b6679..0f263109 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Io-cy" format="2">
-  <advance width="610"/>
+  <advance width="619"/>
   <unicode hex="0401"/>
   <outline>
     <component base="Ie-cy"/>
-    <component base="dieresiscomb.case" xOffset="30"/>
+    <component base="dieresiscomb.case" xOffset="42"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_ogonek.glif b/src/Cantarell-Bold.ufo/glyphs/I_ogonek.glif
index f387b58e..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="310"/>
+  <advance width="318"/>
   <unicode hex="012E"/>
   <outline>
     <component base="I"/>
-    <component base="ogonekcomb.narrow" xOffset="-239"/>
+    <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 ad1fc263..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="310"/>
+  <advance width="318"/>
   <unicode hex="0128"/>
   <outline>
     <component base="I"/>
-    <component base="tildecomb.case" xOffset="-74"/>
+    <component base="tildecomb.case" xOffset="-70"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_u-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_u-cy.glif
index 485247f6..4291cf17 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_u-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_u-cy.glif
@@ -1,48 +1,56 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iu-cy" format="2">
-  <advance width="1072"/>
+  <advance width="1087"/>
   <unicode hex="042E"/>
-  <anchor x="536" y="694" name="top"/>
+  <anchor x="540" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="682" y="-10" type="curve" smooth="yes"/>
-      <point x="902" y="-10"/>
-      <point x="1046" y="133"/>
-      <point x="1046" y="351" type="curve" smooth="yes"/>
-      <point x="1046" y="565"/>
-      <point x="906" y="704"/>
-      <point x="691" y="704" type="curve" smooth="yes"/>
-      <point x="476" y="704"/>
-      <point x="344" y="567"/>
-      <point x="344" y="342" type="curve" smooth="yes"/>
-      <point x="344" y="122"/>
-      <point x="470" y="-10"/>
+      <point x="686" y="-10" type="curve" smooth="yes"/>
+      <point x="906" y="-10"/>
+      <point x="1050" y="133"/>
+      <point x="1050" y="351" type="curve" smooth="yes"/>
+      <point x="1050" y="565"/>
+      <point x="910" y="704"/>
+      <point x="695" y="704" type="curve" smooth="yes"/>
+      <point x="480" y="704"/>
+      <point x="348" y="567"/>
+      <point x="348" y="342" type="curve" smooth="yes"/>
+      <point x="348" y="122"/>
+      <point x="474" y="-10"/>
     </contour>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="243" y="0" type="line"/>
-      <point x="243" y="694" type="line"/>
-      <point x="67" 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="222" y="274" type="line"/>
-      <point x="434" y="274" type="line"/>
-      <point x="434" y="430" type="line"/>
-      <point x="222" y="430" type="line"/>
+      <point x="226" y="274" type="line"/>
+      <point x="438" y="274" type="line"/>
+      <point x="438" y="430" type="line"/>
+      <point x="226" y="430" type="line"/>
     </contour>
     <contour>
-      <point x="693" y="140" type="curve" smooth="yes"/>
-      <point x="586" y="140"/>
-      <point x="519" y="221"/>
-      <point x="519" y="351" type="curve" smooth="yes"/>
-      <point x="519" y="479"/>
-      <point x="581" y="554"/>
-      <point x="685" y="554" type="curve" smooth="yes"/>
-      <point x="794" y="554"/>
-      <point x="866" y="469"/>
-      <point x="866" y="342" type="curve" smooth="yes"/>
-      <point x="866" y="219"/>
-      <point x="798" y="140"/>
+      <point x="697" y="140" type="curve" smooth="yes"/>
+      <point x="590" y="140"/>
+      <point x="523" y="221"/>
+      <point x="523" y="351" type="curve" smooth="yes"/>
+      <point x="523" y="479"/>
+      <point x="585" y="554"/>
+      <point x="689" y="554" type="curve" smooth="yes"/>
+      <point x="798" y="554"/>
+      <point x="870" y="469"/>
+      <point x="870" y="342" type="curve" smooth="yes"/>
+      <point x="870" y="219"/>
+      <point x="802" y="140"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_zhitsa-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_zhitsa-cy.glif
index 9983763d..a4e62116 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_zhitsa-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_zhitsa-cy.glif
@@ -1,23 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Izhitsa-cy" format="2">
-  <advance width="730"/>
+  <advance width="719"/>
   <unicode hex="0474"/>
   <outline>
     <contour>
-      <point x="246" y="0" type="line"/>
-      <point x="431" y="0" type="line"/>
-      <point x="574" y="430" type="line" smooth="yes"/>
-      <point x="599" y="506"/>
-      <point x="645" y="541"/>
-      <point x="722" y="541" type="curve"/>
-      <point x="701" y="704" type="line"/>
-      <point x="558" y="704"/>
-      <point x="464" y="636"/>
-      <point x="428" y="506" type="curve" smooth="yes"/>
-      <point x="323" y="131" type="line"/>
-      <point x="368" y="131" type="line"/>
-      <point x="203" y="694" type="line"/>
-      <point x="1" y="694" type="line"/>
+      <point x="244" y="0" type="line"/>
+      <point x="429" y="0" type="line"/>
+      <point x="572" y="430" type="line" smooth="yes"/>
+      <point x="597" y="506"/>
+      <point x="643" y="541"/>
+      <point x="720" y="541" type="curve"/>
+      <point x="699" y="704" type="line"/>
+      <point x="556" y="704"/>
+      <point x="462" y="636"/>
+      <point x="426" y="506" type="curve" smooth="yes"/>
+      <point x="321" y="131" type="line"/>
+      <point x="366" y="131" type="line"/>
+      <point x="201" y="694" type="line"/>
+      <point x="-1" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>V</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/J_.glif b/src/Cantarell-Bold.ufo/glyphs/J_.glif
index dd672482..d20e178e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/J_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/J_.glif
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="J" format="2">
-  <advance width="455"/>
+  <advance width="454"/>
   <unicode hex="004A"/>
-  <note>
-J
-</note>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="310" y="694" name="top"/>
+  <anchor x="230" y="0" name="bottom"/>
+  <anchor x="306" 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="154" y="-10" type="curve" smooth="yes"/>
+      <point x="307" y="-10"/>
+      <point x="395" y="83"/>
+      <point x="395" y="243" type="curve" smooth="yes"/>
+      <point x="395" y="694" type="line"/>
+      <point x="221" y="694" type="line"/>
+      <point x="221" y="233" type="line" smooth="yes"/>
+      <point x="221" y="173"/>
+      <point x="193" y="143"/>
+      <point x="138" y="143" type="curve" smooth="yes"/>
+      <point x="110" y="143"/>
+      <point x="75" y="151"/>
+      <point x="49" y="162" type="curve"/>
+      <point x="0" y="26" type="line"/>
+      <point x="44" y="2"/>
+      <point x="97" 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 1741c3d4..990080d7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/J_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/J_acute.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Jacute" format="2">
-  <advance width="455"/>
+  <advance width="454"/>
   <outline>
     <component base="J"/>
-    <component base="acutecomb.case" xOffset="231"/>
+    <component base="acutecomb.case" xOffset="227"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/J_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/J_circumflex.glif
index 1472cf9b..7756c101 100644
--- a/src/Cantarell-Bold.ufo/glyphs/J_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/J_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Jcircumflex" format="2">
-  <advance width="455"/>
+  <advance width="454"/>
   <unicode hex="0134"/>
   <outline>
     <component base="J"/>
-    <component base="circumflexcomb.case" xOffset="111"/>
+    <component base="circumflexcomb.case" xOffset="107"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/J_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/J_e-cy.glif
index 390fcc00..3724f4e7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/J_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/J_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Je-cy" format="2">
-  <advance width="455"/>
+  <advance width="454"/>
   <unicode hex="0408"/>
   <outline>
     <component base="J"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_.glif b/src/Cantarell-Bold.ufo/glyphs/K_.glif
index 0a1fe60e..f7bc3672 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_.glif
@@ -1,27 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="K" format="2">
-  <advance width="686"/>
+  <advance width="691"/>
   <unicode hex="004B"/>
-  <note>
-K
-</note>
-  <anchor x="338" y="0" name="bottom"/>
-  <anchor x="338" y="694" name="top"/>
+  <anchor x="341" y="0" name="bottom"/>
+  <anchor x="341" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="466" y="0" type="line"/>
-      <point x="698" y="0" type="line"/>
-      <point x="431" y="394" type="line"/>
-      <point x="434" y="360" type="line"/>
-      <point x="682" y="694" type="line"/>
-      <point x="473" y="694" type="line"/>
-      <point x="233" 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="68" y="0" type="line"/>
-      <point x="246" y="0" type="line"/>
-      <point x="246" y="694" type="line"/>
-      <point x="68" 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>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_a-cy.glif b/src/Cantarell-Bold.ufo/glyphs/K_a-cy.glif
index a6aab2a1..d759f083 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_a-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_a-cy.glif
@@ -1,30 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ka-cy" format="2">
-  <advance width="681"/>
+  <advance width="701"/>
   <unicode hex="041A"/>
-  <anchor x="554" y="0" name="bottomright"/>
-  <anchor x="325" y="694" name="top"/>
+  <anchor x="548" y="0" name="bottomright"/>
+  <anchor x="329" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="494" y="0" type="line"/>
-      <point x="691" y="0" type="line"/>
-      <point x="466" y="393" type="line"/>
-      <point x="469" y="360" type="line"/>
-      <point x="683" y="694" type="line"/>
-      <point x="493" y="694" type="line"/>
-      <point x="288" y="363" type="line"/>
+      <point x="498" y="0" type="line"/>
+      <point x="695" y="0" type="line"/>
+      <point x="470" y="393" type="line"/>
+      <point x="473" y="360" type="line"/>
+      <point x="687" y="694" type="line"/>
+      <point x="497" y="694" type="line"/>
+      <point x="292" y="363" type="line"/>
     </contour>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="242" y="0" type="line"/>
-      <point x="242" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="246" y="0" type="line"/>
+      <point x="246" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="140" y="285" type="line"/>
-      <point x="344" y="285" type="line"/>
-      <point x="344" y="437" type="line"/>
-      <point x="140" y="437" type="line"/>
+      <point x="144" y="285" type="line"/>
+      <point x="348" y="285" type="line"/>
+      <point x="348" y="437" type="line"/>
+      <point x="144" y="437" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_abashkir-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/K_abashkir-cy.glif
index 40c28de9..4cca3d33 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_abashkir-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_abashkir-cy.glif
@@ -1,38 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kabashkir-cy" format="2">
-  <advance width="774"/>
+  <advance width="807"/>
   <unicode hex="04A0"/>
   <outline>
     <contour>
-      <point x="-3" y="542" type="line"/>
-      <point x="335" y="542" type="line"/>
-      <point x="335" y="694" type="line"/>
-      <point x="-3" y="694" type="line"/>
+      <point x="604" y="0" type="line"/>
+      <point x="801" y="0" type="line"/>
+      <point x="576" y="393" type="line"/>
+      <point x="579" y="360" type="line"/>
+      <point x="793" y="694" type="line"/>
+      <point x="603" y="694" type="line"/>
+      <point x="398" y="363" type="line"/>
     </contour>
     <contour>
-      <point x="587" y="0" type="line"/>
-      <point x="784" y="0" type="line"/>
-      <point x="559" y="393" type="line"/>
-      <point x="562" y="360" type="line"/>
-      <point x="776" y="694" type="line"/>
-      <point x="586" y="694" type="line"/>
-      <point x="381" y="363" type="line"/>
+      <point x="177" y="0" type="line"/>
+      <point x="352" y="0" type="line"/>
+      <point x="352" y="694" type="line"/>
+      <point x="14" y="694" type="line"/>
+      <point x="14" y="542" type="line"/>
+      <point x="177" y="542" type="line"/>
     </contour>
     <contour>
-      <point x="160" y="0" type="line"/>
-      <point x="335" y="0" type="line"/>
-      <point x="335" y="694" type="line"/>
-      <point x="160" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="233" y="285" type="line"/>
-      <point x="437" y="285" type="line"/>
-      <point x="437" y="437" type="line"/>
-      <point x="233" y="437" type="line"/>
+      <point x="250" y="285" type="line"/>
+      <point x="454" y="285" type="line"/>
+      <point x="454" y="437" type="line"/>
+      <point x="250" y="437" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|Ge-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>Ka-cy</string>
     </dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_acute.glif b/src/Cantarell-Bold.ufo/glyphs/K_acute.glif
index 8bb30acd..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="686"/>
+  <advance width="691"/>
   <unicode hex="1E30"/>
   <outline>
     <component base="K"/>
-    <component base="acutecomb.case" xOffset="259"/>
+    <component base="acutecomb.case" xOffset="262"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_adescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/K_adescender-cy.glif
index d091308c..6d26d3b6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_adescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_adescender-cy.glif
@@ -1,13 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kadescender-cy" format="2">
-  <advance width="730"/>
+  <advance width="718"/>
   <unicode hex="049A"/>
   <outline>
     <component base="Ka-cy"/>
-    <component base="descender-cy.case" xOffset="458"/>
+    <component base="descender-cy.case" xOffset="452"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Ka-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_averticalstroke-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/K_averticalstroke-cy.glif
index dd12f184..d310e09a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_averticalstroke-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_averticalstroke-cy.glif
@@ -1,34 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kaverticalstroke-cy" format="2">
-  <advance width="719"/>
+  <advance width="737"/>
   <unicode hex="049C"/>
   <outline>
     <contour>
-      <point x="530" y="0" type="line"/>
-      <point x="727" y="0" type="line"/>
-      <point x="522" y="393" type="line"/>
-      <point x="525" y="360" type="line"/>
-      <point x="719" y="694" type="line"/>
-      <point x="529" y="694" type="line"/>
-      <point x="344" y="363" type="line"/>
+      <point x="534" y="0" type="line"/>
+      <point x="731" y="0" type="line"/>
+      <point x="526" y="393" type="line"/>
+      <point x="529" y="360" type="line"/>
+      <point x="723" y="694" type="line"/>
+      <point x="533" y="694" type="line"/>
+      <point x="348" y="363" type="line"/>
     </contour>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="242" y="0" type="line"/>
-      <point x="242" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="246" y="0" type="line"/>
+      <point x="246" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="151" y="285" type="line"/>
-      <point x="400" y="285" type="line"/>
-      <point x="400" y="437" type="line"/>
-      <point x="151" y="437" type="line"/>
+      <point x="155" y="285" type="line"/>
+      <point x="404" y="285" type="line"/>
+      <point x="404" y="437" type="line"/>
+      <point x="155" y="437" type="line"/>
     </contour>
     <contour>
-      <point x="281" y="169" type="line"/>
-      <point x="371" y="169" type="line"/>
-      <point x="371" y="555" type="line"/>
-      <point x="281" y="555" type="line"/>
+      <point x="285" y="169" type="line"/>
+      <point x="375" y="169" type="line"/>
+      <point x="375" y="555" type="line"/>
+      <point x="285" y="555" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Ka-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_commaaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/K_commaaccent.glif
index 193eff06..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="686"/>
+  <advance width="691"/>
   <unicode hex="0136"/>
   <outline>
     <component base="K"/>
-    <component base="commaaccentcomb" xOffset="220"/>
+    <component base="commaaccentcomb" xOffset="223"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_je-cy.glif b/src/Cantarell-Bold.ufo/glyphs/K_je-cy.glif
index d6467974..6c4f0cd1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_je-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_je-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kje-cy" format="2">
-  <advance width="681"/>
+  <advance width="701"/>
   <unicode hex="040C"/>
   <outline>
     <component base="Ka-cy"/>
-    <component base="acutecomb.case" xOffset="246"/>
+    <component base="acutecomb.case" xOffset="250"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_.glif b/src/Cantarell-Bold.ufo/glyphs/L_.glif
index 981f4acd..7c140a7f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_.glif
@@ -1,23 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="L" format="2">
-  <advance width="537"/>
+  <advance width="558"/>
   <unicode hex="004C"/>
-  <note>
-L
-</note>
-  <anchor x="268" y="0" name="bottom"/>
-  <anchor x="166" y="377" name="center"/>
-  <anchor x="537" y="352" name="periodcentered"/>
-  <anchor x="152" y="694" name="top"/>
-  <anchor x="367" 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="67" y="0" type="line"/>
-      <point x="527" y="0" type="line"/>
-      <point x="527" y="153" type="line"/>
-      <point x="240" y="153" type="line"/>
-      <point x="240" y="694" type="line"/>
-      <point x="67" 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>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_J_.glif b/src/Cantarell-Bold.ufo/glyphs/L_J_.glif
index 8dc46854..0c7f4437 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="992"/>
+  <advance width="1012"/>
   <unicode hex="01C7"/>
   <outline>
     <component base="L"/>
-    <component base="J" xOffset="537"/>
+    <component base="J" xOffset="558"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_acute.glif b/src/Cantarell-Bold.ufo/glyphs/L_acute.glif
index ed193d76..38d4ef92 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="537"/>
+  <advance width="558"/>
   <unicode hex="0139"/>
   <outline>
     <component base="L"/>
-    <component base="acutecomb.case" xOffset="73"/>
+    <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 cb916d30..3018cf57 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="537"/>
+  <advance width="558"/>
   <unicode hex="013D"/>
   <outline>
     <component base="L"/>
-    <component base="caroncomb.alt" xOffset="244" 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 3fbe4c55..00a40750 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="537"/>
+  <advance width="558"/>
   <unicode hex="013B"/>
   <outline>
     <component base="L"/>
-    <component base="commaaccentcomb" xOffset="150"/>
+    <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 7aeda72c..4f034ef7 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="537"/>
+  <advance width="558"/>
   <unicode hex="013F"/>
   <outline>
     <component base="L"/>
-    <component base="periodcentered.loclCAT.case" xOffset="537"/>
+    <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 dd2ee9e1..41f0d2eb 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="537"/>
+  <advance width="558"/>
   <unicode hex="1E36"/>
   <outline>
     <component base="L"/>
-    <component base="dotbelowcomb" xOffset="118"/>
+    <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 ea452b2d..3e4c435b 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="824"/>
+  <advance width="855"/>
   <unicode hex="01C8"/>
   <outline>
     <component base="L"/>
-    <component base="j" xOffset="537"/>
+    <component base="j" xOffset="558"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_je-cy.glif b/src/Cantarell-Bold.ufo/glyphs/L_je-cy.glif
index 5c549035..6a4837cd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_je-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_je-cy.glif
@@ -1,55 +1,57 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lje-cy" format="2">
-  <advance width="1131"/>
+  <advance width="1123"/>
   <unicode hex="0409"/>
   <outline>
     <contour>
-      <point x="661" y="0" type="line"/>
-      <point x="825" y="0" type="line" smooth="yes"/>
-      <point x="996" y="0"/>
-      <point x="1116" y="98"/>
-      <point x="1116" y="237" type="curve" smooth="yes"/>
-      <point x="1116" y="364"/>
-      <point x="1023" y="444"/>
-      <point x="876" y="444" type="curve" smooth="yes"/>
-      <point x="674" y="444" type="line"/>
-      <point x="674" y="312" type="line"/>
-      <point x="838" y="312" type="line" smooth="yes"/>
-      <point x="896" y="312"/>
-      <point x="936" y="274"/>
-      <point x="936" y="220" type="curve" smooth="yes"/>
-      <point x="936" y="168"/>
-      <point x="903" y="136"/>
-      <point x="848" y="136" type="curve" smooth="yes"/>
-      <point x="661" y="136" type="line"/>
+      <point x="137" y="-10" type="curve" smooth="yes"/>
+      <point x="287" y="-10"/>
+      <point x="360" y="86"/>
+      <point x="360" y="284" type="curve" smooth="yes"/>
+      <point x="360" y="542" type="line"/>
+      <point x="548" y="542" type="line"/>
+      <point x="548" y="0" type="line"/>
+      <point x="719" y="0" type="line"/>
+      <point x="719" y="694" type="line"/>
+      <point x="196" y="694" type="line"/>
+      <point x="196" y="250" type="line" smooth="yes"/>
+      <point x="196" y="181"/>
+      <point x="165" y="143"/>
+      <point x="108" y="143" type="curve" smooth="yes"/>
+      <point x="86" y="143"/>
+      <point x="63" y="149"/>
+      <point x="46" y="160" type="curve"/>
+      <point x="0" y="31" type="line"/>
+      <point x="37" y="4"/>
+      <point x="79" y="-10"/>
     </contour>
     <contour>
-      <point x="150" y="-10" type="curve" smooth="yes"/>
-      <point x="300" y="-10"/>
-      <point x="373" y="86"/>
-      <point x="373" y="284" type="curve" smooth="yes"/>
-      <point x="373" y="543" type="line"/>
-      <point x="561" y="543" type="line"/>
-      <point x="561" y="0" type="line"/>
-      <point x="732" y="0" type="line"/>
-      <point x="732" y="694" type="line"/>
-      <point x="209" y="694" type="line"/>
-      <point x="209" y="250" type="line" smooth="yes"/>
-      <point x="209" y="181"/>
-      <point x="178" y="143"/>
-      <point x="121" y="143" type="curve" smooth="yes"/>
-      <point x="99" y="143"/>
-      <point x="76" y="149"/>
-      <point x="59" y="160" type="curve"/>
-      <point x="13" y="31" type="line"/>
-      <point x="50" y="4"/>
-      <point x="92" y="-10"/>
+      <point x="648" y="0" type="line"/>
+      <point x="812" y="0" type="line" smooth="yes"/>
+      <point x="983" y="0"/>
+      <point x="1103" y="98"/>
+      <point x="1103" y="237" type="curve" smooth="yes"/>
+      <point x="1103" y="364"/>
+      <point x="1010" y="444"/>
+      <point x="863" y="444" type="curve" smooth="yes"/>
+      <point x="661" y="444" type="line"/>
+      <point x="661" y="312" type="line"/>
+      <point x="825" y="312" type="line" smooth="yes"/>
+      <point x="883" y="312"/>
+      <point x="923" y="274"/>
+      <point x="923" y="220" type="curve" smooth="yes"/>
+      <point x="923" y="168"/>
+      <point x="890" y="136"/>
+      <point x="835" y="136" type="curve" smooth="yes"/>
+      <point x="648" y="136" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>El-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Softsign-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_linebelow.glif b/src/Cantarell-Bold.ufo/glyphs/L_linebelow.glif
index 5190ba03..1d5354ed 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="537"/>
+  <advance width="558"/>
   <unicode hex="1E3A"/>
   <outline>
     <component base="L"/>
-    <component base="macronbelowcomb" xOffset="23"/>
+    <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 65a0e8ca..ab528fb3 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="537"/>
+  <advance width="558"/>
   <unicode hex="0141"/>
   <outline>
     <component base="L"/>
-    <component base="slashshortcomb.case" xOffset="-61" 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 6516feda..23ab8ea2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/M_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/M_.glif
@@ -1,30 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="M" format="2">
-  <advance width="892"/>
+  <advance width="900"/>
   <unicode hex="004D"/>
-  <note>
-M
-</note>
-  <anchor x="447" y="0" name="bottom"/>
-  <anchor x="447" y="694" name="top"/>
+  <anchor x="451" y="0" name="bottom"/>
+  <anchor x="451" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="235" y="0" type="line"/>
-      <point x="235" y="458" type="line"/>
-      <point x="214" y="431" type="line"/>
-      <point x="379" y="107" type="line"/>
-      <point x="510" y="107" type="line"/>
-      <point x="668" y="431" type="line"/>
-      <point x="657" y="453" type="line"/>
-      <point x="657" y="0" type="line"/>
-      <point x="825" y="0" type="line"/>
-      <point x="825" y="694" type="line"/>
-      <point x="660" y="694" type="line"/>
-      <point x="419" y="222" type="line"/>
-      <point x="490" y="222" type="line"/>
-      <point x="234" y="694" type="line"/>
-      <point x="67" 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>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/M_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/M_dotbelow.glif
index 55b0c16a..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="892"/>
+  <advance width="900"/>
   <unicode hex="1E42"/>
   <outline>
     <component base="M"/>
-    <component base="dotbelowcomb" xOffset="297"/>
+    <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 92e3cd76..adefadc6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/N_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/N_.glif
@@ -1,26 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="N" format="2">
-  <advance width="780"/>
+  <advance width="788"/>
   <unicode hex="004E"/>
-  <note>
-N
-</note>
-  <anchor x="389" y="0" name="bottom"/>
-  <anchor x="389" y="694" name="top"/>
+  <anchor x="393" y="0" name="bottom"/>
+  <anchor x="393" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="231" y="0" type="line"/>
-      <point x="231" y="480" type="line"/>
-      <point x="222" y="470" type="line"/>
-      <point x="519" y="0" type="line"/>
-      <point x="713" y="0" type="line"/>
-      <point x="713" y="694" type="line"/>
-      <point x="547" y="694" type="line"/>
-      <point x="545" y="206" type="line"/>
-      <point x="561" y="216" type="line"/>
-      <point x="265" y="694" type="line"/>
-      <point x="67" 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>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_J_.glif b/src/Cantarell-Bold.ufo/glyphs/N_J_.glif
index ed63dc93..07c8fa49 100644
--- a/src/Cantarell-Bold.ufo/glyphs/N_J_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/N_J_.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="NJ" format="2">
-  <advance width="1235"/>
+  <advance width="1242"/>
   <unicode hex="01CA"/>
   <outline>
     <component base="N"/>
-    <component base="J" xOffset="780"/>
+    <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 25ed5e4d..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="780"/>
+  <advance width="788"/>
   <unicode hex="0143"/>
   <outline>
     <component base="N"/>
-    <component base="acutecomb.case" xOffset="310"/>
+    <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 fe9c492a..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="780"/>
+  <advance width="788"/>
   <unicode hex="0147"/>
   <outline>
     <component base="N"/>
-    <component base="caroncomb.case" xOffset="175"/>
+    <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 4c3a4f13..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="780"/>
+  <advance width="788"/>
   <unicode hex="0145"/>
   <outline>
     <component base="N"/>
-    <component base="commaaccentcomb" xOffset="271"/>
+    <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 2f673bd1..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="780"/>
+  <advance width="788"/>
   <unicode hex="1E44"/>
   <outline>
     <component base="N"/>
-    <component base="dotaccentcomb.case" xOffset="244"/>
+    <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 64082c07..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="780"/>
+  <advance width="788"/>
   <unicode hex="1E46"/>
   <outline>
     <component base="N"/>
-    <component base="dotbelowcomb" xOffset="239"/>
+    <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 4557b9e2..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="1067"/>
+  <advance width="1085"/>
   <unicode hex="01CB"/>
   <outline>
     <component base="N"/>
-    <component base="j" xOffset="780"/>
+    <component base="j" xOffset="788"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_je-cy.glif b/src/Cantarell-Bold.ufo/glyphs/N_je-cy.glif
index c3f65b9e..ef0088b6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/N_je-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/N_je-cy.glif
@@ -1,45 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nje-cy" format="2">
-  <advance width="1082"/>
+  <advance width="1091"/>
   <unicode hex="040A"/>
   <outline>
     <contour>
-      <point x="647" y="0" type="line"/>
-      <point x="776" y="0" type="line" smooth="yes"/>
-      <point x="947" y="0"/>
-      <point x="1067" y="98"/>
-      <point x="1067" y="237" type="curve" smooth="yes"/>
-      <point x="1067" y="364"/>
-      <point x="974" y="444"/>
-      <point x="827" y="444" type="curve" smooth="yes"/>
-      <point x="625" y="444" type="line"/>
-      <point x="625" y="312" type="line"/>
-      <point x="789" y="312" type="line" smooth="yes"/>
-      <point x="847" y="312"/>
-      <point x="887" y="274"/>
-      <point x="887" y="220" type="curve" smooth="yes"/>
-      <point x="887" y="168"/>
-      <point x="854" y="136"/>
-      <point x="799" y="136" type="curve" smooth="yes"/>
-      <point x="647" y="136" type="line"/>
+      <point x="651" y="0" type="line"/>
+      <point x="780" y="0" type="line" smooth="yes"/>
+      <point x="955" y="0"/>
+      <point x="1071" y="92"/>
+      <point x="1071" y="229" type="curve" smooth="yes"/>
+      <point x="1071" y="354"/>
+      <point x="980" y="430"/>
+      <point x="831" y="430" type="curve" smooth="yes"/>
+      <point x="629" y="430" type="line"/>
+      <point x="629" y="294" type="line"/>
+      <point x="793" y="294" type="line" smooth="yes"/>
+      <point x="856" y="294"/>
+      <point x="891" y="265"/>
+      <point x="891" y="214" type="curve" smooth="yes"/>
+      <point x="891" y="165"/>
+      <point x="859" y="137"/>
+      <point x="803" y="137" type="curve" smooth="yes"/>
+      <point x="651" y="137" type="line"/>
     </contour>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="243" y="0" type="line"/>
-      <point x="243" y="694" type="line"/>
-      <point x="67" 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="222" y="274" type="line"/>
-      <point x="532" y="274" type="line"/>
-      <point x="532" y="430" type="line"/>
-      <point x="222" 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>
     <contour>
-      <point x="512" y="0" type="line"/>
-      <point x="688" y="0" type="line"/>
-      <point x="688" y="694" type="line"/>
-      <point x="512" 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>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Softsign-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_linebelow.glif b/src/Cantarell-Bold.ufo/glyphs/N_linebelow.glif
index c5b4754a..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="780"/>
+  <advance width="788"/>
   <unicode hex="1E48"/>
   <outline>
     <component base="N"/>
-    <component base="macronbelowcomb" xOffset="144"/>
+    <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 d771cc22..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="780"/>
+  <advance width="788"/>
   <unicode hex="00D1"/>
   <outline>
     <component base="N"/>
-    <component base="tildecomb.case" xOffset="160"/>
+    <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 1854468a..032301f3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="O-cy" format="2">
-  <advance width="760"/>
+  <advance width="782"/>
   <unicode hex="041E"/>
-  <anchor x="380" y="694" name="top"/>
   <outline>
     <component base="O"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_.glif b/src/Cantarell-Bold.ufo/glyphs/O_.glif
index 66b50b47..c53d9d02 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_.glif
@@ -1,45 +1,48 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="O" format="2">
-  <advance width="760"/>
+  <advance width="782"/>
   <unicode hex="004F"/>
-  <note>
-O
-</note>
-  <anchor x="564" y="141" name="Qtail"/>
-  <anchor x="380" y="0" name="bottom"/>
-  <anchor x="403" y="347" name="center"/>
-  <anchor x="465" y="10" name="ogonek"/>
-  <anchor x="380" y="694" name="top"/>
-  <anchor x="83" y="694" name="topleft"/>
-  <anchor x="626" 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="373" y="-10" type="curve" smooth="yes"/>
-      <point x="590" y="-10"/>
-      <point x="734" y="134"/>
-      <point x="734" y="351" type="curve" smooth="yes"/>
-      <point x="734" y="563"/>
-      <point x="594" y="704"/>
-      <point x="384" y="704" type="curve" smooth="yes"/>
-      <point x="169" y="704"/>
-      <point x="26" y="559"/>
-      <point x="26" y="341" type="curve" smooth="yes"/>
-      <point x="26" y="130"/>
-      <point x="165" 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="384" y="140" type="curve" smooth="yes"/>
-      <point x="277" y="140"/>
-      <point x="206" y="224"/>
-      <point x="206" y="351" type="curve" smooth="yes"/>
-      <point x="206" y="473"/>
-      <point x="273" y="554"/>
-      <point x="373" y="554" type="curve" smooth="yes"/>
-      <point x="482" y="554"/>
-      <point x="554" y="469"/>
-      <point x="554" y="341" type="curve" smooth="yes"/>
-      <point x="554" y="220"/>
-      <point x="486" y="140"/>
+      <point x="395" y="142" type="curve" smooth="yes"/>
+      <point x="288" y="142"/>
+      <point x="219" y="224"/>
+      <point x="219" y="351" type="curve" smooth="yes"/>
+      <point x="219" y="473"/>
+      <point x="284" y="552"/>
+      <point x="384" y="552" type="curve" smooth="yes"/>
+      <point x="493" y="552"/>
+      <point x="563" y="469"/>
+      <point x="563" y="341" type="curve" smooth="yes"/>
+      <point x="563" y="220"/>
+      <point x="497" y="142"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_E_.glif b/src/Cantarell-Bold.ufo/glyphs/O_E_.glif
index 3caf32bc..b9369b88 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_E_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_E_.glif
@@ -1,61 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="OE" format="2">
-  <advance width="1043"/>
+  <advance width="1059"/>
   <unicode hex="0152"/>
-  <anchor x="605" y="0" name="bottom"/>
-  <anchor x="605" y="694" name="top"/>
+  <anchor x="616" y="0" name="bottom"/>
+  <anchor x="616" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="404" y="-10" type="curve" smooth="yes"/>
-      <point x="482" y="-10"/>
-      <point x="555" y="7"/>
-      <point x="610" y="38" type="curve"/>
-      <point x="519" y="167" type="line"/>
-      <point x="491" y="150"/>
-      <point x="455" y="140"/>
-      <point x="413" y="140" type="curve" smooth="yes"/>
-      <point x="289" y="140"/>
-      <point x="206" y="224"/>
-      <point x="206" y="351" type="curve" smooth="yes"/>
-      <point x="206" y="473"/>
-      <point x="283" y="554"/>
-      <point x="403" y="554" type="curve" smooth="yes"/>
-      <point x="443" y="554"/>
-      <point x="480" y="545"/>
-      <point x="510" y="528" type="curve"/>
-      <point x="610" y="660" type="line"/>
-      <point x="557" y="688"/>
-      <point x="488" y="704"/>
-      <point x="413" y="704" type="curve" smooth="yes"/>
-      <point x="180" y="704"/>
-      <point x="26" y="559"/>
-      <point x="26" y="341" type="curve" smooth="yes"/>
-      <point x="26" y="130"/>
-      <point x="176" y="-10"/>
+      <point x="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="500" y="0" type="line"/>
-      <point x="673" y="0" type="line"/>
-      <point x="673" y="694" type="line"/>
-      <point x="500" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="580" y="0" type="line"/>
-      <point x="998" y="0" type="line"/>
-      <point x="998" y="152" type="line"/>
-      <point x="580" y="152" type="line"/>
-    </contour>
-    <contour>
-      <point x="580" y="278" type="line"/>
-      <point x="970" y="278" type="line"/>
-      <point x="970" y="430" type="line"/>
-      <point x="580" y="430" type="line"/>
-    </contour>
-    <contour>
-      <point x="580" y="542" type="line"/>
-      <point x="998" y="542" type="line"/>
-      <point x="998" y="694" type="line"/>
-      <point x="580" y="694" type="line"/>
+      <point x="511" y="0" type="line"/>
+      <point x="1009" y="0" type="line"/>
+      <point x="1009" y="152" type="line"/>
+      <point x="684" y="152" type="line"/>
+      <point x="684" y="278" type="line"/>
+      <point x="981" y="278" type="line"/>
+      <point x="981" y="430" type="line"/>
+      <point x="684" y="430" type="line"/>
+      <point x="684" y="542" type="line"/>
+      <point x="1009" y="542" type="line"/>
+      <point x="1009" y="694" type="line"/>
+      <point x="511" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_acute.glif b/src/Cantarell-Bold.ufo/glyphs/O_acute.glif
index 2a5a9638..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="760"/>
+  <advance width="782"/>
   <unicode hex="00D3"/>
   <outline>
     <component base="O"/>
-    <component base="acutecomb.case" xOffset="301"/>
+    <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 3713125c..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="760"/>
+  <advance width="782"/>
   <unicode hex="04E8"/>
   <outline>
     <component base="O"/>
-    <component base="_bar-cy" xOffset="-37" 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 385d9427..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="760"/>
+  <advance width="782"/>
   <unicode hex="014E"/>
   <outline>
     <component base="O"/>
-    <component base="brevecomb.case" xOffset="147"/>
+    <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 90b28b2f..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="760"/>
+  <advance width="782"/>
   <unicode hex="01D1"/>
   <outline>
     <component base="O"/>
-    <component base="caroncomb.case" xOffset="166"/>
+    <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 61b9761d..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="760"/>
+  <advance width="782"/>
   <unicode hex="00D4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb.case" xOffset="181"/>
+    <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 856453d5..b4f78940 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_circumflexacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_circumflexacute.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexacute" format="2">
-  <advance width="760"/>
+  <advance width="782"/>
   <unicode hex="1ED0"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="193" yOffset="4"/>
+    <component base="circumflexcomb.loclVIET" xOffset="187" yOffset="204"/>
+    <component base="acutecomb.loclVIET" xOffset="482" yOffset="327"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_circumflexdotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_circumflexdotbelow.glif
index 6a1a7f88..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="760"/>
+  <advance width="782"/>
   <unicode hex="1ED8"/>
   <outline>
     <component base="O"/>
-    <component base="dotbelowcomb" xOffset="230"/>
-    <component base="circumflexcomb.case" xOffset="181"/>
+    <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 40d4910a..10404ae0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_circumflexgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_circumflexgrave.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexgrave" format="2">
-  <advance width="760"/>
+  <advance width="782"/>
   <unicode hex="1ED2"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="193" yOffset="4"/>
+    <component base="circumflexcomb.loclVIET" xOffset="187" yOffset="204"/>
+    <component base="gravecomb.loclVIET" xOffset="392" yOffset="327"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_circumflexhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_circumflexhookabove.glif
index f68705c8..7d09ee7f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_circumflexhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_circumflexhookabove.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexhookabove" format="2">
-  <advance width="760"/>
+  <advance width="782"/>
   <unicode hex="1ED4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="193" yOffset="4"/>
+    <component base="circumflexcomb.loclVIET" xOffset="187" yOffset="204"/>
+    <component base="hookabovecomb.loclVIET" xOffset="415" yOffset="326"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_circumflextilde.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_circumflextilde.glif
index 3c58eba7..6829854f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_circumflextilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_circumflextilde.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflextilde" format="2">
-  <advance width="760"/>
+  <advance width="782"/>
   <unicode hex="1ED6"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="173" yOffset="4"/>
+    <component base="circumflexcomb.loclVIET" xOffset="187" yOffset="204"/>
+    <component base="tildecomb.loclVIET" xOffset="173" yOffset="344"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>tildecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_dblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/O_dblgrave.glif
index 2c7c2d8c..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="760"/>
+  <advance width="782"/>
   <unicode hex="020C"/>
   <outline>
     <component base="O"/>
-    <component base="dblgravecomb.case" xOffset="97"/>
+    <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 4e539815..25db07b0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_dieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_dieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odieresis-cy" format="2">
-  <advance width="760"/>
+  <advance width="782"/>
   <unicode hex="04E6"/>
   <outline>
     <component base="O-cy"/>
-    <component base="dieresiscomb.case" xOffset="105"/>
+    <component base="dieresiscomb.case" xOffset="116"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_dieresis.glif b/src/Cantarell-Bold.ufo/glyphs/O_dieresis.glif
index 8a54662a..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="760"/>
+  <advance width="782"/>
   <unicode hex="00D6"/>
   <outline>
     <component base="O"/>
-    <component base="dieresiscomb.case" xOffset="105"/>
+    <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 8bb3b188..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="760"/>
+  <advance width="782"/>
   <unicode hex="022A"/>
   <outline>
     <component base="O"/>
-    <component base="dieresiscomb.case" xOffset="105"/>
-    <component base="macroncomb.case" xOffset="141" yOffset="212"/>
+    <component base="dieresiscomb.case" xOffset="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 6ffba30d..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="760"/>
+  <advance width="782"/>
   <unicode hex="0230"/>
   <outline>
     <component base="O"/>
-    <component base="dotaccentcomb.case" xOffset="235"/>
-    <component base="macroncomb.case" xOffset="141" yOffset="252"/>
+    <component base="dotaccentcomb.case" xOffset="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 bad7c678..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="760"/>
+  <advance width="782"/>
   <unicode hex="1ECC"/>
   <outline>
     <component base="O"/>
-    <component base="dotbelowcomb" xOffset="230"/>
+    <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 16e58f9f..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="760"/>
+  <advance width="782"/>
   <unicode hex="00D2"/>
   <outline>
     <component base="O"/>
-    <component base="gravecomb.case" xOffset="151"/>
+    <component base="gravecomb.case" xOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_hm.glif b/src/Cantarell-Bold.ufo/glyphs/O_hm.glif
index 7deb47b7..6e535510 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_hm.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_hm.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohm" format="2">
-  <advance width="791"/>
+  <advance width="815"/>
   <unicode hex="2126"/>
   <outline>
     <contour>
-      <point x="56" y="0" type="line"/>
-      <point x="345" y="0" type="line"/>
-      <point x="345" y="115" type="line"/>
-      <point x="278" y="175"/>
-      <point x="234" y="286"/>
-      <point x="234" y="393" type="curve" smooth="yes"/>
-      <point x="234" y="490"/>
-      <point x="296" y="554"/>
-      <point x="388" y="554" type="curve" smooth="yes"/>
-      <point x="487" y="554"/>
-      <point x="554" y="487"/>
-      <point x="554" y="387" type="curve" smooth="yes"/>
-      <point x="554" y="292"/>
-      <point x="509" y="181"/>
-      <point x="442" y="115" type="curve"/>
-      <point x="442" y="0" type="line"/>
-      <point x="738" y="0" type="line"/>
-      <point x="738" y="156" type="line"/>
-      <point x="596" y="156" type="line"/>
-      <point x="680" y="194"/>
-      <point x="734" y="291"/>
-      <point x="734" y="397" type="curve" smooth="yes"/>
-      <point x="734" y="581"/>
-      <point x="600" y="704"/>
-      <point x="397" y="704" type="curve" smooth="yes"/>
-      <point x="193" y="704"/>
-      <point x="54" y="576"/>
-      <point x="54" y="383" type="curve" smooth="yes"/>
-      <point x="54" y="277"/>
-      <point x="108" y="187"/>
-      <point x="189" y="156" type="curve"/>
-      <point x="56" y="156" type="line"/>
+      <point x="68" y="0" type="line"/>
+      <point x="357" y="0" type="line"/>
+      <point x="357" y="115" type="line"/>
+      <point x="290" y="175"/>
+      <point x="246" y="286"/>
+      <point x="246" y="393" type="curve" smooth="yes"/>
+      <point x="246" y="490"/>
+      <point x="308" y="554"/>
+      <point x="400" y="554" type="curve" smooth="yes"/>
+      <point x="499" y="554"/>
+      <point x="566" y="487"/>
+      <point x="566" y="387" type="curve" smooth="yes"/>
+      <point x="566" y="292"/>
+      <point x="521" y="181"/>
+      <point x="454" y="115" type="curve"/>
+      <point x="454" y="0" type="line"/>
+      <point x="750" y="0" type="line"/>
+      <point x="750" y="156" type="line"/>
+      <point x="608" y="156" type="line"/>
+      <point x="692" y="194"/>
+      <point x="746" y="291"/>
+      <point x="746" y="397" type="curve" smooth="yes"/>
+      <point x="746" y="581"/>
+      <point x="612" y="704"/>
+      <point x="409" y="704" type="curve" smooth="yes"/>
+      <point x="205" y="704"/>
+      <point x="66" y="576"/>
+      <point x="66" y="383" type="curve" smooth="yes"/>
+      <point x="66" y="277"/>
+      <point x="120" y="187"/>
+      <point x="201" y="156" type="curve"/>
+      <point x="68" y="156" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_hookabove.glif b/src/Cantarell-Bold.ufo/glyphs/O_hookabove.glif
index ab0844b3..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="760"/>
+  <advance width="782"/>
   <unicode hex="1ECE"/>
   <outline>
     <component base="O"/>
-    <component base="hookabovecomb.case" xOffset="225"/>
+    <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 60ba8f55..0a04f0a9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_horn.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_horn.glif
@@ -1,13 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorn" format="2">
-  <advance width="842"/>
+  <advance width="864"/>
   <unicode hex="01A0"/>
   <outline>
     <component base="O"/>
-    <component base="horncomb" xOffset="555" yOffset="212"/>
+    <component base="horncomb" xOffset="566" yOffset="212"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
       <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
       <string>=+82</string>
     </dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_hornacute.glif b/src/Cantarell-Bold.ufo/glyphs/O_hornacute.glif
index 1ac6fb0e..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="842"/>
+  <advance width="864"/>
   <unicode hex="1EDA"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="acutecomb.case" xOffset="301"/>
+    <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 8a93fe08..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="842"/>
+  <advance width="864"/>
   <unicode hex="1EE2"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="dotbelowcomb" xOffset="230"/>
+    <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 bc68950b..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="842"/>
+  <advance width="864"/>
   <unicode hex="1EDC"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="gravecomb.case" xOffset="151"/>
+    <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 a56c8512..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="842"/>
+  <advance width="864"/>
   <unicode hex="1EDE"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="hookabovecomb.case" xOffset="225"/>
+    <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 fd0f9c9e..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="842"/>
+  <advance width="864"/>
   <unicode hex="1EE0"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="tildecomb.case" xOffset="151"/>
+    <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 c1194923..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="760"/>
+  <advance width="782"/>
   <unicode hex="0150"/>
   <outline>
     <component base="O"/>
-    <component base="hungarumlautcomb.case" xOffset="142"/>
+    <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 7b83c5b3..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="760"/>
+  <advance width="782"/>
   <unicode hex="020E"/>
   <outline>
     <component base="O"/>
-    <component base="breveinvertedcomb.case" xOffset="149"/>
+    <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 79f91fff..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="760"/>
+  <advance width="782"/>
   <unicode hex="014C"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="141"/>
+    <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 05a70995..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="760"/>
+  <advance width="782"/>
   <unicode hex="1E52"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="141"/>
-    <component base="acutecomb.case" xOffset="301" yOffset="208"/>
+    <component base="macroncomb.case" xOffset="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 8004b74a..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="760"/>
+  <advance width="782"/>
   <unicode hex="1E50"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="141"/>
-    <component base="gravecomb.case" xOffset="151" yOffset="208"/>
+    <component base="macroncomb.case" xOffset="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 819efcb8..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="760"/>
+  <advance width="782"/>
   <unicode hex="01EA"/>
   <outline>
     <component base="O"/>
-    <component base="ogonekcomb.tall.case" xOffset="5"/>
+    <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 70406dfa..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="760"/>
+  <advance width="782"/>
   <unicode hex="00D8"/>
   <outline>
     <component base="O"/>
-    <component base="slashlongcomb.case" xOffset="92" 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 462acbac..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="760"/>
+  <advance width="782"/>
   <unicode hex="01FE"/>
   <outline>
     <component base="Oslash"/>
-    <component base="acutecomb.case" xOffset="301"/>
+    <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 4d259d10..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="760"/>
+  <advance width="782"/>
   <unicode hex="00D5"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="151"/>
+    <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 ce3e890f..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="760"/>
+  <advance width="782"/>
   <unicode hex="1E4C"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="151"/>
-    <component base="acutecomb.case" xOffset="301" yOffset="245"/>
+    <component base="tildecomb.case" xOffset="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 c244f48d..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="760"/>
+  <advance width="782"/>
   <unicode hex="1E4E"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="151"/>
-    <component base="dieresiscomb.case" xOffset="105" yOffset="245"/>
+    <component base="tildecomb.case" xOffset="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 e2eacc48..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="760"/>
+  <advance width="782"/>
   <unicode hex="022C"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="151"/>
-    <component base="macroncomb.case" xOffset="141" yOffset="245"/>
+    <component base="tildecomb.case" xOffset="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 d463fb94..ad55151a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/P_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/P_.glif
@@ -1,38 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="P" format="2">
-  <advance width="626"/>
+  <advance width="625"/>
   <unicode hex="0050"/>
-  <note>
-P
-</note>
-  <anchor x="325" y="0" name="bottom"/>
-  <anchor x="325" y="694" name="top"/>
+  <anchor x="329" y="0" name="bottom"/>
+  <anchor x="329" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="240" y="0" type="line"/>
-      <point x="240" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="176" y="204" type="line"/>
-      <point x="297" y="204" type="line" smooth="yes"/>
-      <point x="485" y="204"/>
-      <point x="609" y="307"/>
-      <point x="609" y="463" type="curve" smooth="yes"/>
-      <point x="609" y="608"/>
-      <point x="503" y="694"/>
-      <point x="326" y="694" type="curve" smooth="yes"/>
-      <point x="176" y="694" type="line"/>
-      <point x="176" y="542" type="line"/>
-      <point x="312" y="542" type="line" smooth="yes"/>
-      <point x="382" y="542"/>
-      <point x="429" y="504"/>
-      <point x="429" y="446" type="curve" smooth="yes"/>
-      <point x="429" y="390"/>
-      <point x="390" y="356"/>
-      <point x="328" y="356" type="curve" smooth="yes"/>
-      <point x="176" y="356" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="244" y="0" type="line"/>
+      <point x="244" 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"/>
+      <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="71" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/P_alochka-cy.glif b/src/Cantarell-Bold.ufo/glyphs/P_alochka-cy.glif
index 549d42b6..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="310"/>
+  <advance width="318"/>
   <unicode hex="04C0"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/P_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/P_e-cy.glif
index 5265ab31..82e770da 100644
--- a/src/Cantarell-Bold.ufo/glyphs/P_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/P_e-cy.glif
@@ -1,18 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Pe-cy" format="2">
-  <advance width="736"/>
+  <advance width="744"/>
   <unicode hex="041F"/>
-  <anchor x="716" y="0" name="bottomright"/>
+  <anchor x="720" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="238" y="0" type="line"/>
-      <point x="238" y="543" type="line"/>
-      <point x="498" y="543" type="line"/>
-      <point x="498" y="0" type="line"/>
-      <point x="669" y="0" type="line"/>
-      <point x="669" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="242" y="0" type="line"/>
+      <point x="242" y="540" type="line"/>
+      <point x="502" y="540" type="line"/>
+      <point x="502" y="0" type="line"/>
+      <point x="673" y="0" type="line"/>
+      <point x="673" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Q_.glif b/src/Cantarell-Bold.ufo/glyphs/Q_.glif
index c99f67ae..383eb753 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Q_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Q_.glif
@@ -1,46 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Q" format="2">
-  <advance width="760"/>
+  <advance width="792"/>
   <unicode hex="0051"/>
-  <note>
-Q
-</note>
-  <anchor x="380" y="0" name="bottom"/>
-  <anchor x="380" y="694" name="top"/>
+  <anchor x="391" y="0" name="bottom"/>
+  <anchor x="391" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="373" y="-10" type="curve" smooth="yes"/>
-      <point x="590" y="-10"/>
-      <point x="734" y="134"/>
-      <point x="734" y="351" type="curve" smooth="yes"/>
-      <point x="734" y="563"/>
-      <point x="594" y="704"/>
-      <point x="384" y="704" type="curve" smooth="yes"/>
-      <point x="169" y="704"/>
-      <point x="26" y="559"/>
-      <point x="26" y="341" type="curve" smooth="yes"/>
-      <point x="26" y="130"/>
-      <point x="165" 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="384" y="140" type="curve" smooth="yes"/>
-      <point x="271" y="140"/>
-      <point x="204" y="218"/>
-      <point x="204" y="351" type="curve" smooth="yes"/>
-      <point x="204" y="479"/>
-      <point x="267" y="554"/>
-      <point x="373" y="554" type="curve" smooth="yes"/>
-      <point x="488" y="554"/>
-      <point x="556" y="475"/>
-      <point x="556" y="341" type="curve" smooth="yes"/>
-      <point x="556" y="215"/>
-      <point x="492" y="140"/>
+      <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>
     <contour>
-      <point x="644" y="-63" type="line"/>
-      <point x="752" y="38" type="line"/>
-      <point x="427" y="348" type="line"/>
-      <point x="323" y="245" type="line"/>
+      <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>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Q_a-cy.glif b/src/Cantarell-Bold.ufo/glyphs/Q_a-cy.glif
index 520862d2..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="760"/>
+  <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 e5f01620..25ead669 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_.glif
@@ -1,44 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="R" format="2">
-  <advance width="663"/>
+  <advance width="671"/>
   <unicode hex="0052"/>
-  <note>
-R
-</note>
-  <anchor x="324" y="0" name="bottom"/>
-  <anchor x="324" y="694" name="top"/>
+  <anchor x="328" y="0" name="bottom"/>
+  <anchor x="328" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="240" y="0" type="line"/>
-      <point x="240" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="244" y="0" type="line"/>
+      <point x="244" 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"/>
+      <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="71" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="188" y="237" type="line"/>
-      <point x="329" y="237" type="line" smooth="yes"/>
-      <point x="499" y="237"/>
-      <point x="612" y="338"/>
-      <point x="612" y="484" type="curve" smooth="yes"/>
-      <point x="612" y="618"/>
-      <point x="516" y="694"/>
-      <point x="353" y="694" type="curve" smooth="yes"/>
-      <point x="188" y="694" type="line"/>
-      <point x="188" y="543" type="line"/>
-      <point x="329" y="543" type="line" smooth="yes"/>
-      <point x="394" y="543"/>
-      <point x="432" y="512"/>
-      <point x="432" y="460" type="curve" smooth="yes"/>
-      <point x="432" y="413"/>
-      <point x="404" y="384"/>
-      <point x="353" y="384" type="curve" smooth="yes"/>
-      <point x="188" y="384" type="line"/>
-    </contour>
-    <contour>
-      <point x="452" y="0" type="line"/>
-      <point x="660" y="0" type="line"/>
-      <point x="472" y="297" type="line"/>
-      <point x="283" 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>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_acute.glif b/src/Cantarell-Bold.ufo/glyphs/R_acute.glif
index 037f0697..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="663"/>
+  <advance width="671"/>
   <unicode hex="0154"/>
   <outline>
     <component base="R"/>
-    <component base="acutecomb.case" xOffset="245"/>
+    <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 95721bb8..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="663"/>
+  <advance width="671"/>
   <unicode hex="0158"/>
   <outline>
     <component base="R"/>
-    <component base="caroncomb.case" xOffset="110"/>
+    <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 6f3b66c0..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="663"/>
+  <advance width="671"/>
   <unicode hex="0156"/>
   <outline>
     <component base="R"/>
-    <component base="commaaccentcomb" xOffset="206"/>
+    <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 dccaa447..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="663"/>
+  <advance width="671"/>
   <unicode hex="0210"/>
   <outline>
     <component base="R"/>
-    <component base="dblgravecomb.case" xOffset="41"/>
+    <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 b5a7ac08..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="663"/>
+  <advance width="671"/>
   <unicode hex="1E5A"/>
   <outline>
     <component base="R"/>
-    <component base="dotbelowcomb" xOffset="174"/>
+    <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 e9daee8e..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="663"/>
+  <advance width="671"/>
   <unicode hex="0212"/>
   <outline>
     <component base="R"/>
-    <component base="breveinvertedcomb.case" xOffset="93"/>
+    <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 32a4a31f..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="663"/>
+  <advance width="671"/>
   <unicode hex="1E5E"/>
   <outline>
     <component base="R"/>
-    <component base="macronbelowcomb" xOffset="79"/>
+    <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 7dbb155e..438a4eb9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_.glif
@@ -1,46 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="S" format="2">
-  <advance width="584"/>
+  <advance width="593"/>
   <unicode hex="0053"/>
-  <note>
-S
-</note>
-  <anchor x="291" y="0" name="bottom"/>
-  <anchor x="284" y="694" name="top"/>
+  <anchor x="295" y="0" name="bottom"/>
+  <anchor x="288" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="274" y="-10" type="curve" smooth="yes"/>
-      <point x="458" y="-10"/>
-      <point x="560" y="78"/>
-      <point x="560" y="217" type="curve" smooth="yes"/>
-      <point x="560" y="472"/>
-      <point x="217" y="395"/>
-      <point x="217" y="498" type="curve" smooth="yes"/>
-      <point x="217" y="533"/>
-      <point x="256" y="552"/>
-      <point x="324" y="552" type="curve" smooth="yes"/>
-      <point x="380" y="552"/>
-      <point x="442" y="542"/>
-      <point x="491" y="525" type="curve"/>
-      <point x="539" y="663" type="line"/>
-      <point x="481" y="689"/>
-      <point x="404" y="704"/>
-      <point x="333" y="704" type="curve" smooth="yes"/>
-      <point x="157" y="704"/>
-      <point x="37" y="612"/>
-      <point x="37" y="472" type="curve" smooth="yes"/>
-      <point x="37" y="236"/>
-      <point x="378" y="303"/>
-      <point x="378" y="196" type="curve" smooth="yes"/>
-      <point x="378" y="164"/>
-      <point x="348" y="146"/>
-      <point x="281" y="146" type="curve" smooth="yes"/>
-      <point x="218" y="146"/>
-      <point x="142" y="158"/>
-      <point x="73" y="187" type="curve"/>
-      <point x="25" y="45" type="line"/>
-      <point x="96" y="13"/>
-      <point x="188" 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 ba1622d6..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="584"/>
+  <advance width="593"/>
   <unicode hex="015A"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="205"/>
+    <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 965a11ef..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="584"/>
+  <advance width="593"/>
   <unicode hex="1E64"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="205"/>
-    <component base="dotaccentcomb.case" xOffset="42" 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 d5a563b9..a1788623 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_altillo.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_altillo.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Saltillo" format="2">
-  <advance width="290"/>
+  <advance width="332"/>
   <unicode hex="A78B"/>
   <outline>
-    <component base="quotesingle" xScale="1.04" yScale="2.16474" yOffset="-808"/>
+    <component base="quotesingle" xScale="1.04" yScale="2.16474" xOffset="18" yOffset="-808"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_caron.glif b/src/Cantarell-Bold.ufo/glyphs/S_caron.glif
index afe1e229..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="584"/>
+  <advance width="593"/>
   <unicode hex="0160"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="70"/>
+    <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 a110f196..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="584"/>
+  <advance width="593"/>
   <unicode hex="1E66"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="70"/>
-    <component base="dotaccentcomb.case" xOffset="174" 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 a95bdf95..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="584"/>
+  <advance width="593"/>
   <unicode hex="015E"/>
   <outline>
     <component base="S"/>
-    <component base="cedillacomb" xOffset="133"/>
+    <component base="cedillacomb" xOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_chwa-cy.glif b/src/Cantarell-Bold.ufo/glyphs/S_chwa-cy.glif
index f0ab2852..0bd968cc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_chwa-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_chwa-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Schwa-cy" format="2">
-  <advance width="741"/>
+  <advance width="733"/>
   <unicode hex="04D8"/>
   <outline>
     <component base="Schwa"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_chwa.glif b/src/Cantarell-Bold.ufo/glyphs/S_chwa.glif
index 2f68d48d..71d04b59 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_chwa.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_chwa.glif
@@ -1,42 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Schwa" format="2">
-  <advance width="741"/>
+  <advance width="733"/>
   <unicode hex="018F"/>
-  <anchor x="376" y="0" name="bottom"/>
-  <anchor x="376" y="694" name="top"/>
+  <anchor x="369" y="0" name="bottom"/>
+  <anchor x="369" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="317" y="704" type="curve" smooth="yes"/>
-      <point x="227" y="704"/>
-      <point x="140" y="685"/>
-      <point x="60" y="648" type="curve"/>
-      <point x="99" y="517" type="line"/>
-      <point x="159" y="541"/>
-      <point x="225" y="554"/>
-      <point x="288" y="554" type="curve" smooth="yes"/>
-      <point x="444" y="554"/>
-      <point x="523" y="483"/>
-      <point x="523" y="315" type="curve" smooth="yes"/>
-      <point x="523" y="192"/>
-      <point x="469" y="140"/>
-      <point x="363" y="140" type="curve" smooth="yes"/>
-      <point x="267" y="140"/>
-      <point x="211" y="180"/>
-      <point x="211" y="272" type="curve"/>
-      <point x="552" y="272" type="line"/>
-      <point x="552" y="414" type="line"/>
-      <point x="53" y="414" type="line"/>
-      <point x="48" y="370"/>
-      <point x="45" y="324"/>
-      <point x="45" y="280" type="curve" smooth="yes"/>
-      <point x="45" y="105"/>
-      <point x="163" y="-10"/>
-      <point x="350" y="-10" type="curve" smooth="yes"/>
-      <point x="560" y="-10"/>
-      <point x="703" y="133"/>
-      <point x="703" y="350" type="curve" smooth="yes"/>
-      <point x="703" y="571"/>
-      <point x="556" y="704"/>
+      <point x="343" y="-10" type="curve" smooth="yes"/>
+      <point x="553" y="-10"/>
+      <point x="696" y="133"/>
+      <point x="696" y="350" type="curve" smooth="yes"/>
+      <point x="696" y="571"/>
+      <point x="549" y="704"/>
+      <point x="310" y="704" type="curve" smooth="yes"/>
+      <point x="220" y="704"/>
+      <point x="133" y="685"/>
+      <point x="53" y="648" type="curve"/>
+      <point x="92" y="517" type="line"/>
+      <point x="152" y="541"/>
+      <point x="218" y="554"/>
+      <point x="281" y="554" type="curve" smooth="yes"/>
+      <point x="437" y="554"/>
+      <point x="516" y="483"/>
+      <point x="516" y="315" type="curve" smooth="yes"/>
+      <point x="516" y="192"/>
+      <point x="462" y="140"/>
+      <point x="356" y="140" type="curve" smooth="yes"/>
+      <point x="260" y="140"/>
+      <point x="204" y="180"/>
+      <point x="204" y="272" type="curve"/>
+      <point x="545" y="272" type="line"/>
+      <point x="545" y="414" type="line"/>
+      <point x="46" y="414" type="line"/>
+      <point x="41" y="370"/>
+      <point x="38" y="324"/>
+      <point x="38" y="280" type="curve" smooth="yes"/>
+      <point x="38" y="105"/>
+      <point x="156" y="-10"/>
     </contour>
   </outline>
   <lib>
@@ -48,6 +48,8 @@
         <key>width</key>
         <integer>148</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>O</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/S_circumflex.glif
index 81ea403b..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="584"/>
+  <advance width="593"/>
   <unicode hex="015C"/>
   <outline>
     <component base="S"/>
-    <component base="circumflexcomb.case" xOffset="85"/>
+    <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 ffd370e9..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="584"/>
+  <advance width="593"/>
   <unicode hex="0218"/>
   <outline>
     <component base="S"/>
-    <component base="commaaccentcomb" xOffset="173"/>
+    <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 6dc1b529..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="584"/>
+  <advance width="593"/>
   <unicode hex="1E60"/>
   <outline>
     <component base="S"/>
-    <component base="dotaccentcomb.case" xOffset="139"/>
+    <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 0ed8d610..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="584"/>
+  <advance width="593"/>
   <unicode hex="1E62"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="141"/>
+    <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 09552a4b..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="584"/>
+  <advance width="593"/>
   <unicode hex="1E68"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="141"/>
-    <component base="dotaccentcomb.case" xOffset="139"/>
+    <component base="dotbelowcomb" xOffset="145"/>
+    <component base="dotaccentcomb.case" xOffset="143"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_ha-cy.glif b/src/Cantarell-Bold.ufo/glyphs/S_ha-cy.glif
index d8fd96e4..1311e6af 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_ha-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_ha-cy.glif
@@ -1,23 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sha-cy" format="2">
-  <advance width="1065"/>
+  <advance width="1073"/>
   <unicode hex="0428"/>
+  <anchor x="939" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="998" y="0" type="line"/>
-      <point x="998" y="694" type="line"/>
-      <point x="827" y="694" type="line"/>
-      <point x="827" y="151" type="line"/>
-      <point x="238" y="151" type="line"/>
-      <point x="238" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="1002" y="0" type="line"/>
+      <point x="1002" y="694" type="line"/>
+      <point x="831" y="694" type="line"/>
+      <point x="831" y="151" type="line"/>
+      <point x="242" y="151" type="line"/>
+      <point x="242" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="447" y="62" type="line"/>
-      <point x="618" y="62" type="line"/>
-      <point x="618" y="694" type="line"/>
-      <point x="447" y="694" type="line"/>
+      <point x="451" y="62" type="line"/>
+      <point x="622" y="62" type="line"/>
+      <point x="622" y="694" type="line"/>
+      <point x="451" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_hcha-cy.glif b/src/Cantarell-Bold.ufo/glyphs/S_hcha-cy.glif
index 995e5be0..1431467e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_hcha-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_hcha-cy.glif
@@ -1,29 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Shcha-cy" format="2">
-  <advance width="1141"/>
+  <advance width="1117"/>
   <unicode hex="0429"/>
   <outline>
-    <contour>
-      <point x="969" y="-187" type="line"/>
-      <point x="1131" y="-187" type="line"/>
-      <point x="1131" y="151" type="line"/>
-      <point x="237" y="151" type="line"/>
-      <point x="237" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
-      <point x="67" y="0" type="line"/>
-      <point x="969" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="447" y="72" type="line"/>
-      <point x="617" y="72" type="line"/>
-      <point x="617" y="694" type="line"/>
-      <point x="447" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="828" y="72" type="line"/>
-      <point x="998" y="72" type="line"/>
-      <point x="998" y="694" type="line"/>
-      <point x="828" y="694" type="line"/>
-    </contour>
+    <component base="Sha-cy"/>
+    <component base="descender-cy.case" xOffset="843"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Tse-cy</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>-1</integer>
+        <integer>0</integer>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_hha-cy.glif b/src/Cantarell-Bold.ufo/glyphs/S_hha-cy.glif
index c39bd403..fc703a8c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_hha-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_hha-cy.glif
@@ -1,31 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Shha-cy" format="2">
-  <advance width="651"/>
+  <advance width="656"/>
   <unicode hex="04BA"/>
   <outline>
     <contour>
-      <point x="451" y="0" type="line"/>
-      <point x="623" y="0" type="line"/>
-      <point x="623" y="233" type="line" smooth="yes"/>
-      <point x="623" y="360"/>
-      <point x="537" y="435"/>
-      <point x="401" y="435" type="curve" smooth="yes"/>
-      <point x="318" y="435"/>
-      <point x="237" y="406"/>
-      <point x="181" y="356" type="curve"/>
-      <point x="204" y="253" type="line"/>
-      <point x="246" y="274"/>
-      <point x="292" y="285"/>
-      <point x="340" y="285" type="curve" smooth="yes"/>
-      <point x="413" y="285"/>
-      <point x="451" y="259"/>
-      <point x="451" y="204" type="curve" smooth="yes"/>
+      <point x="456" y="0" type="line"/>
+      <point x="628" y="0" type="line"/>
+      <point x="628" y="233" type="line" smooth="yes"/>
+      <point x="628" y="360"/>
+      <point x="542" y="435"/>
+      <point x="406" y="435" type="curve" smooth="yes"/>
+      <point x="323" y="435"/>
+      <point x="242" y="406"/>
+      <point x="186" y="356" type="curve"/>
+      <point x="209" y="253" type="line"/>
+      <point x="251" y="274"/>
+      <point x="297" y="285"/>
+      <point x="345" y="285" type="curve" smooth="yes"/>
+      <point x="418" y="285"/>
+      <point x="456" y="259"/>
+      <point x="456" y="204" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="66" y="0" type="line"/>
-      <point x="236" y="0" type="line"/>
-      <point x="236" y="660" type="line"/>
-      <point x="66" y="660" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="241" y="0" type="line"/>
+      <point x="241" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_oftsign-cy.glif b/src/Cantarell-Bold.ufo/glyphs/S_oftsign-cy.glif
index 13ebd78f..11bac6bb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_oftsign-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_oftsign-cy.glif
@@ -1,29 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Softsign-cy" format="2">
-  <advance width="638"/>
+  <advance width="646"/>
   <unicode hex="042C"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="331" y="0" type="line" smooth="yes"/>
-      <point x="513" y="0"/>
-      <point x="622" y="90"/>
-      <point x="622" y="241" type="curve" smooth="yes"/>
-      <point x="622" y="369"/>
-      <point x="525" y="454"/>
-      <point x="382" y="454" type="curve" smooth="yes"/>
-      <point x="180" y="454" type="line"/>
-      <point x="180" y="322" type="line"/>
-      <point x="344" y="322" type="line" smooth="yes"/>
-      <point x="403" y="322"/>
-      <point x="442" y="283"/>
-      <point x="442" y="224" type="curve" smooth="yes"/>
-      <point x="442" y="169"/>
-      <point x="409" y="136"/>
-      <point x="354" y="136" type="curve" smooth="yes"/>
-      <point x="237" y="136" type="line"/>
-      <point x="237" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="335" y="0" type="line" smooth="yes"/>
+      <point x="517" y="0"/>
+      <point x="626" y="90"/>
+      <point x="626" y="241" type="curve" smooth="yes"/>
+      <point x="626" y="369"/>
+      <point x="529" y="454"/>
+      <point x="386" y="454" type="curve" smooth="yes"/>
+      <point x="184" y="454" type="line"/>
+      <point x="184" y="322" type="line"/>
+      <point x="348" y="322" type="line" smooth="yes"/>
+      <point x="407" y="322"/>
+      <point x="446" y="283"/>
+      <point x="446" y="224" type="curve" smooth="yes"/>
+      <point x="446" y="169"/>
+      <point x="413" y="136"/>
+      <point x="358" y="136" type="curve" smooth="yes"/>
+      <point x="241" y="136" type="line"/>
+      <point x="241" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_.glif b/src/Cantarell-Bold.ufo/glyphs/T_.glif
index 01947b2b..3720faed 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_.glif
@@ -1,25 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="T" format="2">
-  <advance width="620"/>
+  <advance width="614"/>
   <unicode hex="0054"/>
-  <note>
-T
-</note>
-  <anchor x="311" y="0" name="bottom"/>
-  <anchor x="310" y="327" name="center"/>
-  <anchor x="309" 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="224" y="0" type="line"/>
-      <point x="394" y="0" type="line"/>
-      <point x="394" y="660" type="line"/>
-      <point x="224" y="660" type="line"/>
-    </contour>
-    <contour>
-      <point x="10" y="542" type="line"/>
-      <point x="610" y="542" type="line"/>
-      <point x="610" y="694" type="line"/>
-      <point x="10" y="694" type="line"/>
+      <point x="221" y="0" type="line"/>
+      <point x="391" y="0" type="line"/>
+      <point x="391" 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"/>
+      <point x="7" y="542" type="line"/>
+      <point x="221" y="542" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_bar.glif b/src/Cantarell-Bold.ufo/glyphs/T_bar.glif
index 4d1c4dc4..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="620"/>
+  <advance width="614"/>
   <unicode hex="0166"/>
   <outline>
     <component base="T"/>
-    <component base="strokeshortcomb.case" xOffset="95" 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 940dcd72..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="620"/>
+  <advance width="614"/>
   <unicode hex="0164"/>
   <outline>
     <component base="T"/>
-    <component base="caroncomb.case" xOffset="95"/>
+    <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 0b264c2a..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="620"/>
+  <advance width="614"/>
   <unicode hex="0162"/>
   <outline>
     <component base="T"/>
-    <component base="cedillacomb" xOffset="153"/>
+    <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 8cf78707..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="620"/>
+  <advance width="614"/>
   <unicode hex="021A"/>
   <outline>
     <component base="T"/>
-    <component base="commaaccentcomb" xOffset="193"/>
+    <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 686ac1ee..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="620"/>
+  <advance width="614"/>
   <unicode hex="1E6C"/>
   <outline>
     <component base="T"/>
-    <component base="dotbelowcomb" xOffset="161"/>
+    <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 c97d4180..50dbb6b3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_e-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Te-cy" format="2">
-  <advance width="620"/>
+  <advance width="614"/>
   <unicode hex="0422"/>
-  <anchor x="600" y="0" name="bottomright"/>
   <outline>
     <component base="T"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_horn.glif b/src/Cantarell-Bold.ufo/glyphs/T_horn.glif
index 481a6680..56fb2f2f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_horn.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_horn.glif
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Thorn" format="2">
-  <advance width="626"/>
+  <advance width="625"/>
   <unicode hex="00DE"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="240" y="0" type="line"/>
-      <point x="240" y="694" type="line"/>
-      <point x="67" y="694" 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>
     <contour>
-      <point x="176" y="116" type="line"/>
-      <point x="312" y="116" type="line" smooth="yes"/>
-      <point x="490" y="116"/>
-      <point x="609" y="216"/>
-      <point x="609" y="365" type="curve" smooth="yes"/>
-      <point x="609" y="510"/>
-      <point x="495" y="606"/>
-      <point x="326" y="606" type="curve" smooth="yes"/>
-      <point x="176" y="606" type="line"/>
-      <point x="176" y="454" type="line"/>
-      <point x="317" y="454" type="line" smooth="yes"/>
-      <point x="385" y="454"/>
-      <point x="429" y="415"/>
-      <point x="429" y="355" type="curve" smooth="yes"/>
-      <point x="429" y="299"/>
-      <point x="393" y="268"/>
-      <point x="328" y="268" type="curve" smooth="yes"/>
-      <point x="176" y="268" 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>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>P</string>
+      <string>I</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>P</string>
     </dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_linebelow.glif b/src/Cantarell-Bold.ufo/glyphs/T_linebelow.glif
index 4787c3d3..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="620"/>
+  <advance width="614"/>
   <unicode hex="1E6E"/>
   <outline>
     <component base="T"/>
-    <component base="macronbelowcomb" xOffset="66"/>
+    <component base="macronbelowcomb" xOffset="63"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_se-cy.glif b/src/Cantarell-Bold.ufo/glyphs/T_se-cy.glif
index 82be5a5f..56e07667 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_se-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_se-cy.glif
@@ -1,23 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tse-cy" format="2">
-  <advance width="799"/>
+  <advance width="785"/>
   <unicode hex="0426"/>
   <outline>
     <contour>
-      <point x="627" y="-187" type="line"/>
-      <point x="789" y="-187" type="line"/>
-      <point x="789" y="151" type="line"/>
-      <point x="238" y="151" type="line"/>
-      <point x="238" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
-      <point x="67" y="0" type="line"/>
-      <point x="627" y="0" type="line"/>
+      <point x="609" y="-187" type="line"/>
+      <point x="771" y="-187" type="line"/>
+      <point x="771" y="151" type="line"/>
+      <point x="242" y="151" type="line"/>
+      <point x="242" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="609" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="485" y="72" type="line"/>
-      <point x="656" y="72" type="line"/>
-      <point x="656" y="694" type="line"/>
-      <point x="485" y="694" type="line"/>
+      <point x="489" y="72" type="line"/>
+      <point x="660" y="72" type="line"/>
+      <point x="660" y="694" type="line"/>
+      <point x="489" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>De-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_she-cy.glif b/src/Cantarell-Bold.ufo/glyphs/T_she-cy.glif
index 4245f52e..bfd24b0d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_she-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_she-cy.glif
@@ -1,37 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tshe-cy" format="2">
-  <advance width="799"/>
+  <advance width="803"/>
   <unicode hex="040B"/>
   <outline>
     <contour>
-      <point x="599" y="0" type="line"/>
-      <point x="771" y="0" type="line"/>
-      <point x="771" y="233" type="line" smooth="yes"/>
-      <point x="771" y="360"/>
-      <point x="685" y="435"/>
-      <point x="549" y="435" type="curve" smooth="yes"/>
-      <point x="466" y="435"/>
-      <point x="385" y="406"/>
-      <point x="329" y="356" type="curve"/>
-      <point x="352" y="253" type="line"/>
-      <point x="394" y="274"/>
-      <point x="440" y="285"/>
-      <point x="488" y="285" type="curve" smooth="yes"/>
-      <point x="561" y="285"/>
-      <point x="599" y="259"/>
-      <point x="599" y="204" type="curve" smooth="yes"/>
+      <point x="218" y="0" type="line"/>
+      <point x="388" y="0" type="line"/>
+      <point x="388" y="542" type="line"/>
+      <point x="614" y="542" type="line"/>
+      <point x="614" y="694" type="line"/>
+      <point x="14" y="694" type="line"/>
+      <point x="14" y="542" type="line"/>
+      <point x="218" y="542" type="line"/>
     </contour>
     <contour>
-      <point x="214" y="0" type="line"/>
-      <point x="384" y="0" type="line"/>
-      <point x="384" y="660" type="line"/>
-      <point x="214" y="660" type="line"/>
-    </contour>
-    <contour>
-      <point x="10" y="542" type="line"/>
-      <point x="610" y="542" type="line"/>
-      <point x="610" y="694" type="line"/>
-      <point x="10" y="694" type="line"/>
+      <point x="603" y="0" type="line"/>
+      <point x="775" y="0" type="line"/>
+      <point x="775" y="233" type="line" smooth="yes"/>
+      <point x="775" y="360"/>
+      <point x="689" y="435"/>
+      <point x="553" y="435" type="curve" smooth="yes"/>
+      <point x="470" y="435"/>
+      <point x="389" y="406"/>
+      <point x="333" y="356" type="curve"/>
+      <point x="356" y="253" type="line"/>
+      <point x="398" y="274"/>
+      <point x="444" y="285"/>
+      <point x="492" y="285" type="curve" smooth="yes"/>
+      <point x="565" y="285"/>
+      <point x="603" y="259"/>
+      <point x="603" y="204" type="curve" smooth="yes"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|Ge-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Shha-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_-cy.glif b/src/Cantarell-Bold.ufo/glyphs/U_-cy.glif
index e635efab..777c4857 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_-cy.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="U-cy" format="2">
-  <advance width="654"/>
+  <advance width="656"/>
   <unicode hex="0423"/>
-  <anchor x="327" y="694" name="top"/>
+  <anchor x="328" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="121" y="0" type="line"/>
-      <point x="314" y="0" type="line"/>
-      <point x="661" y="694" type="line"/>
-      <point x="484" y="694" type="line"/>
-      <point x="331" y="365" type="line"/>
-      <point x="286" y="301" type="line"/>
+      <point x="122" y="0" type="line"/>
+      <point x="321" y="0" type="line"/>
+      <point x="668" y="694" type="line"/>
+      <point x="485" y="694" type="line"/>
+      <point x="332" y="365" type="line"/>
+      <point x="287" y="301" type="line"/>
     </contour>
     <contour>
-      <point x="305" y="142" type="line"/>
-      <point x="384" y="332" type="line"/>
-      <point x="200" y="694" type="line"/>
-      <point x="-8" y="694" type="line"/>
+      <point x="306" y="142" type="line"/>
+      <point x="385" y="332" type="line"/>
+      <point x="201" y="694" type="line"/>
+      <point x="-7" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_.glif b/src/Cantarell-Bold.ufo/glyphs/U_.glif
index deedbeda..d68fcfae 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_.glif
@@ -1,34 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="U" format="2">
-  <advance width="709"/>
+  <advance width="720"/>
   <unicode hex="0055"/>
-  <note>
-U
-</note>
-  <anchor x="355" y="0" name="bottom"/>
-  <anchor x="451" y="10" name="ogonek"/>
-  <anchor x="355" y="694" name="top"/>
-  <anchor x="658" y="694" name="topright"/>
+  <anchor x="360" y="0" name="bottom"/>
+  <anchor x="456" y="10" name="ogonek"/>
+  <anchor x="360" y="694" name="top"/>
+  <anchor x="663" y="694" name="topright"/>
   <outline>
     <contour>
-      <point x="347" y="-10" type="curve" smooth="yes"/>
-      <point x="536" y="-10"/>
-      <point x="658" y="107"/>
-      <point x="658" y="287" type="curve" smooth="yes"/>
-      <point x="658" y="694" type="line"/>
-      <point x="487" y="694" type="line"/>
-      <point x="487" y="267" type="line" smooth="yes"/>
-      <point x="487" y="187"/>
-      <point x="442" y="140"/>
-      <point x="366" y="140" type="curve" smooth="yes"/>
-      <point x="277" y="140"/>
-      <point x="225" y="195"/>
-      <point x="225" y="287" type="curve" smooth="yes"/>
-      <point x="225" y="694" type="line"/>
-      <point x="52" y="694" type="line"/>
-      <point x="52" y="277" type="line" smooth="yes"/>
-      <point x="52" y="98"/>
-      <point x="163" y="-10"/>
+      <point x="352" y="-10" type="curve" smooth="yes"/>
+      <point x="541" y="-10"/>
+      <point x="663" y="107"/>
+      <point x="663" y="287" type="curve" smooth="yes"/>
+      <point x="663" y="694" type="line"/>
+      <point x="492" y="694" type="line"/>
+      <point x="492" y="267" type="line" smooth="yes"/>
+      <point x="492" y="187"/>
+      <point x="447" y="140"/>
+      <point x="371" y="140" type="curve" smooth="yes"/>
+      <point x="282" y="140"/>
+      <point x="230" y="195"/>
+      <point x="230" y="287" type="curve" smooth="yes"/>
+      <point x="230" y="694" type="line"/>
+      <point x="57" y="694" type="line"/>
+      <point x="57" y="277" type="line" smooth="yes"/>
+      <point x="57" y="98"/>
+      <point x="168" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_acute.glif b/src/Cantarell-Bold.ufo/glyphs/U_acute.glif
index 00f65304..0bbdd376 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="709"/>
+  <advance width="720"/>
   <unicode hex="00DA"/>
   <outline>
     <component base="U"/>
-    <component base="acutecomb.case" xOffset="276"/>
+    <component base="acutecomb.case" xOffset="281"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_breve.glif b/src/Cantarell-Bold.ufo/glyphs/U_breve.glif
index f8f3f814..bd7a632c 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="709"/>
+  <advance width="720"/>
   <unicode hex="016C"/>
   <outline>
     <component base="U"/>
-    <component base="brevecomb.case" xOffset="122"/>
+    <component base="brevecomb.case" xOffset="127"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_caron.glif b/src/Cantarell-Bold.ufo/glyphs/U_caron.glif
index 2e860918..6e6a2687 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="709"/>
+  <advance width="720"/>
   <unicode hex="01D3"/>
   <outline>
     <component base="U"/>
-    <component base="caroncomb.case" xOffset="141"/>
+    <component base="caroncomb.case" xOffset="146"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/U_circumflex.glif
index f504c45d..efd56cb0 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="709"/>
+  <advance width="720"/>
   <unicode hex="00DB"/>
   <outline>
     <component base="U"/>
-    <component base="circumflexcomb.case" xOffset="156"/>
+    <component base="circumflexcomb.case" xOffset="161"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_dblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/U_dblgrave.glif
index 30922e43..1a40338d 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="709"/>
+  <advance width="720"/>
   <unicode hex="0214"/>
   <outline>
     <component base="U"/>
-    <component base="dblgravecomb.case" xOffset="72"/>
+    <component base="dblgravecomb.case" xOffset="77"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_dieresis-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_dieresis-cy.glif
index 0527c4cc..3fe2afc9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_dieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_dieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresis-cy" format="2">
-  <advance width="654"/>
+  <advance width="656"/>
   <unicode hex="04F0"/>
   <outline>
     <component base="U-cy"/>
-    <component base="dieresiscomb.case" xOffset="52"/>
+    <component base="dieresiscomb.case" xOffset="53"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_dieresis.glif b/src/Cantarell-Bold.ufo/glyphs/U_dieresis.glif
index e8df03ab..10d78131 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="709"/>
+  <advance width="720"/>
   <unicode hex="00DC"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="80"/>
+    <component base="dieresiscomb.case" xOffset="85"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_dieresisacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_dieresisacute.glif
index 8c5b901d..53bc9144 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="709"/>
+  <advance width="720"/>
   <unicode hex="01D7"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="80"/>
-    <component base="acutecomb.case" xOffset="276" yOffset="212"/>
+    <component base="dieresiscomb.case" xOffset="85"/>
+    <component base="acutecomb.case" xOffset="281" 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 5ceb452d..27017204 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="709"/>
+  <advance width="720"/>
   <unicode hex="01D9"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="80"/>
-    <component base="caroncomb.case" xOffset="141" yOffset="212"/>
+    <component base="dieresiscomb.case" xOffset="85"/>
+    <component base="caroncomb.case" xOffset="146" 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 1d266125..dc9b1483 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="709"/>
+  <advance width="720"/>
   <unicode hex="01DB"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="80"/>
-    <component base="gravecomb.case" xOffset="126" yOffset="212"/>
+    <component base="dieresiscomb.case" xOffset="85"/>
+    <component base="gravecomb.case" xOffset="131" 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 0fc83996..3a5755a0 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="709"/>
+  <advance width="720"/>
   <unicode hex="01D5"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="80"/>
-    <component base="macroncomb.case" xOffset="116" yOffset="212"/>
+    <component base="dieresiscomb.case" xOffset="85"/>
+    <component base="macroncomb.case" xOffset="121" 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 4e03d7ee..e52a4bc0 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="709"/>
+  <advance width="720"/>
   <unicode hex="1EE4"/>
   <outline>
     <component base="U"/>
-    <component base="dotbelowcomb" xOffset="205"/>
+    <component base="dotbelowcomb" xOffset="210"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_grave.glif b/src/Cantarell-Bold.ufo/glyphs/U_grave.glif
index b62efd51..d29ca3c3 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="709"/>
+  <advance width="720"/>
   <unicode hex="00D9"/>
   <outline>
     <component base="U"/>
-    <component base="gravecomb.case" xOffset="126"/>
+    <component base="gravecomb.case" xOffset="131"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_hookabove.glif b/src/Cantarell-Bold.ufo/glyphs/U_hookabove.glif
index 7252b1fb..9d4a5aee 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="709"/>
+  <advance width="720"/>
   <unicode hex="1EE6"/>
   <outline>
     <component base="U"/>
-    <component base="hookabovecomb.case" xOffset="200"/>
+    <component base="hookabovecomb.case" xOffset="205"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_horn.glif b/src/Cantarell-Bold.ufo/glyphs/U_horn.glif
index e012121b..e5cecb0c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_horn.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_horn.glif
@@ -1,13 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorn" format="2">
-  <advance width="874"/>
+  <advance width="885"/>
   <unicode hex="01AF"/>
   <outline>
     <component base="U"/>
-    <component base="horncomb" xOffset="587" yOffset="212"/>
+    <component base="horncomb" xOffset="592" yOffset="212"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>U</string>
       <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
       <string>=+165</string>
     </dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_hornacute.glif b/src/Cantarell-Bold.ufo/glyphs/U_hornacute.glif
index 88cf5dd6..c62b09a8 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="874"/>
+  <advance width="885"/>
   <unicode hex="1EE8"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="acutecomb.case" xOffset="276"/>
+    <component base="acutecomb.case" xOffset="281"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_horndotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_horndotbelow.glif
index 3c14e9e2..b0c44e08 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="874"/>
+  <advance width="885"/>
   <unicode hex="1EF0"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="dotbelowcomb" xOffset="205"/>
+    <component base="dotbelowcomb" xOffset="210"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_horngrave.glif b/src/Cantarell-Bold.ufo/glyphs/U_horngrave.glif
index d479fb8d..3dd74f8d 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="874"/>
+  <advance width="885"/>
   <unicode hex="1EEA"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="gravecomb.case" xOffset="126"/>
+    <component base="gravecomb.case" xOffset="131"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_hornhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_hornhookabove.glif
index acdbdcd1..69db1534 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="874"/>
+  <advance width="885"/>
   <unicode hex="1EEC"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="hookabovecomb.case" xOffset="200"/>
+    <component base="hookabovecomb.case" xOffset="205"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_horntilde.glif b/src/Cantarell-Bold.ufo/glyphs/U_horntilde.glif
index a99c0456..f0f82fd7 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="874"/>
+  <advance width="885"/>
   <unicode hex="1EEE"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="tildecomb.case" xOffset="126"/>
+    <component base="tildecomb.case" xOffset="131"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_hungarumlaut-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_hungarumlaut-cy.glif
index 2498026f..60bd6065 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_hungarumlaut-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_hungarumlaut-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhungarumlaut-cy" format="2">
-  <advance width="654"/>
+  <advance width="656"/>
   <unicode hex="04F2"/>
   <outline>
     <component base="U-cy"/>
-    <component base="hungarumlautcomb.case" xOffset="89"/>
+    <component base="hungarumlautcomb.case" xOffset="90"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_hungarumlaut.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_hungarumlaut.glif
index 83177950..75aee19c 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="709"/>
+  <advance width="720"/>
   <unicode hex="0170"/>
   <outline>
     <component base="U"/>
-    <component base="hungarumlautcomb.case" xOffset="117"/>
+    <component base="hungarumlautcomb.case" xOffset="122"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_invertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_invertedbreve.glif
index 55b253e7..16f90369 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="709"/>
+  <advance width="720"/>
   <unicode hex="0216"/>
   <outline>
     <component base="U"/>
-    <component base="breveinvertedcomb.case" xOffset="124"/>
+    <component base="breveinvertedcomb.case" xOffset="129"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_macron-cy.glif b/src/Cantarell-Bold.ufo/glyphs/U_macron-cy.glif
index b9276041..f0b08692 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_macron-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_macron-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacron-cy" format="2">
-  <advance width="654"/>
+  <advance width="656"/>
   <unicode hex="04EE"/>
   <outline>
     <component base="U-cy"/>
-    <component base="macroncomb.case" xOffset="88"/>
+    <component base="macroncomb.case" xOffset="89"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_macron.glif b/src/Cantarell-Bold.ufo/glyphs/U_macron.glif
index 90d4581e..1ca12090 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="709"/>
+  <advance width="720"/>
   <unicode hex="016A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="116"/>
+    <component base="macroncomb.case" xOffset="121"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_macrondieresis.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_macrondieresis.glif
index c7516073..af303406 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="709"/>
+  <advance width="720"/>
   <unicode hex="1E7A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="116"/>
-    <component base="dieresiscomb.case" xOffset="80" yOffset="208"/>
+    <component base="macroncomb.case" xOffset="121"/>
+    <component base="dieresiscomb.case" xOffset="85" 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 8832a81c..0fbb972d 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="709"/>
+  <advance width="720"/>
   <unicode hex="0172"/>
   <outline>
     <component base="U"/>
-    <component base="ogonekcomb.tall.case" xOffset="-9"/>
+    <component base="ogonekcomb.tall.case" xOffset="-4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_ring.glif b/src/Cantarell-Bold.ufo/glyphs/U_ring.glif
index c61a8284..870e8d7d 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="709"/>
+  <advance width="720"/>
   <unicode hex="016E"/>
   <outline>
     <component base="U"/>
-    <component base="ringcomb.case" xOffset="189"/>
+    <component base="ringcomb.case" xOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_short-cy.glif b/src/Cantarell-Bold.ufo/glyphs/U_short-cy.glif
index c2e18196..e1a2527a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_short-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_short-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ushort-cy" format="2">
-  <advance width="654"/>
+  <advance width="656"/>
   <unicode hex="040E"/>
   <outline>
     <component base="U-cy"/>
-    <component base="brevecomb-cy.case" xOffset="94"/>
+    <component base="brevecomb-cy.case" xOffset="95"/>
   </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 3058a194..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="653"/>
+  <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 51d1f7d4..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="653"/>
+  <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 9058a6f9..86422ea3 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="709"/>
+  <advance width="720"/>
   <unicode hex="0168"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="126"/>
+    <component base="tildecomb.case" xOffset="131"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_tildeacute.glif b/src/Cantarell-Bold.ufo/glyphs/U_tildeacute.glif
index 727df6c6..314b5cc1 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="709"/>
+  <advance width="720"/>
   <unicode hex="1E78"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="126"/>
-    <component base="acutecomb.case" xOffset="276" yOffset="245"/>
+    <component base="tildecomb.case" xOffset="131"/>
+    <component base="acutecomb.case" xOffset="281" yOffset="245"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/V_.glif b/src/Cantarell-Bold.ufo/glyphs/V_.glif
index 7427420e..0e32c4c7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/V_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/V_.glif
@@ -1,22 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="V" format="2">
-  <advance width="672"/>
+  <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>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/V_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/V_e-cy.glif
index c610cdfa..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="652"/>
+  <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 859fc1bf..60e072ac 100644
--- a/src/Cantarell-Bold.ufo/glyphs/W_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/W_.glif
@@ -1,30 +1,33 @@
 <?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="212" y="0" type="line"/>
-      <point x="402" y="0" type="line"/>
-      <point x="543" y="602" type="line"/>
-      <point x="463" y="602" type="line"/>
-      <point x="627" y="0" type="line"/>
-      <point x="812" y="0" type="line"/>
-      <point x="1026" y="694" type="line"/>
-      <point x="851" y="694" type="line"/>
-      <point x="690" y="85" type="line"/>
-      <point x="757" y="109" type="line"/>
-      <point x="608" y="690" type="line"/>
-      <point x="419" y="690" type="line"/>
-      <point x="287" y="105" type="line"/>
-      <point x="339" 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>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
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 da5ac3d3..188ffb2b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/X_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/X_.glif
@@ -1,32 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="X" format="2">
-  <advance width="672"/>
+  <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>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_.glif b/src/Cantarell-Bold.ufo/glyphs/Y_.glif
index 5314815a..2cbcef08 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_.glif
@@ -1,25 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Y" format="2">
-  <advance width="653"/>
+  <advance width="673"/>
   <unicode hex="0059"/>
-  <note>
-Y
-</note>
-  <anchor x="324" y="0" name="bottom"/>
-  <anchor x="324" 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="245" y="0" type="line"/>
-      <point x="418" y="0" type="line"/>
-      <point x="418" y="247" type="line"/>
-      <point x="672" y="694" type="line"/>
-      <point x="478" y="694" type="line"/>
-      <point x="326" y="380" type="line"/>
-      <point x="348" y="380" type="line"/>
-      <point x="184" y="694" type="line"/>
-      <point x="-20" y="694" type="line"/>
-      <point x="245" 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>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_acute.glif b/src/Cantarell-Bold.ufo/glyphs/Y_acute.glif
index b37edca8..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="653"/>
+  <advance width="673"/>
   <unicode hex="00DD"/>
   <outline>
     <component base="Y"/>
-    <component base="acutecomb.case" xOffset="245"/>
+    <component base="acutecomb.case" xOffset="255"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_at-cy.glif b/src/Cantarell-Bold.ufo/glyphs/Y_at-cy.glif
index 3ab4c46d..ee056124 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_at-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_at-cy.glif
@@ -1,35 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yat-cy" format="2">
-  <advance width="700"/>
+  <advance width="677"/>
   <unicode hex="0462"/>
   <outline>
     <contour>
-      <point x="120" y="0" type="line"/>
-      <point x="394" y="0" type="line" smooth="yes"/>
-      <point x="565" y="0"/>
-      <point x="685" y="98"/>
-      <point x="685" y="237" type="curve" smooth="yes"/>
-      <point x="685" y="364"/>
-      <point x="592" y="444"/>
-      <point x="445" y="444" type="curve" smooth="yes"/>
-      <point x="233" y="444" type="line"/>
-      <point x="233" y="312" type="line"/>
-      <point x="407" y="312" type="line" smooth="yes"/>
-      <point x="465" y="312"/>
-      <point x="505" y="274"/>
-      <point x="505" y="220" type="curve" smooth="yes"/>
-      <point x="505" y="168"/>
-      <point x="472" y="136"/>
-      <point x="417" y="136" type="curve" smooth="yes"/>
-      <point x="290" y="136" type="line"/>
-      <point x="290" y="694" type="line"/>
-      <point x="120" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="366" y="0" type="line" smooth="yes"/>
+      <point x="537" y="0"/>
+      <point x="657" y="98"/>
+      <point x="657" y="237" type="curve" smooth="yes"/>
+      <point x="657" y="364"/>
+      <point x="564" y="444"/>
+      <point x="417" y="444" type="curve" smooth="yes"/>
+      <point x="205" y="444" type="line"/>
+      <point x="205" y="312" type="line"/>
+      <point x="379" y="312" type="line" smooth="yes"/>
+      <point x="437" y="312"/>
+      <point x="477" y="274"/>
+      <point x="477" y="220" type="curve" smooth="yes"/>
+      <point x="477" y="168"/>
+      <point x="444" y="136"/>
+      <point x="389" y="136" type="curve" smooth="yes"/>
+      <point x="262" y="136" type="line"/>
+      <point x="262" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="12" y="493" type="line"/>
-      <point x="433" y="493" type="line"/>
-      <point x="433" y="621" type="line"/>
-      <point x="12" y="621" type="line"/>
+      <point x="-16" y="492" type="line"/>
+      <point x="405" y="492" type="line"/>
+      <point x="405" y="622" type="line"/>
+      <point x="-16" y="622" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Eth</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Softsign-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/Y_circumflex.glif
index 2f9a0151..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="653"/>
+  <advance width="673"/>
   <unicode hex="0176"/>
   <outline>
     <component base="Y"/>
-    <component base="circumflexcomb.case" xOffset="125"/>
+    <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 50139fbb..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="653"/>
+  <advance width="673"/>
   <unicode hex="0178"/>
   <outline>
     <component base="Y"/>
-    <component base="dieresiscomb.case" xOffset="49"/>
+    <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 6aad8c26..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="653"/>
+  <advance width="673"/>
   <unicode hex="1E8E"/>
   <outline>
     <component base="Y"/>
-    <component base="dotaccentcomb.case" xOffset="179"/>
+    <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 5eba064f..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="653"/>
+  <advance width="673"/>
   <unicode hex="1EF4"/>
   <outline>
     <component base="Y"/>
-    <component base="dotbelowcomb" xOffset="174"/>
+    <component base="dotbelowcomb" xOffset="184"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_eru-cy.glif b/src/Cantarell-Bold.ufo/glyphs/Y_eru-cy.glif
index 7e4533aa..5761ef8b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_eru-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_eru-cy.glif
@@ -1,36 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yeru-cy" format="2">
-  <advance width="907"/>
+  <advance width="915"/>
   <unicode hex="042B"/>
-  <anchor x="464" y="694" name="top"/>
+  <anchor x="468" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="311" y="0" type="line" smooth="yes"/>
-      <point x="494" y="0"/>
-      <point x="602" y="90"/>
-      <point x="602" y="242" type="curve" smooth="yes"/>
-      <point x="602" y="369"/>
-      <point x="506" y="454"/>
-      <point x="362" y="454" type="curve" smooth="yes"/>
-      <point x="180" y="454" type="line"/>
-      <point x="180" y="322" type="line"/>
-      <point x="324" y="322" type="line" smooth="yes"/>
-      <point x="383" y="322"/>
-      <point x="422" y="283"/>
-      <point x="422" y="225" type="curve" smooth="yes"/>
-      <point x="422" y="169"/>
-      <point x="389" y="136"/>
-      <point x="334" y="136" type="curve" smooth="yes"/>
-      <point x="237" y="136" type="line"/>
-      <point x="237" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="315" y="0" type="line" smooth="yes"/>
+      <point x="498" y="0"/>
+      <point x="606" y="90"/>
+      <point x="606" y="242" type="curve" smooth="yes"/>
+      <point x="606" y="369"/>
+      <point x="510" y="454"/>
+      <point x="366" y="454" type="curve" smooth="yes"/>
+      <point x="184" y="454" type="line"/>
+      <point x="184" y="322" type="line"/>
+      <point x="328" y="322" type="line" smooth="yes"/>
+      <point x="387" y="322"/>
+      <point x="426" y="283"/>
+      <point x="426" y="225" type="curve" smooth="yes"/>
+      <point x="426" y="169"/>
+      <point x="393" y="136"/>
+      <point x="338" y="136" type="curve" smooth="yes"/>
+      <point x="241" y="136" type="line"/>
+      <point x="241" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="664" y="-3" type="line"/>
-      <point x="840" y="-3" type="line"/>
-      <point x="840" y="691" type="line"/>
-      <point x="664" y="691" type="line"/>
+      <point x="668" y="-3" type="line"/>
+      <point x="844" y="-3" type="line"/>
+      <point x="844" y="691" type="line"/>
+      <point x="668" y="691" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_erudieresis-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/Y_erudieresis-cy.glif
index 59cc3b32..c23c3c92 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_erudieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_erudieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yerudieresis-cy" format="2">
-  <advance width="907"/>
+  <advance width="915"/>
   <unicode hex="04F8"/>
   <outline>
     <component base="Yeru-cy"/>
-    <component base="dieresiscomb.case" xOffset="189"/>
+    <component base="dieresiscomb.case" xOffset="193"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_grave.glif b/src/Cantarell-Bold.ufo/glyphs/Y_grave.glif
index cbaad132..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="653"/>
+  <advance width="673"/>
   <unicode hex="1EF2"/>
   <outline>
     <component base="Y"/>
-    <component base="gravecomb.case" xOffset="95"/>
+    <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 64884888..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="653"/>
+  <advance width="673"/>
   <unicode hex="1EF6"/>
   <outline>
     <component base="Y"/>
-    <component base="hookabovecomb.case" xOffset="169"/>
+    <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 2ace02bf..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="310"/>
+  <advance width="318"/>
   <unicode hex="0407"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-120"/>
+    <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 932fd02a..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="653"/>
+  <advance width="673"/>
   <unicode hex="0232"/>
   <outline>
     <component base="Y"/>
-    <component base="macroncomb.case" xOffset="85"/>
+    <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 fbbb025a..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="653"/>
+  <advance width="673"/>
   <unicode hex="1EF8"/>
   <outline>
     <component base="Y"/>
-    <component base="tildecomb.case" xOffset="95"/>
+    <component base="tildecomb.case" xOffset="105"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_usbig-cy.glif b/src/Cantarell-Bold.ufo/glyphs/Y_usbig-cy.glif
index 3a1fa3fa..2ab89461 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_usbig-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_usbig-cy.glif
@@ -1,43 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yusbig-cy" format="2">
-  <advance width="794"/>
+  <advance width="803"/>
   <unicode hex="046A"/>
   <outline>
     <contour>
-      <point x="237" y="378" type="line"/>
-      <point x="424" y="378" type="line"/>
-      <point x="241" y="615" type="line"/>
-      <point x="206" y="550" type="line"/>
-      <point x="583" y="550" type="line"/>
-      <point x="543" y="615" type="line"/>
-      <point x="375" y="398" type="line"/>
-      <point x="552" y="398" type="line"/>
-      <point x="705" y="546" type="line"/>
-      <point x="705" y="694" type="line"/>
-      <point x="83" y="694" type="line"/>
-      <point x="83" y="546" type="line"/>
+      <point x="19" y="0" type="curve"/>
+      <point x="187" y="0" type="line"/>
+      <point x="187" y="200"/>
+      <point x="251" y="291"/>
+      <point x="392" y="291" type="curve" smooth="yes"/>
+      <point x="546" y="291"/>
+      <point x="616" y="200"/>
+      <point x="616" y="0" type="curve"/>
+      <point x="784" y="0" type="line"/>
+      <point x="784" y="288"/>
+      <point x="666" y="420"/>
+      <point x="408" y="420" type="curve" smooth="yes"/>
+      <point x="141" y="420"/>
+      <point x="19" y="288"/>
     </contour>
     <contour>
-      <point x="481" y="304" type="line"/>
-      <point x="314" y="304" type="line"/>
-      <point x="314" y="0" type="line"/>
-      <point x="481" y="0" type="line"/>
+      <point x="318" y="0" type="line"/>
+      <point x="485" y="0" type="line"/>
+      <point x="485" y="304" type="line"/>
+      <point x="318" y="304" type="line"/>
     </contour>
     <contour>
-      <point x="183" y="0" type="line"/>
-      <point x="183" y="200"/>
-      <point x="247" y="291"/>
-      <point x="388" y="291" type="curve" smooth="yes"/>
-      <point x="542" y="291"/>
-      <point x="612" y="200"/>
-      <point x="612" y="0" type="curve"/>
-      <point x="780" y="0" type="line"/>
-      <point x="780" y="288"/>
-      <point x="662" y="420"/>
-      <point x="404" y="420" type="curve" smooth="yes"/>
-      <point x="137" y="420"/>
-      <point x="15" y="288"/>
-      <point x="15" y="0" type="curve"/>
+      <point x="241" y="378" type="line"/>
+      <point x="428" y="378" type="line"/>
+      <point x="245" y="615" type="line"/>
+      <point x="210" y="550" type="line"/>
+      <point x="587" y="550" type="line"/>
+      <point x="547" y="615" type="line"/>
+      <point x="379" y="398" type="line"/>
+      <point x="556" y="398" type="line"/>
+      <point x="709" y="546" type="line"/>
+      <point x="709" y="694" type="line"/>
+      <point x="87" y="694" type="line"/>
+      <point x="87" y="546" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_.glif b/src/Cantarell-Bold.ufo/glyphs/Z_.glif
index 13ba417c..28dea1f7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_.glif
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Z" format="2">
-  <advance width="650"/>
+  <advance width="667"/>
   <unicode hex="005A"/>
-  <note>
-Z
-</note>
-  <anchor x="331" y="0" name="bottom"/>
-  <anchor x="331" y="694" name="top"/>
+  <anchor x="339" y="0" name="bottom"/>
+  <anchor x="339" 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="30" y="0" type="line"/>
+      <point x="633" y="0" type="line"/>
+      <point x="633" y="152" type="line"/>
+      <point x="176" y="152" type="line"/>
+      <point x="217" y="94" type="line"/>
+      <point x="628" y="591" type="line"/>
+      <point x="628" y="694" type="line"/>
+      <point x="48" y="694" type="line"/>
+      <point x="48" y="542" type="line"/>
+      <point x="492" y="542" type="line"/>
+      <point x="440" y="608" type="line"/>
+      <point x="30" 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 2471ec09..d4869939 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="650"/>
+  <advance width="667"/>
   <unicode hex="0179"/>
   <outline>
     <component base="Z"/>
-    <component base="acutecomb.case" xOffset="252"/>
+    <component base="acutecomb.case" xOffset="260"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_caron.glif b/src/Cantarell-Bold.ufo/glyphs/Z_caron.glif
index 256b8039..9923858a 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="650"/>
+  <advance width="667"/>
   <unicode hex="017D"/>
   <outline>
     <component base="Z"/>
-    <component base="caroncomb.case" xOffset="117"/>
+    <component base="caroncomb.case" xOffset="125"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/Z_dotaccent.glif
index 3cf7f45f..650b604d 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="650"/>
+  <advance width="667"/>
   <unicode hex="017B"/>
   <outline>
     <component base="Z"/>
-    <component base="dotaccentcomb.case" xOffset="186"/>
+    <component base="dotaccentcomb.case" xOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/Z_dotbelow.glif
index fadc416e..0d566dc7 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="650"/>
+  <advance width="667"/>
   <unicode hex="1E92"/>
   <outline>
     <component base="Z"/>
-    <component base="dotbelowcomb" xOffset="181"/>
+    <component base="dotbelowcomb" xOffset="189"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/Z_e-cy.glif
index 55b48c29..6f42fe2e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_e-cy.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ze-cy" format="2">
-  <advance width="592"/>
+  <advance width="600"/>
   <unicode hex="0417"/>
-  <anchor x="297" y="0" name="bottom"/>
-  <anchor x="297" y="694" name="top"/>
+  <anchor x="301" y="0" name="bottom"/>
+  <anchor x="301" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="245" y="-10" type="curve" smooth="yes"/>
-      <point x="439" y="-10"/>
-      <point x="565" y="77"/>
-      <point x="565" y="210" type="curve" smooth="yes"/>
-      <point x="565" y="306"/>
-      <point x="494" y="371"/>
-      <point x="384" y="375" type="curve"/>
-      <point x="382" y="365" type="line"/>
-      <point x="477" y="365"/>
-      <point x="546" y="429"/>
-      <point x="546" y="518" type="curve" smooth="yes"/>
-      <point x="546" y="631"/>
-      <point x="439" y="704"/>
-      <point x="273" y="704" type="curve" smooth="yes"/>
-      <point x="188" y="704"/>
-      <point x="103" y="684"/>
-      <point x="29" y="647" type="curve"/>
-      <point x="70" y="510" type="line"/>
-      <point x="137" y="536"/>
-      <point x="191" y="548"/>
-      <point x="242" y="548" type="curve" smooth="yes"/>
-      <point x="316" y="548"/>
-      <point x="355" y="528"/>
-      <point x="355" y="491" type="curve" smooth="yes"/>
-      <point x="355" y="447"/>
-      <point x="307" y="418"/>
-      <point x="235" y="418" type="curve" smooth="yes"/>
-      <point x="130" y="418" type="line"/>
-      <point x="130" y="281" type="line"/>
-      <point x="237" y="281" type="line" smooth="yes"/>
-      <point x="325" y="281"/>
-      <point x="375" y="256"/>
-      <point x="375" y="212" type="curve" smooth="yes"/>
-      <point x="375" y="170"/>
-      <point x="329" y="146"/>
-      <point x="251" y="146" type="curve" smooth="yes"/>
-      <point x="193" y="146"/>
-      <point x="121" y="159"/>
-      <point x="60" y="183" type="curve"/>
-      <point x="18" y="41" type="line"/>
-      <point x="97" y="4"/>
-      <point x="164" y="-10"/>
+      <point x="249" y="-10" type="curve" smooth="yes"/>
+      <point x="443" y="-10"/>
+      <point x="569" y="77"/>
+      <point x="569" y="210" type="curve" smooth="yes"/>
+      <point x="569" y="306"/>
+      <point x="498" y="371"/>
+      <point x="388" y="375" type="curve"/>
+      <point x="386" y="365" type="line"/>
+      <point x="481" y="365"/>
+      <point x="550" y="429"/>
+      <point x="550" y="518" type="curve" smooth="yes"/>
+      <point x="550" y="631"/>
+      <point x="443" y="704"/>
+      <point x="277" y="704" type="curve" smooth="yes"/>
+      <point x="192" y="704"/>
+      <point x="107" y="684"/>
+      <point x="33" y="647" type="curve"/>
+      <point x="74" y="510" type="line"/>
+      <point x="141" y="536"/>
+      <point x="195" y="548"/>
+      <point x="246" y="548" type="curve" smooth="yes"/>
+      <point x="320" y="548"/>
+      <point x="359" y="528"/>
+      <point x="359" y="491" type="curve" smooth="yes"/>
+      <point x="359" y="447"/>
+      <point x="311" y="418"/>
+      <point x="239" y="418" type="curve" smooth="yes"/>
+      <point x="134" y="418" type="line"/>
+      <point x="134" y="281" type="line"/>
+      <point x="241" y="281" type="line" smooth="yes"/>
+      <point x="329" y="281"/>
+      <point x="379" y="256"/>
+      <point x="379" y="212" type="curve" smooth="yes"/>
+      <point x="379" y="170"/>
+      <point x="333" y="146"/>
+      <point x="255" y="146" type="curve" smooth="yes"/>
+      <point x="197" y="146"/>
+      <point x="125" y="159"/>
+      <point x="64" y="183" type="curve"/>
+      <point x="22" y="41" type="line"/>
+      <point x="101" y="4"/>
+      <point x="168" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_edescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/Z_edescender-cy.glif
index ead6229f..087f9baa 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_edescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_edescender-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zedescender-cy" format="2">
-  <advance width="592"/>
+  <advance width="600"/>
   <unicode hex="0498"/>
   <outline>
     <component base="Ze-cy"/>
-    <component base="cedillacomb" xOffset="139"/>
+    <component base="cedillacomb" xOffset="143"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_edieresis-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/Z_edieresis-cy.glif
index 2f68ba0a..f4da02dd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_edieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_edieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zedieresis-cy" format="2">
-  <advance width="592"/>
+  <advance width="600"/>
   <unicode hex="04DE"/>
   <outline>
     <component base="Ze-cy"/>
-    <component base="dieresiscomb.case" xOffset="22"/>
+    <component base="dieresiscomb.case" xOffset="26"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_he-cy.glif b/src/Cantarell-Bold.ufo/glyphs/Z_he-cy.glif
index dcd0550e..80f14e8e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_he-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_he-cy.glif
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhe-cy" format="2">
-  <advance width="1041"/>
+  <advance width="1045"/>
   <unicode hex="0416"/>
-  <anchor x="905" y="0" name="bottomright"/>
-  <anchor x="521" y="694" name="top"/>
+  <anchor x="897" y="0" name="bottomright"/>
+  <anchor x="523" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="845" y="0" type="line"/>
-      <point x="1042" y="0" type="line"/>
-      <point x="829" y="387" type="line"/>
-      <point x="832" y="360" type="line"/>
-      <point x="1034" y="694" type="line"/>
-      <point x="831" y="694" type="line"/>
-      <point x="649" y="363" type="line"/>
+      <point x="847" y="0" type="line"/>
+      <point x="1044" y="0" type="line"/>
+      <point x="831" y="387" type="line"/>
+      <point x="834" y="360" type="line"/>
+      <point x="1036" y="694" type="line"/>
+      <point x="833" y="694" type="line"/>
+      <point x="651" y="363" type="line"/>
     </contour>
     <contour>
-      <point x="-3" y="0" type="line"/>
-      <point x="192" y="0" type="line"/>
-      <point x="395" y="361" type="line"/>
-      <point x="218" y="694" type="line"/>
-      <point x="13" y="694" type="line"/>
-      <point x="215" y="331" type="line"/>
-      <point x="212" y="359" type="line"/>
+      <point x="-1" y="0" type="line"/>
+      <point x="194" y="0" type="line"/>
+      <point x="397" y="361" type="line"/>
+      <point x="220" y="694" type="line"/>
+      <point x="15" y="694" type="line"/>
+      <point x="217" y="331" type="line"/>
+      <point x="214" y="359" type="line"/>
     </contour>
     <contour>
-      <point x="301" y="278" type="line"/>
-      <point x="750" y="278" type="line"/>
-      <point x="750" y="430" type="line"/>
-      <point x="301" y="430" type="line"/>
+      <point x="439" y="0" type="line"/>
+      <point x="612" y="0" type="line"/>
+      <point x="612" y="694" type="line"/>
+      <point x="439" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="437" y="0" type="line"/>
-      <point x="610" y="0" type="line"/>
-      <point x="610" y="694" type="line"/>
-      <point x="437" y="694" type="line"/>
+      <point x="303" y="278" type="line"/>
+      <point x="752" y="278" type="line"/>
+      <point x="752" y="430" type="line"/>
+      <point x="303" y="430" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_hebreve-cy.glif b/src/Cantarell-Bold.ufo/glyphs/Z_hebreve-cy.glif
index 4b9d3ee7..462484bd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_hebreve-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_hebreve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhebreve-cy" format="2">
-  <advance width="1041"/>
+  <advance width="1045"/>
   <unicode hex="04C1"/>
   <outline>
     <component base="Zhe-cy"/>
-    <component base="brevecomb-cy.case" xOffset="288"/>
+    <component base="brevecomb-cy.case" xOffset="290"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_hedescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/Z_hedescender-cy.glif
index 2a0a6975..63fa561e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_hedescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_hedescender-cy.glif
@@ -1,13 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhedescender-cy" format="2">
-  <advance width="1086"/>
+  <advance width="1062"/>
   <unicode hex="0496"/>
   <outline>
-    <component base="Zhe-cy" xOffset="5"/>
-    <component base="descender-cy.case" xOffset="814"/>
+    <component base="Zhe-cy"/>
+    <component base="descender-cy.case" xOffset="801"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Zhe-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Zhe-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_hedieresis-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/Z_hedieresis-cy.glif
index 35f55162..d6dae78b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_hedieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_hedieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhedieresis-cy" format="2">
-  <advance width="1041"/>
+  <advance width="1045"/>
   <unicode hex="04DC"/>
   <outline>
     <component base="Zhe-cy"/>
-    <component base="dieresiscomb.case" xOffset="246"/>
+    <component base="dieresiscomb.case" xOffset="248"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/_currencyvstem.glif 
b/src/Cantarell-Bold.ufo/glyphs/_currencyvstem.glif
index e990aaab..153661c9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/_currencyvstem.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/_currencyvstem.glif
@@ -3,10 +3,10 @@
   <advance width="370"/>
   <outline>
     <contour>
-      <point x="102" y="649" type="line"/>
-      <point x="268" y="649" type="line"/>
-      <point x="268" y="842" type="line"/>
-      <point x="102" y="842" type="line"/>
+      <point x="102" y="661" type="line"/>
+      <point x="268" y="661" type="line"/>
+      <point x="268" y="831" type="line"/>
+      <point x="102" y="831" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/_descenderreverse-cy.case.glif 
b/src/Cantarell-Bold.ufo/glyphs/_descenderreverse-cy.case.glif
index db38c7c0..664eab9e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/_descenderreverse-cy.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/_descenderreverse-cy.case.glif
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="_descenderreverse-cy.case" format="2">
   <advance width="316"/>
-  <anchor x="201" y="0" name="_bottomright"/>
+  <anchor x="188" y="0" name="_bottomright"/>
   <outline>
     <contour>
       <point x="-20" y="-187" type="line"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/_descenderreversed-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/_descenderreversed-cy.glif
index 7c9103bc..a19d4591 100644
--- a/src/Cantarell-Bold.ufo/glyphs/_descenderreversed-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/_descenderreversed-cy.glif
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="_descenderreversed-cy" format="2">
   <advance width="316"/>
-  <anchor x="243" y="0" name="_bottomright"/>
+  <anchor x="212" y="0" name="_bottomright"/>
   <outline>
     <contour>
       <point x="47" y="-136" type="line"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/_typoquote.glif b/src/Cantarell-Bold.ufo/glyphs/_typoquote.glif
index dccf1d1b..097395e9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/_typoquote.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/_typoquote.glif
@@ -3,14 +3,14 @@
   <advance width="389"/>
   <outline>
     <contour>
-      <point x="74" y="-171" type="curve"/>
-      <point x="220" y="-171" type="line"/>
-      <point x="265" y="-80"/>
-      <point x="308" y="53"/>
+      <point x="75" y="-171" type="curve"/>
+      <point x="226" y="-171" type="line"/>
+      <point x="269" y="-93"/>
+      <point x="302" y="26"/>
       <point x="308" y="126" type="curve"/>
-      <point x="120" y="126" type="line"/>
-      <point x="120" y="37"/>
-      <point x="102" y="-82"/>
+      <point x="130" y="126" type="line"/>
+      <point x="125" y="25"/>
+      <point x="103" y="-94"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/a-cy.glif b/src/Cantarell-Bold.ufo/glyphs/a-cy.glif
index 7707967e..ea6974d2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/a-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/a-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="a-cy" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="0430"/>
-  <anchor x="264" y="490" name="top"/>
   <outline>
     <component base="a"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/a.glif b/src/Cantarell-Bold.ufo/glyphs/a.glif
index 3f817d27..489253e1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/a.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/a.glif
@@ -1,54 +1,57 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="a" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="0061"/>
-  <note>
-a
-</note>
-  <anchor x="267" y="0" name="bottom"/>
-  <anchor x="441" y="10" name="ogonek"/>
-  <anchor x="257" y="490" name="top"/>
+  <anchor x="278" y="0" name="bottom"/>
+  <anchor x="452" y="10" name="ogonek"/>
+  <anchor x="268" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="363" y="0" type="line"/>
-      <point x="488" y="0" type="line"/>
-      <point x="488" y="272" type="line" smooth="yes"/>
-      <point x="488" y="420"/>
-      <point x="406" y="500"/>
-      <point x="246" y="500" type="curve" smooth="yes"/>
-      <point x="170" y="500"/>
-      <point x="90" y="482"/>
-      <point x="28" y="452" type="curve"/>
-      <point x="68" y="335" type="line"/>
-      <point x="119" y="353"/>
-      <point x="166" y="362"/>
-      <point x="209" y="362" type="curve" smooth="yes"/>
-      <point x="279" y="362"/>
-      <point x="319" y="338"/>
-      <point x="319" y="292" type="curve" smooth="yes"/>
-      <point x="319" y="129" type="line"/>
+      <point x="374" y="0" type="line"/>
+      <point x="499" y="0" type="line"/>
+      <point x="499" y="272" type="line" smooth="yes"/>
+      <point x="499" y="420"/>
+      <point x="417" y="500"/>
+      <point x="257" y="500" type="curve" smooth="yes"/>
+      <point x="181" y="500"/>
+      <point x="101" y="482"/>
+      <point x="39" y="452" type="curve"/>
+      <point x="79" y="335" type="line"/>
+      <point x="130" y="353"/>
+      <point x="177" y="362"/>
+      <point x="220" y="362" type="curve" smooth="yes"/>
+      <point x="290" y="362"/>
+      <point x="330" y="338"/>
+      <point x="330" y="292" type="curve" smooth="yes"/>
+      <point x="330" y="129" type="line"/>
     </contour>
     <contour>
-      <point x="195" y="-10" type="curve" smooth="yes"/>
-      <point x="294" y="-10"/>
-      <point x="362" y="41"/>
-      <point x="395" y="145" type="curve"/>
-      <point x="342" y="168" type="line"/>
-      <point x="324" y="138"/>
-      <point x="291" y="119"/>
-      <point x="255" y="119" type="curve" smooth="yes"/>
-      <point x="220" y="119"/>
-      <point x="196" y="137"/>
-      <point x="196" y="163" type="curve" smooth="yes"/>
-      <point x="196" y="197"/>
-      <point x="238" y="210"/>
-      <point x="350" y="210" type="curve"/>
-      <point x="350" y="296" type="line"/>
-      <point x="124" y="296"/>
-      <point x="22" y="247"/>
-      <point x="22" y="138" type="curve" smooth="yes"/>
-      <point x="22" y="49"/>
-      <point x="89" y="-10"/>
+      <point x="206" y="-10" type="curve" smooth="yes"/>
+      <point x="305" y="-10"/>
+      <point x="373" y="41"/>
+      <point x="406" y="145" type="curve"/>
+      <point x="353" y="168" type="line"/>
+      <point x="335" y="138"/>
+      <point x="302" y="119"/>
+      <point x="266" y="119" type="curve" smooth="yes"/>
+      <point x="231" y="119"/>
+      <point x="207" y="137"/>
+      <point x="207" y="163" type="curve" smooth="yes"/>
+      <point x="207" y="197"/>
+      <point x="249" y="210"/>
+      <point x="361" y="210" type="curve"/>
+      <point x="361" y="296" type="line"/>
+      <point x="135" y="296"/>
+      <point x="33" y="247"/>
+      <point x="33" y="138" type="curve" smooth="yes"/>
+      <point x="33" y="49"/>
+      <point x="100" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/aacute.glif b/src/Cantarell-Bold.ufo/glyphs/aacute.glif
index 46ce8674..7d8bc172 100644
--- a/src/Cantarell-Bold.ufo/glyphs/aacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/aacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aacute" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="00E1"/>
   <outline>
     <component base="a"/>
-    <component base="acutecomb" xOffset="161"/>
+    <component base="acutecomb" xOffset="172"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/abreve-cy.glif b/src/Cantarell-Bold.ufo/glyphs/abreve-cy.glif
index 75679849..352d5c8f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/abreve-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/abreve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abreve-cy" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="04D1"/>
   <outline>
     <component base="a-cy"/>
-    <component base="brevecomb-cy" xOffset="31"/>
+    <component base="brevecomb-cy" xOffset="35"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/abreve.glif b/src/Cantarell-Bold.ufo/glyphs/abreve.glif
index 2ffde5f2..b381568d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/abreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/abreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abreve" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="0103"/>
   <outline>
     <component base="a"/>
-    <component base="brevecomb" xOffset="41"/>
+    <component base="brevecomb" xOffset="52"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/abreveacute.glif b/src/Cantarell-Bold.ufo/glyphs/abreveacute.glif
index be2a7eee..1beba5ea 100644
--- a/src/Cantarell-Bold.ufo/glyphs/abreveacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/abreveacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abreveacute" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="1EAF"/>
   <outline>
     <component base="a"/>
-    <component base="brevecomb_acutecomb" xOffset="32"/>
+    <component base="brevecomb.loclVIET" xOffset="43"/>
+    <component base="acutecomb.loclVIET" xOffset="182" yOffset="141"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/abrevedotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/abrevedotbelow.glif
index ec4a38e1..ee2292ca 100644
--- a/src/Cantarell-Bold.ufo/glyphs/abrevedotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/abrevedotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abrevedotbelow" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="1EB7"/>
   <outline>
     <component base="a"/>
-    <component base="dotbelowcomb" xOffset="117"/>
-    <component base="brevecomb" xOffset="41"/>
+    <component base="dotbelowcomb" xOffset="128"/>
+    <component base="brevecomb" xOffset="52"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/abrevegrave.glif b/src/Cantarell-Bold.ufo/glyphs/abrevegrave.glif
index f39bc40d..7be76fa4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/abrevegrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/abrevegrave.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abrevegrave" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="1EB1"/>
   <outline>
     <component base="a"/>
-    <component base="brevecomb_gravecomb" xOffset="32"/>
+    <component base="brevecomb.loclVIET" xOffset="43"/>
+    <component base="gravecomb.loclVIET" xOffset="92" yOffset="141"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/abrevehookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/abrevehookabove.glif
index 75115f0a..b3bd3e37 100644
--- a/src/Cantarell-Bold.ufo/glyphs/abrevehookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/abrevehookabove.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abrevehookabove" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="1EB3"/>
   <outline>
     <component base="a"/>
-    <component base="brevecomb_hookabovecomb" xOffset="32"/>
+    <component base="brevecomb.loclVIET" xOffset="43"/>
+    <component base="hookabovecomb.loclVIET" xOffset="115" yOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/abrevetilde.glif b/src/Cantarell-Bold.ufo/glyphs/abrevetilde.glif
index b5477684..4989e9b6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/abrevetilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/abrevetilde.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abrevetilde" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="1EB5"/>
   <outline>
     <component base="a"/>
-    <component base="brevecomb_tildecomb" xOffset="24"/>
+    <component base="brevecomb.loclVIET" xOffset="43"/>
+    <component base="tildecomb.loclVIET" xOffset="50" yOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/acaron.glif b/src/Cantarell-Bold.ufo/glyphs/acaron.glif
index a4b76737..829a3247 100644
--- a/src/Cantarell-Bold.ufo/glyphs/acaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/acaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acaron" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="01CE"/>
   <outline>
     <component base="a"/>
-    <component base="caroncomb" xOffset="51"/>
+    <component base="caroncomb" xOffset="62"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/acircumflex.glif b/src/Cantarell-Bold.ufo/glyphs/acircumflex.glif
index eec22927..1b24069c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/acircumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/acircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflex" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="00E2"/>
   <outline>
     <component base="a"/>
-    <component base="circumflexcomb" xOffset="54"/>
+    <component base="circumflexcomb" xOffset="65"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/acircumflexacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/acircumflexacute.glif
index 4b2c5377..bd58c2b4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/acircumflexacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/acircumflexacute.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflexacute" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="1EA5"/>
   <outline>
     <component base="a"/>
-    <component base="circumflexcomb_acutecomb" xOffset="53"/>
+    <component base="circumflexcomb.loclVIET" xOffset="64"/>
+    <component base="acutecomb.loclVIET" xOffset="359" yOffset="123"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/acircumflexdotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/acircumflexdotbelow.glif
index f75785af..3a335e1c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/acircumflexdotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/acircumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflexdotbelow" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="1EAD"/>
   <outline>
     <component base="a"/>
-    <component base="dotbelowcomb" xOffset="117"/>
-    <component base="circumflexcomb" xOffset="54"/>
+    <component base="dotbelowcomb" xOffset="128"/>
+    <component base="circumflexcomb" xOffset="65"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/acircumflexgrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/acircumflexgrave.glif
index 186dc42b..1b12a5e2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/acircumflexgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/acircumflexgrave.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflexgrave" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="1EA7"/>
   <outline>
     <component base="a"/>
-    <component base="circumflexcomb_gravecomb" xOffset="53"/>
+    <component base="circumflexcomb.loclVIET" xOffset="64"/>
+    <component base="gravecomb.loclVIET" xOffset="269" yOffset="123"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/acircumflexhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/acircumflexhookabove.glif
index b9f4acc5..3e6ee62b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/acircumflexhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/acircumflexhookabove.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflexhookabove" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="1EA9"/>
   <outline>
     <component base="a"/>
-    <component base="circumflexcomb_hookabovecomb" xOffset="53"/>
+    <component base="circumflexcomb.loclVIET" xOffset="64"/>
+    <component base="hookabovecomb.loclVIET" xOffset="292" yOffset="122"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/acircumflextilde.glif 
b/src/Cantarell-Bold.ufo/glyphs/acircumflextilde.glif
index 3a7a1df1..602dbf78 100644
--- a/src/Cantarell-Bold.ufo/glyphs/acircumflextilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/acircumflextilde.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflextilde" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="1EAB"/>
   <outline>
     <component base="a"/>
-    <component base="circumflexcomb_tildecomb" xOffset="35"/>
+    <component base="circumflexcomb.loclVIET" xOffset="64"/>
+    <component base="tildecomb.loclVIET" xOffset="50" yOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/acute.glif b/src/Cantarell-Bold.ufo/glyphs/acute.glif
index f14acfa4..00be7acf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/acute.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acute" format="2">
-  <advance width="287"/>
+  <advance width="500"/>
   <unicode hex="00B4"/>
   <outline>
-    <component base="acutecomb" xOffset="-4"/>
+    <component base="acutecomb" xOffset="109"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/adblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/adblgrave.glif
index 010fc10e..d253ffe4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/adblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/adblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="adblgrave" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="0201"/>
   <outline>
     <component base="a"/>
-    <component base="dblgravecomb" xOffset="-44"/>
+    <component base="dblgravecomb" xOffset="-33"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/adieresis-cy.glif b/src/Cantarell-Bold.ufo/glyphs/adieresis-cy.glif
index c648bafd..1a8ca4ec 100644
--- a/src/Cantarell-Bold.ufo/glyphs/adieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/adieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="adieresis-cy" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="04D3"/>
   <outline>
     <component base="a-cy"/>
-    <component base="dieresiscomb" xOffset="-5"/>
+    <component base="dieresiscomb" xOffset="-1"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/adieresis.glif b/src/Cantarell-Bold.ufo/glyphs/adieresis.glif
index 490837fe..5f1ccc08 100644
--- a/src/Cantarell-Bold.ufo/glyphs/adieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/adieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="adieresis" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="00E4"/>
   <outline>
     <component base="a"/>
-    <component base="dieresiscomb" xOffset="-12"/>
+    <component base="dieresiscomb" xOffset="-1"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/adotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/adotbelow.glif
index dbb44f5e..95536e0d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/adotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/adotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="adotbelow" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="1EA1"/>
   <outline>
     <component base="a"/>
-    <component base="dotbelowcomb" xOffset="117"/>
+    <component base="dotbelowcomb" xOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ae.glif b/src/Cantarell-Bold.ufo/glyphs/ae.glif
index f960f248..a79f9421 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ae.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ae.glif
@@ -1,82 +1,82 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ae" format="2">
-  <advance width="796"/>
+  <advance width="812"/>
   <unicode hex="00E6"/>
-  <anchor x="397" y="0" name="bottom"/>
-  <anchor x="397" y="490" name="top"/>
+  <anchor x="408" y="0" name="bottom"/>
+  <anchor x="408" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="313" y="255" type="line"/>
-      <point x="446" y="255" type="line"/>
-      <point x="446" y="282" type="line" smooth="yes"/>
-      <point x="446" y="429"/>
-      <point x="383" y="500"/>
-      <point x="253" y="500" type="curve" smooth="yes"/>
-      <point x="175" y="500"/>
-      <point x="91" y="477"/>
-      <point x="27" y="438" type="curve"/>
-      <point x="65" y="321" type="line"/>
-      <point x="117" y="345"/>
-      <point x="173" y="359"/>
-      <point x="217" y="359" type="curve" smooth="yes"/>
-      <point x="278" y="359"/>
-      <point x="313" y="331"/>
-      <point x="313" y="282" type="curve" smooth="yes"/>
+      <point x="585" y="-10" type="curve" smooth="yes"/>
+      <point x="645" y="-10"/>
+      <point x="708" y="1"/>
+      <point x="770" y="22" type="curve"/>
+      <point x="731" y="141" type="line"/>
+      <point x="691" y="127"/>
+      <point x="651" y="120"/>
+      <point x="614" y="120" type="curve" smooth="yes"/>
+      <point x="518" y="120"/>
+      <point x="475" y="165"/>
+      <point x="475" y="263" type="curve" smooth="yes"/>
+      <point x="475" y="334"/>
+      <point x="498" y="369"/>
+      <point x="544" y="369" type="curve" smooth="yes"/>
+      <point x="585" y="369"/>
+      <point x="609" y="343"/>
+      <point x="609" y="299" type="curve"/>
+      <point x="449" y="299" type="line"/>
+      <point x="449" y="199" type="line"/>
+      <point x="772" y="199" type="line"/>
+      <point x="776" y="215"/>
+      <point x="779" y="244"/>
+      <point x="779" y="271" type="curve" smooth="yes"/>
+      <point x="779" y="415"/>
+      <point x="696" y="500"/>
+      <point x="556" y="500" type="curve" smooth="yes"/>
+      <point x="411" y="500"/>
+      <point x="329" y="408"/>
+      <point x="329" y="245" type="curve" smooth="yes"/>
+      <point x="329" y="77"/>
+      <point x="416" y="-10"/>
     </contour>
     <contour>
-      <point x="186" y="-10" type="curve" smooth="yes"/>
-      <point x="282" y="-10"/>
-      <point x="354" y="43"/>
-      <point x="415" y="155" type="curve"/>
-      <point x="362" y="178" type="line"/>
-      <point x="329" y="140"/>
-      <point x="288" y="119"/>
-      <point x="249" y="119" type="curve" smooth="yes"/>
-      <point x="215" y="119"/>
-      <point x="196" y="133"/>
-      <point x="196" y="157" type="curve" smooth="yes"/>
-      <point x="196" y="192"/>
-      <point x="241" y="206"/>
-      <point x="350" y="205" type="curve"/>
-      <point x="350" y="299" type="line"/>
-      <point x="144" y="300"/>
-      <point x="22" y="236"/>
-      <point x="22" y="126" type="curve" smooth="yes"/>
-      <point x="22" y="44"/>
-      <point x="88" y="-10"/>
+      <point x="197" y="-10" type="curve" smooth="yes"/>
+      <point x="293" y="-10"/>
+      <point x="365" y="43"/>
+      <point x="426" y="155" type="curve"/>
+      <point x="373" y="178" type="line"/>
+      <point x="340" y="140"/>
+      <point x="299" y="119"/>
+      <point x="260" y="119" type="curve" smooth="yes"/>
+      <point x="226" y="119"/>
+      <point x="207" y="133"/>
+      <point x="207" y="157" type="curve" smooth="yes"/>
+      <point x="207" y="192"/>
+      <point x="252" y="206"/>
+      <point x="361" y="205" type="curve"/>
+      <point x="361" y="299" type="line"/>
+      <point x="155" y="300"/>
+      <point x="33" y="236"/>
+      <point x="33" y="126" type="curve" smooth="yes"/>
+      <point x="33" y="44"/>
+      <point x="99" y="-10"/>
     </contour>
     <contour>
-      <point x="574" y="-10" type="curve" smooth="yes"/>
-      <point x="634" y="-10"/>
-      <point x="697" y="1"/>
-      <point x="759" y="22" type="curve"/>
-      <point x="720" y="141" type="line"/>
-      <point x="680" y="127"/>
-      <point x="640" y="120"/>
-      <point x="603" y="120" type="curve" smooth="yes"/>
-      <point x="507" y="120"/>
-      <point x="464" y="165"/>
-      <point x="464" y="263" type="curve" smooth="yes"/>
-      <point x="464" y="334"/>
-      <point x="487" y="369"/>
-      <point x="533" y="369" type="curve" smooth="yes"/>
-      <point x="574" y="369"/>
-      <point x="598" y="343"/>
-      <point x="598" y="299" type="curve"/>
-      <point x="438" y="299" type="line"/>
-      <point x="438" y="199" type="line"/>
-      <point x="761" y="199" type="line"/>
-      <point x="765" y="215"/>
-      <point x="768" y="244"/>
-      <point x="768" y="271" type="curve" smooth="yes"/>
-      <point x="768" y="415"/>
-      <point x="685" y="500"/>
-      <point x="545" y="500" type="curve" smooth="yes"/>
-      <point x="400" y="500"/>
-      <point x="318" y="408"/>
-      <point x="318" y="245" type="curve" smooth="yes"/>
-      <point x="318" y="77"/>
-      <point x="405" y="-10"/>
+      <point x="324" y="255" type="line"/>
+      <point x="457" y="255" type="line"/>
+      <point x="457" y="282" type="line" smooth="yes"/>
+      <point x="457" y="429"/>
+      <point x="394" y="500"/>
+      <point x="264" y="500" type="curve" smooth="yes"/>
+      <point x="186" y="500"/>
+      <point x="102" y="477"/>
+      <point x="38" y="438" type="curve"/>
+      <point x="76" y="321" type="line"/>
+      <point x="128" y="345"/>
+      <point x="184" y="359"/>
+      <point x="228" y="359" type="curve" smooth="yes"/>
+      <point x="289" y="359"/>
+      <point x="324" y="331"/>
+      <point x="324" y="282" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/aeacute.glif b/src/Cantarell-Bold.ufo/glyphs/aeacute.glif
index 979b399f..fbba9e68 100644
--- a/src/Cantarell-Bold.ufo/glyphs/aeacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/aeacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aeacute" format="2">
-  <advance width="796"/>
+  <advance width="812"/>
   <unicode hex="01FD"/>
   <outline>
     <component base="ae"/>
-    <component base="acutecomb" xOffset="301"/>
+    <component base="acutecomb" xOffset="312"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/agrave.glif b/src/Cantarell-Bold.ufo/glyphs/agrave.glif
index a2b7ec74..fd6e7818 100644
--- a/src/Cantarell-Bold.ufo/glyphs/agrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/agrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="agrave" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="00E0"/>
   <outline>
     <component base="a"/>
-    <component base="gravecomb" xOffset="59"/>
+    <component base="gravecomb" xOffset="70"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ahookabove.glif b/src/Cantarell-Bold.ufo/glyphs/ahookabove.glif
index 0a67d5d7..44797bb6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ahookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ahookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ahookabove" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="1EA3"/>
   <outline>
     <component base="a"/>
-    <component base="hookabovecomb" xOffset="103"/>
+    <component base="hookabovecomb" xOffset="114"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/aie-cy.glif b/src/Cantarell-Bold.ufo/glyphs/aie-cy.glif
index 9b4eb9ea..225308da 100644
--- a/src/Cantarell-Bold.ufo/glyphs/aie-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/aie-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aie-cy" format="2">
-  <advance width="796"/>
+  <advance width="812"/>
   <unicode hex="04D5"/>
   <outline>
     <component base="ae"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ainvertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/ainvertedbreve.glif
index d41209aa..567bcbd0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ainvertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ainvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ainvertedbreve" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="0203"/>
   <outline>
     <component base="a"/>
-    <component base="breveinvertedcomb" xOffset="31"/>
+    <component base="breveinvertedcomb" xOffset="42"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/amacron.glif b/src/Cantarell-Bold.ufo/glyphs/amacron.glif
index 98e31562..7bec8b6d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/amacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/amacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="amacron" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="0101"/>
   <outline>
     <component base="a"/>
-    <component base="macroncomb" xOffset="15"/>
+    <component base="macroncomb" xOffset="26"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ampersand.glif b/src/Cantarell-Bold.ufo/glyphs/ampersand.glif
index 8335ce56..d1ef6530 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ampersand.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ampersand.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ampersand" format="2">
-  <advance width="691"/>
+  <advance width="716"/>
   <unicode hex="0026"/>
   <outline>
     <contour>
-      <point x="582" y="-10" type="curve"/>
-      <point x="671" y="92" type="line"/>
-      <point x="376" y="314"/>
-      <point x="275" y="416"/>
-      <point x="275" y="511" type="curve" smooth="yes"/>
-      <point x="275" y="551"/>
-      <point x="295" y="572"/>
-      <point x="331" y="572" type="curve" smooth="yes"/>
-      <point x="364" y="572"/>
-      <point x="387" y="554"/>
-      <point x="387" y="528" type="curve" smooth="yes"/>
-      <point x="387" y="419"/>
-      <point x="27" y="443"/>
-      <point x="27" y="200" type="curve" smooth="yes"/>
-      <point x="27" y="75"/>
-      <point x="125" y="-10"/>
-      <point x="271" y="-10" type="curve" smooth="yes"/>
-      <point x="431" y="-10"/>
-      <point x="567" y="94"/>
-      <point x="657" y="290" type="curve"/>
-      <point x="542" y="358" type="line"/>
-      <point x="476" y="209"/>
-      <point x="393" y="126"/>
-      <point x="294" y="126" type="curve" smooth="yes"/>
-      <point x="234" y="126"/>
-      <point x="193" y="158"/>
-      <point x="193" y="208" type="curve" smooth="yes"/>
-      <point x="193" y="355"/>
-      <point x="541" y="327"/>
-      <point x="541" y="533" type="curve" smooth="yes"/>
-      <point x="541" y="634"/>
-      <point x="457" y="704"/>
-      <point x="333" y="704" type="curve" smooth="yes"/>
-      <point x="207" y="704"/>
-      <point x="120" y="629"/>
-      <point x="120" y="517" type="curve" smooth="yes"/>
-      <point x="120" y="397"/>
-      <point x="218" y="284"/>
+      <point x="283" y="-10" type="curve" smooth="yes"/>
+      <point x="443" y="-10"/>
+      <point x="579" y="94"/>
+      <point x="669" y="290" type="curve"/>
+      <point x="554" y="358" type="line"/>
+      <point x="488" y="209"/>
+      <point x="405" y="126"/>
+      <point x="306" y="126" type="curve" smooth="yes"/>
+      <point x="246" y="126"/>
+      <point x="205" y="158"/>
+      <point x="205" y="208" type="curve" smooth="yes"/>
+      <point x="205" y="355"/>
+      <point x="553" y="327"/>
+      <point x="553" y="533" type="curve" smooth="yes"/>
+      <point x="553" y="634"/>
+      <point x="469" y="704"/>
+      <point x="345" y="704" type="curve" smooth="yes"/>
+      <point x="219" y="704"/>
+      <point x="132" y="629"/>
+      <point x="132" y="517" type="curve" smooth="yes"/>
+      <point x="132" y="397"/>
+      <point x="230" y="284"/>
+      <point x="594" y="-10" type="curve"/>
+      <point x="683" y="92" type="line"/>
+      <point x="388" y="314"/>
+      <point x="287" y="416"/>
+      <point x="287" y="511" type="curve" smooth="yes"/>
+      <point x="287" y="551"/>
+      <point x="307" y="572"/>
+      <point x="343" y="572" type="curve" smooth="yes"/>
+      <point x="376" y="572"/>
+      <point x="399" y="554"/>
+      <point x="399" y="528" type="curve" smooth="yes"/>
+      <point x="399" y="419"/>
+      <point x="39" y="443"/>
+      <point x="39" y="200" type="curve" smooth="yes"/>
+      <point x="39" y="75"/>
+      <point x="137" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/aogonek.glif b/src/Cantarell-Bold.ufo/glyphs/aogonek.glif
index 3e5011b5..bfd1cccc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/aogonek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/aogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aogonek" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="0105"/>
   <outline>
     <component base="a"/>
-    <component base="ogonekcomb" xOffset="-19"/>
+    <component base="ogonekcomb" xOffset="-8"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/apostrophemod.glif 
b/src/Cantarell-Bold.ufo/glyphs/apostrophemod.glif
index 3580da7e..4dd045d2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/apostrophemod.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/apostrophemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="apostrophemod" format="2">
-  <advance width="288"/>
+  <advance width="234"/>
   <unicode hex="02BC"/>
   <outline>
-    <component base="quoteright" xOffset="-15"/>
+    <component base="quoteright" xOffset="-29"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/approxequal.glif b/src/Cantarell-Bold.ufo/glyphs/approxequal.glif
index 019f7951..a1825b57 100644
--- a/src/Cantarell-Bold.ufo/glyphs/approxequal.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/approxequal.glif
@@ -1,51 +1,57 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="approxequal" format="2">
-  <advance width="606"/>
+  <advance width="600"/>
   <unicode hex="2248"/>
   <outline>
     <contour>
-      <point x="143" y="322" type="line"/>
-      <point x="167" y="369"/>
-      <point x="183" y="384"/>
-      <point x="208" y="384" type="curve" smooth="yes"/>
-      <point x="256" y="384"/>
-      <point x="298" y="326"/>
-      <point x="370" y="326" type="curve" smooth="yes"/>
-      <point x="448" y="326"/>
-      <point x="531" y="397"/>
-      <point x="568" y="495" type="curve"/>
-      <point x="458" y="544" type="line"/>
-      <point x="442" y="504"/>
-      <point x="416" y="483"/>
-      <point x="383" y="483" type="curve" smooth="yes"/>
-      <point x="327" y="483"/>
-      <point x="294" y="541"/>
-      <point x="223" y="541" type="curve" smooth="yes"/>
-      <point x="150" y="541"/>
-      <point x="79" y="474"/>
-      <point x="39" y="368" type="curve"/>
+      <point x="365" y="331" type="curve" smooth="yes"/>
+      <point x="436" y="331"/>
+      <point x="520" y="398"/>
+      <point x="557" y="500" type="curve"/>
+      <point x="449" y="549" type="line"/>
+      <point x="434" y="509"/>
+      <point x="408" y="488"/>
+      <point x="377" y="488" type="curve" smooth="yes"/>
+      <point x="323" y="488"/>
+      <point x="291" y="546"/>
+      <point x="223" y="546" type="curve" smooth="yes"/>
+      <point x="154" y="546"/>
+      <point x="83" y="479"/>
+      <point x="44" y="373" type="curve"/>
+      <point x="147" y="327" type="line"/>
+      <point x="170" y="375"/>
+      <point x="187" y="389"/>
+      <point x="208" y="389" type="curve" smooth="yes"/>
+      <point x="254" y="389"/>
+      <point x="295" y="331"/>
     </contour>
     <contour>
-      <point x="139" y="90" type="line"/>
-      <point x="161" y="133"/>
-      <point x="181" y="151"/>
-      <point x="208" y="151" type="curve" smooth="yes"/>
-      <point x="256" y="151"/>
-      <point x="298" y="93"/>
-      <point x="370" y="93" type="curve" smooth="yes"/>
-      <point x="448" y="93"/>
-      <point x="531" y="164"/>
-      <point x="568" y="262" type="curve"/>
-      <point x="458" y="310" type="line"/>
-      <point x="442" y="271"/>
-      <point x="416" y="250"/>
-      <point x="383" y="250" type="curve" smooth="yes"/>
-      <point x="327" y="250"/>
-      <point x="294" y="308"/>
-      <point x="223" y="308" type="curve" smooth="yes"/>
-      <point x="150" y="308"/>
-      <point x="79" y="241"/>
-      <point x="39" y="135" type="curve"/>
+      <point x="365" y="88" type="curve" smooth="yes"/>
+      <point x="436" y="88"/>
+      <point x="520" y="155"/>
+      <point x="557" y="257" type="curve"/>
+      <point x="449" y="305" type="line"/>
+      <point x="434" y="266"/>
+      <point x="408" y="245"/>
+      <point x="377" y="245" type="curve" smooth="yes"/>
+      <point x="323" y="245"/>
+      <point x="291" y="303"/>
+      <point x="223" y="303" type="curve" smooth="yes"/>
+      <point x="156" y="303"/>
+      <point x="85" y="240"/>
+      <point x="44" y="130" type="curve"/>
+      <point x="143" y="85" type="line"/>
+      <point x="164" y="129"/>
+      <point x="185" y="146"/>
+      <point x="208" y="146" type="curve" smooth="yes"/>
+      <point x="254" y="146"/>
+      <point x="295" y="88"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/aring.glif b/src/Cantarell-Bold.ufo/glyphs/aring.glif
index 446cfa8c..25cebaad 100644
--- a/src/Cantarell-Bold.ufo/glyphs/aring.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/aring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aring" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="00E5"/>
   <outline>
     <component base="a"/>
-    <component base="ringcomb" xOffset="91"/>
+    <component base="ringcomb" xOffset="102"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/aringacute.glif b/src/Cantarell-Bold.ufo/glyphs/aringacute.glif
index af719fd8..b332c080 100644
--- a/src/Cantarell-Bold.ufo/glyphs/aringacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/aringacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aringacute" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="01FB"/>
   <outline>
     <component base="a"/>
-    <component base="ringcomb_acutecomb" xOffset="101"/>
+    <component base="ringcomb_acutecomb" xOffset="112"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/asciicircum.glif b/src/Cantarell-Bold.ufo/glyphs/asciicircum.glif
index 8e79e509..a15b53bd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/asciicircum.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/asciicircum.glif
@@ -1,17 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="asciicircum" format="2">
-  <advance width="647"/>
+  <advance width="600"/>
   <unicode hex="005E"/>
   <outline>
     <contour>
-      <point x="153" y="176" type="line"/>
-      <point x="332" y="506" type="line"/>
-      <point x="295" y="504" type="line"/>
-      <point x="463" y="175" type="line"/>
-      <point x="628" y="247" type="line"/>
-      <point x="387" y="695" type="line"/>
-      <point x="256" y="695" type="line"/>
-      <point x="19" y="235" type="line"/>
+      <point x="150" y="216" type="line"/>
+      <point x="308" y="506" type="line"/>
+      <point x="272" y="504" type="line"/>
+      <point x="418" y="217" type="line"/>
+      <point x="583" y="289" type="line"/>
+      <point x="363" y="695" type="line"/>
+      <point x="233" y="695" type="line"/>
+      <point x="16" y="275" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/asciitilde.glif b/src/Cantarell-Bold.ufo/glyphs/asciitilde.glif
index a7650060..519c0219 100644
--- a/src/Cantarell-Bold.ufo/glyphs/asciitilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/asciitilde.glif
@@ -1,29 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="asciitilde" format="2">
-  <advance width="629"/>
+  <advance width="600"/>
   <unicode hex="007E"/>
   <outline>
     <contour>
-      <point x="133" y="219" type="line"/>
-      <point x="150" y="253"/>
-      <point x="177" y="274"/>
-      <point x="208" y="274" type="curve" smooth="yes"/>
-      <point x="268" y="274"/>
-      <point x="307" y="208"/>
-      <point x="387" y="208" type="curve" smooth="yes"/>
-      <point x="469" y="208"/>
-      <point x="555" y="279"/>
-      <point x="591" y="384" type="curve"/>
-      <point x="490" y="427" type="line"/>
-      <point x="472" y="391"/>
-      <point x="441" y="370"/>
-      <point x="405" y="370" type="curve" smooth="yes"/>
-      <point x="336" y="370"/>
-      <point x="308" y="436"/>
-      <point x="228" y="436" type="curve" smooth="yes"/>
-      <point x="146" y="436"/>
-      <point x="74" y="364"/>
-      <point x="40" y="261" type="curve"/>
+      <point x="371" y="203" type="curve" smooth="yes"/>
+      <point x="453" y="203"/>
+      <point x="539" y="274"/>
+      <point x="575" y="379" type="curve"/>
+      <point x="474" y="422" type="line"/>
+      <point x="456" y="386"/>
+      <point x="425" y="365"/>
+      <point x="389" y="365" type="curve" smooth="yes"/>
+      <point x="320" y="365"/>
+      <point x="292" y="431"/>
+      <point x="212" y="431" type="curve" smooth="yes"/>
+      <point x="130" y="431"/>
+      <point x="58" y="359"/>
+      <point x="24" y="256" type="curve"/>
+      <point x="117" y="214" type="line"/>
+      <point x="134" y="248"/>
+      <point x="161" y="269"/>
+      <point x="192" y="269" type="curve" smooth="yes"/>
+      <point x="252" y="269"/>
+      <point x="291" y="203"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/asterisk.glif b/src/Cantarell-Bold.ufo/glyphs/asterisk.glif
index df8cf893..72a2c7e2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/asterisk.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/asterisk.glif
@@ -1,43 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="asterisk" format="2">
-  <advance width="466"/>
+  <advance width="495"/>
   <unicode hex="002A"/>
   <outline>
     <contour>
-      <point x="243" y="467" type="line"/>
-      <point x="456" y="526" type="line"/>
-      <point x="391" y="643" type="line"/>
-      <point x="219" y="511" type="line"/>
+      <point x="395" y="315" type="line"/>
+      <point x="467" y="442" type="line"/>
+      <point x="259" y="507" type="line"/>
+      <point x="232" y="463" type="line"/>
     </contour>
     <contour>
-      <point x="77" y="323" type="line"/>
-      <point x="245" y="464" type="line"/>
-      <point x="220" y="507" type="line"/>
-      <point x="13" y="441" type="line"/>
+      <point x="93" y="318" type="line"/>
+      <point x="258" y="464" type="line"/>
+      <point x="233" y="507" type="line"/>
+      <point x="23" y="446" type="line"/>
     </contour>
     <contour>
-      <point x="157" y="272" type="line"/>
-      <point x="306" y="272" type="line"/>
-      <point x="258" y="488" type="line"/>
-      <point x="208" y="488" type="line"/>
+      <point x="164" y="272" type="line"/>
+      <point x="325" y="272" type="line"/>
+      <point x="271" y="488" type="line"/>
+      <point x="221" y="488" type="line"/>
     </contour>
     <contour>
-      <point x="221" y="467" type="line"/>
-      <point x="246" y="510" type="line"/>
-      <point x="79" y="651" type="line"/>
-      <point x="14" y="535" type="line"/>
+      <point x="234" y="467" type="line"/>
+      <point x="259" y="510" type="line"/>
+      <point x="95" y="656" type="line"/>
+      <point x="24" y="530" type="line"/>
     </contour>
     <contour>
-      <point x="385" y="320" type="line"/>
-      <point x="451" y="437" type="line"/>
-      <point x="246" y="507" type="line"/>
-      <point x="219" y="463" type="line"/>
+      <point x="221" y="488" type="line"/>
+      <point x="271" y="488" type="line"/>
+      <point x="325" y="704" type="line"/>
+      <point x="164" y="704" type="line"/>
     </contour>
     <contour>
-      <point x="208" y="488" type="line"/>
-      <point x="258" y="488" type="line"/>
-      <point x="306" y="704" type="line"/>
-      <point x="157" y="704" type="line"/>
+      <point x="256" y="467" type="line"/>
+      <point x="472" y="521" type="line"/>
+      <point x="401" y="648" type="line"/>
+      <point x="232" y="511" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/at.glif b/src/Cantarell-Bold.ufo/glyphs/at.glif
index 1d08b1bd..411b8bd5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/at.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/at.glif
@@ -1,82 +1,82 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="at" format="2">
-  <advance width="964"/>
+  <advance width="988"/>
   <unicode hex="0040"/>
   <outline>
     <contour>
-      <point x="458" y="-175" type="curve" smooth="yes"/>
-      <point x="535" y="-175"/>
-      <point x="608" y="-159"/>
-      <point x="677" y="-125" type="curve"/>
-      <point x="641" y="-18" type="line"/>
-      <point x="592" y="-43"/>
-      <point x="533" y="-56"/>
-      <point x="474" y="-56" type="curve" smooth="yes"/>
-      <point x="293" y="-56"/>
-      <point x="172" y="68"/>
-      <point x="172" y="255" type="curve" smooth="yes"/>
-      <point x="172" y="446"/>
-      <point x="299" y="580"/>
-      <point x="491" y="580" type="curve" smooth="yes"/>
-      <point x="674" y="580"/>
-      <point x="795" y="459"/>
-      <point x="795" y="272" type="curve" smooth="yes"/>
-      <point x="795" y="189"/>
-      <point x="771" y="132"/>
-      <point x="736" y="132" type="curve" smooth="yes"/>
-      <point x="713" y="132"/>
-      <point x="695" y="157"/>
-      <point x="695" y="191" type="curve"/>
-      <point x="548" y="191" type="line"/>
-      <point x="548" y="91"/>
-      <point x="623" y="22"/>
-      <point x="723" y="22" type="curve" smooth="yes"/>
-      <point x="849" y="22"/>
-      <point x="932" y="132"/>
-      <point x="932" y="300" type="curve" smooth="yes"/>
-      <point x="932" y="541"/>
-      <point x="759" y="704"/>
-      <point x="500" y="704" type="curve" smooth="yes"/>
-      <point x="223" y="704"/>
-      <point x="35" y="522"/>
-      <point x="35" y="251" type="curve" smooth="yes"/>
-      <point x="35" y="-8"/>
-      <point x="208" y="-175"/>
+      <point x="470" y="-175" type="curve" smooth="yes"/>
+      <point x="547" y="-175"/>
+      <point x="620" y="-159"/>
+      <point x="689" y="-125" type="curve"/>
+      <point x="653" y="-18" type="line"/>
+      <point x="604" y="-43"/>
+      <point x="545" y="-56"/>
+      <point x="486" y="-56" type="curve" smooth="yes"/>
+      <point x="305" y="-56"/>
+      <point x="184" y="68"/>
+      <point x="184" y="255" type="curve" smooth="yes"/>
+      <point x="184" y="446"/>
+      <point x="311" y="580"/>
+      <point x="503" y="580" type="curve" smooth="yes"/>
+      <point x="686" y="580"/>
+      <point x="807" y="459"/>
+      <point x="807" y="272" type="curve" smooth="yes"/>
+      <point x="807" y="189"/>
+      <point x="783" y="132"/>
+      <point x="748" y="132" type="curve" smooth="yes"/>
+      <point x="725" y="132"/>
+      <point x="707" y="157"/>
+      <point x="707" y="191" type="curve"/>
+      <point x="560" y="191" type="line"/>
+      <point x="560" y="91"/>
+      <point x="635" y="22"/>
+      <point x="735" y="22" type="curve" smooth="yes"/>
+      <point x="861" y="22"/>
+      <point x="944" y="132"/>
+      <point x="944" y="300" type="curve" smooth="yes"/>
+      <point x="944" y="541"/>
+      <point x="771" y="704"/>
+      <point x="512" y="704" type="curve" smooth="yes"/>
+      <point x="235" y="704"/>
+      <point x="47" y="522"/>
+      <point x="47" y="251" type="curve" smooth="yes"/>
+      <point x="47" y="-8"/>
+      <point x="220" y="-175"/>
     </contour>
     <contour>
-      <point x="435" y="37" type="curve" smooth="yes"/>
-      <point x="495" y="37"/>
-      <point x="552" y="61"/>
-      <point x="595" y="107" type="curve"/>
-      <point x="553" y="205" type="line"/>
-      <point x="534" y="173"/>
-      <point x="504" y="157"/>
-      <point x="479" y="157" type="curve" smooth="yes"/>
-      <point x="437" y="157"/>
-      <point x="413" y="196"/>
-      <point x="413" y="256" type="curve" smooth="yes"/>
-      <point x="413" y="320"/>
-      <point x="441" y="366"/>
-      <point x="482" y="366" type="curve" smooth="yes"/>
-      <point x="516" y="366"/>
-      <point x="546" y="337"/>
-      <point x="553" y="296" type="curve"/>
-      <point x="613" y="359" type="line"/>
-      <point x="609" y="440"/>
-      <point x="557" y="486"/>
-      <point x="471" y="486" type="curve" smooth="yes"/>
-      <point x="342" y="486"/>
-      <point x="245" y="382"/>
-      <point x="245" y="242" type="curve" smooth="yes"/>
-      <point x="245" y="119"/>
-      <point x="321" y="37"/>
+      <point x="447" y="37" type="curve" smooth="yes"/>
+      <point x="507" y="37"/>
+      <point x="564" y="61"/>
+      <point x="607" y="107" type="curve"/>
+      <point x="565" y="205" type="line"/>
+      <point x="546" y="173"/>
+      <point x="516" y="157"/>
+      <point x="491" y="157" type="curve" smooth="yes"/>
+      <point x="449" y="157"/>
+      <point x="425" y="196"/>
+      <point x="425" y="256" type="curve" smooth="yes"/>
+      <point x="425" y="320"/>
+      <point x="453" y="366"/>
+      <point x="494" y="366" type="curve" smooth="yes"/>
+      <point x="528" y="366"/>
+      <point x="558" y="337"/>
+      <point x="565" y="296" type="curve"/>
+      <point x="625" y="359" type="line"/>
+      <point x="621" y="440"/>
+      <point x="569" y="486"/>
+      <point x="483" y="486" type="curve" smooth="yes"/>
+      <point x="354" y="486"/>
+      <point x="257" y="382"/>
+      <point x="257" y="242" type="curve" smooth="yes"/>
+      <point x="257" y="119"/>
+      <point x="333" y="37"/>
     </contour>
     <contour>
-      <point x="545" y="172" type="line"/>
-      <point x="693" y="172" type="line"/>
-      <point x="715" y="474" type="line"/>
-      <point x="592" y="474" type="line"/>
-      <point x="559" y="383" type="line"/>
+      <point x="557" y="172" type="line"/>
+      <point x="705" y="172" type="line"/>
+      <point x="727" y="474" type="line"/>
+      <point x="604" y="474" type="line"/>
+      <point x="571" y="383" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/atilde.glif b/src/Cantarell-Bold.ufo/glyphs/atilde.glif
index 5cf59979..5e5f9667 100644
--- a/src/Cantarell-Bold.ufo/glyphs/atilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/atilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="atilde" format="2">
-  <advance width="528"/>
+  <advance width="550"/>
   <unicode hex="00E3"/>
   <outline>
     <component base="a"/>
-    <component base="tildecomb" xOffset="22"/>
+    <component base="tildecomb" xOffset="33"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/b.glif b/src/Cantarell-Bold.ufo/glyphs/b.glif
index 7b29b605..4845de6a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/b.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/b.glif
@@ -1,47 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="b" format="2">
-  <advance width="576"/>
+  <advance width="596"/>
   <unicode hex="0062"/>
-  <note>
-b
-</note>
-  <anchor x="289" y="0" name="bottom"/>
-  <anchor x="289" y="490" name="top"/>
+  <anchor x="297" y="0" name="bottom"/>
+  <anchor x="297" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="160" y="0" type="line"/>
-      <point x="220" y="120" type="line"/>
-      <point x="220" y="739" type="line"/>
-      <point x="54" y="739" type="line"/>
+      <point x="336" y="-10" type="curve" smooth="yes"/>
+      <point x="472" y="-10"/>
+      <point x="563" y="94"/>
+      <point x="563" y="249" type="curve" smooth="yes"/>
+      <point x="563" y="400"/>
+      <point x="478" y="500"/>
+      <point x="354" y="500" type="curve" smooth="yes"/>
+      <point x="268" y="500"/>
+      <point x="204" y="452"/>
+      <point x="172" y="371" type="curve"/>
+      <point x="219" y="318" type="line"/>
+      <point x="234" y="347"/>
+      <point x="263" y="356"/>
+      <point x="292" y="356" type="curve" smooth="yes"/>
+      <point x="353" y="356"/>
+      <point x="387" y="316"/>
+      <point x="387" y="243" type="curve" smooth="yes"/>
+      <point x="387" y="173"/>
+      <point x="357" y="134"/>
+      <point x="303" y="134" type="curve" smooth="yes"/>
+      <point x="267" y="134"/>
+      <point x="236" y="151"/>
+      <point x="219" y="183" type="curve"/>
+      <point x="170" y="98" type="line"/>
+      <point x="199" y="27"/>
+      <point x="255" y="-10"/>
     </contour>
     <contour>
-      <point x="328" y="-10" type="curve" smooth="yes"/>
-      <point x="464" y="-10"/>
-      <point x="555" y="94"/>
-      <point x="555" y="249" type="curve" smooth="yes"/>
-      <point x="555" y="400"/>
-      <point x="470" y="500"/>
-      <point x="346" y="500" type="curve" smooth="yes"/>
-      <point x="260" y="500"/>
-      <point x="196" y="452"/>
-      <point x="164" y="371" type="curve"/>
-      <point x="211" y="318" type="line"/>
-      <point x="226" y="347"/>
-      <point x="255" y="356"/>
-      <point x="284" y="356" type="curve" smooth="yes"/>
-      <point x="345" y="356"/>
-      <point x="379" y="316"/>
-      <point x="379" y="243" type="curve" smooth="yes"/>
-      <point x="379" y="173"/>
-      <point x="349" y="134"/>
-      <point x="295" y="134" type="curve" smooth="yes"/>
-      <point x="259" y="134"/>
-      <point x="228" y="151"/>
-      <point x="211" y="183" type="curve"/>
-      <point x="162" y="98" type="line"/>
-      <point x="191" y="27"/>
-      <point x="247" y="-10"/>
+      <point x="62" y="0" type="line"/>
+      <point x="168" y="0" type="line"/>
+      <point x="228" y="120" type="line"/>
+      <point x="228" y="739" type="line"/>
+      <point x="62" y="739" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/backslash.glif b/src/Cantarell-Bold.ufo/glyphs/backslash.glif
index c7e25579..6def32b0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/backslash.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/backslash.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="backslash" format="2">
-  <advance width="364"/>
+  <advance width="393"/>
   <unicode hex="005C"/>
   <outline>
-    <component base="slash" xScale="-1" xOffset="364"/>
+    <component base="slash" xScale="-1" xOffset="393"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|slash</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|slash</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/bar.glif b/src/Cantarell-Bold.ufo/glyphs/bar.glif
index b290eb14..623f8512 100644
--- a/src/Cantarell-Bold.ufo/glyphs/bar.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/bar.glif
@@ -1,13 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bar" format="2">
-  <advance width="325"/>
+  <advance width="307"/>
   <unicode hex="007C"/>
   <outline>
     <contour>
-      <point x="80" y="-161" type="line"/>
-      <point x="245" y="-161" type="line"/>
-      <point x="245" y="743" type="line"/>
-      <point x="80" y="743" 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>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/be-cy.glif b/src/Cantarell-Bold.ufo/glyphs/be-cy.glif
index 48a72006..09e7df9b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/be-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/be-cy.glif
@@ -1,47 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="be-cy" format="2">
-  <advance width="567"/>
+  <advance width="583"/>
   <unicode hex="0431"/>
   <outline>
     <contour>
-      <point x="297" y="-10" type="curve" smooth="yes"/>
-      <point x="452" y="-10"/>
-      <point x="548" y="85"/>
-      <point x="548" y="244" type="curve" smooth="yes"/>
-      <point x="548" y="382"/>
-      <point x="476" y="466"/>
-      <point x="353" y="466" type="curve" smooth="yes"/>
-      <point x="266" y="466"/>
-      <point x="199" y="421"/>
-      <point x="159" y="335" type="curve"/>
-      <point x="202" y="275" type="line"/>
-      <point x="229" y="309"/>
+      <point x="304" y="-10" type="curve" smooth="yes"/>
+      <point x="459" y="-10"/>
+      <point x="555" y="85"/>
+      <point x="555" y="244" type="curve" smooth="yes"/>
+      <point x="555" y="382"/>
+      <point x="483" y="466"/>
+      <point x="360" y="466" type="curve" smooth="yes"/>
+      <point x="273" y="466"/>
+      <point x="206" y="421"/>
+      <point x="166" y="335" type="curve"/>
+      <point x="202" y="267" type="line"/>
+      <point x="227" y="306"/>
       <point x="266" y="329"/>
-      <point x="300" y="329" type="curve" smooth="yes"/>
-      <point x="350" y="329"/>
-      <point x="380" y="293"/>
-      <point x="380" y="231" type="curve" smooth="yes"/>
-      <point x="380" y="171"/>
-      <point x="353" y="133"/>
-      <point x="305" y="133" type="curve" smooth="yes"/>
-      <point x="236" y="133"/>
-      <point x="200" y="211"/>
-      <point x="200" y="354" type="curve" smooth="yes"/>
-      <point x="200" y="500"/>
-      <point x="229" y="544"/>
-      <point x="326" y="544" type="curve" smooth="yes"/>
-      <point x="415" y="544"/>
-      <point x="475" y="583"/>
-      <point x="528" y="673" type="curve"/>
-      <point x="421" y="746" type="line"/>
-      <point x="390" y="710"/>
-      <point x="340" y="694"/>
-      <point x="272" y="694" type="curve" smooth="yes"/>
-      <point x="100" y="694"/>
-      <point x="30" y="582"/>
-      <point x="30" y="335" type="curve" smooth="yes"/>
-      <point x="30" y="109"/>
-      <point x="122" y="-10"/>
+      <point x="307" y="329" type="curve" smooth="yes"/>
+      <point x="357" y="329"/>
+      <point x="387" y="293"/>
+      <point x="387" y="231" type="curve" smooth="yes"/>
+      <point x="387" y="171"/>
+      <point x="360" y="133"/>
+      <point x="312" y="133" type="curve" smooth="yes"/>
+      <point x="243" y="133"/>
+      <point x="199" y="211"/>
+      <point x="199" y="354" type="curve" smooth="yes"/>
+      <point x="199" y="507"/>
+      <point x="235" y="552"/>
+      <point x="376" y="577" type="curve" smooth="yes"/>
+      <point x="478" y="595" type="line"/>
+      <point x="454" y="743" type="line"/>
+      <point x="341" y="726" type="line" smooth="yes"/>
+      <point x="124" y="693"/>
+      <point x="37" y="587"/>
+      <point x="37" y="354" type="curve" smooth="yes"/>
+      <point x="37" y="112"/>
+      <point x="127" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/blackC_ircle.glif b/src/Cantarell-Bold.ufo/glyphs/blackC_ircle.glif
index 24b7fc61..6ea9563f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/blackC_ircle.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/blackC_ircle.glif
@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="blackCircle" format="2">
-  <advance width="569"/>
+  <advance width="593"/>
   <unicode hex="25CF"/>
-  <note>
-H18533
-</note>
   <outline>
     <contour>
-      <point x="282" y="109" type="curve" smooth="yes"/>
-      <point x="427" y="109"/>
-      <point x="524" y="205"/>
-      <point x="524" y="349" type="curve" smooth="yes"/>
-      <point x="524" y="490"/>
-      <point x="430" y="585"/>
-      <point x="287" y="585" type="curve" smooth="yes"/>
-      <point x="142" y="585"/>
-      <point x="45" y="488"/>
-      <point x="45" y="342" type="curve" smooth="yes"/>
-      <point x="45" y="202"/>
-      <point x="140" y="109"/>
+      <point x="294" y="109" type="curve" smooth="yes"/>
+      <point x="439" y="109"/>
+      <point x="536" y="205"/>
+      <point x="536" y="349" type="curve" smooth="yes"/>
+      <point x="536" y="490"/>
+      <point x="442" y="585"/>
+      <point x="299" y="585" type="curve" smooth="yes"/>
+      <point x="154" y="585"/>
+      <point x="57" y="488"/>
+      <point x="57" y="342" type="curve" smooth="yes"/>
+      <point x="57" y="202"/>
+      <point x="152" y="109"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/blank.glif b/src/Cantarell-Bold.ufo/glyphs/blank.glif
index cb464a30..3f598af5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/blank.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/blank.glif
@@ -1,20 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="blank" format="2">
-  <advance width="861"/>
+  <advance width="843"/>
   <unicode hex="2423"/>
-  <note>
-uni2423
-</note>
   <outline>
     <contour>
-      <point x="80" y="0" type="line"/>
-      <point x="781" y="0" type="line"/>
-      <point x="781" y="256" type="line"/>
-      <point x="638" y="256" type="line"/>
-      <point x="638" y="135" type="line"/>
-      <point x="223" y="135" type="line"/>
-      <point x="223" y="256" type="line"/>
-      <point x="80" y="256" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="772" y="0" type="line"/>
+      <point x="772" y="256" type="line"/>
+      <point x="629" y="256" type="line"/>
+      <point x="629" y="135" type="line"/>
+      <point x="214" y="135" type="line"/>
+      <point x="214" y="256" type="line"/>
+      <point x="71" y="256" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/braceleft.glif b/src/Cantarell-Bold.ufo/glyphs/braceleft.glif
index e15243d9..da861a2a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/braceleft.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/braceleft.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="braceleft" format="2">
-  <advance width="417"/>
+  <advance width="410"/>
   <unicode hex="007B"/>
   <outline>
     <contour>
-      <point x="401" y="-183" type="curve"/>
-      <point x="401" y="-42" type="line"/>
-      <point x="333" y="-42"/>
-      <point x="296" y="-9"/>
-      <point x="296" y="50" type="curve" smooth="yes"/>
-      <point x="296" y="130" type="line" smooth="yes"/>
-      <point x="296" y="210"/>
-      <point x="251" y="276"/>
-      <point x="184" y="294" type="curve"/>
-      <point x="184" y="295" type="line"/>
-      <point x="251" y="324"/>
-      <point x="296" y="387"/>
-      <point x="296" y="454" type="curve" smooth="yes"/>
-      <point x="296" y="515" type="line" smooth="yes"/>
-      <point x="296" y="575"/>
-      <point x="332" y="608"/>
-      <point x="401" y="608" type="curve"/>
-      <point x="401" y="749" type="line"/>
-      <point x="234" y="749"/>
-      <point x="135" y="672"/>
-      <point x="135" y="546" type="curve" smooth="yes"/>
+      <point x="365" y="-186" type="curve"/>
+      <point x="375" y="-45" type="line"/>
+      <point x="290" y="-45"/>
+      <point x="271" y="-14"/>
+      <point x="280" y="42" type="curve" smooth="yes"/>
+      <point x="295" y="134" type="line" smooth="yes"/>
+      <point x="308" y="211"/>
+      <point x="253" y="274"/>
+      <point x="163" y="286" type="curve"/>
+      <point x="163" y="287" type="line"/>
+      <point x="246" y="291"/>
+      <point x="310" y="351"/>
+      <point x="301" y="414" type="curve" smooth="yes"/>
+      <point x="286" y="514" type="line" smooth="yes"/>
+      <point x="276" y="578"/>
+      <point x="301" y="605"/>
+      <point x="375" y="605" type="curve"/>
+      <point x="365" y="746" type="line"/>
+      <point x="155" y="746"/>
+      <point x="101" y="676"/>
+      <point x="120" y="545" type="curve" smooth="yes"/>
       <point x="135" y="444" type="line" smooth="yes"/>
-      <point x="135" y="392"/>
-      <point x="62" y="339"/>
-      <point x="-4" y="318" type="curve"/>
-      <point x="-4" y="271" type="line"/>
-      <point x="80" y="241"/>
-      <point x="135" y="181"/>
-      <point x="135" y="120" type="curve" smooth="yes"/>
-      <point x="135" y="9" type="line" smooth="yes"/>
-      <point x="135" y="-111"/>
-      <point x="235" y="-183"/>
+      <point x="144" y="382"/>
+      <point x="99" y="336"/>
+      <point x="27" y="336" type="curve"/>
+      <point x="27" y="213" type="line"/>
+      <point x="96" y="213"/>
+      <point x="143" y="175"/>
+      <point x="134" y="124" type="curve" smooth="yes"/>
+      <point x="119" y="35" type="line" smooth="yes"/>
+      <point x="95" y="-108"/>
+      <point x="146" y="-186"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/braceright.glif b/src/Cantarell-Bold.ufo/glyphs/braceright.glif
index d39edf25..4e532fa1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/braceright.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/braceright.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="braceright" format="2">
-  <advance width="411"/>
+  <advance width="410"/>
   <unicode hex="007D"/>
   <outline>
-    <component base="braceleft" xScale="-1" yScale="-1" xOffset="417" yOffset="566"/>
+    <component base="braceleft" xScale="-1" yScale="-1" xOffset="410" yOffset="558"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|braceleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>braceleft</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/bracketleft.glif b/src/Cantarell-Bold.ufo/glyphs/bracketleft.glif
index a2b46fad..8ee7b64d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/bracketleft.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/bracketleft.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bracketleft" format="2">
-  <advance width="381"/>
+  <advance width="386"/>
   <unicode hex="005B"/>
   <outline>
     <contour>
-      <point x="64" y="-180" type="line"/>
-      <point x="366" y="-180" type="line"/>
-      <point x="366" y="-46" type="line"/>
-      <point x="221" y="-46" type="line"/>
-      <point x="221" y="605" type="line"/>
-      <point x="366" y="605" type="line"/>
-      <point x="366" y="739" type="line"/>
-      <point x="64" y="739" type="line"/>
+      <point x="74" y="-180" type="line"/>
+      <point x="350" y="-180" type="line"/>
+      <point x="350" y="-46" type="line"/>
+      <point x="231" y="-46" type="line"/>
+      <point x="231" y="605" type="line"/>
+      <point x="350" y="605" type="line"/>
+      <point x="350" y="739" type="line"/>
+      <point x="74" y="739" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/bracketright.glif b/src/Cantarell-Bold.ufo/glyphs/bracketright.glif
index e78b711d..c87a4198 100644
--- a/src/Cantarell-Bold.ufo/glyphs/bracketright.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/bracketright.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bracketright" format="2">
-  <advance width="389"/>
+  <advance width="386"/>
   <unicode hex="005D"/>
   <outline>
-    <component base="bracketleft" xScale="-1" xOffset="381"/>
+    <component base="bracketleft" xScale="-1" xOffset="386"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|bracketleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>bracketleft</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/breve.glif b/src/Cantarell-Bold.ufo/glyphs/breve.glif
index 9a3be707..b837232f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/breve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/breve.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="breve" format="2">
-  <advance width="460"/>
+  <advance width="500"/>
   <unicode hex="02D8"/>
   <outline>
-    <component base="brevecomb" xOffset="-25"/>
+    <component base="brevecomb" xOffset="36"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/brevecomb-cy.glif b/src/Cantarell-Bold.ufo/glyphs/brevecomb-cy.glif
index fb6e5508..ade8c67c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/brevecomb-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/brevecomb-cy.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="brevecomb-cy" format="2">
   <anchor x="233" y="490" name="_top"/>
-  <anchor x="233" y="727" name="top"/>
+  <anchor x="233" y="728" name="top"/>
   <outline>
     <contour>
       <point x="238" y="547" type="curve" smooth="yes"/>
-      <point x="368" y="547"/>
-      <point x="456" y="608"/>
-      <point x="472" y="711" type="curve"/>
-      <point x="354" y="767" type="line"/>
-      <point x="340" y="703"/>
-      <point x="301" y="666"/>
-      <point x="247" y="666" type="curve" smooth="yes"/>
-      <point x="192" y="666"/>
-      <point x="147" y="708"/>
-      <point x="138" y="771" type="curve"/>
-      <point x="18" y="705" type="line"/>
-      <point x="35" y="606"/>
-      <point x="117" y="547"/>
+      <point x="366" y="547"/>
+      <point x="446" y="606"/>
+      <point x="468" y="716" type="curve"/>
+      <point x="347" y="769" type="line"/>
+      <point x="329" y="701"/>
+      <point x="295" y="667"/>
+      <point x="247" y="667" type="curve" smooth="yes"/>
+      <point x="195" y="667"/>
+      <point x="157" y="704"/>
+      <point x="143" y="769" type="curve"/>
+      <point x="22" y="705" type="line"/>
+      <point x="45" y="604"/>
+      <point x="123" y="547"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/breveinvertedcomb.case.glif 
b/src/Cantarell-Bold.ufo/glyphs/breveinvertedcomb.case.glif
index 4bb4e9d1..237b66f0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/breveinvertedcomb.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/breveinvertedcomb.case.glif
@@ -3,7 +3,7 @@
   <anchor x="231" y="694" name="_top"/>
   <anchor x="231" y="932" name="top"/>
   <outline>
-    <component base="breveinvertedcomb" yOffset="170"/>
+    <component base="breveinvertedcomb" yOffset="200"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/brokenbar.glif b/src/Cantarell-Bold.ufo/glyphs/brokenbar.glif
index 344cb3fc..071a4984 100644
--- a/src/Cantarell-Bold.ufo/glyphs/brokenbar.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/brokenbar.glif
@@ -1,19 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="brokenbar" format="2">
-  <advance width="330"/>
+  <advance width="312"/>
   <unicode hex="00A6"/>
   <outline>
     <contour>
-      <point x="80" y="-161" type="line"/>
-      <point x="250" y="-161" type="line"/>
-      <point x="250" y="181" type="line"/>
-      <point x="80" 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="80" y="412" type="line"/>
-      <point x="250" y="412" type="line"/>
-      <point x="250" y="743" type="line"/>
-      <point x="80" 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>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/bullet.glif b/src/Cantarell-Bold.ufo/glyphs/bullet.glif
index f464ddcd..de55fdcb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/bullet.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/bullet.glif
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bullet" format="2">
-  <advance width="464"/>
+  <advance width="466"/>
   <unicode hex="2022"/>
   <outline>
-    <component base="period" xScale="2" yScale="2" xOffset="-50" yOffset="92"/>
+    <contour>
+      <point x="233" y="138" type="curve" smooth="yes"/>
+      <point x="354" y="138"/>
+      <point x="433" y="225"/>
+      <point x="433" y="338" type="curve" smooth="yes"/>
+      <point x="433" y="459"/>
+      <point x="354" y="546"/>
+      <point x="233" y="546" type="curve" smooth="yes"/>
+      <point x="112" y="546"/>
+      <point x="33" y="459"/>
+      <point x="33" y="338" type="curve" smooth="yes"/>
+      <point x="33" y="225"/>
+      <point x="112" y="138"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/bulletoperator.glif 
b/src/Cantarell-Bold.ufo/glyphs/bulletoperator.glif
index 6ea39095..cb9da1b2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/bulletoperator.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/bulletoperator.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bulletoperator" format="2">
-  <advance width="379"/>
+  <advance width="286"/>
   <unicode hex="2219"/>
   <outline>
-    <component base="period" xScale="1.25716" yScale="1.25716" xOffset="12" yOffset="230"/>
+    <component base="period" yOffset="243"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>period</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/c.glif b/src/Cantarell-Bold.ufo/glyphs/c.glif
index 03d396f8..e72b14eb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/c.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/c.glif
@@ -1,40 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="c" format="2">
-  <advance width="460"/>
+  <advance width="483"/>
   <unicode hex="0063"/>
-  <note>
-c
-</note>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="241" y="490" name="top"/>
+  <anchor x="240" y="0" name="bottom"/>
+  <anchor x="256" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="284" y="-10" type="curve" smooth="yes"/>
-      <point x="344" y="-10"/>
-      <point x="395" y="2"/>
-      <point x="446" y="28" type="curve"/>
-      <point x="408" y="145" type="line"/>
-      <point x="379" y="133"/>
-      <point x="349" y="128"/>
-      <point x="321" y="128" type="curve" smooth="yes"/>
-      <point x="240" y="128"/>
-      <point x="194" y="171"/>
-      <point x="194" y="248" type="curve" smooth="yes"/>
-      <point x="194" y="317"/>
-      <point x="231" y="356"/>
-      <point x="305" y="356" type="curve" smooth="yes"/>
-      <point x="338" y="356"/>
-      <point x="378" y="349"/>
-      <point x="408" y="339" type="curve"/>
-      <point x="443" y="473" type="line"/>
-      <point x="403" y="490"/>
-      <point x="348" y="500"/>
-      <point x="296" y="500" type="curve" smooth="yes"/>
-      <point x="126" y="500"/>
-      <point x="18" y="398"/>
-      <point x="18" y="236" type="curve" smooth="yes"/>
-      <point x="18" y="81"/>
-      <point x="117" y="-10"/>
+      <point x="299" y="-10" type="curve" smooth="yes"/>
+      <point x="359" y="-10"/>
+      <point x="410" y="2"/>
+      <point x="461" y="28" type="curve"/>
+      <point x="423" y="145" type="line"/>
+      <point x="394" y="133"/>
+      <point x="364" y="128"/>
+      <point x="336" y="128" type="curve" smooth="yes"/>
+      <point x="255" y="128"/>
+      <point x="209" y="171"/>
+      <point x="209" y="248" type="curve" smooth="yes"/>
+      <point x="209" y="317"/>
+      <point x="246" y="356"/>
+      <point x="320" y="356" type="curve" smooth="yes"/>
+      <point x="353" y="356"/>
+      <point x="393" y="349"/>
+      <point x="423" y="339" type="curve"/>
+      <point x="458" y="473" type="line"/>
+      <point x="418" y="490"/>
+      <point x="363" y="500"/>
+      <point x="311" y="500" type="curve" smooth="yes"/>
+      <point x="141" y="500"/>
+      <point x="33" y="398"/>
+      <point x="33" y="236" type="curve" smooth="yes"/>
+      <point x="33" y="81"/>
+      <point x="132" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/cacute.glif b/src/Cantarell-Bold.ufo/glyphs/cacute.glif
index 938d79ff..a6527fe5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/cacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/cacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cacute" format="2">
-  <advance width="460"/>
+  <advance width="483"/>
   <unicode hex="0107"/>
   <outline>
     <component base="c"/>
-    <component base="acutecomb" xOffset="145"/>
+    <component base="acutecomb" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/caron.glif b/src/Cantarell-Bold.ufo/glyphs/caron.glif
index 6009c1ab..2c067c9c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/caron.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="caron" format="2">
-  <advance width="413"/>
+  <advance width="500"/>
   <unicode hex="02C7"/>
   <outline>
-    <component base="caroncomb" xOffset="-3"/>
+    <component base="caroncomb" xOffset="45"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/caroncomb.loclV_I_E_T_.glif 
b/src/Cantarell-Bold.ufo/glyphs/caroncomb.loclV_I_E_T_.glif
index d879f688..83d1c6f2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/caroncomb.loclV_I_E_T_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/caroncomb.loclV_I_E_T_.glif
@@ -4,13 +4,13 @@
   <anchor x="208" y="685" name="top"/>
   <outline>
     <contour>
+      <point x="155" y="533" type="line"/>
+      <point x="255" y="533" type="line"/>
       <point x="399" y="687" type="line"/>
       <point x="338" y="740" type="line"/>
       <point x="224" y="660" type="line"/>
       <point x="108" y="739" type="line"/>
       <point x="11" y="646" type="line"/>
-      <point x="155" y="533" type="line"/>
-      <point x="255" y="533" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ccaron.glif b/src/Cantarell-Bold.ufo/glyphs/ccaron.glif
index ac6e39b8..83b39181 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ccaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ccaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccaron" format="2">
-  <advance width="460"/>
+  <advance width="483"/>
   <unicode hex="010D"/>
   <outline>
     <component base="c"/>
-    <component base="caroncomb" xOffset="35"/>
+    <component base="caroncomb" xOffset="50"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ccedilla.glif b/src/Cantarell-Bold.ufo/glyphs/ccedilla.glif
index d0041d71..7dbd9e59 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ccedilla.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ccedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccedilla" format="2">
-  <advance width="460"/>
+  <advance width="483"/>
   <unicode hex="00E7"/>
   <outline>
     <component base="c"/>
-    <component base="cedillacomb" xOffset="67"/>
+    <component base="cedillacomb" xOffset="82"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ccedillaacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/ccedillaacute.glif
index f7e5cab7..76ccd825 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ccedillaacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ccedillaacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccedillaacute" format="2">
-  <advance width="460"/>
+  <advance width="483"/>
   <unicode hex="1E09"/>
   <outline>
     <component base="c"/>
-    <component base="cedillacomb" xOffset="67"/>
-    <component base="acutecomb" xOffset="145"/>
+    <component base="cedillacomb" xOffset="82"/>
+    <component base="acutecomb" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ccircumflex.glif b/src/Cantarell-Bold.ufo/glyphs/ccircumflex.glif
index 24049d9a..2cf023fa 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ccircumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ccircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccircumflex" format="2">
-  <advance width="460"/>
+  <advance width="483"/>
   <unicode hex="0109"/>
   <outline>
     <component base="c"/>
-    <component base="circumflexcomb" xOffset="38"/>
+    <component base="circumflexcomb" xOffset="53"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/cdotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/cdotaccent.glif
index 24695c29..1aeb4482 100644
--- a/src/Cantarell-Bold.ufo/glyphs/cdotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/cdotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cdotaccent" format="2">
-  <advance width="460"/>
+  <advance width="483"/>
   <unicode hex="010B"/>
   <outline>
     <component base="c"/>
-    <component base="dotaccentcomb" xOffset="97"/>
+    <component base="dotaccentcomb" xOffset="112"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/cedi.glif b/src/Cantarell-Bold.ufo/glyphs/cedi.glif
index 116ebfdf..fd507ebf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/cedi.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/cedi.glif
@@ -1,20 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cedi" format="2">
-  <advance width="643"/>
+  <advance width="600"/>
   <unicode hex="20B5"/>
   <outline>
-    <component base="C" xOffset="8"/>
-    <component base="_currencyvstem" xOffset="194" yOffset="-6"/>
-    <component base="_currencyvstem" xOffset="194" yOffset="-800"/>
+    <contour>
+      <point x="362" y="-10" type="curve" smooth="yes"/>
+      <point x="429" y="-10"/>
+      <point x="506" y="10"/>
+      <point x="550" y="39" type="curve"/>
+      <point x="512" y="164" type="line"/>
+      <point x="480" y="150"/>
+      <point x="439" y="142"/>
+      <point x="405" y="142" type="curve" smooth="yes"/>
+      <point x="291" y="142"/>
+      <point x="229" y="224"/>
+      <point x="229" y="359" type="curve" smooth="yes"/>
+      <point x="229" y="485"/>
+      <point x="282" y="551"/>
+      <point x="381" y="551" type="curve" smooth="yes"/>
+      <point x="427" y="551"/>
+      <point x="482" y="541"/>
+      <point x="511" y="525" type="curve"/>
+      <point x="559" y="661" type="line"/>
+      <point x="498" y="690"/>
+      <point x="443" y="704"/>
+      <point x="383" y="704" type="curve" smooth="yes"/>
+      <point x="187" y="704"/>
+      <point x="49" y="560"/>
+      <point x="49" y="342" type="curve" smooth="yes"/>
+      <point x="49" y="131"/>
+      <point x="178" y="-10"/>
+    </contour>
+    <contour>
+      <point x="274" y="-123" type="line"/>
+      <point x="431" y="-123" type="line"/>
+      <point x="431" y="31" type="line"/>
+      <point x="274" y="31" type="line"/>
+    </contour>
+    <contour>
+      <point x="273" y="655" type="line"/>
+      <point x="430" y="655" type="line"/>
+      <point x="430" y="821" type="line"/>
+      <point x="273" y="821" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>-1</integer>
-        <integer>-1</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/cedilla.glif b/src/Cantarell-Bold.ufo/glyphs/cedilla.glif
index 7be16ee7..f8396f05 100644
--- a/src/Cantarell-Bold.ufo/glyphs/cedilla.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/cedilla.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cedilla" format="2">
-  <advance width="320"/>
+  <advance width="500"/>
   <unicode hex="00B8"/>
   <outline>
-    <component base="cedillacomb" xOffset="-7"/>
+    <component base="cedillacomb" xOffset="75"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/cent.glif b/src/Cantarell-Bold.ufo/glyphs/cent.glif
index 2ac5fa31..dd08eef9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/cent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/cent.glif
@@ -1,14 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cent" format="2">
-  <advance width="497"/>
+  <advance width="600"/>
   <unicode hex="00A2"/>
   <outline>
-    <component base="c" xOffset="16"/>
-    <component base="_currencyvstem" xOffset="95" yOffset="-202"/>
-    <component base="_currencyvstem" xOffset="100" yOffset="-798"/>
+    <component base="c" xOffset="68"/>
+    <component base="_currencyvstem" xOffset="147" yOffset="-202"/>
+    <component base="_currencyvstem" xOffset="152" yOffset="-781"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Bold.ufo/glyphs/che-cy.glif b/src/Cantarell-Bold.ufo/glyphs/che-cy.glif
index 86deba07..d812f69d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/che-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/che-cy.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="che-cy" format="2">
-  <advance width="558"/>
+  <advance width="570"/>
   <unicode hex="0447"/>
-  <anchor x="435" y="0" name="bottomright"/>
-  <anchor x="280" y="490" name="top"/>
+  <anchor x="429" y="0" name="bottomright"/>
+  <anchor x="284" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="201" y="162" type="curve" smooth="yes"/>
-      <point x="269" y="162"/>
-      <point x="333" y="184"/>
-      <point x="377" y="229" type="curve"/>
-      <point x="355" y="331" type="line"/>
-      <point x="331" y="318"/>
-      <point x="292" y="310"/>
-      <point x="263" y="310" type="curve" smooth="yes"/>
-      <point x="220" y="310"/>
-      <point x="184" y="329"/>
-      <point x="184" y="354" type="curve" smooth="yes"/>
-      <point x="184" y="490" type="line"/>
-      <point x="19" y="490" type="line"/>
-      <point x="19" y="315" type="line" smooth="yes"/>
-      <point x="19" y="220"/>
-      <point x="91" y="162"/>
+      <point x="205" y="162" type="curve" smooth="yes"/>
+      <point x="273" y="162"/>
+      <point x="337" y="184"/>
+      <point x="381" y="229" type="curve"/>
+      <point x="359" y="331" type="line"/>
+      <point x="335" y="318"/>
+      <point x="296" y="310"/>
+      <point x="267" y="310" type="curve" smooth="yes"/>
+      <point x="224" y="310"/>
+      <point x="188" y="329"/>
+      <point x="188" y="354" type="curve" smooth="yes"/>
+      <point x="188" y="490" type="line"/>
+      <point x="23" y="490" type="line"/>
+      <point x="23" y="315" type="line" smooth="yes"/>
+      <point x="23" y="220"/>
+      <point x="95" y="162"/>
     </contour>
     <contour>
-      <point x="336" y="0" type="line"/>
-      <point x="504" y="0" type="line"/>
-      <point x="504" y="490" type="line"/>
-      <point x="336" y="490" type="line"/>
+      <point x="340" y="0" type="line"/>
+      <point x="508" y="0" type="line"/>
+      <point x="508" y="490" type="line"/>
+      <point x="340" y="490" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -41,6 +41,8 @@
         <key>width</key>
         <integer>78</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/chedescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/chedescender-cy.glif
index 7332d37c..fddc8924 100644
--- a/src/Cantarell-Bold.ufo/glyphs/chedescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/chedescender-cy.glif
@@ -1,15 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="chedescender-cy" format="2">
-  <advance width="599"/>
+  <advance width="596"/>
   <unicode hex="04B7"/>
   <outline>
     <component base="che-cy"/>
-    <component base="descender-cy" xOffset="339"/>
+    <component base="descender-cy" xOffset="333"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>che-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>tse-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Bold.ufo/glyphs/chedieresis-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/chedieresis-cy.glif
index ec3b4e46..e76a1416 100644
--- a/src/Cantarell-Bold.ufo/glyphs/chedieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/chedieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="chedieresis-cy" format="2">
-  <advance width="558"/>
+  <advance width="570"/>
   <unicode hex="04F5"/>
   <outline>
     <component base="che-cy"/>
-    <component base="dieresiscomb" xOffset="11"/>
+    <component base="dieresiscomb" xOffset="15"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/chekhakassian-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/chekhakassian-cy.glif
index bbf84a74..12f196fe 100644
--- a/src/Cantarell-Bold.ufo/glyphs/chekhakassian-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/chekhakassian-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="chekhakassian-cy" format="2">
-  <advance width="558"/>
+  <advance width="570"/>
   <unicode hex="04CC"/>
   <outline>
     <component base="che-cy"/>
-    <component base="_descenderreversed-cy" xOffset="192"/>
+    <component base="_descenderreversed-cy" xOffset="217"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/cheverticalstroke-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/cheverticalstroke-cy.glif
index b60abfe6..caf2452f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/cheverticalstroke-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/cheverticalstroke-cy.glif
@@ -1,37 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cheverticalstroke-cy" format="2">
-  <advance width="557"/>
+  <advance width="569"/>
   <unicode hex="04B9"/>
   <outline>
     <contour>
-      <point x="201" y="162" type="curve" smooth="yes"/>
-      <point x="271" y="162"/>
-      <point x="333" y="185"/>
-      <point x="377" y="229" type="curve"/>
-      <point x="354" y="331" type="line"/>
-      <point x="331" y="318"/>
-      <point x="291" y="310"/>
-      <point x="263" y="310" type="curve" smooth="yes"/>
-      <point x="219" y="310"/>
-      <point x="184" y="329"/>
-      <point x="184" y="354" type="curve" smooth="yes"/>
-      <point x="184" y="490" type="line"/>
-      <point x="19" y="490" type="line"/>
-      <point x="19" y="315" type="line" smooth="yes"/>
-      <point x="19" y="220"/>
-      <point x="90" y="162"/>
+      <point x="205" y="162" type="curve" smooth="yes"/>
+      <point x="275" y="162"/>
+      <point x="337" y="185"/>
+      <point x="381" y="229" type="curve"/>
+      <point x="358" y="331" type="line"/>
+      <point x="335" y="318"/>
+      <point x="295" y="310"/>
+      <point x="267" y="310" type="curve" smooth="yes"/>
+      <point x="223" y="310"/>
+      <point x="188" y="329"/>
+      <point x="188" y="354" type="curve" smooth="yes"/>
+      <point x="188" y="490" type="line"/>
+      <point x="23" y="490" type="line"/>
+      <point x="23" y="315" type="line" smooth="yes"/>
+      <point x="23" y="220"/>
+      <point x="94" y="162"/>
     </contour>
     <contour>
-      <point x="335" y="0" type="line"/>
-      <point x="503" y="0" type="line"/>
-      <point x="503" y="490" type="line"/>
-      <point x="335" y="490" type="line"/>
+      <point x="222" y="67" type="line"/>
+      <point x="303" y="67" type="line"/>
+      <point x="303" y="418" type="line"/>
+      <point x="222" y="418" type="line"/>
     </contour>
     <contour>
-      <point x="218" y="67" type="line"/>
-      <point x="299" y="67" type="line"/>
-      <point x="299" y="418" type="line"/>
-      <point x="218" y="418" type="line"/>
+      <point x="339" y="0" type="line"/>
+      <point x="507" y="0" type="line"/>
+      <point x="507" y="490" type="line"/>
+      <point x="339" y="490" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>che-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>en-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/circumflex.glif
index b857fa17..da053ae9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/circumflex.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="circumflex" format="2">
-  <advance width="413"/>
+  <advance width="500"/>
   <unicode hex="02C6"/>
   <outline>
-    <component base="circumflexcomb" xOffset="-4"/>
+    <component base="circumflexcomb" xOffset="42"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb.glif 
b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb.glif
index d90ad26f..bd76f936 100644
--- a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb.glif
@@ -6,13 +6,13 @@
   <anchor x="379" y="648" name="top_viet"/>
   <outline>
     <contour>
-      <point x="20" y="594" type="line"/>
       <point x="89" y="535" type="line"/>
       <point x="198" y="618" type="line"/>
       <point x="302" y="534" type="line"/>
       <point x="398" y="625" type="line"/>
       <point x="251" y="762" type="line"/>
       <point x="166" y="762" type="line"/>
+      <point x="20" y="594" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif 
b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif
index c1fd0f42..3fe62f3b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif
@@ -5,13 +5,13 @@
   <anchor x="381" y="612" name="top_viet"/>
   <outline>
     <contour>
-      <point x="20" y="571" type="line"/>
       <point x="89" y="512" type="line"/>
       <point x="198" y="581" type="line"/>
       <point x="302" y="511" type="line"/>
       <point x="398" y="602" type="line"/>
       <point x="251" y="714" type="line"/>
       <point x="166" y="714" type="line"/>
+      <point x="20" y="571" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/colon.glif b/src/Cantarell-Bold.ufo/glyphs/colon.glif
index 47478b5e..ca1793f1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/colon.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/colon.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="colon" format="2">
-  <advance width="282"/>
+  <advance width="286"/>
   <unicode hex="003A"/>
   <outline>
     <component base="period"/>
@@ -8,6 +8,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>period</string>
       <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
       <string>period</string>
     </dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/colonsign.glif b/src/Cantarell-Bold.ufo/glyphs/colonsign.glif
index 5f12ba63..8f379373 100644
--- a/src/Cantarell-Bold.ufo/glyphs/colonsign.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/colonsign.glif
@@ -1,32 +1,65 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="colonsign" format="2">
-  <advance width="646"/>
+  <advance width="600"/>
   <unicode hex="20A1"/>
   <outline>
     <contour>
-      <point x="414" y="625" type="line"/>
-      <point x="534" y="625" type="line"/>
-      <point x="577" y="837" type="line"/>
-      <point x="457" y="837" type="line"/>
+      <point x="359" y="-10" type="curve" smooth="yes"/>
+      <point x="426" y="-10"/>
+      <point x="503" y="10"/>
+      <point x="547" y="39" type="curve"/>
+      <point x="509" y="164" type="line"/>
+      <point x="477" y="150"/>
+      <point x="436" y="142"/>
+      <point x="401" y="142" type="curve" smooth="yes"/>
+      <point x="288" y="142"/>
+      <point x="226" y="224"/>
+      <point x="226" y="359" type="curve" smooth="yes"/>
+      <point x="226" y="486"/>
+      <point x="280" y="551"/>
+      <point x="378" y="551" type="curve" smooth="yes"/>
+      <point x="424" y="551"/>
+      <point x="479" y="541"/>
+      <point x="508" y="525" type="curve"/>
+      <point x="556" y="661" type="line"/>
+      <point x="495" y="690"/>
+      <point x="440" y="704"/>
+      <point x="379" y="704" type="curve" smooth="yes"/>
+      <point x="185" y="704"/>
+      <point x="46" y="560"/>
+      <point x="46" y="342" type="curve" smooth="yes"/>
+      <point x="46" y="131"/>
+      <point x="175" y="-10"/>
     </contour>
     <contour>
-      <point x="148" y="-141" type="line"/>
-      <point x="268" y="-141" type="line"/>
-      <point x="305" y="80" type="line"/>
-      <point x="185" y="80" type="line"/>
+      <point x="130" y="-123" type="line"/>
+      <point x="249" y="-123" type="line"/>
+      <point x="284" y="80" type="line"/>
+      <point x="164" y="80" type="line"/>
     </contour>
     <contour>
-      <point x="237" y="625" type="line"/>
-      <point x="357" y="625" type="line"/>
-      <point x="400" y="837" type="line"/>
-      <point x="280" y="837" type="line"/>
+      <point x="299" y="-123" type="line"/>
+      <point x="418" y="-123" type="line"/>
+      <point x="453" y="80" type="line"/>
+      <point x="333" y="80" type="line"/>
     </contour>
     <contour>
-      <point x="326" y="-141" type="line"/>
-      <point x="446" y="-141" type="line"/>
-      <point x="483" y="80" type="line"/>
-      <point x="363" y="80" type="line"/>
+      <point x="204" y="625" type="line"/>
+      <point x="323" y="625" type="line"/>
+      <point x="361" y="821" type="line"/>
+      <point x="241" y="821" type="line"/>
+    </contour>
+    <contour>
+      <point x="372" y="625" type="line"/>
+      <point x="491" y="625" type="line"/>
+      <point x="529" y="821" type="line"/>
+      <point x="410" y="821" type="line"/>
     </contour>
-    <component base="C" xOffset="8"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/comma.glif b/src/Cantarell-Bold.ufo/glyphs/comma.glif
index 8c639847..87821082 100644
--- a/src/Cantarell-Bold.ufo/glyphs/comma.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/comma.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="comma" format="2">
-  <advance width="282"/>
+  <advance width="286"/>
   <unicode hex="002C"/>
   <outline>
     <contour>
-      <point x="19" y="-178" type="curve"/>
-      <point x="152" y="-178" type="line"/>
-      <point x="203" y="-67"/>
-      <point x="233" y="41"/>
-      <point x="233" y="113" type="curve"/>
-      <point x="61" y="113" type="line"/>
-      <point x="61" y="15"/>
-      <point x="45" y="-94"/>
+      <point x="21" y="-179" type="curve"/>
+      <point x="173" y="-179" type="line"/>
+      <point x="216" y="-83"/>
+      <point x="243" y="46"/>
+      <point x="243" y="144" type="curve"/>
+      <point x="65" y="144" type="line"/>
+      <point x="65" y="39"/>
+      <point x="46" y="-90"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/commaturnedabovecomb.glif 
b/src/Cantarell-Bold.ufo/glyphs/commaturnedabovecomb.glif
index 4e32756c..93f79e0c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/commaturnedabovecomb.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/commaturnedabovecomb.glif
@@ -5,14 +5,14 @@
   <anchor x="146" y="739" name="top"/>
   <outline>
     <contour>
-      <point x="240" y="730" type="curve"/>
-      <point x="99" y="730" type="line"/>
-      <point x="64" y="692"/>
-      <point x="48" y="641"/>
       <point x="48" y="568" type="curve"/>
       <point x="215" y="568" type="line"/>
       <point x="215" y="637"/>
       <point x="226" y="697"/>
+      <point x="240" y="730" type="curve"/>
+      <point x="99" y="730" type="line"/>
+      <point x="64" y="692"/>
+      <point x="48" y="641"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/commaturnedmod.glif 
b/src/Cantarell-Bold.ufo/glyphs/commaturnedmod.glif
index 850a6d1e..8ccc165d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/commaturnedmod.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/commaturnedmod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="commaturnedmod" format="2">
-  <advance width="285"/>
+  <advance width="225"/>
   <unicode hex="02BB"/>
   <outline>
-    <component base="commaturnedabovecomb"/>
+    <component base="commaturnedabovecomb" xOffset="-30"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/commercialM_inusS_ign.glif 
b/src/Cantarell-Bold.ufo/glyphs/commercialM_inusS_ign.glif
index dfa5ae65..678334b8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/commercialM_inusS_ign.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/commercialM_inusS_ign.glif
@@ -1,41 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="commercialMinusSign" format="2">
-  <advance width="696"/>
+  <advance width="600"/>
   <unicode hex="2052"/>
   <outline>
     <contour>
-      <point x="27" y="0" type="line"/>
-      <point x="202" y="0" type="line"/>
-      <point x="676" y="694" type="line"/>
-      <point x="483" y="694" type="line"/>
+      <point x="10" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="590" y="694" type="line"/>
+      <point x="408" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="532" y="-11" type="curve" smooth="yes"/>
-      <point x="603" y="-11"/>
-      <point x="651" y="37"/>
-      <point x="651" y="108" type="curve" smooth="yes"/>
-      <point x="651" y="182"/>
-      <point x="603" y="232"/>
-      <point x="532" y="232" type="curve" smooth="yes"/>
-      <point x="460" y="232"/>
-      <point x="412" y="182"/>
-      <point x="412" y="108" type="curve" smooth="yes"/>
-      <point x="412" y="37"/>
-      <point x="460" y="-11"/>
+      <point x="462" y="-11" type="curve" smooth="yes"/>
+      <point x="527" y="-11"/>
+      <point x="573" y="37"/>
+      <point x="573" y="108" type="curve" smooth="yes"/>
+      <point x="573" y="182"/>
+      <point x="527" y="232"/>
+      <point x="462" y="232" type="curve" smooth="yes"/>
+      <point x="395" y="232"/>
+      <point x="350" y="182"/>
+      <point x="350" y="108" type="curve" smooth="yes"/>
+      <point x="350" y="37"/>
+      <point x="395" y="-11"/>
     </contour>
     <contour>
-      <point x="159" y="455" type="curve" smooth="yes"/>
-      <point x="232" y="455"/>
-      <point x="280" y="504"/>
-      <point x="280" y="577" type="curve" smooth="yes"/>
-      <point x="280" y="652"/>
-      <point x="231" y="703"/>
-      <point x="159" y="703" type="curve" smooth="yes"/>
-      <point x="86" y="703"/>
-      <point x="37" y="652"/>
-      <point x="37" y="577" type="curve" smooth="yes"/>
-      <point x="37" y="504"/>
-      <point x="86" y="455"/>
+      <point x="134" y="455" type="curve" smooth="yes"/>
+      <point x="201" y="455"/>
+      <point x="246" y="504"/>
+      <point x="246" y="577" type="curve" smooth="yes"/>
+      <point x="246" y="651"/>
+      <point x="201" y="703"/>
+      <point x="134" y="703" type="curve" smooth="yes"/>
+      <point x="66" y="703"/>
+      <point x="20" y="652"/>
+      <point x="20" y="577" type="curve" smooth="yes"/>
+      <point x="20" y="504"/>
+      <point x="66" y="455"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/contents.plist b/src/Cantarell-Bold.ufo/glyphs/contents.plist
index 818d6b92..286fd932 100644
--- a/src/Cantarell-Bold.ufo/glyphs/contents.plist
+++ b/src/Cantarell-Bold.ufo/glyphs/contents.plist
@@ -686,8 +686,6 @@
     <string>_descenderreverse-cy.case.glif</string>
     <key>_descenderreversed-cy</key>
     <string>_descenderreversed-cy.glif</string>
-    <key>_o.numero</key>
-    <string>_o.numero.glif</string>
     <key>_slash.zero</key>
     <string>_slash.zero.glif</string>
     <key>_slash.zero.osf</key>
@@ -736,8 +734,6 @@
     <string>acutecomb.case.glif</string>
     <key>acutecomb.loclVIET</key>
     <string>acutecomb.loclV_I_E_T_.glif</string>
-    <key>acutecomb_dotaccentcomb</key>
-    <string>acutecomb_dotaccentcomb.glif</string>
     <key>adblgrave</key>
     <string>adblgrave.glif</string>
     <key>adieresis</key>
@@ -768,8 +764,6 @@
     <string>apostrophemod.glif</string>
     <key>approxequal</key>
     <string>approxequal.glif</string>
-    <key>approxequal.tf</key>
-    <string>approxequal.tf.glif</string>
     <key>aring</key>
     <string>aring.glif</string>
     <key>aringacute</key>
@@ -818,22 +812,6 @@
     <string>brevecomb.case.glif</string>
     <key>brevecomb.loclVIET</key>
     <string>brevecomb.loclV_I_E_T_.glif</string>
-    <key>brevecomb_acutecomb</key>
-    <string>brevecomb_acutecomb.glif</string>
-    <key>brevecomb_acutecomb.case</key>
-    <string>brevecomb_acutecomb.case.glif</string>
-    <key>brevecomb_gravecomb</key>
-    <string>brevecomb_gravecomb.glif</string>
-    <key>brevecomb_gravecomb.case</key>
-    <string>brevecomb_gravecomb.case.glif</string>
-    <key>brevecomb_hookabovecomb</key>
-    <string>brevecomb_hookabovecomb.glif</string>
-    <key>brevecomb_hookabovecomb.case</key>
-    <string>brevecomb_hookabovecomb.case.glif</string>
-    <key>brevecomb_tildecomb</key>
-    <string>brevecomb_tildecomb.glif</string>
-    <key>brevecomb_tildecomb.case</key>
-    <string>brevecomb_tildecomb.case.glif</string>
     <key>breveinvertedcomb</key>
     <string>breveinvertedcomb.glif</string>
     <key>breveinvertedcomb.case</key>
@@ -844,8 +822,6 @@
     <string>bullet.glif</string>
     <key>bulletoperator</key>
     <string>bulletoperator.glif</string>
-    <key>bulletoperator.tf</key>
-    <string>bulletoperator.tf.glif</string>
     <key>c</key>
     <string>c.glif</string>
     <key>cacute</key>
@@ -860,8 +836,6 @@
     <string>caroncomb.case.glif</string>
     <key>caroncomb.loclVIET</key>
     <string>caroncomb.loclV_I_E_T_.glif</string>
-    <key>caroncomb_dotaccentcomb</key>
-    <string>caroncomb_dotaccentcomb.glif</string>
     <key>ccaron</key>
     <string>ccaron.glif</string>
     <key>ccedilla</key>
@@ -898,22 +872,6 @@
     <string>circumflexcomb.case.glif</string>
     <key>circumflexcomb.loclVIET</key>
     <string>circumflexcomb.loclV_I_E_T_.glif</string>
-    <key>circumflexcomb_acutecomb</key>
-    <string>circumflexcomb_acutecomb.glif</string>
-    <key>circumflexcomb_acutecomb.case</key>
-    <string>circumflexcomb_acutecomb.case.glif</string>
-    <key>circumflexcomb_gravecomb</key>
-    <string>circumflexcomb_gravecomb.glif</string>
-    <key>circumflexcomb_gravecomb.case</key>
-    <string>circumflexcomb_gravecomb.case.glif</string>
-    <key>circumflexcomb_hookabovecomb</key>
-    <string>circumflexcomb_hookabovecomb.glif</string>
-    <key>circumflexcomb_hookabovecomb.case</key>
-    <string>circumflexcomb_hookabovecomb.case.glif</string>
-    <key>circumflexcomb_tildecomb</key>
-    <string>circumflexcomb_tildecomb.glif</string>
-    <key>circumflexcomb_tildecomb.case</key>
-    <string>circumflexcomb_tildecomb.case.glif</string>
     <key>colon</key>
     <string>colon.glif</string>
     <key>colonsign</key>
@@ -928,8 +886,6 @@
     <string>commaturnedmod.glif</string>
     <key>commercialMinusSign</key>
     <string>commercialM_inusS_ign.glif</string>
-    <key>commercialMinusSign.tf</key>
-    <string>commercialM_inusS_ign.tf.glif</string>
     <key>copyright</key>
     <string>copyright.glif</string>
     <key>currency</key>
@@ -970,22 +926,10 @@
     <string>dieresiscomb.case.glif</string>
     <key>dieresiscomb.loclVIET</key>
     <string>dieresiscomb.loclV_I_E_T_.glif</string>
-    <key>dieresiscomb_acutecomb</key>
-    <string>dieresiscomb_acutecomb.glif</string>
-    <key>dieresiscomb_caroncomb</key>
-    <string>dieresiscomb_caroncomb.glif</string>
-    <key>dieresiscomb_gravecomb</key>
-    <string>dieresiscomb_gravecomb.glif</string>
-    <key>dieresiscomb_macroncomb</key>
-    <string>dieresiscomb_macroncomb.glif</string>
     <key>divide</key>
     <string>divide.glif</string>
-    <key>divide.tf</key>
-    <string>divide.tf.glif</string>
     <key>divisionslash</key>
     <string>divisionslash.glif</string>
-    <key>divisionslash.tf</key>
-    <string>divisionslash.tf.glif</string>
     <key>dje-cy</key>
     <string>dje-cy.glif</string>
     <key>dlinebelow</key>
@@ -1002,8 +946,6 @@
     <string>dotaccentcomb.case.glif</string>
     <key>dotaccentcomb.loclVIET</key>
     <string>dotaccentcomb.loclV_I_E_T_.glif</string>
-    <key>dotaccentcomb_macroncomb</key>
-    <string>dotaccentcomb_macroncomb.glif</string>
     <key>dotbelowcomb</key>
     <string>dotbelowcomb.glif</string>
     <key>doubleprimemod</key>
@@ -1064,8 +1006,6 @@
     <string>eight.osf.glif</string>
     <key>eight.tf</key>
     <string>eight.tf.glif</string>
-    <key>eight.tosf</key>
-    <string>eight.tosf.glif</string>
     <key>eightinferior</key>
     <string>eightinferior.glif</string>
     <key>eightsuperior</key>
@@ -1088,8 +1028,6 @@
     <string>emdash.glif</string>
     <key>emptyset</key>
     <string>emptyset.glif</string>
-    <key>emquad</key>
-    <string>emquad.glif</string>
     <key>emspace</key>
     <string>emspace.glif</string>
     <key>en-cy</key>
@@ -1102,20 +1040,14 @@
     <string>eng.glif</string>
     <key>enghe-cy</key>
     <string>enghe-cy.glif</string>
-    <key>enquad</key>
-    <string>enquad.glif</string>
     <key>enspace</key>
     <string>enspace.glif</string>
     <key>eogonek</key>
     <string>eogonek.glif</string>
     <key>equal</key>
     <string>equal.glif</string>
-    <key>equal.tf</key>
-    <string>equal.tf.glif</string>
     <key>equivalence</key>
     <string>equivalence.glif</string>
-    <key>equivalence.tf</key>
-    <string>equivalence.tf.glif</string>
     <key>er-cy</key>
     <string>er-cy.glif</string>
     <key>ereversed-cy</key>
@@ -1138,12 +1070,6 @@
     <string>exclamdown.glif</string>
     <key>f</key>
     <string>f.glif</string>
-    <key>f_f</key>
-    <string>f_f.glif</string>
-    <key>f_f_i</key>
-    <string>f_f_i.glif</string>
-    <key>f_f_l</key>
-    <string>f_f_l.glif</string>
     <key>fi</key>
     <string>fi.glif</string>
     <key>figuredash</key>
@@ -1164,8 +1090,6 @@
     <string>five.osf.glif</string>
     <key>five.tf</key>
     <string>five.tf.glif</string>
-    <key>five.tosf</key>
-    <string>five.tosf.glif</string>
     <key>fiveeighths</key>
     <string>fiveeighths.glif</string>
     <key>fiveinferior</key>
@@ -1188,8 +1112,6 @@
     <string>four.osf.glif</string>
     <key>four.tf</key>
     <string>four.tf.glif</string>
-    <key>four.tosf</key>
-    <string>four.tosf.glif</string>
     <key>fourfifths</key>
     <string>fourfifths.glif</string>
     <key>fourinferior</key>
@@ -1242,12 +1164,8 @@
     <string>gravecomb.loclV_I_E_T_.glif</string>
     <key>greater</key>
     <string>greater.glif</string>
-    <key>greater.tf</key>
-    <string>greater.tf.glif</string>
     <key>greaterequal</key>
     <string>greaterequal.glif</string>
-    <key>greaterequal.tf</key>
-    <string>greaterequal.tf.glif</string>
     <key>guarani</key>
     <string>guarani.glif</string>
     <key>guillemetleft</key>
@@ -1282,8 +1200,6 @@
     <string>hookabovecomb.case.glif</string>
     <key>hookabovecomb.loclVIET</key>
     <string>hookabovecomb.loclV_I_E_T_.glif</string>
-    <key>horizontalbar</key>
-    <string>horizontalbar.glif</string>
     <key>horncomb</key>
     <string>horncomb.glif</string>
     <key>hryvnia</key>
@@ -1296,8 +1212,6 @@
     <string>hungarumlautcomb.case.glif</string>
     <key>hyphen</key>
     <string>hyphen.glif</string>
-    <key>hyphentwo</key>
-    <string>hyphentwo.glif</string>
     <key>i</key>
     <string>i.glif</string>
     <key>i-cy</key>
@@ -1396,6 +1310,8 @@
     <string>kje-cy.glif</string>
     <key>l</key>
     <string>l.glif</string>
+    <key>l.ss01</key>
+    <string>l.ss01.glif</string>
     <key>lacute</key>
     <string>lacute.glif</string>
     <key>lcaron</key>
@@ -1412,12 +1328,8 @@
     <string>leftanglebracket-math.glif</string>
     <key>less</key>
     <string>less.glif</string>
-    <key>less.tf</key>
-    <string>less.tf.glif</string>
     <key>lessequal</key>
     <string>lessequal.glif</string>
-    <key>lessequal.tf</key>
-    <string>lessequal.tf.glif</string>
     <key>lira</key>
     <string>lira.glif</string>
     <key>liraTurkish</key>
@@ -1432,8 +1344,6 @@
     <string>llinebelow.glif</string>
     <key>logicalnot</key>
     <string>logicalnot.glif</string>
-    <key>logicalnot.tf</key>
-    <string>logicalnot.tf.glif</string>
     <key>lozenge</key>
     <string>lozenge.glif</string>
     <key>lslash</key>
@@ -1456,12 +1366,6 @@
     <string>macroncomb.narrow.glif</string>
     <key>macroncomb.narrow.case</key>
     <string>macroncomb.narrow.case.glif</string>
-    <key>macroncomb_acutecomb</key>
-    <string>macroncomb_acutecomb.glif</string>
-    <key>macroncomb_dieresiscomb</key>
-    <string>macroncomb_dieresiscomb.glif</string>
-    <key>macroncomb_gravecomb</key>
-    <string>macroncomb_gravecomb.glif</string>
     <key>manat</key>
     <string>manat.glif</string>
     <key>mdotbelow</key>
@@ -1470,22 +1374,16 @@
     <string>micro.glif</string>
     <key>minus</key>
     <string>minus.glif</string>
-    <key>minus.tf</key>
-    <string>minus.tf.glif</string>
     <key>minute</key>
     <string>minute.glif</string>
     <key>multiply</key>
     <string>multiply.glif</string>
-    <key>multiply.tf</key>
-    <string>multiply.tf.glif</string>
     <key>n</key>
     <string>n.glif</string>
     <key>nacute</key>
     <string>nacute.glif</string>
     <key>naira</key>
     <string>naira.glif</string>
-    <key>nbspace</key>
-    <string>nbspace.glif</string>
     <key>ncaron</key>
     <string>ncaron.glif</string>
     <key>ncommaaccent</key>
@@ -1504,8 +1402,6 @@
     <string>nine.osf.glif</string>
     <key>nine.tf</key>
     <string>nine.tf.glif</string>
-    <key>nine.tosf</key>
-    <string>nine.tosf.glif</string>
     <key>nineinferior</key>
     <string>nineinferior.glif</string>
     <key>ninesuperior</key>
@@ -1516,16 +1412,10 @@
     <string>nje-cy.glif</string>
     <key>nlinebelow</key>
     <string>nlinebelow.glif</string>
-    <key>nonbreakinghyphen</key>
-    <string>nonbreakinghyphen.glif</string>
     <key>notequal</key>
     <string>notequal.glif</string>
-    <key>notequal.tf</key>
-    <string>notequal.tf.glif</string>
     <key>notidentical</key>
     <string>notidentical.glif</string>
-    <key>notidentical.tf</key>
-    <string>notidentical.tf.glif</string>
     <key>ntilde</key>
     <string>ntilde.glif</string>
     <key>numbersign</key>
@@ -1616,8 +1506,6 @@
     <string>one.osf.glif</string>
     <key>one.tf</key>
     <string>one.tf.glif</string>
-    <key>one.tosf</key>
-    <string>one.tosf.glif</string>
     <key>oneeighth</key>
     <string>oneeighth.glif</string>
     <key>onefifth</key>
@@ -1694,12 +1582,8 @@
     <string>pi.glif</string>
     <key>plus</key>
     <string>plus.glif</string>
-    <key>plus.tf</key>
-    <string>plus.tf.glif</string>
     <key>plusminus</key>
     <string>plusminus.glif</string>
-    <key>plusminus.tf</key>
-    <string>plusminus.tf.glif</string>
     <key>primeReversed</key>
     <string>primeR_eversed.glif</string>
     <key>primemod</key>
@@ -1822,8 +1706,6 @@
     <string>seven.osf.glif</string>
     <key>seven.tf</key>
     <string>seven.tf.glif</string>
-    <key>seven.tosf</key>
-    <string>seven.tosf.glif</string>
     <key>seveneighths</key>
     <string>seveneighths.glif</string>
     <key>seveninferior</key>
@@ -1846,8 +1728,6 @@
     <string>six.osf.glif</string>
     <key>six.tf</key>
     <string>six.tf.glif</string>
-    <key>six.tosf</key>
-    <string>six.tosf.glif</string>
     <key>sixinferior</key>
     <string>sixinferior.glif</string>
     <key>sixperemspace</key>
@@ -1864,8 +1744,6 @@
     <string>slashshortcomb.glif</string>
     <key>slashshortcomb.case</key>
     <string>slashshortcomb.case.glif</string>
-    <key>softhyphen</key>
-    <string>softhyphen.glif</string>
     <key>softsign-cy</key>
     <string>softsign-cy.glif</string>
     <key>space</key>
@@ -1912,8 +1790,6 @@
     <string>three.osf.glif</string>
     <key>three.tf</key>
     <string>three.tf.glif</string>
-    <key>three.tosf</key>
-    <string>three.tosf.glif</string>
     <key>threeeighths</key>
     <string>threeeighths.glif</string>
     <key>threefifths</key>
@@ -1934,12 +1810,6 @@
     <string>tildecomb.case.glif</string>
     <key>tildecomb.loclVIET</key>
     <string>tildecomb.loclV_I_E_T_.glif</string>
-    <key>tildecomb_acutecomb</key>
-    <string>tildecomb_acutecomb.glif</string>
-    <key>tildecomb_dieresiscomb</key>
-    <string>tildecomb_dieresiscomb.glif</string>
-    <key>tildecomb_macroncomb</key>
-    <string>tildecomb_macroncomb.glif</string>
     <key>tlinebelow</key>
     <string>tlinebelow.glif</string>
     <key>trademark</key>
@@ -1962,8 +1832,6 @@
     <string>two.osf.glif</string>
     <key>two.tf</key>
     <string>two.tf.glif</string>
-    <key>two.tosf</key>
-    <string>two.tosf.glif</string>
     <key>twofifths</key>
     <string>twofifths.glif</string>
     <key>twoinferior</key>
@@ -2138,10 +2006,6 @@
     <string>zero.tf.glif</string>
     <key>zero.tf.zero</key>
     <string>zero.tf.zero.glif</string>
-    <key>zero.tosf</key>
-    <string>zero.tosf.glif</string>
-    <key>zero.tosf.zero</key>
-    <string>zero.tosf.zero.glif</string>
     <key>zero.zero</key>
     <string>zero.zero.glif</string>
     <key>zeroinferior</key>
diff --git a/src/Cantarell-Bold.ufo/glyphs/copyright.glif b/src/Cantarell-Bold.ufo/glyphs/copyright.glif
index 04221e27..d62ee135 100644
--- a/src/Cantarell-Bold.ufo/glyphs/copyright.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/copyright.glif
@@ -1,63 +1,69 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="copyright" format="2">
-  <advance width="809"/>
+  <advance width="833"/>
   <unicode hex="00A9"/>
   <outline>
     <contour>
-      <point x="400" y="-10" type="curve" smooth="yes"/>
-      <point x="623" y="-10"/>
-      <point x="771" y="134"/>
-      <point x="771" y="350" type="curve" smooth="yes"/>
-      <point x="771" y="562"/>
-      <point x="626" y="704"/>
-      <point x="408" y="704" type="curve" smooth="yes"/>
-      <point x="186" y="704"/>
-      <point x="38" y="558"/>
-      <point x="38" y="340" type="curve" smooth="yes"/>
-      <point x="38" y="130"/>
-      <point x="183" y="-10"/>
+      <point x="412" y="-10" type="curve" smooth="yes"/>
+      <point x="635" y="-10"/>
+      <point x="783" y="134"/>
+      <point x="783" y="350" type="curve" smooth="yes"/>
+      <point x="783" y="562"/>
+      <point x="638" y="704"/>
+      <point x="420" y="704" type="curve" smooth="yes"/>
+      <point x="198" y="704"/>
+      <point x="50" y="558"/>
+      <point x="50" y="340" type="curve" smooth="yes"/>
+      <point x="50" y="130"/>
+      <point x="195" y="-10"/>
     </contour>
     <contour>
-      <point x="409" y="81" type="curve" smooth="yes"/>
-      <point x="242" y="81"/>
-      <point x="130" y="189"/>
-      <point x="130" y="350" type="curve" smooth="yes"/>
-      <point x="130" y="508"/>
-      <point x="238" y="613"/>
-      <point x="400" y="613" type="curve" smooth="yes"/>
-      <point x="567" y="613"/>
-      <point x="679" y="504"/>
-      <point x="679" y="341" type="curve" smooth="yes"/>
-      <point x="679" y="185"/>
-      <point x="571" y="81"/>
+      <point x="430" y="134" type="curve" smooth="yes"/>
+      <point x="474" y="134"/>
+      <point x="525" y="144"/>
+      <point x="559" y="158" type="curve"/>
+      <point x="522" y="283" type="line"/>
+      <point x="506" y="278"/>
+      <point x="485" y="275"/>
+      <point x="468" y="275" type="curve" smooth="yes"/>
+      <point x="413" y="275"/>
+      <point x="377" y="306"/>
+      <point x="377" y="354" type="curve" smooth="yes"/>
+      <point x="377" y="396"/>
+      <point x="404" y="422"/>
+      <point x="449" y="422" type="curve" smooth="yes"/>
+      <point x="472" y="422"/>
+      <point x="502" y="416"/>
+      <point x="521" y="407" type="curve"/>
+      <point x="565" y="541" type="line"/>
+      <point x="531" y="556"/>
+      <point x="491" y="563"/>
+      <point x="449" y="563" type="curve" smooth="yes"/>
+      <point x="304" y="563"/>
+      <point x="208" y="477"/>
+      <point x="208" y="345" type="curve" smooth="yes"/>
+      <point x="208" y="218"/>
+      <point x="297" y="134"/>
     </contour>
     <contour>
-      <point x="418" y="134" type="curve" smooth="yes"/>
-      <point x="462" y="134"/>
-      <point x="513" y="144"/>
-      <point x="547" y="158" type="curve"/>
-      <point x="510" y="283" type="line"/>
-      <point x="494" y="278"/>
-      <point x="473" y="275"/>
-      <point x="456" y="275" type="curve" smooth="yes"/>
-      <point x="401" y="275"/>
-      <point x="365" y="306"/>
-      <point x="365" y="354" type="curve" smooth="yes"/>
-      <point x="365" y="396"/>
-      <point x="392" y="422"/>
-      <point x="437" y="422" type="curve" smooth="yes"/>
-      <point x="460" y="422"/>
-      <point x="490" y="416"/>
-      <point x="509" y="407" type="curve"/>
-      <point x="553" y="541" type="line"/>
-      <point x="519" y="556"/>
-      <point x="479" y="563"/>
-      <point x="437" y="563" type="curve" smooth="yes"/>
-      <point x="292" y="563"/>
-      <point x="196" y="477"/>
-      <point x="196" y="345" type="curve" smooth="yes"/>
-      <point x="196" y="218"/>
-      <point x="285" y="134"/>
+      <point x="421" y="81" type="curve" smooth="yes"/>
+      <point x="254" y="81"/>
+      <point x="142" y="189"/>
+      <point x="142" y="350" type="curve" smooth="yes"/>
+      <point x="142" y="508"/>
+      <point x="250" y="613"/>
+      <point x="412" y="613" type="curve" smooth="yes"/>
+      <point x="579" y="613"/>
+      <point x="691" y="504"/>
+      <point x="691" y="341" type="curve" smooth="yes"/>
+      <point x="691" y="185"/>
+      <point x="583" y="81"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/currency.glif b/src/Cantarell-Bold.ufo/glyphs/currency.glif
index f0550bac..b3ee8091 100644
--- a/src/Cantarell-Bold.ufo/glyphs/currency.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/currency.glif
@@ -1,59 +1,65 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="currency" format="2">
-  <advance width="703"/>
+  <advance width="600"/>
   <unicode hex="00A4"/>
   <outline>
     <contour>
-      <point x="345" y="76" type="curve" smooth="yes"/>
-      <point x="505" y="76"/>
-      <point x="611" y="183"/>
-      <point x="611" y="344" type="curve" smooth="yes"/>
-      <point x="611" y="495"/>
-      <point x="509" y="595"/>
-      <point x="357" y="595" type="curve" smooth="yes"/>
-      <point x="197" y="595"/>
-      <point x="91" y="489"/>
-      <point x="91" y="330" type="curve" smooth="yes"/>
-      <point x="91" y="178"/>
-      <point x="193" y="76"/>
+      <point x="296" y="88" type="curve" smooth="yes"/>
+      <point x="447" y="88"/>
+      <point x="548" y="190"/>
+      <point x="548" y="344" type="curve" smooth="yes"/>
+      <point x="548" y="487"/>
+      <point x="452" y="583"/>
+      <point x="307" y="583" type="curve" smooth="yes"/>
+      <point x="155" y="583"/>
+      <point x="55" y="481"/>
+      <point x="55" y="330" type="curve" smooth="yes"/>
+      <point x="55" y="186"/>
+      <point x="151" y="88"/>
     </contour>
     <contour>
-      <point x="128" y="21" type="line"/>
-      <point x="283" y="174" type="line"/>
-      <point x="195" y="262" type="line"/>
-      <point x="40" y="109" type="line"/>
+      <point x="84" y="36" type="line"/>
+      <point x="225" y="176" type="line"/>
+      <point x="148" y="253" type="line"/>
+      <point x="7" y="114" type="line"/>
     </contour>
     <contour>
-      <point x="578" y="10" type="line"/>
-      <point x="673" y="106" type="line"/>
-      <point x="510" y="264" type="line"/>
-      <point x="416" y="170" type="line"/>
+      <point x="522" y="28" type="line"/>
+      <point x="604" y="112" type="line"/>
+      <point x="457" y="254" type="line"/>
+      <point x="375" y="172" type="line"/>
     </contour>
     <contour>
-      <point x="354" y="246" type="curve" smooth="yes"/>
-      <point x="299" y="246"/>
-      <point x="263" y="283"/>
-      <point x="263" y="339" type="curve" smooth="yes"/>
-      <point x="263" y="391"/>
-      <point x="297" y="425"/>
-      <point x="348" y="425" type="curve" smooth="yes"/>
-      <point x="403" y="425"/>
-      <point x="439" y="388"/>
-      <point x="439" y="333" type="curve" smooth="yes"/>
-      <point x="439" y="281"/>
-      <point x="405" y="246"/>
+      <point x="305" y="237" type="curve" smooth="yes"/>
+      <point x="245" y="237"/>
+      <point x="206" y="278"/>
+      <point x="206" y="339" type="curve" smooth="yes"/>
+      <point x="206" y="397"/>
+      <point x="243" y="434"/>
+      <point x="298" y="434" type="curve" smooth="yes"/>
+      <point x="358" y="434"/>
+      <point x="397" y="393"/>
+      <point x="397" y="333" type="curve" smooth="yes"/>
+      <point x="397" y="276"/>
+      <point x="360" y="237"/>
     </contour>
     <contour>
-      <point x="195" y="398" type="line"/>
-      <point x="293" y="492" type="line"/>
-      <point x="123" y="662" type="line"/>
-      <point x="26" y="566" type="line"/>
+      <point x="148" y="409" type="line"/>
+      <point x="233" y="491" type="line"/>
+      <point x="81" y="644" type="line"/>
+      <point x="-4" y="560" type="line"/>
     </contour>
     <contour>
-      <point x="513" y="407" type="line"/>
-      <point x="671" y="562" type="line"/>
-      <point x="574" y="658" type="line"/>
-      <point x="417" y="502" type="line"/>
+      <point x="459" y="416" type="line"/>
+      <point x="603" y="557" type="line"/>
+      <point x="518" y="641" type="line"/>
+      <point x="376" y="499" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/d.glif b/src/Cantarell-Bold.ufo/glyphs/d.glif
index 27b2752a..0a647466 100644
--- a/src/Cantarell-Bold.ufo/glyphs/d.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/d.glif
@@ -1,49 +1,54 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="d" format="2">
-  <advance width="576"/>
+  <advance width="596"/>
   <unicode hex="0064"/>
-  <note>
-d
-</note>
-  <anchor x="284" y="0" name="bottom"/>
-  <anchor x="413" y="600" name="center"/>
-  <anchor x="288" y="490" name="top"/>
-  <anchor x="628" y="490" name="topright"/>
+  <anchor x="296" y="0" name="bottom"/>
+  <anchor x="425" y="600" name="center"/>
+  <anchor x="300" y="490" name="top"/>
+  <anchor x="640" y="490" name="topright"/>
   <outline>
     <contour>
-      <point x="416" y="0" type="line"/>
-      <point x="522" y="0" type="line"/>
-      <point x="522" y="739" type="line"/>
-      <point x="356" y="739" type="line"/>
-      <point x="356" y="120" type="line"/>
+      <point x="240" y="-10" type="curve" smooth="yes"/>
+      <point x="311" y="-10"/>
+      <point x="369" y="25"/>
+      <point x="405" y="85" type="curve"/>
+      <point x="376" y="179" type="line"/>
+      <point x="359" y="151"/>
+      <point x="330" y="134"/>
+      <point x="295" y="134" type="curve" smooth="yes"/>
+      <point x="241" y="134"/>
+      <point x="209" y="176"/>
+      <point x="209" y="248" type="curve" smooth="yes"/>
+      <point x="209" y="316"/>
+      <point x="240" y="356"/>
+      <point x="293" y="356" type="curve" smooth="yes"/>
+      <point x="329" y="356"/>
+      <point x="360" y="338"/>
+      <point x="377" y="308" type="curve"/>
+      <point x="413" y="416" type="line"/>
+      <point x="382" y="472"/>
+      <point x="330" y="500"/>
+      <point x="262" y="500" type="curve" smooth="yes"/>
+      <point x="125" y="500"/>
+      <point x="33" y="397"/>
+      <point x="33" y="241" type="curve" smooth="yes"/>
+      <point x="33" y="89"/>
+      <point x="120" y="-10"/>
     </contour>
     <contour>
-      <point x="228" y="-10" type="curve" smooth="yes"/>
-      <point x="299" y="-10"/>
-      <point x="357" y="25"/>
-      <point x="393" y="85" type="curve"/>
-      <point x="364" y="179" type="line"/>
-      <point x="347" y="151"/>
-      <point x="318" y="134"/>
-      <point x="283" y="134" type="curve" smooth="yes"/>
-      <point x="229" y="134"/>
-      <point x="197" y="176"/>
-      <point x="197" y="248" type="curve" smooth="yes"/>
-      <point x="197" y="316"/>
-      <point x="228" y="356"/>
-      <point x="281" y="356" type="curve" smooth="yes"/>
-      <point x="317" y="356"/>
-      <point x="348" y="338"/>
-      <point x="365" y="308" type="curve"/>
-      <point x="401" y="416" type="line"/>
-      <point x="370" y="472"/>
-      <point x="318" y="500"/>
-      <point x="250" y="500" type="curve" smooth="yes"/>
-      <point x="113" y="500"/>
-      <point x="21" y="397"/>
-      <point x="21" y="241" type="curve" smooth="yes"/>
-      <point x="21" y="89"/>
-      <point x="108" y="-10"/>
+      <point x="428" y="0" type="line"/>
+      <point x="534" y="0" type="line"/>
+      <point x="534" y="739" type="line"/>
+      <point x="368" y="739" type="line"/>
+      <point x="368" y="120" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dagger.glif b/src/Cantarell-Bold.ufo/glyphs/dagger.glif
index 2feb1dac..266ce3fb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dagger.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dagger.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dagger" format="2">
-  <advance width="480"/>
+  <advance width="506"/>
   <unicode hex="2020"/>
   <outline>
     <contour>
-      <point x="152" y="-10" type="line"/>
-      <point x="326" y="-10" type="line"/>
-      <point x="300" y="486" type="line"/>
-      <point x="326" y="704" type="line"/>
-      <point x="152" y="704" type="line"/>
-      <point x="169" y="486" type="line"/>
+      <point x="165" y="-10" type="line"/>
+      <point x="339" y="-10" type="line"/>
+      <point x="313" y="486" type="line"/>
+      <point x="339" y="704" type="line"/>
+      <point x="165" y="704" type="line"/>
+      <point x="182" y="486" type="line"/>
     </contour>
     <contour>
-      <point x="25" y="416" type="line"/>
-      <point x="232" y="430" type="line"/>
-      <point x="232" y="541" type="line"/>
-      <point x="25" y="555" type="line"/>
+      <point x="38" y="416" type="line"/>
+      <point x="245" y="430" type="line"/>
+      <point x="245" y="541" type="line"/>
+      <point x="38" y="555" type="line"/>
     </contour>
     <contour>
-      <point x="455" y="416" type="line"/>
-      <point x="455" y="555" type="line"/>
-      <point x="243" y="541" type="line"/>
-      <point x="243" y="430" type="line"/>
+      <point x="468" y="416" type="line"/>
+      <point x="468" y="555" type="line"/>
+      <point x="256" y="541" type="line"/>
+      <point x="256" y="430" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/daggerdbl.glif b/src/Cantarell-Bold.ufo/glyphs/daggerdbl.glif
index 3f5a2311..f7a87d96 100644
--- a/src/Cantarell-Bold.ufo/glyphs/daggerdbl.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/daggerdbl.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="daggerdbl" format="2">
-  <advance width="508"/>
+  <advance width="532"/>
   <unicode hex="2021"/>
   <outline>
     <contour>
-      <point x="167" y="-10" type="line"/>
-      <point x="340" y="-10" type="line"/>
-      <point x="314" y="175" type="line"/>
-      <point x="329" y="347" type="line"/>
-      <point x="314" y="505" type="line"/>
-      <point x="340" y="704" type="line"/>
-      <point x="167" y="704" type="line"/>
-      <point x="184" y="505" type="line"/>
-      <point x="169" y="347" type="line"/>
-      <point x="184" y="175" type="line"/>
+      <point x="179" y="-10" type="line"/>
+      <point x="352" y="-10" type="line"/>
+      <point x="326" y="175" type="line"/>
+      <point x="341" y="347" type="line"/>
+      <point x="326" y="505" type="line"/>
+      <point x="352" y="704" type="line"/>
+      <point x="179" y="704" type="line"/>
+      <point x="196" y="505" type="line"/>
+      <point x="181" y="347" type="line"/>
+      <point x="196" y="175" type="line"/>
     </contour>
     <contour>
-      <point x="49" y="104" type="line"/>
-      <point x="248" y="118" type="line"/>
-      <point x="248" y="230" type="line"/>
-      <point x="49" y="244" type="line"/>
+      <point x="61" y="104" type="line"/>
+      <point x="260" y="118" type="line"/>
+      <point x="260" y="230" type="line"/>
+      <point x="61" y="244" type="line"/>
     </contour>
     <contour>
-      <point x="459" y="104" type="line"/>
-      <point x="459" y="244" type="line"/>
-      <point x="257" y="230" type="line"/>
-      <point x="257" y="118" type="line"/>
+      <point x="471" y="104" type="line"/>
+      <point x="471" y="244" type="line"/>
+      <point x="269" y="230" type="line"/>
+      <point x="269" y="118" type="line"/>
     </contour>
     <contour>
-      <point x="49" y="448" type="line"/>
-      <point x="248" y="462" type="line"/>
-      <point x="248" y="574" type="line"/>
-      <point x="49" y="588" type="line"/>
+      <point x="61" y="448" type="line"/>
+      <point x="260" y="462" type="line"/>
+      <point x="260" y="574" type="line"/>
+      <point x="61" y="588" type="line"/>
     </contour>
     <contour>
-      <point x="459" y="448" type="line"/>
-      <point x="459" y="588" type="line"/>
-      <point x="257" y="574" type="line"/>
-      <point x="257" y="462" type="line"/>
+      <point x="471" y="448" type="line"/>
+      <point x="471" y="588" type="line"/>
+      <point x="269" y="574" type="line"/>
+      <point x="269" y="462" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dblgravecomb.glif b/src/Cantarell-Bold.ufo/glyphs/dblgravecomb.glif
index 5704cebf..7bb8d2e6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dblgravecomb.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dblgravecomb.glif
@@ -4,18 +4,18 @@
   <anchor x="301" y="490" name="_top"/>
   <anchor x="301" y="799" name="top"/>
   <outline>
-    <contour>
-      <point x="159" y="527" type="line"/>
-      <point x="250" y="579" type="line"/>
-      <point x="165" y="775" type="line"/>
-      <point x="24" y="697" type="line"/>
-    </contour>
     <contour>
       <point x="378" y="527" type="line"/>
       <point x="469" y="579" type="line"/>
       <point x="384" y="776" type="line"/>
       <point x="242" y="697" type="line"/>
     </contour>
+    <contour>
+      <point x="159" y="527" type="line"/>
+      <point x="250" y="579" type="line"/>
+      <point x="165" y="775" type="line"/>
+      <point x="24" y="697" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dcaron.glif b/src/Cantarell-Bold.ufo/glyphs/dcaron.glif
index 144fdc99..9a97420e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dcaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dcaron.glif
@@ -4,7 +4,7 @@
   <unicode hex="010F"/>
   <outline>
     <component base="d"/>
-    <component base="caroncomb.alt" xOffset="505" yOffset="-2"/>
+    <component base="caroncomb.alt" xOffset="517" yOffset="-2"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dcroat.glif b/src/Cantarell-Bold.ufo/glyphs/dcroat.glif
index 134e6895..8e31cc2d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dcroat.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dcroat.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dcroat" format="2">
-  <advance width="576"/>
+  <advance width="596"/>
   <unicode hex="0111"/>
   <outline>
     <component base="d"/>
-    <component base="strokeshortcomb" xOffset="198" yOffset="301"/>
+    <component base="strokeshortcomb" xOffset="210" yOffset="301"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ddotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/ddotbelow.glif
index d0e3c063..8d47b3f3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ddotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ddotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ddotbelow" format="2">
-  <advance width="576"/>
+  <advance width="596"/>
   <unicode hex="1E0D"/>
   <outline>
     <component base="d"/>
-    <component base="dotbelowcomb" xOffset="134"/>
+    <component base="dotbelowcomb" xOffset="146"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/de-cy.glif b/src/Cantarell-Bold.ufo/glyphs/de-cy.glif
index 310810f7..cf7b1617 100644
--- a/src/Cantarell-Bold.ufo/glyphs/de-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/de-cy.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="de-cy" format="2">
-  <advance width="626"/>
+  <advance width="621"/>
   <unicode hex="0434"/>
   <outline>
     <contour>
-      <point x="62" y="81" type="line"/>
-      <point x="185" y="81"/>
-      <point x="249" y="152"/>
-      <point x="249" y="289" type="curve" smooth="yes"/>
-      <point x="249" y="355" type="line"/>
-      <point x="364" y="355" type="line"/>
-      <point x="364" y="70" type="line"/>
-      <point x="524" y="70" type="line"/>
-      <point x="524" y="490" type="line"/>
-      <point x="104" y="490" type="line"/>
-      <point x="104" y="285" type="line" smooth="yes"/>
-      <point x="104" y="186"/>
-      <point x="78" y="130"/>
-      <point x="28" y="130" type="curve"/>
+      <point x="72" y="81" type="line"/>
+      <point x="195" y="81"/>
+      <point x="259" y="152"/>
+      <point x="259" y="289" type="curve" smooth="yes"/>
+      <point x="259" y="355" type="line"/>
+      <point x="374" y="355" type="line"/>
+      <point x="374" y="70" type="line"/>
+      <point x="534" y="70" type="line"/>
+      <point x="534" y="490" type="line"/>
+      <point x="114" y="490" type="line"/>
+      <point x="114" y="285" type="line" smooth="yes"/>
+      <point x="114" y="186"/>
+      <point x="88" y="130"/>
+      <point x="38" y="130" type="curve"/>
     </contour>
     <contour>
-      <point x="3" y="-135" type="line"/>
-      <point x="157" y="-135" type="line"/>
-      <point x="157" y="0" type="line"/>
-      <point x="470" y="0" type="line"/>
-      <point x="470" y="-135" type="line"/>
-      <point x="623" y="-135" type="line"/>
-      <point x="623" y="131" type="line"/>
-      <point x="3" y="131" type="line"/>
+      <point x="10" y="-135" type="line"/>
+      <point x="161" y="-135" type="line"/>
+      <point x="161" y="0" type="line"/>
+      <point x="459" y="0" type="line"/>
+      <point x="459" y="-135" type="line"/>
+      <point x="610" y="-135" type="line"/>
+      <point x="610" y="131" type="line"/>
+      <point x="10" y="131" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/degree.glif b/src/Cantarell-Bold.ufo/glyphs/degree.glif
index b8e5c587..dd50ee8a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/degree.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/degree.glif
@@ -1,35 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="degree" format="2">
-  <advance width="429"/>
+  <advance width="452"/>
   <unicode hex="00B0"/>
   <outline>
     <contour>
-      <point x="212" y="399" type="curve" smooth="yes"/>
-      <point x="311" y="399"/>
-      <point x="376" y="464"/>
-      <point x="376" y="561" type="curve" smooth="yes"/>
-      <point x="376" y="656"/>
-      <point x="312" y="719"/>
-      <point x="217" y="719" type="curve" smooth="yes"/>
-      <point x="118" y="719"/>
-      <point x="52" y="654"/>
-      <point x="52" y="557" type="curve" smooth="yes"/>
-      <point x="52" y="462"/>
-      <point x="116" y="399"/>
+      <point x="224" y="384" type="curve" smooth="yes"/>
+      <point x="323" y="384"/>
+      <point x="388" y="449"/>
+      <point x="388" y="546" type="curve" smooth="yes"/>
+      <point x="388" y="641"/>
+      <point x="324" y="704"/>
+      <point x="229" y="704" type="curve" smooth="yes"/>
+      <point x="130" y="704"/>
+      <point x="64" y="639"/>
+      <point x="64" y="542" type="curve" smooth="yes"/>
+      <point x="64" y="447"/>
+      <point x="128" y="384"/>
     </contour>
     <contour>
-      <point x="217" y="507" type="curve" smooth="yes"/>
-      <point x="182" y="507"/>
-      <point x="160" y="529"/>
-      <point x="160" y="561" type="curve" smooth="yes"/>
-      <point x="160" y="592"/>
-      <point x="180" y="612"/>
-      <point x="212" y="612" type="curve" smooth="yes"/>
-      <point x="246" y="612"/>
-      <point x="268" y="590"/>
-      <point x="268" y="557" type="curve" smooth="yes"/>
-      <point x="268" y="527"/>
-      <point x="248" y="507"/>
+      <point x="229" y="492" type="curve" smooth="yes"/>
+      <point x="194" y="492"/>
+      <point x="172" y="514"/>
+      <point x="172" y="546" type="curve" smooth="yes"/>
+      <point x="172" y="577"/>
+      <point x="192" y="597"/>
+      <point x="224" y="597" type="curve" smooth="yes"/>
+      <point x="258" y="597"/>
+      <point x="280" y="575"/>
+      <point x="280" y="542" type="curve" smooth="yes"/>
+      <point x="280" y="512"/>
+      <point x="260" y="492"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/descender-cy.case.glif 
b/src/Cantarell-Bold.ufo/glyphs/descender-cy.case.glif
index 97ca76cf..66801964 100644
--- a/src/Cantarell-Bold.ufo/glyphs/descender-cy.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/descender-cy.case.glif
@@ -4,12 +4,12 @@
   <anchor x="96" y="0" name="_bottomright"/>
   <outline>
     <contour>
-      <point x="35" y="0" type="line"/>
-      <point x="98" y="0" type="line"/>
       <point x="98" y="-187" type="line"/>
       <point x="260" y="-187" type="line"/>
       <point x="260" y="151" type="line"/>
-      <point x="35" y="151" type="line"/>
+      <point x="55" y="151" type="line"/>
+      <point x="55" y="0" type="line"/>
+      <point x="98" y="0" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/descender-cy.glif b/src/Cantarell-Bold.ufo/glyphs/descender-cy.glif
index ed37a911..5134f1f6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/descender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/descender-cy.glif
@@ -6,8 +6,8 @@
     <contour>
       <point x="104" y="-136" type="line"/>
       <point x="252" y="-136" type="line"/>
-      <point x="252" y="128" type="line"/>
-      <point x="77" y="128" type="line"/>
+      <point x="252" y="133" type="line"/>
+      <point x="77" y="133" type="line"/>
       <point x="77" y="0" type="line"/>
       <point x="104" y="0" type="line"/>
     </contour>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dieresis.glif b/src/Cantarell-Bold.ufo/glyphs/dieresis.glif
index 6ddeab1c..34ff3dec 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dieresis.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dieresis" format="2">
-  <advance width="538"/>
+  <advance width="500"/>
   <unicode hex="00A8"/>
   <outline>
-    <component base="dieresiscomb" xOffset="-7"/>
+    <component base="dieresiscomb" xOffset="-19"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dieresisbelowcomb.glif 
b/src/Cantarell-Bold.ufo/glyphs/dieresisbelowcomb.glif
index c53126f4..be74326b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dieresisbelowcomb.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dieresisbelowcomb.glif
@@ -4,20 +4,6 @@
   <anchor x="275" y="0" name="_bottom"/>
   <anchor x="275" y="-203" name="bottom"/>
   <outline>
-    <contour>
-      <point x="150" y="-227" type="curve" smooth="yes"/>
-      <point x="209" y="-227"/>
-      <point x="249" y="-187"/>
-      <point x="249" y="-128" type="curve" smooth="yes"/>
-      <point x="249" y="-68"/>
-      <point x="209" y="-28"/>
-      <point x="150" y="-28" type="curve" smooth="yes"/>
-      <point x="91" y="-28"/>
-      <point x="51" y="-68"/>
-      <point x="51" y="-128" type="curve" smooth="yes"/>
-      <point x="51" y="-187"/>
-      <point x="91" y="-227"/>
-    </contour>
     <contour>
       <point x="400" y="-227" type="curve" smooth="yes"/>
       <point x="459" y="-227"/>
@@ -32,6 +18,20 @@
       <point x="301" y="-187"/>
       <point x="341" y="-227"/>
     </contour>
+    <contour>
+      <point x="150" y="-227" type="curve" smooth="yes"/>
+      <point x="209" y="-227"/>
+      <point x="249" y="-187"/>
+      <point x="249" y="-128" type="curve" smooth="yes"/>
+      <point x="249" y="-68"/>
+      <point x="209" y="-28"/>
+      <point x="150" y="-28" type="curve" smooth="yes"/>
+      <point x="91" y="-28"/>
+      <point x="51" y="-68"/>
+      <point x="51" y="-128" type="curve" smooth="yes"/>
+      <point x="51" y="-187"/>
+      <point x="91" y="-227"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dieresiscomb.glif b/src/Cantarell-Bold.ufo/glyphs/dieresiscomb.glif
index 7bac52bc..d212aabe 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dieresiscomb.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dieresiscomb.glif
@@ -4,20 +4,6 @@
   <anchor x="269" y="490" name="_top"/>
   <anchor x="269" y="726" name="top"/>
   <outline>
-    <contour>
-      <point x="144" y="557" type="curve" smooth="yes"/>
-      <point x="203" y="557"/>
-      <point x="243" y="597"/>
-      <point x="243" y="656" type="curve" smooth="yes"/>
-      <point x="243" y="716"/>
-      <point x="203" y="756"/>
-      <point x="144" y="756" type="curve" smooth="yes"/>
-      <point x="85" y="756"/>
-      <point x="45" y="716"/>
-      <point x="45" y="656" type="curve" smooth="yes"/>
-      <point x="45" y="597"/>
-      <point x="85" y="557"/>
-    </contour>
     <contour>
       <point x="394" y="557" type="curve" smooth="yes"/>
       <point x="453" y="557"/>
@@ -32,6 +18,20 @@
       <point x="295" y="597"/>
       <point x="335" y="557"/>
     </contour>
+    <contour>
+      <point x="144" y="557" type="curve" smooth="yes"/>
+      <point x="203" y="557"/>
+      <point x="243" y="597"/>
+      <point x="243" y="656" type="curve" smooth="yes"/>
+      <point x="243" y="716"/>
+      <point x="203" y="756"/>
+      <point x="144" y="756" type="curve" smooth="yes"/>
+      <point x="85" y="756"/>
+      <point x="45" y="716"/>
+      <point x="45" y="656" type="curve" smooth="yes"/>
+      <point x="45" y="597"/>
+      <point x="85" y="557"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif 
b/src/Cantarell-Bold.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif
index 0317313c..8c03440e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif
@@ -3,20 +3,6 @@
   <anchor x="256" y="490" name="_top"/>
   <anchor x="256" y="676" name="top"/>
   <outline>
-    <contour>
-      <point x="136" y="536" type="curve" smooth="yes"/>
-      <point x="190" y="536"/>
-      <point x="226" y="572"/>
-      <point x="226" y="626" type="curve" smooth="yes"/>
-      <point x="226" y="681"/>
-      <point x="190" y="717"/>
-      <point x="136" y="717" type="curve" smooth="yes"/>
-      <point x="82" y="717"/>
-      <point x="46" y="681"/>
-      <point x="46" y="626" type="curve" smooth="yes"/>
-      <point x="46" y="572"/>
-      <point x="82" y="536"/>
-    </contour>
     <contour>
       <point x="376" y="536" type="curve" smooth="yes"/>
       <point x="430" y="536"/>
@@ -31,6 +17,20 @@
       <point x="286" y="572"/>
       <point x="322" y="536"/>
     </contour>
+    <contour>
+      <point x="136" y="536" type="curve" smooth="yes"/>
+      <point x="190" y="536"/>
+      <point x="226" y="572"/>
+      <point x="226" y="626" type="curve" smooth="yes"/>
+      <point x="226" y="681"/>
+      <point x="190" y="717"/>
+      <point x="136" y="717" type="curve" smooth="yes"/>
+      <point x="82" y="717"/>
+      <point x="46" y="681"/>
+      <point x="46" y="626" type="curve" smooth="yes"/>
+      <point x="46" y="572"/>
+      <point x="82" y="536"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/divide.glif b/src/Cantarell-Bold.ufo/glyphs/divide.glif
index 75e3b9bf..f59a552e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/divide.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/divide.glif
@@ -4,38 +4,46 @@
   <unicode hex="00F7"/>
   <outline>
     <contour>
-      <point x="29" y="262" type="line"/>
-      <point x="571" y="262" type="line"/>
-      <point x="571" y="397" type="line"/>
-      <point x="29" y="397" type="line"/>
+      <point x="60" y="254" type="line"/>
+      <point x="540" y="254" type="line"/>
+      <point x="540" y="405" type="line"/>
+      <point x="60" y="405" type="line"/>
     </contour>
     <contour>
-      <point x="300" y="435" type="curve" smooth="yes"/>
-      <point x="359" y="435"/>
-      <point x="399" y="475"/>
-      <point x="399" y="534" type="curve" smooth="yes"/>
-      <point x="399" y="594"/>
-      <point x="359" y="634"/>
-      <point x="300" y="634" type="curve" smooth="yes"/>
-      <point x="241" y="634"/>
-      <point x="201" y="594"/>
-      <point x="201" y="534" type="curve" smooth="yes"/>
-      <point x="201" y="475"/>
-      <point x="241" y="435"/>
+      <point x="300" y="19" type="curve" smooth="yes"/>
+      <point x="363" y="19"/>
+      <point x="407" y="62"/>
+      <point x="407" y="123" type="curve" smooth="yes"/>
+      <point x="407" y="186"/>
+      <point x="363" y="229"/>
+      <point x="300" y="229" type="curve" smooth="yes"/>
+      <point x="237" y="229"/>
+      <point x="194" y="186"/>
+      <point x="194" y="123" type="curve" smooth="yes"/>
+      <point x="194" y="62"/>
+      <point x="237" y="19"/>
     </contour>
     <contour>
-      <point x="300" y="25" type="curve" smooth="yes"/>
-      <point x="359" y="25"/>
-      <point x="399" y="65"/>
-      <point x="399" y="124" type="curve" smooth="yes"/>
-      <point x="399" y="184"/>
-      <point x="359" y="224"/>
-      <point x="300" y="224" type="curve" smooth="yes"/>
-      <point x="241" y="224"/>
-      <point x="201" y="184"/>
-      <point x="201" y="124" type="curve" smooth="yes"/>
-      <point x="201" y="65"/>
-      <point x="241" y="25"/>
+      <point x="300" y="430" type="curve" smooth="yes"/>
+      <point x="363" y="430"/>
+      <point x="407" y="473"/>
+      <point x="407" y="534" type="curve" smooth="yes"/>
+      <point x="407" y="597"/>
+      <point x="363" y="640"/>
+      <point x="300" y="640" type="curve" smooth="yes"/>
+      <point x="237" y="640"/>
+      <point x="194" y="597"/>
+      <point x="194" y="534" type="curve" smooth="yes"/>
+      <point x="194" y="473"/>
+      <point x="237" y="430"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minus</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/divisionslash.glif 
b/src/Cantarell-Bold.ufo/glyphs/divisionslash.glif
index 9bb4b0ee..01a1d8d4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/divisionslash.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/divisionslash.glif
@@ -1,8 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="divisionslash" format="2">
-  <advance width="338"/>
+  <advance width="600"/>
   <unicode hex="2215"/>
   <outline>
-    <component base="fraction"/>
+    <contour>
+      <point x="67" y="0" type="line"/>
+      <point x="217" y="0" type="line"/>
+      <point x="514" y="694" type="line"/>
+      <point x="349" y="694" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dje-cy.glif b/src/Cantarell-Bold.ufo/glyphs/dje-cy.glif
index 05e61880..684172ff 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dje-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dje-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dje-cy" format="2">
-  <advance width="579"/>
+  <advance width="595"/>
   <unicode hex="0452"/>
   <outline>
     <component base="tshe-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dlinebelow.glif b/src/Cantarell-Bold.ufo/glyphs/dlinebelow.glif
index 2205ba5e..c35bb4a3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dlinebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dlinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dlinebelow" format="2">
-  <advance width="576"/>
+  <advance width="596"/>
   <unicode hex="1E0F"/>
   <outline>
     <component base="d"/>
-    <component base="macronbelowcomb" xOffset="39"/>
+    <component base="macronbelowcomb" xOffset="51"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dollar.glif b/src/Cantarell-Bold.ufo/glyphs/dollar.glif
index d9967287..bc07aca2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dollar.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dollar.glif
@@ -1,20 +1,59 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dollar" format="2">
-  <advance width="599"/>
+  <advance width="600"/>
   <unicode hex="0024"/>
   <outline>
-    <component base="S" xOffset="7"/>
-    <component base="_currencyvstem" xOffset="122" yOffset="-5"/>
-    <component base="_currencyvstem" xOffset="122" yOffset="-798"/>
+    <contour>
+      <point x="286" y="0" type="curve" smooth="yes"/>
+      <point x="453" y="0"/>
+      <point x="549" y="87"/>
+      <point x="549" y="218" type="curve" smooth="yes"/>
+      <point x="549" y="461"/>
+      <point x="231" y="396"/>
+      <point x="231" y="496" type="curve" smooth="yes"/>
+      <point x="231" y="531"/>
+      <point x="267" y="551"/>
+      <point x="332" y="551" type="curve" smooth="yes"/>
+      <point x="379" y="551"/>
+      <point x="438" y="541"/>
+      <point x="485" y="523" type="curve"/>
+      <point x="530" y="653" type="line"/>
+      <point x="476" y="679"/>
+      <point x="402" y="694"/>
+      <point x="338" y="694" type="curve" smooth="yes"/>
+      <point x="174" y="694"/>
+      <point x="62" y="604"/>
+      <point x="62" y="473" type="curve" smooth="yes"/>
+      <point x="62" y="245"/>
+      <point x="378" y="303"/>
+      <point x="378" y="199" type="curve" smooth="yes"/>
+      <point x="378" y="166"/>
+      <point x="351" y="147"/>
+      <point x="286" y="147" type="curve" smooth="yes"/>
+      <point x="232" y="147"/>
+      <point x="161" y="159"/>
+      <point x="95" y="188" type="curve"/>
+      <point x="50" y="55" type="line"/>
+      <point x="116" y="23"/>
+      <point x="199" y="0"/>
+    </contour>
+    <contour>
+      <point x="231" y="-123" type="line"/>
+      <point x="388" y="-123" type="line"/>
+      <point x="388" y="54" type="line"/>
+      <point x="231" y="54" type="line"/>
+    </contour>
+    <contour>
+      <point x="231" y="636" type="line"/>
+      <point x="388" y="636" type="line"/>
+      <point x="388" y="821" type="line"/>
+      <point x="231" y="821" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>-1</integer>
-        <integer>-1</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dong.glif b/src/Cantarell-Bold.ufo/glyphs/dong.glif
index 6c1ba11a..40e8aef2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dong.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dong.glif
@@ -1,14 +1,60 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dong" format="2">
-  <advance width="645"/>
+  <advance width="600"/>
   <unicode hex="20AB"/>
   <outline>
     <contour>
-      <point x="81" y="-175" type="line"/>
-      <point x="593" y="-175" type="line"/>
-      <point x="593" y="-50" type="line"/>
-      <point x="81" y="-50" type="line"/>
+      <point x="229" y="-10" type="curve" smooth="yes"/>
+      <point x="297" y="-10"/>
+      <point x="355" y="25"/>
+      <point x="390" y="85" type="curve"/>
+      <point x="361" y="179" type="line"/>
+      <point x="345" y="151"/>
+      <point x="317" y="134"/>
+      <point x="284" y="134" type="curve" smooth="yes"/>
+      <point x="233" y="134"/>
+      <point x="203" y="177"/>
+      <point x="203" y="248" type="curve" smooth="yes"/>
+      <point x="203" y="316"/>
+      <point x="233" y="356"/>
+      <point x="282" y="356" type="curve" smooth="yes"/>
+      <point x="316" y="356"/>
+      <point x="346" y="338"/>
+      <point x="362" y="308" type="curve"/>
+      <point x="398" y="416" type="line"/>
+      <point x="368" y="472"/>
+      <point x="316" y="500"/>
+      <point x="251" y="500" type="curve" smooth="yes"/>
+      <point x="117" y="500"/>
+      <point x="27" y="396"/>
+      <point x="27" y="241" type="curve" smooth="yes"/>
+      <point x="27" y="90"/>
+      <point x="112" y="-10"/>
+    </contour>
+    <contour>
+      <point x="73" y="-175" type="line"/>
+      <point x="577" y="-175" type="line"/>
+      <point x="577" y="-50" type="line"/>
+      <point x="73" y="-50" type="line"/>
+    </contour>
+    <contour>
+      <point x="414" y="0" type="line"/>
+      <point x="519" y="0" type="line"/>
+      <point x="519" y="739" type="line"/>
+      <point x="353" y="739" type="line"/>
+      <point x="353" y="120" type="line"/>
+    </contour>
+    <contour>
+      <point x="237" y="546" type="line"/>
+      <point x="585" y="546" type="line"/>
+      <point x="585" y="653" type="line"/>
+      <point x="237" y="653" type="line"/>
     </contour>
-    <component base="dcroat" xOffset="16"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/dotaccent.glif
index 897b00e1..7a19b5f8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dotaccent.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dotaccent" format="2">
-  <advance width="288"/>
+  <advance width="500"/>
   <unicode hex="02D9"/>
   <outline>
-    <component base="dotaccentcomb" xOffset="-28"/>
+    <component base="dotaccentcomb" xOffset="106"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/doubleprimemod.glif 
b/src/Cantarell-Bold.ufo/glyphs/doubleprimemod.glif
index 92601d3d..3d037877 100644
--- a/src/Cantarell-Bold.ufo/glyphs/doubleprimemod.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/doubleprimemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="doubleprimemod" format="2">
-  <advance width="571"/>
+  <advance width="456"/>
   <unicode hex="02BA"/>
   <outline>
-    <component base="second"/>
+    <component base="second" xOffset="-60"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/downA_rrow.glif b/src/Cantarell-Bold.ufo/glyphs/downA_rrow.glif
index 5a336c4b..656372b8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/downA_rrow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/downA_rrow.glif
@@ -1,11 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="downArrow" format="2">
-  <advance width="619"/>
+  <advance width="643"/>
   <unicode hex="2193"/>
-  <note>
-arrowdown
-</note>
   <outline>
-    <component base="upArrow" xScale="-1" yScale="-1" xOffset="635" yOffset="642"/>
+    <component base="upArrow" xScale="-1" yScale="-1" xOffset="643" yOffset="642"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>upArrow</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>upArrow</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dzcaron.glif b/src/Cantarell-Bold.ufo/glyphs/dzcaron.glif
index f524fe0d..33f0d52a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dzcaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dzcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dzcaron" format="2">
-  <advance width="1066"/>
+  <advance width="1111"/>
   <unicode hex="01C6"/>
   <outline>
     <component base="d"/>
-    <component base="zcaron" xOffset="576"/>
+    <component base="zcaron" xOffset="596"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dze-cy.glif b/src/Cantarell-Bold.ufo/glyphs/dze-cy.glif
index 070aed3e..d6516e6f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dze-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dze-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dze-cy" format="2">
-  <advance width="477"/>
+  <advance width="493"/>
   <unicode hex="0455"/>
   <outline>
     <component base="s"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dzhe-cy.glif b/src/Cantarell-Bold.ufo/glyphs/dzhe-cy.glif
index 7aef4241..8272ac01 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dzhe-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dzhe-cy.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dzhe-cy" format="2">
-  <advance width="598"/>
+  <advance width="614"/>
   <unicode hex="045F"/>
   <outline>
     <contour>
-      <point x="223" y="-134" type="line"/>
-      <point x="379" y="-134" type="line"/>
-      <point x="379" y="0" type="line"/>
-      <point x="544" y="0" type="line"/>
-      <point x="544" y="490" type="line"/>
-      <point x="379" y="490" type="line"/>
-      <point x="379" y="135" type="line"/>
-      <point x="219" y="135" type="line"/>
-      <point x="219" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
-      <point x="54" y="0" type="line"/>
-      <point x="223" y="0" type="line"/>
+      <point x="231" y="-134" type="line"/>
+      <point x="387" y="-134" type="line"/>
+      <point x="387" y="0" type="line"/>
+      <point x="552" y="0" type="line"/>
+      <point x="552" y="490" type="line"/>
+      <point x="387" y="490" type="line"/>
+      <point x="387" y="135" type="line"/>
+      <point x="227" y="135" type="line"/>
+      <point x="227" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="231" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -27,6 +27,10 @@
         <key>width</key>
         <integer>70</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/e-cy.glif
index e3c21f9d..e72d55a3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/e-cy.glif
@@ -1,43 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="e-cy" format="2">
-  <advance width="482"/>
+  <advance width="505"/>
   <unicode hex="0454"/>
-  <anchor x="239" y="0" name="bottom"/>
-  <anchor x="258" y="489" name="top"/>
+  <anchor x="254" y="0" name="bottom"/>
+  <anchor x="273" y="489" name="top"/>
   <outline>
     <contour>
-      <point x="293" y="-10" type="curve" smooth="yes"/>
-      <point x="354" y="-10"/>
-      <point x="413" y="1"/>
-      <point x="468" y="28" type="curve"/>
-      <point x="433" y="135" type="line"/>
-      <point x="400" y="123"/>
-      <point x="363" y="116"/>
-      <point x="328" y="116" type="curve" smooth="yes"/>
-      <point x="234" y="116"/>
-      <point x="178" y="164"/>
-      <point x="178" y="247" type="curve" smooth="yes"/>
-      <point x="178" y="324"/>
-      <point x="227" y="367"/>
-      <point x="315" y="367" type="curve" smooth="yes"/>
-      <point x="351" y="367"/>
-      <point x="400" y="359"/>
-      <point x="433" y="348" type="curve"/>
-      <point x="465" y="471" type="line"/>
-      <point x="420" y="489"/>
-      <point x="360" y="499"/>
-      <point x="308" y="499" type="curve" smooth="yes"/>
-      <point x="133" y="499"/>
-      <point x="18" y="396"/>
-      <point x="18" y="235" type="curve" smooth="yes"/>
-      <point x="18" y="81"/>
-      <point x="122" y="-10"/>
+      <point x="308" y="-10" type="curve" smooth="yes"/>
+      <point x="369" y="-10"/>
+      <point x="428" y="1"/>
+      <point x="483" y="28" type="curve"/>
+      <point x="448" y="135" type="line"/>
+      <point x="415" y="123"/>
+      <point x="378" y="116"/>
+      <point x="343" y="116" type="curve" smooth="yes"/>
+      <point x="249" y="116"/>
+      <point x="193" y="164"/>
+      <point x="193" y="247" type="curve" smooth="yes"/>
+      <point x="193" y="324"/>
+      <point x="242" y="367"/>
+      <point x="330" y="367" type="curve" smooth="yes"/>
+      <point x="366" y="367"/>
+      <point x="415" y="359"/>
+      <point x="448" y="348" type="curve"/>
+      <point x="480" y="471" type="line"/>
+      <point x="435" y="489"/>
+      <point x="375" y="499"/>
+      <point x="323" y="499" type="curve" smooth="yes"/>
+      <point x="148" y="499"/>
+      <point x="33" y="396"/>
+      <point x="33" y="235" type="curve" smooth="yes"/>
+      <point x="33" y="81"/>
+      <point x="137" y="-10"/>
     </contour>
     <contour>
-      <point x="124" y="194" type="line"/>
-      <point x="392" y="194" type="line"/>
-      <point x="392" y="306" type="line"/>
-      <point x="124" y="306" type="line"/>
+      <point x="139" y="194" type="line"/>
+      <point x="407" y="194" type="line"/>
+      <point x="407" y="306" type="line"/>
+      <point x="139" y="306" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>es-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>es-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/e.glif b/src/Cantarell-Bold.ufo/glyphs/e.glif
index 74995e0c..9dac98b6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/e.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/e.glif
@@ -1,46 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="e" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="0065"/>
-  <note>
-e
-</note>
-  <anchor x="265" y="0" name="bottom"/>
-  <anchor x="432" y="10" name="ogonek"/>
-  <anchor x="267" y="490" name="top"/>
+  <anchor x="280" y="0" name="bottom"/>
+  <anchor x="447" y="10" name="ogonek"/>
+  <anchor x="282" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="304" y="-10" type="curve" smooth="yes"/>
-      <point x="364" y="-10"/>
-      <point x="427" y="1"/>
-      <point x="489" y="22" type="curve"/>
-      <point x="451" y="139" type="line"/>
-      <point x="410" y="125"/>
-      <point x="371" y="118"/>
-      <point x="331" y="118" type="curve" smooth="yes"/>
-      <point x="234" y="118"/>
-      <point x="189" y="160"/>
-      <point x="189" y="261" type="curve" smooth="yes"/>
-      <point x="189" y="335"/>
-      <point x="215" y="373"/>
-      <point x="264" y="373" type="curve" smooth="yes"/>
-      <point x="309" y="373"/>
-      <point x="335" y="345"/>
-      <point x="335" y="297" type="curve"/>
-      <point x="168" y="297" type="line"/>
-      <point x="168" y="197" type="line"/>
-      <point x="491" y="197" type="line"/>
-      <point x="495" y="222"/>
-      <point x="498" y="247"/>
-      <point x="498" y="273" type="curve" smooth="yes"/>
-      <point x="498" y="416"/>
-      <point x="416" y="500"/>
-      <point x="276" y="500" type="curve" smooth="yes"/>
-      <point x="121" y="500"/>
-      <point x="18" y="398"/>
-      <point x="18" y="244" type="curve" smooth="yes"/>
-      <point x="18" y="86"/>
-      <point x="126" y="-10"/>
+      <point x="319" y="-10" type="curve" smooth="yes"/>
+      <point x="379" y="-10"/>
+      <point x="442" y="1"/>
+      <point x="504" y="22" type="curve"/>
+      <point x="466" y="139" type="line"/>
+      <point x="425" y="125"/>
+      <point x="386" y="118"/>
+      <point x="346" y="118" type="curve" smooth="yes"/>
+      <point x="249" y="118"/>
+      <point x="204" y="160"/>
+      <point x="204" y="261" type="curve" smooth="yes"/>
+      <point x="204" y="335"/>
+      <point x="230" y="373"/>
+      <point x="279" y="373" type="curve" smooth="yes"/>
+      <point x="324" y="373"/>
+      <point x="350" y="344"/>
+      <point x="350" y="292" type="curve"/>
+      <point x="183" y="292" type="line"/>
+      <point x="183" y="197" type="line"/>
+      <point x="506" y="197" type="line"/>
+      <point x="510" y="222"/>
+      <point x="513" y="247"/>
+      <point x="513" y="273" type="curve" smooth="yes"/>
+      <point x="513" y="416"/>
+      <point x="431" y="500"/>
+      <point x="291" y="500" type="curve" smooth="yes"/>
+      <point x="136" y="500"/>
+      <point x="33" y="398"/>
+      <point x="33" y="244" type="curve" smooth="yes"/>
+      <point x="33" y="86"/>
+      <point x="141" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eacute.glif b/src/Cantarell-Bold.ufo/glyphs/eacute.glif
index caa46fab..a1b4015d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eacute" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="00E9"/>
   <outline>
     <component base="e"/>
-    <component base="acutecomb" xOffset="171"/>
+    <component base="acutecomb" xOffset="186"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ebreve.glif b/src/Cantarell-Bold.ufo/glyphs/ebreve.glif
index 7879cc03..804f3b64 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ebreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ebreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ebreve" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="0115"/>
   <outline>
     <component base="e"/>
-    <component base="brevecomb" xOffset="51"/>
+    <component base="brevecomb" xOffset="66"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ecaron.glif b/src/Cantarell-Bold.ufo/glyphs/ecaron.glif
index 4232df5f..4c2cfb20 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ecaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ecaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecaron" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="011B"/>
   <outline>
     <component base="e"/>
-    <component base="caroncomb" xOffset="61"/>
+    <component base="caroncomb" xOffset="76"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ecedillabreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/ecedillabreve.glif
index 5556cd26..d28e12f0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ecedillabreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ecedillabreve.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecedillabreve" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="1E1D"/>
   <outline>
     <component base="e"/>
-    <component base="cedillacomb" xOffset="107"/>
-    <component base="brevecomb" xOffset="51"/>
+    <component base="cedillacomb" xOffset="122"/>
+    <component base="brevecomb" xOffset="66"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ecircumflex.glif b/src/Cantarell-Bold.ufo/glyphs/ecircumflex.glif
index fddde2f4..a0657c1b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ecircumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ecircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflex" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="00EA"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb" xOffset="64"/>
+    <component base="circumflexcomb" xOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ecircumflexacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/ecircumflexacute.glif
index 47c5224e..4bca9bb1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ecircumflexacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ecircumflexacute.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexacute" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="1EBF"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb_acutecomb" xOffset="63"/>
+    <component base="circumflexcomb.loclVIET" xOffset="78"/>
+    <component base="acutecomb.loclVIET" xOffset="373" yOffset="123"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ecircumflexdotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/ecircumflexdotbelow.glif
index bc6618bf..b70a94e2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ecircumflexdotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ecircumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexdotbelow" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="1EC7"/>
   <outline>
     <component base="e"/>
-    <component base="dotbelowcomb" xOffset="115"/>
-    <component base="circumflexcomb" xOffset="64"/>
+    <component base="dotbelowcomb" xOffset="130"/>
+    <component base="circumflexcomb" xOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ecircumflexgrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/ecircumflexgrave.glif
index f0a7af10..433e1991 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ecircumflexgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ecircumflexgrave.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexgrave" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="1EC1"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb_gravecomb" xOffset="63"/>
+    <component base="circumflexcomb.loclVIET" xOffset="78"/>
+    <component base="gravecomb.loclVIET" xOffset="283" yOffset="123"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ecircumflexhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/ecircumflexhookabove.glif
index 0863444e..82d97ffa 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ecircumflexhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ecircumflexhookabove.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexhookabove" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="1EC3"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb_hookabovecomb" xOffset="63"/>
+    <component base="circumflexcomb.loclVIET" xOffset="78"/>
+    <component base="hookabovecomb.loclVIET" xOffset="306" yOffset="122"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ecircumflextilde.glif 
b/src/Cantarell-Bold.ufo/glyphs/ecircumflextilde.glif
index e717c4c4..a6f59b0c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ecircumflextilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ecircumflextilde.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflextilde" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="1EC5"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb_tildecomb" xOffset="45"/>
+    <component base="circumflexcomb.loclVIET" xOffset="78"/>
+    <component base="tildecomb.loclVIET" xOffset="64" yOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/edblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/edblgrave.glif
index c5c19407..f02f6609 100644
--- a/src/Cantarell-Bold.ufo/glyphs/edblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/edblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edblgrave" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="0205"/>
   <outline>
     <component base="e"/>
-    <component base="dblgravecomb" xOffset="-34"/>
+    <component base="dblgravecomb" xOffset="-19"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/edieresis.glif b/src/Cantarell-Bold.ufo/glyphs/edieresis.glif
index 3f5d3c0b..f2ed94f6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/edieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/edieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edieresis" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="00EB"/>
   <outline>
     <component base="e"/>
-    <component base="dieresiscomb" xOffset="-2"/>
+    <component base="dieresiscomb" xOffset="13"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/edotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/edotaccent.glif
index 34d3cd32..2050f556 100644
--- a/src/Cantarell-Bold.ufo/glyphs/edotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/edotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edotaccent" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="0117"/>
   <outline>
     <component base="e"/>
-    <component base="dotaccentcomb" xOffset="123"/>
+    <component base="dotaccentcomb" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/edotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/edotbelow.glif
index 4daafd52..de30a00b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/edotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/edotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edotbelow" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="1EB9"/>
   <outline>
     <component base="e"/>
-    <component base="dotbelowcomb" xOffset="115"/>
+    <component base="dotbelowcomb" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ef-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ef-cy.glif
index bf29f814..671a54d8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ef-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ef-cy.glif
@@ -1,69 +1,77 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ef-cy" format="2">
-  <advance width="792"/>
+  <advance width="816"/>
   <unicode hex="0444"/>
   <outline>
     <contour>
-      <point x="320" y="-217" type="line"/>
-      <point x="476" y="-217" type="line"/>
-      <point x="476" y="739" type="line"/>
-      <point x="320" y="739" type="line"/>
+      <point x="563" y="-5" type="curve" smooth="yes"/>
+      <point x="692" y="-5"/>
+      <point x="783" y="102"/>
+      <point x="783" y="254" type="curve" smooth="yes"/>
+      <point x="783" y="395"/>
+      <point x="700" y="495"/>
+      <point x="581" y="495" type="curve" smooth="yes"/>
+      <point x="500" y="495"/>
+      <point x="436" y="449"/>
+      <point x="404" y="366" type="curve"/>
+      <point x="450" y="313" type="line"/>
+      <point x="462" y="340"/>
+      <point x="489" y="355"/>
+      <point x="522" y="355" type="curve" smooth="yes"/>
+      <point x="578" y="355"/>
+      <point x="612" y="314"/>
+      <point x="612" y="247" type="curve" smooth="yes"/>
+      <point x="612" y="178"/>
+      <point x="581" y="135"/>
+      <point x="531" y="135" type="curve" smooth="yes"/>
+      <point x="496" y="135"/>
+      <point x="465" y="154"/>
+      <point x="450" y="186" type="curve"/>
+      <point x="402" y="104" type="line"/>
+      <point x="430" y="32"/>
+      <point x="485" y="-5"/>
     </contour>
     <contour>
-      <point x="221" y="-5" type="curve" smooth="yes"/>
-      <point x="290" y="-5"/>
-      <point x="347" y="30"/>
-      <point x="382" y="91" type="curve"/>
-      <point x="353" y="181" type="line"/>
-      <point x="337" y="153"/>
-      <point x="309" y="135"/>
-      <point x="275" y="135" type="curve" smooth="yes"/>
-      <point x="224" y="135"/>
-      <point x="192" y="178"/>
-      <point x="192" y="248" type="curve" smooth="yes"/>
-      <point x="192" y="310"/>
-      <point x="224" y="350"/>
-      <point x="273" y="350" type="curve" smooth="yes"/>
-      <point x="306" y="350"/>
-      <point x="338" y="331"/>
-      <point x="354" y="300" type="curve"/>
-      <point x="390" y="405" type="line"/>
-      <point x="360" y="461"/>
-      <point x="307" y="490"/>
-      <point x="243" y="490" type="curve" smooth="yes"/>
-      <point x="112" y="490"/>
-      <point x="21" y="388"/>
-      <point x="21" y="241" type="curve" smooth="yes"/>
-      <point x="21" y="97"/>
-      <point x="104" y="-5"/>
+      <point x="233" y="-5" type="curve" smooth="yes"/>
+      <point x="301" y="-5"/>
+      <point x="359" y="29"/>
+      <point x="394" y="91" type="curve"/>
+      <point x="365" y="181" type="line"/>
+      <point x="348" y="152"/>
+      <point x="320" y="135"/>
+      <point x="287" y="135" type="curve" smooth="yes"/>
+      <point x="237" y="135"/>
+      <point x="204" y="182"/>
+      <point x="204" y="250" type="curve" smooth="yes"/>
+      <point x="204" y="316"/>
+      <point x="236" y="355"/>
+      <point x="284" y="355" type="curve" smooth="yes"/>
+      <point x="318" y="355"/>
+      <point x="350" y="336"/>
+      <point x="366" y="305" type="curve"/>
+      <point x="402" y="410" type="line"/>
+      <point x="373" y="465"/>
+      <point x="322" y="495"/>
+      <point x="252" y="495" type="curve" smooth="yes"/>
+      <point x="124" y="495"/>
+      <point x="33" y="393"/>
+      <point x="33" y="244" type="curve" smooth="yes"/>
+      <point x="33" y="101"/>
+      <point x="117" y="-5"/>
     </contour>
     <contour>
-      <point x="551" y="-5" type="curve" smooth="yes"/>
-      <point x="681" y="-5"/>
-      <point x="771" y="98"/>
-      <point x="771" y="249" type="curve" smooth="yes"/>
-      <point x="771" y="390"/>
-      <point x="688" y="490"/>
-      <point x="569" y="490" type="curve" smooth="yes"/>
-      <point x="488" y="490"/>
-      <point x="424" y="444"/>
-      <point x="392" y="361" type="curve"/>
-      <point x="438" y="308" type="line"/>
-      <point x="451" y="337"/>
-      <point x="479" y="350"/>
-      <point x="508" y="350" type="curve" smooth="yes"/>
-      <point x="565" y="350"/>
-      <point x="600" y="310"/>
-      <point x="600" y="243" type="curve" smooth="yes"/>
-      <point x="600" y="175"/>
-      <point x="570" y="135"/>
-      <point x="519" y="135" type="curve" smooth="yes"/>
-      <point x="485" y="135"/>
-      <point x="454" y="153"/>
-      <point x="438" y="186" type="curve"/>
-      <point x="390" y="104" type="line"/>
-      <point x="419" y="30"/>
-      <point x="475" y="-5"/>
+      <point x="333" y="-217" type="line"/>
+      <point x="487" y="-217" type="line"/>
+      <point x="487" y="739" type="line"/>
+      <point x="333" y="739" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/egrave.glif b/src/Cantarell-Bold.ufo/glyphs/egrave.glif
index 8286f6e4..62287ae2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/egrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/egrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="egrave" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="00E8"/>
   <outline>
     <component base="e"/>
-    <component base="gravecomb" xOffset="69"/>
+    <component base="gravecomb" xOffset="84"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ehookabove.glif b/src/Cantarell-Bold.ufo/glyphs/ehookabove.glif
index abfe3873..ab3b8656 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ehookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ehookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ehookabove" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="1EBB"/>
   <outline>
     <component base="e"/>
-    <component base="hookabovecomb" xOffset="113"/>
+    <component base="hookabovecomb" xOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eight.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/eight.dnom.glif
index 92184b9d..9f68439e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eight.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eight.dnom.glif
@@ -1,55 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight.dnom" format="2">
-  <advance width="469"/>
-  <note>
-eight
-</note>
+  <advance width="437"/>
   <outline>
     <contour>
-      <point x="230" y="-7" type="curve" smooth="yes"/>
-      <point x="361" y="-7"/>
-      <point x="448" y="56"/>
-      <point x="448" y="148" type="curve" smooth="yes"/>
-      <point x="448" y="309"/>
-      <point x="180" y="274"/>
-      <point x="180" y="337" type="curve" smooth="yes"/>
-      <point x="180" y="355"/>
-      <point x="202" y="367"/>
-      <point x="234" y="367" type="curve" smooth="yes"/>
-      <point x="268" y="367"/>
-      <point x="288" y="354"/>
-      <point x="288" y="334" type="curve" smooth="yes"/>
-      <point x="288" y="312"/>
-      <point x="264" y="298"/>
-      <point x="231" y="299" type="curve"/>
-      <point x="332" y="248" type="line"/>
-      <point x="397" y="273"/>
-      <point x="433" y="314"/>
-      <point x="433" y="362" type="curve" smooth="yes"/>
-      <point x="433" y="436"/>
-      <point x="355" y="486"/>
-      <point x="242" y="486" type="curve" smooth="yes"/>
-      <point x="116" y="486"/>
-      <point x="34" y="423"/>
-      <point x="34" y="332" type="curve" smooth="yes"/>
-      <point x="34" y="167"/>
-      <point x="303" y="202"/>
-      <point x="303" y="142" type="curve" smooth="yes"/>
-      <point x="303" y="123"/>
-      <point x="277" y="112"/>
-      <point x="241" y="112" type="curve" smooth="yes"/>
-      <point x="195" y="112"/>
-      <point x="166" y="130"/>
-      <point x="166" y="158" type="curve" smooth="yes"/>
-      <point x="166" y="183"/>
-      <point x="191" y="195"/>
-      <point x="238" y="191" type="curve"/>
-      <point x="153" y="245" type="line"/>
-      <point x="70" y="232"/>
-      <point x="21" y="191"/>
-      <point x="21" y="130" type="curve" smooth="yes"/>
-      <point x="21" y="49"/>
-      <point x="106" y="-7"/>
+      <point x="215" y="-6" type="curve" smooth="yes"/>
+      <point x="329" y="-6"/>
+      <point x="405" y="49"/>
+      <point x="405" y="127" type="curve" smooth="yes"/>
+      <point x="405" y="263"/>
+      <point x="168" y="233"/>
+      <point x="168" y="296" type="curve" smooth="yes"/>
+      <point x="168" y="311"/>
+      <point x="190" y="323"/>
+      <point x="218" y="323" type="curve" smooth="yes"/>
+      <point x="248" y="323"/>
+      <point x="268" y="310"/>
+      <point x="268" y="291" type="curve" smooth="yes"/>
+      <point x="268" y="271"/>
+      <point x="245" y="258"/>
+      <point x="216" y="259" type="curve"/>
+      <point x="303" y="215" type="line"/>
+      <point x="363" y="238"/>
+      <point x="391" y="275"/>
+      <point x="391" y="315" type="curve" smooth="yes"/>
+      <point x="391" y="380"/>
+      <point x="322" y="422"/>
+      <point x="225" y="422" type="curve" smooth="yes"/>
+      <point x="117" y="422"/>
+      <point x="44" y="368"/>
+      <point x="44" y="289" type="curve" smooth="yes"/>
+      <point x="44" y="151"/>
+      <point x="280" y="180"/>
+      <point x="280" y="120" type="curve" smooth="yes"/>
+      <point x="280" y="105"/>
+      <point x="255" y="93"/>
+      <point x="224" y="93" type="curve" smooth="yes"/>
+      <point x="185" y="93"/>
+      <point x="157" y="111"/>
+      <point x="157" y="136" type="curve" smooth="yes"/>
+      <point x="157" y="161"/>
+      <point x="183" y="170"/>
+      <point x="222" y="167" type="curve"/>
+      <point x="149" y="213" type="line"/>
+      <point x="78" y="203"/>
+      <point x="33" y="167"/>
+      <point x="33" y="113" type="curve" smooth="yes"/>
+      <point x="33" y="42"/>
+      <point x="108" y="-6"/>
     </contour>
   </outline>
   <lib>
@@ -57,11 +54,11 @@ eight
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>69</integer>
+        <integer>60</integer>
         <key>weight</key>
-        <integer>-23</integer>
+        <integer>-45</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>65</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eight.glif b/src/Cantarell-Bold.ufo/glyphs/eight.glif
index cfae2555..a74197be 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="603"/>
+  <advance width="620"/>
   <unicode hex="0038"/>
   <outline>
     <contour>
-      <point x="298" y="-10" type="curve" smooth="yes"/>
-      <point x="468" y="-10"/>
-      <point x="580" y="76"/>
-      <point x="580" y="203" type="curve" smooth="yes"/>
-      <point x="580" y="434"/>
-      <point x="212" y="379"/>
-      <point x="212" y="502" type="curve" smooth="yes"/>
-      <point x="212" y="539"/>
-      <point x="246" y="566"/>
-      <point x="300" y="566" type="curve" smooth="yes"/>
-      <point x="354" y="566"/>
-      <point x="389" y="539"/>
-      <point x="389" y="497" type="curve" smooth="yes"/>
-      <point x="389" y="454"/>
-      <point x="351" y="424"/>
-      <point x="295" y="419" type="curve"/>
-      <point x="412" y="359" type="line"/>
-      <point x="505" y="393"/>
-      <point x="557" y="455"/>
-      <point x="557" y="529" type="curve" smooth="yes"/>
-      <point x="557" y="634"/>
-      <point x="455" y="704"/>
-      <point x="309" y="704" type="curve" smooth="yes"/>
-      <point x="149" y="704"/>
-      <point x="44" y="619"/>
-      <point x="44" y="493" type="curve" smooth="yes"/>
-      <point x="44" y="257"/>
-      <point x="412" y="311"/>
-      <point x="412" y="193" type="curve" smooth="yes"/>
-      <point x="412" y="155"/>
-      <point x="373" y="128"/>
-      <point x="309" y="128" type="curve" smooth="yes"/>
-      <point x="239" y="128"/>
-      <point x="193" y="162"/>
-      <point x="193" y="215" type="curve" smooth="yes"/>
-      <point x="193" y="264"/>
-      <point x="233" y="292"/>
-      <point x="303" y="294" type="curve"/>
-      <point x="204" y="357" type="line"/>
-      <point x="92" y="337"/>
-      <point x="25" y="273"/>
-      <point x="25" y="183" type="curve" smooth="yes"/>
-      <point x="25" y="68"/>
-      <point x="136" y="-10"/>
+      <point x="306" y="-10" type="curve" smooth="yes"/>
+      <point x="476" y="-10"/>
+      <point x="588" y="76"/>
+      <point x="588" y="203" type="curve" smooth="yes"/>
+      <point x="588" y="429"/>
+      <point x="220" y="374"/>
+      <point x="220" y="502" type="curve" smooth="yes"/>
+      <point x="220" y="539"/>
+      <point x="254" y="566"/>
+      <point x="308" y="566" type="curve" smooth="yes"/>
+      <point x="362" y="566"/>
+      <point x="397" y="539"/>
+      <point x="397" y="497" type="curve" smooth="yes"/>
+      <point x="397" y="454"/>
+      <point x="359" y="424"/>
+      <point x="303" y="419" type="curve"/>
+      <point x="420" y="359" type="line"/>
+      <point x="513" y="393"/>
+      <point x="565" y="455"/>
+      <point x="565" y="529" type="curve" smooth="yes"/>
+      <point x="565" y="634"/>
+      <point x="463" y="704"/>
+      <point x="317" y="704" type="curve" smooth="yes"/>
+      <point x="157" y="704"/>
+      <point x="52" y="619"/>
+      <point x="52" y="493" type="curve" smooth="yes"/>
+      <point x="52" y="262"/>
+      <point x="420" y="316"/>
+      <point x="420" y="193" type="curve" smooth="yes"/>
+      <point x="420" y="155"/>
+      <point x="381" y="128"/>
+      <point x="317" y="128" type="curve" smooth="yes"/>
+      <point x="247" y="128"/>
+      <point x="201" y="162"/>
+      <point x="201" y="215" type="curve" smooth="yes"/>
+      <point x="201" y="264"/>
+      <point x="241" y="292"/>
+      <point x="311" y="294" type="curve"/>
+      <point x="212" y="357" type="line"/>
+      <point x="100" y="337"/>
+      <point x="33" y="273"/>
+      <point x="33" y="183" type="curve" smooth="yes"/>
+      <point x="33" y="68"/>
+      <point x="144" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eight.numr.glif b/src/Cantarell-Bold.ufo/glyphs/eight.numr.glif
index 0b1f3bfd..77b589ce 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eight.numr.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eight.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight.numr" format="2">
-  <advance width="469"/>
+  <advance width="437"/>
   <outline>
     <component base="eight.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eight.osf.glif b/src/Cantarell-Bold.ufo/glyphs/eight.osf.glif
index 9dc13cba..5e2b853c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eight.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eight.osf.glif
@@ -1,52 +1,60 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight.osf" format="2">
-  <advance width="597"/>
+  <advance width="614"/>
   <outline>
     <contour>
-      <point x="295" y="-10" type="curve" smooth="yes"/>
-      <point x="464" y="-10"/>
-      <point x="574" y="76"/>
-      <point x="574" y="200" type="curve" smooth="yes"/>
-      <point x="574" y="431"/>
-      <point x="205" y="378"/>
-      <point x="205" y="505" type="curve" smooth="yes"/>
-      <point x="205" y="543"/>
-      <point x="242" y="571"/>
-      <point x="297" y="571" type="curve" smooth="yes"/>
-      <point x="351" y="571"/>
-      <point x="389" y="543"/>
-      <point x="389" y="500" type="curve" smooth="yes"/>
-      <point x="389" y="452"/>
-      <point x="344" y="421"/>
-      <point x="292" y="416" type="curve"/>
-      <point x="405" y="359" type="line"/>
-      <point x="498" y="393"/>
-      <point x="550" y="455"/>
-      <point x="550" y="529" type="curve" smooth="yes"/>
-      <point x="550" y="634"/>
-      <point x="449" y="704"/>
-      <point x="306" y="704" type="curve" smooth="yes"/>
-      <point x="149" y="704"/>
-      <point x="44" y="619"/>
-      <point x="44" y="496" type="curve" smooth="yes"/>
-      <point x="44" y="260"/>
-      <point x="412" y="314"/>
-      <point x="412" y="190" type="curve" smooth="yes"/>
-      <point x="412" y="151"/>
-      <point x="372" y="124"/>
-      <point x="306" y="124" type="curve" smooth="yes"/>
-      <point x="235" y="124"/>
-      <point x="186" y="159"/>
-      <point x="186" y="212" type="curve" smooth="yes"/>
-      <point x="186" y="263"/>
-      <point x="231" y="295"/>
-      <point x="300" y="297" type="curve"/>
-      <point x="204" y="357" type="line"/>
-      <point x="92" y="337"/>
-      <point x="25" y="273"/>
-      <point x="25" y="183" type="curve" smooth="yes"/>
-      <point x="25" y="68"/>
-      <point x="136" y="-10"/>
+      <point x="303" y="-10" type="curve" smooth="yes"/>
+      <point x="472" y="-10"/>
+      <point x="582" y="76"/>
+      <point x="582" y="200" type="curve" smooth="yes"/>
+      <point x="582" y="431"/>
+      <point x="213" y="378"/>
+      <point x="213" y="505" type="curve" smooth="yes"/>
+      <point x="213" y="543"/>
+      <point x="250" y="571"/>
+      <point x="305" y="571" type="curve" smooth="yes"/>
+      <point x="359" y="571"/>
+      <point x="397" y="543"/>
+      <point x="397" y="500" type="curve" smooth="yes"/>
+      <point x="397" y="452"/>
+      <point x="352" y="421"/>
+      <point x="300" y="416" type="curve"/>
+      <point x="413" y="359" type="line"/>
+      <point x="506" y="393"/>
+      <point x="558" y="455"/>
+      <point x="558" y="529" type="curve" smooth="yes"/>
+      <point x="558" y="634"/>
+      <point x="457" y="704"/>
+      <point x="314" y="704" type="curve" smooth="yes"/>
+      <point x="157" y="704"/>
+      <point x="52" y="619"/>
+      <point x="52" y="496" type="curve" smooth="yes"/>
+      <point x="52" y="260"/>
+      <point x="420" y="314"/>
+      <point x="420" y="190" type="curve" smooth="yes"/>
+      <point x="420" y="151"/>
+      <point x="380" y="124"/>
+      <point x="314" y="124" type="curve" smooth="yes"/>
+      <point x="243" y="124"/>
+      <point x="194" y="159"/>
+      <point x="194" y="212" type="curve" smooth="yes"/>
+      <point x="194" y="263"/>
+      <point x="239" y="295"/>
+      <point x="308" y="297" type="curve"/>
+      <point x="212" y="357" type="line"/>
+      <point x="100" y="337"/>
+      <point x="33" y="273"/>
+      <point x="33" y="183" type="curve" smooth="yes"/>
+      <point x="33" y="68"/>
+      <point x="144" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>eight</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>eight</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eight.tf.glif b/src/Cantarell-Bold.ufo/glyphs/eight.tf.glif
index eaf84137..8bd81220 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eight.tf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eight.tf.glif
@@ -1,53 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight.tf" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <outline>
-    <contour>
-      <point x="286" y="-10" type="curve" smooth="yes"/>
-      <point x="451" y="-10"/>
-      <point x="561" y="76"/>
-      <point x="561" y="203" type="curve" smooth="yes"/>
-      <point x="561" y="433"/>
-      <point x="204" y="379"/>
-      <point x="204" y="502" type="curve" smooth="yes"/>
-      <point x="204" y="539"/>
-      <point x="237" y="566"/>
-      <point x="288" y="566" type="curve" smooth="yes"/>
-      <point x="339" y="566"/>
-      <point x="373" y="539"/>
-      <point x="373" y="497" type="curve" smooth="yes"/>
-      <point x="373" y="455"/>
-      <point x="337" y="424"/>
-      <point x="283" y="419" type="curve"/>
-      <point x="399" y="359" type="line"/>
-      <point x="489" y="393"/>
-      <point x="539" y="456"/>
-      <point x="539" y="529" type="curve" smooth="yes"/>
-      <point x="539" y="634"/>
-      <point x="439" y="704"/>
-      <point x="297" y="704" type="curve" smooth="yes"/>
-      <point x="141" y="704"/>
-      <point x="38" y="619"/>
-      <point x="38" y="493" type="curve" smooth="yes"/>
-      <point x="38" y="257"/>
-      <point x="395" y="311"/>
-      <point x="395" y="193" type="curve" smooth="yes"/>
-      <point x="395" y="155"/>
-      <point x="357" y="128"/>
-      <point x="297" y="128" type="curve" smooth="yes"/>
-      <point x="230" y="128"/>
-      <point x="186" y="162"/>
-      <point x="186" y="215" type="curve" smooth="yes"/>
-      <point x="186" y="263"/>
-      <point x="224" y="292"/>
-      <point x="291" y="294" type="curve"/>
-      <point x="194" y="357" type="line"/>
-      <point x="85" y="337"/>
-      <point x="20" y="273"/>
-      <point x="20" y="183" type="curve" smooth="yes"/>
-      <point x="20" y="68"/>
-      <point x="129" y="-10"/>
-    </contour>
+    <component base="eight" xOffset="2"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eightinferior.glif 
b/src/Cantarell-Bold.ufo/glyphs/eightinferior.glif
index 76285734..0459f5a6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eightinferior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eightinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eightinferior" format="2">
-  <advance width="469"/>
+  <advance width="437"/>
   <unicode hex="2088"/>
   <outline>
     <component base="eight.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eightsuperior.glif 
b/src/Cantarell-Bold.ufo/glyphs/eightsuperior.glif
index 16f4b231..d4f5663e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eightsuperior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eightsuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eightsuperior" format="2">
-  <advance width="469"/>
+  <advance width="437"/>
   <unicode hex="2078"/>
   <outline>
     <component base="eight.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/einvertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/einvertedbreve.glif
index f2800bbc..992146b9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/einvertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/einvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="einvertedbreve" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="0207"/>
   <outline>
     <component base="e"/>
-    <component base="breveinvertedcomb" xOffset="41"/>
+    <component base="breveinvertedcomb" xOffset="56"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/el-cy.glif b/src/Cantarell-Bold.ufo/glyphs/el-cy.glif
index e1741f0d..7f67cb25 100644
--- a/src/Cantarell-Bold.ufo/glyphs/el-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/el-cy.glif
@@ -1,29 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="el-cy" format="2">
-  <advance width="602"/>
+  <advance width="600"/>
   <unicode hex="043B"/>
   <outline>
     <contour>
-      <point x="96" y="-17" type="curve" smooth="yes"/>
-      <point x="207" y="-17"/>
-      <point x="273" y="90"/>
-      <point x="273" y="200" type="curve" smooth="yes"/>
-      <point x="273" y="351" type="line"/>
-      <point x="382" y="351" type="line"/>
-      <point x="382" y="0" type="line"/>
-      <point x="548" y="0" type="line"/>
-      <point x="548" y="491" type="line"/>
-      <point x="120" y="491" type="line"/>
-      <point x="120" y="194" type="line" smooth="yes"/>
-      <point x="120" y="176"/>
-      <point x="108" y="115"/>
-      <point x="66" y="115" type="curve" smooth="yes"/>
-      <point x="58" y="115"/>
-      <point x="37" y="122"/>
-      <point x="23" y="131" type="curve"/>
-      <point x="-4" y="15" type="line"/>
-      <point x="21" y="-5"/>
-      <point x="57" y="-17"/>
+      <point x="89" y="-10" type="curve" smooth="yes"/>
+      <point x="198" y="-10"/>
+      <point x="263" y="68"/>
+      <point x="263" y="200" type="curve" smooth="yes"/>
+      <point x="263" y="351" type="line"/>
+      <point x="372" y="351" type="line"/>
+      <point x="372" y="0" type="line"/>
+      <point x="538" y="0" type="line"/>
+      <point x="538" y="491" type="line"/>
+      <point x="110" y="491" type="line"/>
+      <point x="110" y="194" type="line" smooth="yes"/>
+      <point x="110" y="147"/>
+      <point x="88" y="115"/>
+      <point x="56" y="115" type="curve" smooth="yes"/>
+      <point x="43" y="115"/>
+      <point x="29" y="118"/>
+      <point x="13" y="129" type="curve"/>
+      <point x="-14" y="22" type="line"/>
+      <point x="14" y="2"/>
+      <point x="50" y="-10"/>
     </contour>
   </outline>
   <lib>
@@ -37,6 +37,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ellipsis.glif b/src/Cantarell-Bold.ufo/glyphs/ellipsis.glif
index ce4f0a9c..74f79cf6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ellipsis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ellipsis.glif
@@ -1,10 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ellipsis" format="2">
-  <advance width="822"/>
+  <advance width="1016"/>
   <unicode hex="2026"/>
   <outline>
-    <component base="period" xOffset="540"/>
-    <component base="period" xOffset="270"/>
-    <component base="period"/>
+    <component base="period" xOffset="704"/>
+    <component base="period" xOffset="365"/>
+    <component base="period" xOffset="26"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/em-cy.glif b/src/Cantarell-Bold.ufo/glyphs/em-cy.glif
index 9ca7a43b..5fc3b32c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/em-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/em-cy.glif
@@ -1,25 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="em-cy" format="2">
-  <advance width="665"/>
+  <advance width="681"/>
   <unicode hex="043C"/>
   <outline>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="197" y="0" type="line"/>
-      <point x="197" y="286" type="line"/>
-      <point x="182" y="261" type="line"/>
-      <point x="288" y="76" type="line"/>
-      <point x="376" y="76" type="line"/>
-      <point x="475" y="261" type="line"/>
-      <point x="467" y="281" type="line"/>
-      <point x="467" y="0" type="line"/>
-      <point x="611" y="0" type="line"/>
-      <point x="611" y="490" type="line"/>
-      <point x="470" y="490" type="line"/>
-      <point x="311" y="176" type="line"/>
-      <point x="370" y="176" type="line"/>
-      <point x="196" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="205" y="0" type="line"/>
+      <point x="205" y="286" type="line"/>
+      <point x="190" y="261" type="line"/>
+      <point x="296" y="76" type="line"/>
+      <point x="384" y="76" type="line"/>
+      <point x="483" y="261" type="line"/>
+      <point x="475" y="281" type="line"/>
+      <point x="475" y="0" type="line"/>
+      <point x="619" y="0" type="line"/>
+      <point x="619" y="490" type="line"/>
+      <point x="478" y="490" type="line"/>
+      <point x="319" y="176" type="line"/>
+      <point x="378" y="176" type="line"/>
+      <point x="204" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -33,6 +33,10 @@
         <key>width</key>
         <integer>75</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/emacron.glif b/src/Cantarell-Bold.ufo/glyphs/emacron.glif
index 55988f5a..97104f74 100644
--- a/src/Cantarell-Bold.ufo/glyphs/emacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/emacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacron" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="0113"/>
   <outline>
     <component base="e"/>
-    <component base="macroncomb" xOffset="25"/>
+    <component base="macroncomb" xOffset="40"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/emacronacute.glif b/src/Cantarell-Bold.ufo/glyphs/emacronacute.glif
index 78d82b06..6c70822a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/emacronacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/emacronacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacronacute" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="1E17"/>
   <outline>
     <component base="e"/>
-    <component base="macroncomb_acutecomb" xOffset="28"/>
+    <component base="macroncomb.loclVIET" xOffset="43"/>
+    <component base="acutecomb" xOffset="186" yOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/emacrongrave.glif b/src/Cantarell-Bold.ufo/glyphs/emacrongrave.glif
index 3701f8eb..5906b942 100644
--- a/src/Cantarell-Bold.ufo/glyphs/emacrongrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/emacrongrave.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacrongrave" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="1E15"/>
   <outline>
     <component base="e"/>
-    <component base="macroncomb_gravecomb" xOffset="28"/>
+    <component base="macroncomb.loclVIET" xOffset="43"/>
+    <component base="gravecomb" xOffset="84" yOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/emdash.glif b/src/Cantarell-Bold.ufo/glyphs/emdash.glif
index 4b62807d..53ff4a8b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/emdash.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/emdash.glif
@@ -1,13 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emdash" format="2">
-  <advance width="1108"/>
+  <advance width="1000"/>
   <unicode hex="2014"/>
+  <unicode hex="2015"/>
   <outline>
     <contour>
-      <point x="54" y="189" type="line"/>
-      <point x="1054" y="189" type="line"/>
-      <point x="1054" y="329" type="line"/>
-      <point x="54" y="329" type="line"/>
+      <point x="-10" y="189" type="line"/>
+      <point x="1010" y="189" type="line"/>
+      <point x="1010" y="329" type="line"/>
+      <point x="-10" y="329" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/emptyset.glif b/src/Cantarell-Bold.ufo/glyphs/emptyset.glif
index 86fc069e..0626c1fb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/emptyset.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/emptyset.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emptyset" format="2">
-  <advance width="700"/>
+  <advance width="725"/>
   <unicode hex="2205"/>
   <outline>
     <contour>
-      <point x="344" y="33" type="curve" smooth="yes"/>
-      <point x="536" y="33"/>
-      <point x="664" y="158"/>
-      <point x="664" y="345" type="curve" smooth="yes"/>
-      <point x="664" y="528"/>
-      <point x="541" y="650"/>
-      <point x="356" y="650" type="curve" smooth="yes"/>
-      <point x="164" y="650"/>
-      <point x="37" y="523"/>
-      <point x="37" y="334" type="curve" smooth="yes"/>
-      <point x="37" y="153"/>
-      <point x="160" y="33"/>
+      <point x="185" y="-33" type="line"/>
+      <point x="644" y="651" type="line"/>
+      <point x="533" y="725" type="line"/>
+      <point x="74" y="41" type="line"/>
     </contour>
     <contour>
-      <point x="354" y="193" type="curve" smooth="yes"/>
-      <point x="265" y="193"/>
-      <point x="206" y="253"/>
-      <point x="206" y="344" type="curve" smooth="yes"/>
-      <point x="206" y="432"/>
-      <point x="262" y="490"/>
-      <point x="346" y="490" type="curve" smooth="yes"/>
-      <point x="435" y="490"/>
-      <point x="495" y="429"/>
-      <point x="495" y="337" type="curve" smooth="yes"/>
-      <point x="495" y="251"/>
-      <point x="439" y="193"/>
+      <point x="356" y="33" type="curve" smooth="yes"/>
+      <point x="548" y="33"/>
+      <point x="676" y="158"/>
+      <point x="676" y="345" type="curve" smooth="yes"/>
+      <point x="676" y="528"/>
+      <point x="553" y="650"/>
+      <point x="368" y="650" type="curve" smooth="yes"/>
+      <point x="176" y="650"/>
+      <point x="49" y="523"/>
+      <point x="49" y="334" type="curve" smooth="yes"/>
+      <point x="49" y="153"/>
+      <point x="172" y="33"/>
     </contour>
     <contour>
-      <point x="173" y="-33" type="line"/>
-      <point x="632" y="651" type="line"/>
-      <point x="521" y="725" type="line"/>
-      <point x="62" y="41" type="line"/>
+      <point x="366" y="193" type="curve" smooth="yes"/>
+      <point x="277" y="193"/>
+      <point x="218" y="253"/>
+      <point x="218" y="344" type="curve" smooth="yes"/>
+      <point x="218" y="432"/>
+      <point x="274" y="490"/>
+      <point x="358" y="490" type="curve" smooth="yes"/>
+      <point x="447" y="490"/>
+      <point x="507" y="429"/>
+      <point x="507" y="337" type="curve" smooth="yes"/>
+      <point x="507" y="251"/>
+      <point x="451" y="193"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/emspace.glif b/src/Cantarell-Bold.ufo/glyphs/emspace.glif
index 33d6e61a..e6faaef2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/emspace.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/emspace.glif
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emspace" format="2">
   <advance width="1000"/>
+  <unicode hex="2001"/>
   <unicode hex="2003"/>
   <outline>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/en-cy.glif b/src/Cantarell-Bold.ufo/glyphs/en-cy.glif
index 82133814..58f3841c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/en-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/en-cy.glif
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="en-cy" format="2">
-  <advance width="596"/>
+  <advance width="612"/>
   <unicode hex="043D"/>
-  <anchor x="473" y="0" name="bottomright"/>
+  <anchor x="471" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="374" y="0" type="line"/>
-      <point x="542" y="0" type="line"/>
-      <point x="542" y="490" type="line"/>
-      <point x="374" y="490" type="line"/>
+      <point x="382" y="0" type="line"/>
+      <point x="550" y="0" type="line"/>
+      <point x="550" y="490" type="line"/>
+      <point x="382" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="222" y="0" type="line"/>
-      <point x="222" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="230" y="0" type="line"/>
+      <point x="230" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="204" y="179" type="line"/>
-      <point x="392" y="179" type="line"/>
-      <point x="392" y="314" type="line"/>
-      <point x="204" y="314" type="line"/>
+      <point x="212" y="179" type="line"/>
+      <point x="400" y="179" type="line"/>
+      <point x="400" y="314" type="line"/>
+      <point x="212" y="314" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -34,6 +34,10 @@
         <key>width</key>
         <integer>79</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/endash.glif b/src/Cantarell-Bold.ufo/glyphs/endash.glif
index d1b5002a..d4997375 100644
--- a/src/Cantarell-Bold.ufo/glyphs/endash.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/endash.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="endash" format="2">
-  <advance width="608"/>
+  <advance width="500"/>
   <unicode hex="2013"/>
   <outline>
     <contour>
-      <point x="54" y="189" type="line"/>
-      <point x="554" y="189" type="line"/>
-      <point x="554" y="329" type="line"/>
-      <point x="54" y="329" type="line"/>
+      <point x="-10" y="189" type="line"/>
+      <point x="510" y="189" type="line"/>
+      <point x="510" y="329" type="line"/>
+      <point x="-10" y="329" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/endescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/endescender-cy.glif
index 5e8c6693..3c55cf83 100644
--- a/src/Cantarell-Bold.ufo/glyphs/endescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/endescender-cy.glif
@@ -1,15 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="endescender-cy" format="2">
-  <advance width="630"/>
+  <advance width="638"/>
   <unicode hex="04A3"/>
   <outline>
     <component base="en-cy"/>
-    <component base="descender-cy" xOffset="377"/>
+    <component base="descender-cy" xOffset="375"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>tse-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eng.glif b/src/Cantarell-Bold.ufo/glyphs/eng.glif
index 65ea746b..04de16fd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eng.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eng.glif
@@ -1,44 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eng" format="2">
-  <advance width="581"/>
+  <advance width="598"/>
   <unicode hex="014B"/>
   <outline>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="227" y="0" type="line"/>
-      <point x="227" y="376" type="line"/>
-      <point x="179" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
+      <point x="374" y="0" type="line"/>
+      <point x="547" y="0" type="line"/>
+      <point x="547" y="304" type="line" smooth="yes"/>
+      <point x="547" y="422"/>
+      <point x="479" y="496"/>
+      <point x="371" y="496" type="curve" smooth="yes"/>
+      <point x="301" y="496"/>
+      <point x="240" y="465"/>
+      <point x="200" y="408" type="curve"/>
+      <point x="219" y="305" type="line"/>
+      <point x="244" y="332"/>
+      <point x="272" y="346"/>
+      <point x="306" y="346" type="curve" smooth="yes"/>
+      <point x="353" y="346"/>
+      <point x="374" y="320"/>
+      <point x="374" y="265" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="366" y="0" type="line"/>
-      <point x="539" y="0" type="line"/>
-      <point x="539" y="304" type="line" smooth="yes"/>
-      <point x="539" y="422"/>
-      <point x="471" y="496"/>
-      <point x="363" y="496" type="curve" smooth="yes"/>
-      <point x="293" y="496"/>
-      <point x="232" y="465"/>
-      <point x="192" y="408" type="curve"/>
-      <point x="211" y="305" type="line"/>
-      <point x="236" y="332"/>
-      <point x="264" y="346"/>
-      <point x="298" y="346" type="curve" smooth="yes"/>
-      <point x="345" y="346"/>
-      <point x="366" y="320"/>
-      <point x="366" y="265" type="curve" smooth="yes"/>
+      <point x="374" y="-227" type="line"/>
+      <point x="478" y="-197"/>
+      <point x="547" y="-111"/>
+      <point x="547" y="-13" type="curve" smooth="yes"/>
+      <point x="547" y="0" type="line"/>
+      <point x="374" y="0" type="line"/>
+      <point x="374" y="-25" type="line" smooth="yes"/>
+      <point x="374" y="-70"/>
+      <point x="352" y="-112"/>
+      <point x="319" y="-131" type="curve"/>
     </contour>
     <contour>
-      <point x="366" y="-227" type="line"/>
-      <point x="470" y="-197"/>
-      <point x="539" y="-111"/>
-      <point x="539" y="-13" type="curve" smooth="yes"/>
-      <point x="539" y="0" type="line"/>
-      <point x="366" y="0" type="line"/>
-      <point x="366" y="-25" type="line" smooth="yes"/>
-      <point x="366" y="-70"/>
-      <point x="344" y="-112"/>
-      <point x="311" y="-131" type="curve"/>
+      <point x="62" y="0" type="line"/>
+      <point x="235" y="0" type="line"/>
+      <point x="235" y="376" type="line"/>
+      <point x="187" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/enghe-cy.glif b/src/Cantarell-Bold.ufo/glyphs/enghe-cy.glif
index bf570738..0f7c5632 100644
--- a/src/Cantarell-Bold.ufo/glyphs/enghe-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/enghe-cy.glif
@@ -1,31 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="enghe-cy" format="2">
-  <advance width="716"/>
+  <advance width="734"/>
   <unicode hex="04A5"/>
   <outline>
     <contour>
-      <point x="375" y="0" type="line"/>
-      <point x="543" y="0" type="line"/>
-      <point x="543" y="490" type="line"/>
-      <point x="375" y="490" type="line"/>
+      <point x="382" y="0" type="line"/>
+      <point x="550" y="0" type="line"/>
+      <point x="550" y="357" type="line"/>
+      <point x="724" y="357" type="line"/>
+      <point x="724" y="490" type="line"/>
+      <point x="382" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="223" y="0" type="line"/>
-      <point x="223" y="490" type="line"/>
-      <point x="55" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="230" y="0" type="line"/>
+      <point x="230" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="205" y="179" type="line"/>
-      <point x="393" y="179" type="line"/>
-      <point x="393" y="314" type="line"/>
-      <point x="205" y="314" type="line"/>
-    </contour>
-    <contour>
-      <point x="505" y="357" type="line"/>
-      <point x="717" y="357" type="line"/>
-      <point x="717" y="490" type="line"/>
-      <point x="505" y="490" type="line"/>
+      <point x="212" y="179" type="line"/>
+      <point x="400" y="179" type="line"/>
+      <point x="400" y="314" type="line"/>
+      <point x="212" y="314" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/enspace.glif b/src/Cantarell-Bold.ufo/glyphs/enspace.glif
index 41767d40..f91bc29a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/enspace.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/enspace.glif
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="enspace" format="2">
   <advance width="500"/>
+  <unicode hex="2000"/>
   <unicode hex="2002"/>
   <outline>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eogonek.glif b/src/Cantarell-Bold.ufo/glyphs/eogonek.glif
index 7e78a0a4..c0f3c49b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eogonek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eogonek" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="0119"/>
   <outline>
     <component base="e"/>
-    <component base="ogonekcomb.tall" xOffset="-28" yOffset="-1"/>
+    <component base="ogonekcomb.tall" xOffset="-13" yOffset="-1"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/equal.glif b/src/Cantarell-Bold.ufo/glyphs/equal.glif
index cd50872b..b9e84c27 100644
--- a/src/Cantarell-Bold.ufo/glyphs/equal.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/equal.glif
@@ -1,19 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="equal" format="2">
-  <advance width="666"/>
+  <advance width="600"/>
   <unicode hex="003D"/>
   <outline>
-    <contour>
-      <point x="80" y="371" type="line"/>
-      <point x="586" y="371" type="line"/>
-      <point x="586" y="521" type="line"/>
-      <point x="80" y="521" type="line"/>
-    </contour>
-    <contour>
-      <point x="80" y="131" type="line"/>
-      <point x="586" y="131" type="line"/>
-      <point x="586" y="281" type="line"/>
-      <point x="80" y="281" type="line"/>
-    </contour>
+    <component base="minus" yOffset="114"/>
+    <component base="minus" yOffset="-129"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minus</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/equivalence.glif b/src/Cantarell-Bold.ufo/glyphs/equivalence.glif
index 3e9391a4..6d43849a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/equivalence.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/equivalence.glif
@@ -1,25 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="equivalence" format="2">
-  <advance width="655"/>
+  <advance width="600"/>
   <unicode hex="2261"/>
   <outline>
     <contour>
-      <point x="80" y="462" type="line"/>
-      <point x="575" y="462" type="line"/>
-      <point x="575" y="597" type="line"/>
-      <point x="80" y="597" type="line"/>
+      <point x="60" y="462" type="line"/>
+      <point x="540" y="462" type="line"/>
+      <point x="540" y="597" type="line"/>
+      <point x="60" y="597" type="line"/>
     </contour>
     <contour>
-      <point x="80" y="82" type="line"/>
-      <point x="575" y="82" type="line"/>
-      <point x="575" y="217" type="line"/>
-      <point x="80" y="217" type="line"/>
+      <point x="60" y="82" type="line"/>
+      <point x="540" y="82" type="line"/>
+      <point x="540" y="217" type="line"/>
+      <point x="60" y="217" type="line"/>
     </contour>
     <contour>
-      <point x="80" y="272" type="line"/>
-      <point x="575" y="272" type="line"/>
-      <point x="575" y="407" type="line"/>
-      <point x="80" y="407" type="line"/>
+      <point x="60" y="272" type="line"/>
+      <point x="540" y="272" type="line"/>
+      <point x="540" y="407" type="line"/>
+      <point x="60" y="407" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minus</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/er-cy.glif b/src/Cantarell-Bold.ufo/glyphs/er-cy.glif
index 07193d00..a9600f0e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/er-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/er-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="er-cy" format="2">
-  <advance width="574"/>
+  <advance width="595"/>
   <unicode hex="0440"/>
   <outline>
     <component base="p"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ereversed-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ereversed-cy.glif
index 8ac9f9d7..44902769 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ereversed-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ereversed-cy.glif
@@ -1,42 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ereversed-cy" format="2">
-  <advance width="477"/>
+  <advance width="503"/>
   <unicode hex="044D"/>
-  <anchor x="238" y="490" name="top"/>
+  <anchor x="250" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="187" y="-7" type="curve" smooth="yes"/>
-      <point x="352" y="-7"/>
-      <point x="458" y="91"/>
-      <point x="458" y="250" type="curve" smooth="yes"/>
-      <point x="458" y="405"/>
-      <point x="358" y="500"/>
-      <point x="205" y="500" type="curve" smooth="yes"/>
-      <point x="144" y="500"/>
-      <point x="55" y="484"/>
-      <point x="18" y="465" type="curve"/>
-      <point x="49" y="359" type="line"/>
-      <point x="79" y="369"/>
-      <point x="140" y="374"/>
-      <point x="167" y="374" type="curve" smooth="yes"/>
-      <point x="262" y="374"/>
-      <point x="308" y="329"/>
-      <point x="308" y="235" type="curve" smooth="yes"/>
-      <point x="308" y="152"/>
-      <point x="272" y="120"/>
-      <point x="187" y="120" type="curve" smooth="yes"/>
-      <point x="146" y="120"/>
-      <point x="78" y="127"/>
-      <point x="50" y="137" type="curve"/>
-      <point x="10" y="24" type="line"/>
-      <point x="60" y="3"/>
-      <point x="133" y="-7"/>
+      <point x="199" y="-7" type="curve" smooth="yes"/>
+      <point x="364" y="-7"/>
+      <point x="470" y="91"/>
+      <point x="470" y="250" type="curve" smooth="yes"/>
+      <point x="470" y="405"/>
+      <point x="370" y="500"/>
+      <point x="217" y="500" type="curve" smooth="yes"/>
+      <point x="156" y="500"/>
+      <point x="67" y="484"/>
+      <point x="30" y="465" type="curve"/>
+      <point x="61" y="359" type="line"/>
+      <point x="91" y="369"/>
+      <point x="152" y="374"/>
+      <point x="179" y="374" type="curve" smooth="yes"/>
+      <point x="274" y="374"/>
+      <point x="320" y="329"/>
+      <point x="320" y="235" type="curve" smooth="yes"/>
+      <point x="320" y="152"/>
+      <point x="284" y="120"/>
+      <point x="199" y="120" type="curve" smooth="yes"/>
+      <point x="158" y="120"/>
+      <point x="90" y="127"/>
+      <point x="62" y="137" type="curve"/>
+      <point x="22" y="24" type="line"/>
+      <point x="72" y="3"/>
+      <point x="145" y="-7"/>
     </contour>
     <contour>
-      <point x="98" y="189" type="line"/>
-      <point x="329" y="189" type="line"/>
-      <point x="329" y="306" type="line"/>
-      <point x="98" y="306" type="line"/>
+      <point x="110" y="189" type="line"/>
+      <point x="341" y="189" type="line"/>
+      <point x="341" y="306" type="line"/>
+      <point x="110" y="306" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -50,6 +50,10 @@
         <key>width</key>
         <integer>74</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|es-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|es-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/es-cy.glif b/src/Cantarell-Bold.ufo/glyphs/es-cy.glif
index 86af0bb0..1aef9629 100644
--- a/src/Cantarell-Bold.ufo/glyphs/es-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/es-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="es-cy" format="2">
-  <advance width="460"/>
+  <advance width="483"/>
   <unicode hex="0441"/>
   <anchor x="264" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/esdescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/esdescender-cy.glif
index d22d9ec7..26ea785b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/esdescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/esdescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="esdescender-cy" format="2">
-  <advance width="460"/>
+  <advance width="483"/>
   <unicode hex="04AB"/>
   <outline>
     <component base="es-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/estimated.glif b/src/Cantarell-Bold.ufo/glyphs/estimated.glif
index 095b7645..6f4e3400 100644
--- a/src/Cantarell-Bold.ufo/glyphs/estimated.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/estimated.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="estimated" format="2">
-  <advance width="763"/>
+  <advance width="767"/>
   <unicode hex="212E"/>
   <outline>
     <contour>
-      <point x="385" y="-10" type="curve" smooth="yes"/>
-      <point x="516" y="-10"/>
-      <point x="640" y="42"/>
-      <point x="712" y="119" type="curve"/>
-      <point x="646" y="119" type="line"/>
-      <point x="574" y="62"/>
-      <point x="482" y="36"/>
-      <point x="393" y="36" type="curve" smooth="yes"/>
-      <point x="271" y="36"/>
-      <point x="197" y="84"/>
-      <point x="150" y="145" type="curve"/>
-      <point x="150" y="315" type="line"/>
-      <point x="733" y="315" type="line"/>
-      <point x="733" y="545"/>
-      <point x="616" y="704"/>
-      <point x="388" y="704" type="curve" smooth="yes"/>
-      <point x="157" y="704"/>
-      <point x="39" y="541"/>
-      <point x="39" y="339" type="curve" smooth="yes"/>
-      <point x="39" y="123"/>
-      <point x="175" y="-10"/>
+      <point x="387" y="-10" type="curve" smooth="yes"/>
+      <point x="518" y="-10"/>
+      <point x="642" y="42"/>
+      <point x="714" y="119" type="curve"/>
+      <point x="648" y="119" type="line"/>
+      <point x="576" y="62"/>
+      <point x="484" y="36"/>
+      <point x="395" y="36" type="curve" smooth="yes"/>
+      <point x="273" y="36"/>
+      <point x="199" y="84"/>
+      <point x="152" y="145" type="curve"/>
+      <point x="152" y="315" type="line"/>
+      <point x="735" y="315" type="line"/>
+      <point x="735" y="545"/>
+      <point x="618" y="704"/>
+      <point x="390" y="704" type="curve" smooth="yes"/>
+      <point x="159" y="704"/>
+      <point x="41" y="541"/>
+      <point x="41" y="339" type="curve" smooth="yes"/>
+      <point x="41" y="123"/>
+      <point x="177" y="-10"/>
     </contour>
     <contour>
-      <point x="150" y="358" type="line"/>
-      <point x="150" y="535" type="line"/>
-      <point x="196" y="619"/>
-      <point x="271" y="662"/>
-      <point x="385" y="662" type="curve" smooth="yes"/>
-      <point x="499" y="662"/>
-      <point x="573" y="619"/>
-      <point x="619" y="535" type="curve"/>
-      <point x="619" y="358" type="line"/>
+      <point x="152" y="358" type="line"/>
+      <point x="152" y="535" type="line"/>
+      <point x="198" y="619"/>
+      <point x="273" y="662"/>
+      <point x="387" y="662" type="curve" smooth="yes"/>
+      <point x="501" y="662"/>
+      <point x="575" y="619"/>
+      <point x="621" y="535" type="curve"/>
+      <point x="621" y="358" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etilde.glif b/src/Cantarell-Bold.ufo/glyphs/etilde.glif
index 7f7ef8de..8f0276ad 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etilde" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="1EBD"/>
   <outline>
     <component base="e"/>
-    <component base="tildecomb" xOffset="32"/>
+    <component base="tildecomb" xOffset="47"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/euro.glif b/src/Cantarell-Bold.ufo/glyphs/euro.glif
index 5ad2f9b4..8058aca0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/euro.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/euro.glif
@@ -1,47 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="euro" format="2">
-  <advance width="714"/>
+  <advance width="600"/>
   <unicode hex="20AC"/>
   <outline>
     <contour>
-      <point x="42" y="385" type="line"/>
-      <point x="614" y="385" type="line"/>
-      <point x="614" y="481" type="line"/>
-      <point x="42" y="481" type="line"/>
+      <point x="399" y="-10" type="curve" smooth="yes"/>
+      <point x="471" y="-10"/>
+      <point x="547" y="10"/>
+      <point x="591" y="39" type="curve"/>
+      <point x="553" y="164" type="line"/>
+      <point x="521" y="150"/>
+      <point x="479" y="142"/>
+      <point x="443" y="142" type="curve" smooth="yes"/>
+      <point x="324" y="142"/>
+      <point x="265" y="216"/>
+      <point x="265" y="359" type="curve" smooth="yes"/>
+      <point x="265" y="491"/>
+      <point x="311" y="551"/>
+      <point x="420" y="551" type="curve" smooth="yes"/>
+      <point x="465" y="551"/>
+      <point x="520" y="542"/>
+      <point x="552" y="525" type="curve"/>
+      <point x="600" y="661" type="line"/>
+      <point x="539" y="690"/>
+      <point x="482" y="704"/>
+      <point x="422" y="704" type="curve" smooth="yes"/>
+      <point x="226" y="704"/>
+      <point x="85" y="560"/>
+      <point x="85" y="342" type="curve" smooth="yes"/>
+      <point x="85" y="127"/>
+      <point x="221" y="-10"/>
     </contour>
     <contour>
-      <point x="42" y="221" type="line"/>
-      <point x="588" y="221" type="line"/>
-      <point x="588" y="317" type="line"/>
-      <point x="42" y="317" type="line"/>
+      <point x="21" y="209" type="line"/>
+      <point x="524" y="209" type="line"/>
+      <point x="524" y="315" type="line"/>
+      <point x="21" y="315" type="line"/>
     </contour>
     <contour>
-      <point x="451" y="-10" type="curve" smooth="yes"/>
-      <point x="529" y="-10"/>
-      <point x="615" y="10"/>
-      <point x="668" y="39" type="curve"/>
-      <point x="630" y="164" type="line"/>
-      <point x="590" y="150"/>
-      <point x="539" y="142"/>
-      <point x="495" y="142" type="curve" smooth="yes"/>
-      <point x="350" y="142"/>
-      <point x="275" y="216"/>
-      <point x="275" y="359" type="curve" smooth="yes"/>
-      <point x="275" y="491"/>
-      <point x="337" y="551"/>
-      <point x="473" y="551" type="curve" smooth="yes"/>
-      <point x="528" y="551"/>
-      <point x="591" y="541"/>
-      <point x="629" y="525" type="curve"/>
-      <point x="677" y="661" type="line"/>
-      <point x="610" y="690"/>
-      <point x="545" y="704"/>
-      <point x="475" y="704" type="curve" smooth="yes"/>
-      <point x="251" y="704"/>
-      <point x="95" y="560"/>
-      <point x="95" y="342" type="curve" smooth="yes"/>
-      <point x="95" y="127"/>
-      <point x="246" y="-10"/>
+      <point x="21" y="385" type="line"/>
+      <point x="541" y="385" type="line"/>
+      <point x="541" y="490" type="line"/>
+      <point x="21" y="490" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/exclam.glif b/src/Cantarell-Bold.ufo/glyphs/exclam.glif
index 06fe94b5..e7ed5fe5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/exclam.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/exclam.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="exclam" format="2">
-  <advance width="261"/>
+  <advance width="289"/>
   <unicode hex="0021"/>
   <outline>
     <contour>
-      <point x="63" y="267" type="line"/>
-      <point x="197" y="267" type="line"/>
-      <point x="215" y="694" type="line"/>
-      <point x="45" y="694" type="line"/>
+      <point x="80" y="267" type="line"/>
+      <point x="214" y="267" type="line"/>
+      <point x="232" y="694" type="line"/>
+      <point x="62" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="128" y="-10" type="curve" smooth="yes"/>
-      <point x="192" y="-10"/>
-      <point x="234" y="36"/>
-      <point x="234" y="96" type="curve" smooth="yes"/>
-      <point x="234" y="160"/>
-      <point x="192" y="206"/>
-      <point x="128" y="206" type="curve" smooth="yes"/>
-      <point x="64" y="206"/>
-      <point x="22" y="160"/>
-      <point x="22" y="96" type="curve" smooth="yes"/>
-      <point x="22" y="36"/>
-      <point x="64" y="-10"/>
+      <point x="145" y="-10" type="curve" smooth="yes"/>
+      <point x="209" y="-10"/>
+      <point x="251" y="36"/>
+      <point x="251" y="96" type="curve" smooth="yes"/>
+      <point x="251" y="160"/>
+      <point x="209" y="206"/>
+      <point x="145" y="206" type="curve" smooth="yes"/>
+      <point x="81" y="206"/>
+      <point x="39" y="160"/>
+      <point x="39" y="96" type="curve" smooth="yes"/>
+      <point x="39" y="36"/>
+      <point x="81" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/exclamdown.glif b/src/Cantarell-Bold.ufo/glyphs/exclamdown.glif
index f9868662..b97a1d71 100644
--- a/src/Cantarell-Bold.ufo/glyphs/exclamdown.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/exclamdown.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="exclamdown" format="2">
-  <advance width="263"/>
+  <advance width="289"/>
   <unicode hex="00A1"/>
   <outline>
-    <component base="exclam" yScale="-1" xOffset="-6" yOffset="480"/>
+    <component base="exclam" yScale="-1" yOffset="480"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>exclam</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>exclam</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/f.glif b/src/Cantarell-Bold.ufo/glyphs/f.glif
index 30dd725b..05d35fcf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/f.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/f.glif
@@ -1,36 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="f" format="2">
-  <advance width="383"/>
+  <advance width="406"/>
   <unicode hex="0066"/>
-  <note>
-f
-</note>
-  <anchor x="168" y="0" name="bottom"/>
-  <anchor x="316" y="739" name="top"/>
+  <anchor x="178" y="0" name="bottom"/>
+  <anchor x="326" y="739" name="top"/>
   <outline>
     <contour>
-      <point x="85" y="0" type="line"/>
-      <point x="249" y="0" type="line"/>
-      <point x="249" y="540" type="line" smooth="yes"/>
-      <point x="249" y="582"/>
-      <point x="277" y="607"/>
-      <point x="327" y="607" type="curve" smooth="yes"/>
-      <point x="351" y="607"/>
-      <point x="379" y="601"/>
-      <point x="392" y="594" type="curve"/>
-      <point x="426" y="717" type="line"/>
-      <point x="395" y="737"/>
-      <point x="349" y="749"/>
-      <point x="302" y="749" type="curve" smooth="yes"/>
-      <point x="172" y="749"/>
-      <point x="85" y="661"/>
-      <point x="85" y="528" type="curve" smooth="yes"/>
+      <point x="95" y="0" type="line"/>
+      <point x="259" y="0" type="line"/>
+      <point x="259" y="540" type="line" smooth="yes"/>
+      <point x="259" y="582"/>
+      <point x="287" y="607"/>
+      <point x="337" y="607" type="curve" smooth="yes"/>
+      <point x="361" y="607"/>
+      <point x="389" y="601"/>
+      <point x="402" y="594" type="curve"/>
+      <point x="436" y="717" type="line"/>
+      <point x="405" y="737"/>
+      <point x="359" y="749"/>
+      <point x="312" y="749" type="curve" smooth="yes"/>
+      <point x="182" y="749"/>
+      <point x="95" y="661"/>
+      <point x="95" y="528" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="7" y="355" type="line"/>
-      <point x="379" y="355" type="line"/>
-      <point x="379" y="490" type="line"/>
-      <point x="7" y="490" type="line"/>
+      <point x="17" y="355" type="line"/>
+      <point x="389" y="355" type="line"/>
+      <point x="389" y="490" type="line"/>
+      <point x="17" y="490" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/fi.glif b/src/Cantarell-Bold.ufo/glyphs/fi.glif
index 6b7cc702..98f31ea7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/fi.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/fi.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fi" format="2">
-  <advance width="670"/>
+  <advance width="703"/>
   <unicode hex="FB01"/>
   <outline>
     <component base="f"/>
-    <component base="i" xOffset="383"/>
+    <component base="i" xOffset="406"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/figuredash.glif b/src/Cantarell-Bold.ufo/glyphs/figuredash.glif
index e3a3cdde..ec20413a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/figuredash.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/figuredash.glif
@@ -1,13 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="figuredash" format="2">
-  <advance width="712"/>
+  <advance width="600"/>
   <unicode hex="2012"/>
   <outline>
     <contour>
-      <point x="54" y="189" type="line"/>
-      <point x="658" y="189" type="line"/>
-      <point x="658" y="329" type="line"/>
-      <point x="54" y="329" type="line"/>
+      <point x="50" y="189" type="line"/>
+      <point x="550" y="189" type="line"/>
+      <point x="550" y="329" type="line"/>
+      <point x="50" y="329" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/figurespace.glif b/src/Cantarell-Bold.ufo/glyphs/figurespace.glif
index 23fcc00f..68267d3e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/figurespace.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/figurespace.glif
@@ -1,7 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="figurespace" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <unicode hex="2007"/>
   <outline>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>zero.tf</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/firsttonechinese.glif 
b/src/Cantarell-Bold.ufo/glyphs/firsttonechinese.glif
index 1471cea5..1a22ffa3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/firsttonechinese.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/firsttonechinese.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="firsttonechinese" format="2">
-  <advance width="477"/>
+  <advance width="424"/>
   <unicode hex="02C9"/>
   <outline>
-    <component base="macroncomb"/>
+    <component base="macroncomb" xOffset="-30"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/fita-cy.glif b/src/Cantarell-Bold.ufo/glyphs/fita-cy.glif
index 102ddf21..5ac5279b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/fita-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/fita-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fita-cy" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="0473"/>
   <outline>
     <component base="obarred-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/five.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/five.dnom.glif
index 5aed65ab..7e273b69 100644
--- a/src/Cantarell-Bold.ufo/glyphs/five.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/five.dnom.glif
@@ -1,42 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five.dnom" format="2">
-  <advance width="448"/>
-  <note>
-five
-</note>
+  <advance width="419"/>
   <outline>
     <contour>
-      <point x="194" y="-7" type="curve" smooth="yes"/>
-      <point x="335" y="-7"/>
-      <point x="426" y="55"/>
-      <point x="426" y="164" type="curve" smooth="yes"/>
-      <point x="426" y="256"/>
-      <point x="356" y="307"/>
-      <point x="228" y="307" type="curve" smooth="yes"/>
-      <point x="198" y="307"/>
-      <point x="184" y="304"/>
-      <point x="173" y="294" type="curve"/>
-      <point x="209" y="248" type="line"/>
-      <point x="214" y="348" type="line"/>
-      <point x="398" y="348" type="line"/>
-      <point x="398" y="479" type="line"/>
-      <point x="68" y="479" type="line"/>
-      <point x="54" y="182" type="line"/>
-      <point x="86" y="187"/>
-      <point x="128" y="191"/>
-      <point x="161" y="191" type="curve" smooth="yes"/>
-      <point x="228" y="191"/>
-      <point x="271" y="175"/>
-      <point x="271" y="150" type="curve" smooth="yes"/>
-      <point x="271" y="129"/>
-      <point x="243" y="122"/>
-      <point x="198" y="122" type="curve" smooth="yes"/>
-      <point x="147" y="122"/>
-      <point x="99" y="131"/>
-      <point x="62" y="147" type="curve"/>
-      <point x="21" y="29" type="line"/>
-      <point x="73" y="5"/>
-      <point x="132" y="-7"/>
+      <point x="183" y="-6" type="curve" smooth="yes"/>
+      <point x="307" y="-6"/>
+      <point x="386" y="49"/>
+      <point x="386" y="142" type="curve" smooth="yes"/>
+      <point x="386" y="222"/>
+      <point x="324" y="266"/>
+      <point x="212" y="266" type="curve" smooth="yes"/>
+      <point x="187" y="266"/>
+      <point x="174" y="264"/>
+      <point x="163" y="256" type="curve"/>
+      <point x="193" y="216" type="line"/>
+      <point x="198" y="305" type="line"/>
+      <point x="361" y="305" type="line"/>
+      <point x="361" y="416" type="line"/>
+      <point x="74" y="416" type="line"/>
+      <point x="62" y="159" type="line"/>
+      <point x="90" y="163"/>
+      <point x="125" y="168"/>
+      <point x="154" y="168" type="curve" smooth="yes"/>
+      <point x="217" y="168"/>
+      <point x="254" y="153"/>
+      <point x="254" y="129" type="curve" smooth="yes"/>
+      <point x="254" y="111"/>
+      <point x="229" y="101"/>
+      <point x="183" y="101" type="curve" smooth="yes"/>
+      <point x="148" y="101"/>
+      <point x="107" y="110"/>
+      <point x="68" y="125" type="curve"/>
+      <point x="33" y="25" type="line"/>
+      <point x="79" y="5"/>
+      <point x="127" y="-6"/>
     </contour>
   </outline>
   <lib>
@@ -44,11 +41,11 @@ five
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>69</integer>
+        <integer>60</integer>
         <key>weight</key>
-        <integer>-23</integer>
+        <integer>-45</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>65</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/five.glif b/src/Cantarell-Bold.ufo/glyphs/five.glif
index d56797ba..115d9807 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="566"/>
+  <advance width="577"/>
   <unicode hex="0035"/>
   <outline>
     <contour>
-      <point x="243" y="-10" type="curve" smooth="yes"/>
-      <point x="426" y="-10"/>
-      <point x="543" y="80"/>
-      <point x="543" y="230" type="curve" smooth="yes"/>
-      <point x="543" y="362"/>
-      <point x="449" y="436"/>
-      <point x="281" y="436" type="curve" smooth="yes"/>
-      <point x="238" y="436"/>
-      <point x="216" y="431"/>
-      <point x="196" y="418" type="curve"/>
-      <point x="239" y="365" type="line"/>
-      <point x="247" y="543" type="line"/>
-      <point x="506" y="543" type="line"/>
-      <point x="506" y="694" type="line"/>
-      <point x="78" y="694" type="line"/>
-      <point x="60" y="287" type="line"/>
-      <point x="103" y="295"/>
-      <point x="158" y="301"/>
-      <point x="199" y="301" type="curve" smooth="yes"/>
-      <point x="303" y="301"/>
-      <point x="363" y="268"/>
-      <point x="363" y="212" type="curve" smooth="yes"/>
-      <point x="363" y="165"/>
-      <point x="320" y="140"/>
-      <point x="242" y="140" type="curve" smooth="yes"/>
-      <point x="182" y="140"/>
-      <point x="115" y="154"/>
-      <point x="65" y="178" type="curve"/>
-      <point x="18" y="42" type="line"/>
-      <point x="85" y="8"/>
-      <point x="161" y="-10"/>
+      <point x="248" y="-10" type="curve" smooth="yes"/>
+      <point x="431" y="-10"/>
+      <point x="548" y="80"/>
+      <point x="548" y="230" type="curve" smooth="yes"/>
+      <point x="548" y="362"/>
+      <point x="454" y="436"/>
+      <point x="286" y="436" type="curve" smooth="yes"/>
+      <point x="243" y="436"/>
+      <point x="221" y="431"/>
+      <point x="201" y="418" type="curve"/>
+      <point x="244" y="365" type="line"/>
+      <point x="252" y="543" type="line"/>
+      <point x="511" y="543" type="line"/>
+      <point x="511" y="694" type="line"/>
+      <point x="83" y="694" type="line"/>
+      <point x="65" y="287" type="line"/>
+      <point x="108" y="295"/>
+      <point x="163" y="301"/>
+      <point x="204" y="301" type="curve" smooth="yes"/>
+      <point x="308" y="301"/>
+      <point x="368" y="268"/>
+      <point x="368" y="212" type="curve" smooth="yes"/>
+      <point x="368" y="165"/>
+      <point x="325" y="140"/>
+      <point x="247" y="140" type="curve" smooth="yes"/>
+      <point x="187" y="140"/>
+      <point x="120" y="154"/>
+      <point x="70" y="178" type="curve"/>
+      <point x="23" y="42" type="line"/>
+      <point x="90" y="8"/>
+      <point x="166" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/five.numr.glif b/src/Cantarell-Bold.ufo/glyphs/five.numr.glif
index 82b6dc03..b53ba8f3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/five.numr.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/five.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five.numr" format="2">
-  <advance width="448"/>
+  <advance width="419"/>
   <outline>
     <component base="five.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/five.osf.glif b/src/Cantarell-Bold.ufo/glyphs/five.osf.glif
index e447cd6f..d51715af 100644
--- a/src/Cantarell-Bold.ufo/glyphs/five.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/five.osf.glif
@@ -1,39 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five.osf" format="2">
-  <advance width="560"/>
+  <advance width="571"/>
   <outline>
     <contour>
-      <point x="240" y="-110" type="curve" smooth="yes"/>
-      <point x="420" y="-110"/>
-      <point x="537" y="-20"/>
-      <point x="537" y="129" type="curve" smooth="yes"/>
-      <point x="537" y="260"/>
-      <point x="443" y="336"/>
-      <point x="276" y="336" type="curve" smooth="yes"/>
-      <point x="239" y="336"/>
-      <point x="211" y="331"/>
-      <point x="188" y="318" type="curve"/>
-      <point x="230" y="268" type="line"/>
-      <point x="239" y="451" type="line"/>
-      <point x="501" y="451" type="line"/>
-      <point x="501" y="594" type="line"/>
-      <point x="78" y="594" type="line"/>
-      <point x="60" y="192" type="line"/>
-      <point x="103" y="200"/>
-      <point x="162" y="206"/>
-      <point x="199" y="206" type="curve" smooth="yes"/>
-      <point x="302" y="206"/>
-      <point x="366" y="171"/>
-      <point x="366" y="112" type="curve" smooth="yes"/>
-      <point x="366" y="60"/>
-      <point x="318" y="32"/>
-      <point x="240" y="32" type="curve" smooth="yes"/>
-      <point x="178" y="32"/>
-      <point x="109" y="49"/>
-      <point x="63" y="72" type="curve"/>
-      <point x="18" y="-58" type="line"/>
-      <point x="85" y="-92"/>
-      <point x="161" y="-110"/>
+      <point x="245" y="-110" type="curve" smooth="yes"/>
+      <point x="425" y="-110"/>
+      <point x="542" y="-20"/>
+      <point x="542" y="129" type="curve" smooth="yes"/>
+      <point x="542" y="260"/>
+      <point x="448" y="336"/>
+      <point x="281" y="336" type="curve" smooth="yes"/>
+      <point x="244" y="336"/>
+      <point x="216" y="331"/>
+      <point x="193" y="318" type="curve"/>
+      <point x="235" y="268" type="line"/>
+      <point x="244" y="451" type="line"/>
+      <point x="506" y="451" type="line"/>
+      <point x="506" y="594" type="line"/>
+      <point x="83" y="594" type="line"/>
+      <point x="65" y="192" type="line"/>
+      <point x="108" y="200"/>
+      <point x="167" y="206"/>
+      <point x="204" y="206" type="curve" smooth="yes"/>
+      <point x="307" y="206"/>
+      <point x="371" y="171"/>
+      <point x="371" y="112" type="curve" smooth="yes"/>
+      <point x="371" y="60"/>
+      <point x="323" y="32"/>
+      <point x="245" y="32" type="curve" smooth="yes"/>
+      <point x="183" y="32"/>
+      <point x="114" y="49"/>
+      <point x="68" y="72" type="curve"/>
+      <point x="23" y="-58" type="line"/>
+      <point x="90" y="-92"/>
+      <point x="166" y="-110"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>five</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>five</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/five.tf.glif b/src/Cantarell-Bold.ufo/glyphs/five.tf.glif
index fc33deeb..1768792e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/five.tf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/five.tf.glif
@@ -1,40 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five.tf" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <outline>
-    <contour>
-      <point x="250" y="-10" type="curve" smooth="yes"/>
-      <point x="435" y="-10"/>
-      <point x="554" y="80"/>
-      <point x="554" y="230" type="curve" smooth="yes"/>
-      <point x="554" y="362"/>
-      <point x="458" y="436"/>
-      <point x="287" y="436" type="curve" smooth="yes"/>
-      <point x="244" y="436"/>
-      <point x="221" y="431"/>
-      <point x="199" y="418" type="curve"/>
-      <point x="242" y="365" type="line"/>
-      <point x="251" y="543" type="line"/>
-      <point x="517" y="543" type="line"/>
-      <point x="517" y="694" type="line"/>
-      <point x="82" y="694" type="line"/>
-      <point x="64" y="287" type="line"/>
-      <point x="108" y="295"/>
-      <point x="164" y="301"/>
-      <point x="206" y="301" type="curve" smooth="yes"/>
-      <point x="312" y="301"/>
-      <point x="374" y="268"/>
-      <point x="374" y="212" type="curve" smooth="yes"/>
-      <point x="374" y="165"/>
-      <point x="329" y="140"/>
-      <point x="249" y="140" type="curve" smooth="yes"/>
-      <point x="189" y="140"/>
-      <point x="119" y="154"/>
-      <point x="68" y="178" type="curve"/>
-      <point x="21" y="42" type="line"/>
-      <point x="89" y="8"/>
-      <point x="167" y="-10"/>
-    </contour>
+    <component base="five" xOffset="22"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/fiveeighths.glif b/src/Cantarell-Bold.ufo/glyphs/fiveeighths.glif
index 9e23feca..7cef5646 100644
--- a/src/Cantarell-Bold.ufo/glyphs/fiveeighths.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/fiveeighths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fiveeighths" format="2">
-  <advance width="1255"/>
+  <advance width="1105"/>
   <unicode hex="215D"/>
   <outline>
     <component base="five.numr"/>
-    <component base="fraction" xOffset="448"/>
-    <component base="eight.dnom" xOffset="786"/>
+    <component base="fraction" xOffset="419"/>
+    <component base="eight.dnom" xOffset="668"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/fiveinferior.glif b/src/Cantarell-Bold.ufo/glyphs/fiveinferior.glif
index e6fe720c..aee04dfd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/fiveinferior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/fiveinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fiveinferior" format="2">
-  <advance width="448"/>
+  <advance width="419"/>
   <unicode hex="2085"/>
   <outline>
     <component base="five.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/fivesixths.glif b/src/Cantarell-Bold.ufo/glyphs/fivesixths.glif
index e8d670fa..f35e6784 100644
--- a/src/Cantarell-Bold.ufo/glyphs/fivesixths.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/fivesixths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fivesixths" format="2">
-  <advance width="1248"/>
+  <advance width="1098"/>
   <unicode hex="215A"/>
   <outline>
     <component base="five.numr"/>
-    <component base="fraction" xOffset="448"/>
-    <component base="six.dnom" xOffset="786"/>
+    <component base="fraction" xOffset="419"/>
+    <component base="six.dnom" xOffset="668"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/fivesuperior.glif b/src/Cantarell-Bold.ufo/glyphs/fivesuperior.glif
index 14ff0fcf..656727ee 100644
--- a/src/Cantarell-Bold.ufo/glyphs/fivesuperior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/fivesuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fivesuperior" format="2">
-  <advance width="448"/>
+  <advance width="419"/>
   <unicode hex="2075"/>
   <outline>
     <component base="five.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/fl.glif b/src/Cantarell-Bold.ufo/glyphs/fl.glif
index c8660196..99c45e40 100644
--- a/src/Cantarell-Bold.ufo/glyphs/fl.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/fl.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fl" format="2">
-  <advance width="693"/>
+  <advance width="737"/>
   <unicode hex="FB02"/>
   <outline>
     <component base="f"/>
-    <component base="l" xOffset="383"/>
+    <component base="l" xOffset="406"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/florin.glif b/src/Cantarell-Bold.ufo/glyphs/florin.glif
index 60d4d533..ec867e89 100644
--- a/src/Cantarell-Bold.ufo/glyphs/florin.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/florin.glif
@@ -1,43 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="florin" format="2">
-  <advance width="489"/>
+  <advance width="600"/>
   <unicode hex="0192"/>
   <outline>
     <contour>
-      <point x="107" y="0" type="line"/>
-      <point x="280" y="0" type="line"/>
-      <point x="280" y="534" type="line" smooth="yes"/>
-      <point x="280" y="581"/>
-      <point x="307" y="607"/>
-      <point x="354" y="607" type="curve" smooth="yes"/>
-      <point x="376" y="607"/>
-      <point x="404" y="601"/>
-      <point x="431" y="589" type="curve"/>
-      <point x="467" y="723" type="line"/>
-      <point x="436" y="740"/>
-      <point x="390" y="749"/>
-      <point x="342" y="749" type="curve" smooth="yes"/>
-      <point x="196" y="749"/>
-      <point x="107" y="662"/>
-      <point x="107" y="518" type="curve" smooth="yes"/>
+      <point x="172" y="0" type="line"/>
+      <point x="345" y="0" type="line"/>
+      <point x="345" y="534" type="line" smooth="yes"/>
+      <point x="345" y="581"/>
+      <point x="372" y="607"/>
+      <point x="419" y="607" type="curve" smooth="yes"/>
+      <point x="441" y="607"/>
+      <point x="469" y="601"/>
+      <point x="496" y="589" type="curve"/>
+      <point x="532" y="723" type="line"/>
+      <point x="501" y="740"/>
+      <point x="455" y="749"/>
+      <point x="407" y="749" type="curve" smooth="yes"/>
+      <point x="261" y="749"/>
+      <point x="172" y="662"/>
+      <point x="172" y="518" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="28" y="355" type="line"/>
-      <point x="417" y="355" type="line"/>
-      <point x="417" y="490" type="line"/>
-      <point x="28" y="490" type="line"/>
+      <point x="172" y="-227" type="line"/>
+      <point x="276" y="-197"/>
+      <point x="345" y="-111"/>
+      <point x="345" y="-13" type="curve" smooth="yes"/>
+      <point x="345" y="0" type="line"/>
+      <point x="172" y="0" type="line"/>
+      <point x="172" y="-25" type="line" smooth="yes"/>
+      <point x="172" y="-70"/>
+      <point x="150" y="-112"/>
+      <point x="117" y="-131" type="curve"/>
     </contour>
     <contour>
-      <point x="107" y="-227" type="line"/>
-      <point x="211" y="-197"/>
-      <point x="280" y="-111"/>
-      <point x="280" y="-13" type="curve" smooth="yes"/>
-      <point x="280" y="0" type="line"/>
-      <point x="107" y="0" type="line"/>
-      <point x="107" y="-25" type="line" smooth="yes"/>
-      <point x="107" y="-70"/>
-      <point x="85" y="-112"/>
-      <point x="52" y="-131" type="curve"/>
+      <point x="93" y="355" type="line"/>
+      <point x="482" y="355" type="line"/>
+      <point x="482" y="490" type="line"/>
+      <point x="93" y="490" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/four.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/four.dnom.glif
index bcb604ef..56539cb8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/four.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/four.dnom.glif
@@ -1,23 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four.dnom" format="2">
-  <advance width="478"/>
-  <note>
-four
-</note>
+  <advance width="437"/>
   <outline>
     <contour>
-      <point x="233" y="-2" type="line"/>
-      <point x="379" y="-2" type="line"/>
-      <point x="379" y="479" type="line"/>
-      <point x="237" y="479" type="line"/>
-      <point x="3" y="151" type="line"/>
-      <point x="3" y="72" type="line"/>
-      <point x="470" y="72" type="line"/>
-      <point x="470" y="199" type="line"/>
-      <point x="78" y="201" type="line"/>
-      <point x="122" y="152" type="line"/>
-      <point x="251" y="343" type="line"/>
-      <point x="233" y="388" type="line"/>
+      <point x="216" y="-2" type="line"/>
+      <point x="341" y="-2" type="line"/>
+      <point x="341" y="416" type="line"/>
+      <point x="220" y="416" type="line"/>
+      <point x="13" y="131" type="line"/>
+      <point x="13" y="64" type="line"/>
+      <point x="420" y="64" type="line"/>
+      <point x="420" y="172" type="line"/>
+      <point x="82" y="173" type="line"/>
+      <point x="117" y="133" type="line"/>
+      <point x="233" y="300" type="line"/>
+      <point x="216" y="335" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -25,11 +22,11 @@ four
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>69</integer>
+        <integer>60</integer>
         <key>weight</key>
-        <integer>-23</integer>
+        <integer>-45</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>65</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/four.glif b/src/Cantarell-Bold.ufo/glyphs/four.glif
index cb39c6cf..be0a3d37 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="622"/>
+  <advance width="643"/>
   <unicode hex="0034"/>
   <outline>
     <contour>
-      <point x="322" y="-5" type="line"/>
-      <point x="491" y="-5" type="line"/>
-      <point x="491" y="694" type="line"/>
-      <point x="327" y="694" type="line"/>
-      <point x="4" y="215" type="line"/>
-      <point x="4" y="124" type="line"/>
-      <point x="613" y="124" type="line"/>
-      <point x="613" y="270" type="line"/>
-      <point x="92" y="272" type="line"/>
-      <point x="142" y="217" type="line"/>
-      <point x="343" y="534" type="line"/>
-      <point x="322" y="583" type="line"/>
+      <point x="335" y="-5" type="line"/>
+      <point x="504" y="-5" type="line"/>
+      <point x="504" y="694" type="line"/>
+      <point x="340" y="694" type="line"/>
+      <point x="17" y="215" type="line"/>
+      <point x="17" y="124" type="line"/>
+      <point x="626" y="124" type="line"/>
+      <point x="626" y="270" type="line"/>
+      <point x="105" y="272" type="line"/>
+      <point x="155" y="217" type="line"/>
+      <point x="356" y="534" type="line"/>
+      <point x="335" y="583" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/four.numr.glif b/src/Cantarell-Bold.ufo/glyphs/four.numr.glif
index 06297252..c3aa0a5c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/four.numr.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/four.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four.numr" format="2">
-  <advance width="478"/>
+  <advance width="437"/>
   <outline>
     <component base="four.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/four.osf.glif b/src/Cantarell-Bold.ufo/glyphs/four.osf.glif
index 497f37af..8dc9c462 100644
--- a/src/Cantarell-Bold.ufo/glyphs/four.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/four.osf.glif
@@ -1,20 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four.osf" format="2">
-  <advance width="618"/>
+  <advance width="639"/>
   <outline>
     <contour>
-      <point x="323" y="-105" type="line"/>
-      <point x="487" y="-105" type="line"/>
-      <point x="487" y="594" type="line"/>
-      <point x="328" y="594" type="line"/>
-      <point x="4" y="115" type="line"/>
-      <point x="4" y="26" type="line"/>
-      <point x="609" y="26" type="line"/>
-      <point x="609" y="168" type="line"/>
-      <point x="92" y="170" type="line"/>
-      <point x="139" y="117" type="line"/>
-      <point x="343" y="437" type="line"/>
-      <point x="323" y="483" type="line"/>
+      <point x="336" y="-105" type="line"/>
+      <point x="500" y="-105" type="line"/>
+      <point x="500" y="594" type="line"/>
+      <point x="341" y="594" type="line"/>
+      <point x="17" y="115" type="line"/>
+      <point x="17" y="26" type="line"/>
+      <point x="622" y="26" type="line"/>
+      <point x="622" y="168" type="line"/>
+      <point x="105" y="170" type="line"/>
+      <point x="152" y="117" type="line"/>
+      <point x="356" y="437" type="line"/>
+      <point x="336" y="483" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>four</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>four</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/four.tf.glif b/src/Cantarell-Bold.ufo/glyphs/four.tf.glif
index 7520a9df..fadecb8c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/four.tf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/four.tf.glif
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four.tf" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <outline>
     <contour>
-      <point x="298" y="-5" type="line"/>
-      <point x="464" y="-5" type="line"/>
-      <point x="464" y="694" type="line"/>
-      <point x="303" y="694" type="line"/>
-      <point x="-4" y="215" type="line"/>
-      <point x="-4" y="124" type="line"/>
-      <point x="580" y="124" type="line"/>
-      <point x="580" y="270" type="line"/>
-      <point x="81" y="272" type="line"/>
-      <point x="131" y="217" type="line"/>
-      <point x="319" y="534" type="line"/>
-      <point x="298" y="583" type="line"/>
+      <point x="308" y="-5" type="line"/>
+      <point x="474" y="-5" type="line"/>
+      <point x="474" y="694" type="line"/>
+      <point x="313" y="694" type="line"/>
+      <point x="6" y="215" type="line"/>
+      <point x="6" y="124" type="line"/>
+      <point x="590" y="124" type="line"/>
+      <point x="590" y="270" type="line"/>
+      <point x="91" y="272" type="line"/>
+      <point x="141" y="217" type="line"/>
+      <point x="329" y="534" type="line"/>
+      <point x="308" y="583" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/fourfifths.glif b/src/Cantarell-Bold.ufo/glyphs/fourfifths.glif
index deb0eb63..07978785 100644
--- a/src/Cantarell-Bold.ufo/glyphs/fourfifths.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/fourfifths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fourfifths" format="2">
-  <advance width="1264"/>
+  <advance width="1105"/>
   <unicode hex="2158"/>
   <outline>
     <component base="four.numr"/>
-    <component base="fraction" xOffset="478"/>
-    <component base="five.dnom" xOffset="816"/>
+    <component base="fraction" xOffset="437"/>
+    <component base="five.dnom" xOffset="686"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/fourinferior.glif b/src/Cantarell-Bold.ufo/glyphs/fourinferior.glif
index 5c909c7a..4e21b022 100644
--- a/src/Cantarell-Bold.ufo/glyphs/fourinferior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/fourinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fourinferior" format="2">
-  <advance width="478"/>
+  <advance width="437"/>
   <unicode hex="2084"/>
   <outline>
     <component base="four.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/foursuperior.glif b/src/Cantarell-Bold.ufo/glyphs/foursuperior.glif
index 7cc6c379..45071904 100644
--- a/src/Cantarell-Bold.ufo/glyphs/foursuperior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/foursuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="foursuperior" format="2">
-  <advance width="478"/>
+  <advance width="437"/>
   <unicode hex="2074"/>
   <outline>
     <component base="four.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/fourthtonechinese.glif 
b/src/Cantarell-Bold.ufo/glyphs/fourthtonechinese.glif
index 11deacef..81245630 100644
--- a/src/Cantarell-Bold.ufo/glyphs/fourthtonechinese.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/fourthtonechinese.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fourthtonechinese" format="2">
-  <advance width="287"/>
+  <advance width="203"/>
   <unicode hex="02CB"/>
   <outline>
-    <component base="gravecomb"/>
+    <component base="gravecomb" xOffset="-43"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/fraction.glif b/src/Cantarell-Bold.ufo/glyphs/fraction.glif
index e80e404e..8c0a2601 100644
--- a/src/Cantarell-Bold.ufo/glyphs/fraction.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/fraction.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fraction" format="2">
-  <advance width="338"/>
+  <advance width="249"/>
   <unicode hex="2044"/>
   <outline>
     <contour>
-      <point x="-66" y="0" type="line"/>
-      <point x="86" y="0" type="line"/>
-      <point x="393" y="694" type="line"/>
-      <point x="226" y="694" type="line"/>
+      <point x="-100" y="0" type="line"/>
+      <point x="34" y="0" type="line"/>
+      <point x="389" y="694" type="line"/>
+      <point x="242" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/franc.glif b/src/Cantarell-Bold.ufo/glyphs/franc.glif
index 8e7a0042..555442af 100644
--- a/src/Cantarell-Bold.ufo/glyphs/franc.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/franc.glif
@@ -1,18 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="franc" format="2">
-  <advance width="651"/>
+  <advance width="600"/>
   <unicode hex="20A3"/>
   <outline>
-    <component base="F" xOffset="49"/>
-    <component base="strokeshortcomb.case" xOffset="10" yOffset="-150"/>
+    <contour>
+      <point x="105" y="0" type="line"/>
+      <point x="281" y="0" type="line"/>
+      <point x="281" y="257" type="line"/>
+      <point x="524" y="257" type="line"/>
+      <point x="524" y="409" type="line"/>
+      <point x="281" y="409" type="line"/>
+      <point x="281" y="542" type="line"/>
+      <point x="557" y="542" type="line"/>
+      <point x="557" y="694" type="line"/>
+      <point x="105" y="694" type="line"/>
+    </contour>
+    <contour>
+      <point x="35" y="67" type="line"/>
+      <point x="410" y="67" type="line"/>
+      <point x="410" y="187" type="line"/>
+      <point x="35" y="187" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>0</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/g.glif b/src/Cantarell-Bold.ufo/glyphs/g.glif
index 1a27a0fd..b2d1d675 100644
--- a/src/Cantarell-Bold.ufo/glyphs/g.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/g.glif
@@ -1,59 +1,64 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="g" format="2">
-  <advance width="578"/>
+  <advance width="597"/>
   <unicode hex="0067"/>
-  <note>
-g
-</note>
-  <anchor x="295" y="0" name="bottom"/>
-  <anchor x="265" y="490" name="top"/>
+  <anchor x="306" y="0" name="bottom"/>
+  <anchor x="276" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="242" y="-232" type="curve" smooth="yes"/>
-      <point x="411" y="-232"/>
-      <point x="524" y="-138"/>
-      <point x="524" y="2" type="curve" smooth="yes"/>
-      <point x="524" y="490" type="line"/>
-      <point x="401" y="490" type="line"/>
-      <point x="356" y="370" type="line"/>
-      <point x="356" y="2" type="line" smooth="yes"/>
-      <point x="356" y="-59"/>
-      <point x="311" y="-94"/>
-      <point x="234" y="-94" type="curve" smooth="yes"/>
-      <point x="194" y="-94"/>
-      <point x="146" y="-84"/>
-      <point x="105" y="-67" type="curve"/>
-      <point x="72" y="-195" type="line"/>
-      <point x="127" y="-220"/>
-      <point x="182" y="-232"/>
+      <point x="253" y="-232" type="curve" smooth="yes"/>
+      <point x="422" y="-232"/>
+      <point x="535" y="-138"/>
+      <point x="535" y="2" type="curve" smooth="yes"/>
+      <point x="535" y="490" type="line"/>
+      <point x="412" y="490" type="line"/>
+      <point x="367" y="370" type="line"/>
+      <point x="367" y="2" type="line" smooth="yes"/>
+      <point x="367" y="-59"/>
+      <point x="322" y="-94"/>
+      <point x="245" y="-94" type="curve" smooth="yes"/>
+      <point x="205" y="-94"/>
+      <point x="157" y="-84"/>
+      <point x="116" y="-67" type="curve"/>
+      <point x="83" y="-195" type="line"/>
+      <point x="138" y="-220"/>
+      <point x="193" y="-232"/>
     </contour>
     <contour>
-      <point x="228" y="-10" type="curve" smooth="yes"/>
-      <point x="315" y="-10"/>
-      <point x="382" y="43"/>
-      <point x="414" y="131" type="curve"/>
-      <point x="369" y="184" type="line"/>
-      <point x="354" y="153"/>
-      <point x="323" y="134"/>
-      <point x="283" y="134" type="curve" smooth="yes"/>
-      <point x="230" y="134"/>
-      <point x="198" y="176"/>
-      <point x="198" y="248" type="curve" smooth="yes"/>
-      <point x="198" y="316"/>
-      <point x="229" y="356"/>
-      <point x="281" y="356" type="curve" smooth="yes"/>
-      <point x="324" y="356"/>
-      <point x="359" y="330"/>
-      <point x="373" y="283" type="curve"/>
-      <point x="418" y="383" type="line"/>
-      <point x="393" y="460"/>
-      <point x="335" y="500"/>
-      <point x="250" y="500" type="curve" smooth="yes"/>
-      <point x="115" y="500"/>
-      <point x="22" y="397"/>
-      <point x="22" y="240" type="curve" smooth="yes"/>
-      <point x="22" y="88"/>
-      <point x="109" y="-10"/>
+      <point x="239" y="-10" type="curve" smooth="yes"/>
+      <point x="326" y="-10"/>
+      <point x="393" y="43"/>
+      <point x="425" y="131" type="curve"/>
+      <point x="380" y="184" type="line"/>
+      <point x="365" y="153"/>
+      <point x="334" y="134"/>
+      <point x="294" y="134" type="curve" smooth="yes"/>
+      <point x="241" y="134"/>
+      <point x="209" y="176"/>
+      <point x="209" y="248" type="curve" smooth="yes"/>
+      <point x="209" y="316"/>
+      <point x="240" y="356"/>
+      <point x="292" y="356" type="curve" smooth="yes"/>
+      <point x="335" y="356"/>
+      <point x="370" y="330"/>
+      <point x="384" y="283" type="curve"/>
+      <point x="429" y="383" type="line"/>
+      <point x="404" y="460"/>
+      <point x="346" y="500"/>
+      <point x="261" y="500" type="curve" smooth="yes"/>
+      <point x="126" y="500"/>
+      <point x="33" y="397"/>
+      <point x="33" y="240" type="curve" smooth="yes"/>
+      <point x="33" y="88"/>
+      <point x="120" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/gbreve.glif b/src/Cantarell-Bold.ufo/glyphs/gbreve.glif
index e6e2789e..a0916a71 100644
--- a/src/Cantarell-Bold.ufo/glyphs/gbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/gbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gbreve" format="2">
-  <advance width="578"/>
+  <advance width="597"/>
   <unicode hex="011F"/>
   <outline>
     <component base="g"/>
-    <component base="brevecomb" xOffset="49"/>
+    <component base="brevecomb" xOffset="60"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/gcaron.glif b/src/Cantarell-Bold.ufo/glyphs/gcaron.glif
index 9051dcbe..b11c87bb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/gcaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/gcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gcaron" format="2">
-  <advance width="578"/>
+  <advance width="597"/>
   <unicode hex="01E7"/>
   <outline>
     <component base="g"/>
-    <component base="caroncomb" xOffset="59"/>
+    <component base="caroncomb" xOffset="70"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/gcircumflex.glif b/src/Cantarell-Bold.ufo/glyphs/gcircumflex.glif
index 5e4b0e13..699a1bee 100644
--- a/src/Cantarell-Bold.ufo/glyphs/gcircumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/gcircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gcircumflex" format="2">
-  <advance width="578"/>
+  <advance width="597"/>
   <unicode hex="011D"/>
   <outline>
     <component base="g"/>
-    <component base="circumflexcomb" xOffset="62"/>
+    <component base="circumflexcomb" xOffset="73"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/gcommaaccent.glif b/src/Cantarell-Bold.ufo/glyphs/gcommaaccent.glif
index ac1690b0..e56ecbb1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/gcommaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/gcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gcommaaccent" format="2">
-  <advance width="578"/>
+  <advance width="597"/>
   <unicode hex="0123"/>
   <outline>
     <component base="g"/>
-    <component base="commaturnedabovecomb" xOffset="119"/>
+    <component base="commaturnedabovecomb" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/gdotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/gdotaccent.glif
index 3a1b69e2..3d53be22 100644
--- a/src/Cantarell-Bold.ufo/glyphs/gdotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/gdotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gdotaccent" format="2">
-  <advance width="578"/>
+  <advance width="597"/>
   <unicode hex="0121"/>
   <outline>
     <component base="g"/>
-    <component base="dotaccentcomb" xOffset="121"/>
+    <component base="dotaccentcomb" xOffset="132"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ge-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ge-cy.glif
index cab958d0..81b39442 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ge-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ge-cy.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ge-cy" format="2">
-  <advance width="451"/>
+  <advance width="469"/>
   <unicode hex="0433"/>
-  <anchor x="174" y="0" name="bottomright"/>
-  <anchor x="228" y="490" name="top"/>
+  <anchor x="181" y="0" name="bottomright"/>
+  <anchor x="235" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="228" y="0" type="line"/>
-      <point x="228" y="356" type="line"/>
-      <point x="452" y="356" type="line"/>
-      <point x="452" y="490" type="line"/>
-      <point x="55" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="235" y="0" type="line"/>
+      <point x="235" y="356" type="line"/>
+      <point x="459" y="356" type="line"/>
+      <point x="459" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -25,6 +25,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/gedescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/gedescender-cy.glif
index db6bf364..198a11b1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/gedescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/gedescender-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gedescender-cy" format="2">
-  <advance width="451"/>
+  <advance width="469"/>
   <unicode hex="04F7"/>
   <outline>
     <component base="ge-cy"/>
-    <component base="descender-cy" xOffset="78"/>
+    <component base="descender-cy" xOffset="85"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/germandbls.glif b/src/Cantarell-Bold.ufo/glyphs/germandbls.glif
index e0f1d897..e71e0982 100644
--- a/src/Cantarell-Bold.ufo/glyphs/germandbls.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/germandbls.glif
@@ -46,4 +46,10 @@
       <point x="357" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ghemiddlehook-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/ghemiddlehook-cy.glif
index 6fe6619f..dd0ac8b9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ghemiddlehook-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ghemiddlehook-cy.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ghemiddlehook-cy" format="2">
-  <advance width="559"/>
+  <advance width="575"/>
   <unicode hex="0495"/>
   <outline>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="214" y="0" type="line"/>
-      <point x="214" y="355" type="line"/>
-      <point x="423" y="355" type="line"/>
-      <point x="423" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
+      <point x="279" y="-240" type="line"/>
+      <point x="457" y="-208"/>
+      <point x="562" y="-97"/>
+      <point x="562" y="58" type="curve" smooth="yes"/>
+      <point x="562" y="197"/>
+      <point x="475" y="290"/>
+      <point x="345" y="290" type="curve" smooth="yes"/>
+      <point x="250" y="290"/>
+      <point x="167" y="239"/>
+      <point x="130" y="159" type="curve"/>
+      <point x="151" y="62" type="line"/>
+      <point x="173" y="122"/>
+      <point x="223" y="159"/>
+      <point x="279" y="159" type="curve" smooth="yes"/>
+      <point x="346" y="159"/>
+      <point x="391" y="106"/>
+      <point x="391" y="27" type="curve" smooth="yes"/>
+      <point x="391" y="-58"/>
+      <point x="342" y="-120"/>
+      <point x="258" y="-140" type="curve"/>
     </contour>
     <contour>
-      <point x="122" y="159" type="curve"/>
-      <point x="143" y="62" type="line"/>
-      <point x="165" y="122"/>
-      <point x="215" y="159"/>
-      <point x="271" y="159" type="curve" smooth="yes"/>
-      <point x="338" y="159"/>
-      <point x="383" y="106"/>
-      <point x="383" y="27" type="curve" smooth="yes"/>
-      <point x="383" y="-58"/>
-      <point x="334" y="-120"/>
-      <point x="250" y="-140" type="curve"/>
-      <point x="271" y="-240" type="line"/>
-      <point x="449" y="-208"/>
-      <point x="554" y="-97"/>
-      <point x="554" y="58" type="curve" smooth="yes"/>
-      <point x="554" y="197"/>
-      <point x="467" y="290"/>
-      <point x="337" y="290" type="curve" smooth="yes"/>
-      <point x="242" y="290"/>
-      <point x="159" y="239"/>
+      <point x="62" y="0" type="line"/>
+      <point x="222" y="0" type="line"/>
+      <point x="222" y="355" type="line"/>
+      <point x="431" y="355" type="line"/>
+      <point x="431" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -45,6 +45,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ghestroke-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ghestroke-cy.glif
index c04b4aff..e26658a0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ghestroke-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ghestroke-cy.glif
@@ -1,21 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ghestroke-cy" format="2">
-  <advance width="483"/>
+  <advance width="544"/>
   <unicode hex="0493"/>
   <outline>
     <contour>
-      <point x="86" y="0" type="line"/>
-      <point x="259" y="0" type="line"/>
-      <point x="259" y="356" type="line"/>
-      <point x="483" y="356" type="line"/>
-      <point x="483" y="490" type="line"/>
-      <point x="86" y="490" type="line"/>
+      <point x="137" y="0" type="line"/>
+      <point x="310" y="0" type="line"/>
+      <point x="310" y="356" type="line"/>
+      <point x="534" y="356" type="line"/>
+      <point x="534" y="490" type="line"/>
+      <point x="137" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="7" y="174" type="line"/>
-      <point x="403" y="174" type="line"/>
-      <point x="403" y="294" type="line"/>
-      <point x="7" y="294" type="line"/>
+      <point x="58" y="174" type="line"/>
+      <point x="454" y="174" type="line"/>
+      <point x="454" y="294" type="line"/>
+      <point x="58" y="294" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/gheupturn-cy.glif b/src/Cantarell-Bold.ufo/glyphs/gheupturn-cy.glif
index d1b89155..c2140093 100644
--- a/src/Cantarell-Bold.ufo/glyphs/gheupturn-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/gheupturn-cy.glif
@@ -1,17 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gheupturn-cy" format="2">
-  <advance width="461"/>
+  <advance width="479"/>
   <unicode hex="0491"/>
   <outline>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="228" y="0" type="line"/>
-      <point x="228" y="356" type="line"/>
-      <point x="462" y="356" type="line"/>
-      <point x="462" y="624" type="line"/>
-      <point x="306" y="624" type="line"/>
-      <point x="306" y="490" type="line"/>
-      <point x="55" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="235" y="0" type="line"/>
+      <point x="235" y="356" type="line"/>
+      <point x="469" y="356" type="line"/>
+      <point x="469" y="624" type="line"/>
+      <point x="313" y="624" type="line"/>
+      <point x="313" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/gje-cy.glif b/src/Cantarell-Bold.ufo/glyphs/gje-cy.glif
index a6819a13..d00a6e93 100644
--- a/src/Cantarell-Bold.ufo/glyphs/gje-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/gje-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gje-cy" format="2">
-  <advance width="451"/>
+  <advance width="469"/>
   <unicode hex="0453"/>
   <outline>
     <component base="ge-cy"/>
-    <component base="acutecomb" xOffset="132"/>
+    <component base="acutecomb" xOffset="139"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/gmacron.glif b/src/Cantarell-Bold.ufo/glyphs/gmacron.glif
index e927a408..fa736bec 100644
--- a/src/Cantarell-Bold.ufo/glyphs/gmacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/gmacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gmacron" format="2">
-  <advance width="578"/>
+  <advance width="597"/>
   <unicode hex="1E21"/>
   <outline>
     <component base="g"/>
-    <component base="macroncomb" xOffset="23"/>
+    <component base="macroncomb" xOffset="34"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/grave.glif b/src/Cantarell-Bold.ufo/glyphs/grave.glif
index c727ab8f..eb845fb0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/grave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/grave.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="grave" format="2">
-  <advance width="287"/>
+  <advance width="500"/>
   <unicode hex="0060"/>
   <outline>
-    <component base="gravecomb" xOffset="9"/>
+    <component base="gravecomb" xOffset="108"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/greater.glif b/src/Cantarell-Bold.ufo/glyphs/greater.glif
index 4bacff16..c59e5468 100644
--- a/src/Cantarell-Bold.ufo/glyphs/greater.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/greater.glif
@@ -1,17 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="greater" format="2">
-  <advance width="569"/>
+  <advance width="600"/>
   <unicode hex="003E"/>
   <outline>
     <contour>
-      <point x="61" y="71" type="line"/>
-      <point x="537" y="266" type="line"/>
-      <point x="537" y="400" type="line"/>
-      <point x="61" y="620" type="line"/>
-      <point x="61" y="445" type="line"/>
-      <point x="382" y="317" type="line"/>
-      <point x="382" y="345" type="line"/>
-      <point x="61" y="237" type="line"/>
+      <point x="82" y="19" type="line"/>
+      <point x="518" y="238" type="line"/>
+      <point x="518" y="380" type="line"/>
+      <point x="82" y="612" type="line"/>
+      <point x="82" y="424" type="line"/>
+      <point x="353" y="290" type="line"/>
+      <point x="353" y="318" type="line"/>
+      <point x="82" y="192" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/greaterequal.glif b/src/Cantarell-Bold.ufo/glyphs/greaterequal.glif
index 65488ed9..ec32782a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/greaterequal.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/greaterequal.glif
@@ -1,23 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="greaterequal" format="2">
-  <advance width="592"/>
+  <advance width="600"/>
   <unicode hex="2265"/>
   <outline>
     <contour>
-      <point x="68" y="186" type="line"/>
-      <point x="546" y="367" type="line"/>
-      <point x="546" y="476" type="line"/>
-      <point x="68" y="667" type="line"/>
-      <point x="68" y="512" type="line"/>
-      <point x="386" y="418" type="line"/>
-      <point x="385" y="440" type="line"/>
-      <point x="68" y="336" type="line"/>
+      <point x="68" y="155" type="line"/>
+      <point x="532" y="336" type="line"/>
+      <point x="532" y="450" type="line"/>
+      <point x="68" y="641" type="line"/>
+      <point x="68" y="476" type="line"/>
+      <point x="363" y="379" type="line"/>
+      <point x="362" y="408" type="line"/>
+      <point x="68" y="310" type="line"/>
     </contour>
     <contour>
-      <point x="68" y="26" type="line"/>
-      <point x="546" y="26" type="line"/>
-      <point x="546" y="161" type="line"/>
-      <point x="68" y="161" type="line"/>
+      <point x="68" y="-8" type="line"/>
+      <point x="532" y="-8" type="line"/>
+      <point x="532" y="135" type="line"/>
+      <point x="68" y="135" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/guarani.glif b/src/Cantarell-Bold.ufo/glyphs/guarani.glif
index 8e0be72b..c782467d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/guarani.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/guarani.glif
@@ -1,20 +1,58 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guarani" format="2">
-  <advance width="723"/>
+  <advance width="600"/>
   <unicode hex="20B2"/>
   <outline>
-    <component base="G" xOffset="8"/>
-    <component base="_currencyvstem" xOffset="214" yOffset="-800"/>
-    <component base="_currencyvstem" xOffset="203" yOffset="-5"/>
+    <contour>
+      <point x="329" y="-10" type="curve" smooth="yes"/>
+      <point x="427" y="-10"/>
+      <point x="507" y="23"/>
+      <point x="576" y="87" type="curve"/>
+      <point x="576" y="406" type="line"/>
+      <point x="303" y="406" type="line"/>
+      <point x="303" y="268" type="line"/>
+      <point x="421" y="268" type="line"/>
+      <point x="421" y="78" type="line"/>
+      <point x="445" y="172" type="line"/>
+      <point x="430" y="147"/>
+      <point x="394" y="132"/>
+      <point x="349" y="132" type="curve" smooth="yes"/>
+      <point x="251" y="132"/>
+      <point x="186" y="216"/>
+      <point x="186" y="353" type="curve" smooth="yes"/>
+      <point x="186" y="487"/>
+      <point x="247" y="560"/>
+      <point x="361" y="560" type="curve" smooth="yes"/>
+      <point x="412" y="560"/>
+      <point x="471" y="548"/>
+      <point x="510" y="532" type="curve"/>
+      <point x="555" y="660" type="line"/>
+      <point x="504" y="688"/>
+      <point x="431" y="704"/>
+      <point x="366" y="704" type="curve" smooth="yes"/>
+      <point x="154" y="704"/>
+      <point x="15" y="556"/>
+      <point x="15" y="339" type="curve" smooth="yes"/>
+      <point x="15" y="130"/>
+      <point x="144" y="-10"/>
+    </contour>
+    <contour>
+      <point x="254" y="-123" type="line"/>
+      <point x="411" y="-123" type="line"/>
+      <point x="411" y="31" type="line"/>
+      <point x="254" y="31" type="line"/>
+    </contour>
+    <contour>
+      <point x="244" y="656" type="line"/>
+      <point x="401" y="656" type="line"/>
+      <point x="401" y="821" type="line"/>
+      <point x="244" y="821" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>-1</integer>
-        <integer>-1</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/guillemetleft.glif 
b/src/Cantarell-Bold.ufo/glyphs/guillemetleft.glif
index 83f4ad55..763910ce 100644
--- a/src/Cantarell-Bold.ufo/glyphs/guillemetleft.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/guillemetleft.glif
@@ -1,25 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guillemetleft" format="2">
-  <advance width="587"/>
+  <advance width="666"/>
   <unicode hex="00AB"/>
   <outline>
     <contour>
-      <point x="150" y="27" type="line"/>
-      <point x="319" y="27" type="line"/>
-      <point x="162" y="268" type="line"/>
-      <point x="162" y="221" type="line"/>
-      <point x="312" y="453" type="line"/>
-      <point x="154" y="453" type="line"/>
-      <point x="7" y="242" type="line"/>
+      <point x="179" y="26" type="line"/>
+      <point x="367" y="26" type="line"/>
+      <point x="200" y="269" type="line"/>
+      <point x="199" y="220" type="line"/>
+      <point x="359" y="453" type="line"/>
+      <point x="184" y="453" type="line"/>
+      <point x="27" y="241" type="line"/>
     </contour>
     <contour>
-      <point x="412" y="27" type="line"/>
-      <point x="581" y="27" type="line"/>
-      <point x="424" y="268" type="line"/>
-      <point x="424" y="221" type="line"/>
-      <point x="574" y="453" type="line"/>
-      <point x="416" y="453" type="line"/>
-      <point x="269" y="242" type="line"/>
+      <point x="452" y="26" type="line"/>
+      <point x="640" y="26" type="line"/>
+      <point x="473" y="269" type="line"/>
+      <point x="473" y="220" type="line"/>
+      <point x="633" y="453" type="line"/>
+      <point x="456" y="453" type="line"/>
+      <point x="300" y="241" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/guillemetright.glif 
b/src/Cantarell-Bold.ufo/glyphs/guillemetright.glif
index 87e1d15f..b3cd3ccb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/guillemetright.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/guillemetright.glif
@@ -1,25 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guillemetright" format="2">
-  <advance width="578"/>
+  <advance width="666"/>
   <unicode hex="00BB"/>
   <outline>
     <contour>
-      <point x="266" y="27" type="line"/>
-      <point x="424" y="27" type="line"/>
-      <point x="571" y="242" type="line"/>
-      <point x="427" y="453" type="line"/>
-      <point x="258" y="453" type="line"/>
-      <point x="416" y="214" type="line"/>
-      <point x="416" y="261" type="line"/>
+      <point x="306" y="26" type="line"/>
+      <point x="483" y="26" type="line"/>
+      <point x="639" y="242" type="line"/>
+      <point x="486" y="453" type="line"/>
+      <point x="298" y="453" type="line"/>
+      <point x="466" y="212" type="line"/>
+      <point x="466" y="261" type="line"/>
     </contour>
     <contour>
-      <point x="14" y="27" type="line"/>
-      <point x="172" y="27" type="line"/>
-      <point x="319" y="242" type="line"/>
-      <point x="175" y="453" type="line"/>
-      <point x="6" y="453" type="line"/>
-      <point x="164" y="214" type="line"/>
-      <point x="164" y="261" type="line"/>
+      <point x="33" y="26" type="line"/>
+      <point x="210" y="26" type="line"/>
+      <point x="366" y="242" type="line"/>
+      <point x="213" y="453" type="line"/>
+      <point x="25" y="453" type="line"/>
+      <point x="193" y="212" type="line"/>
+      <point x="194" y="261" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|guillemetleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>guillemetleft</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/guilsinglleft.glif 
b/src/Cantarell-Bold.ufo/glyphs/guilsinglleft.glif
index 6dd10553..af3bd22b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/guilsinglleft.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/guilsinglleft.glif
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guilsinglleft" format="2">
-  <advance width="353"/>
+  <advance width="412"/>
   <unicode hex="2039"/>
   <outline>
     <contour>
-      <point x="151" y="26" type="line"/>
-      <point x="347" y="26" type="line"/>
-      <point x="189" y="269" type="line"/>
-      <point x="189" y="219" type="line"/>
-      <point x="339" y="453" type="line"/>
-      <point x="155" y="453" type="line"/>
-      <point x="7" y="242" type="line"/>
+      <point x="191" y="26" type="line"/>
+      <point x="387" y="26" type="line"/>
+      <point x="206" y="269" type="line"/>
+      <point x="206" y="219" type="line"/>
+      <point x="379" y="453" type="line"/>
+      <point x="196" y="453" type="line"/>
+      <point x="26" y="242" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/guilsinglright.glif 
b/src/Cantarell-Bold.ufo/glyphs/guilsinglright.glif
index 7566a3c2..84bca48a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/guilsinglright.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/guilsinglright.glif
@@ -1,16 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guilsinglright" format="2">
-  <advance width="354"/>
+  <advance width="412"/>
   <unicode hex="203A"/>
   <outline>
     <contour>
-      <point x="14" y="26" type="line"/>
-      <point x="199" y="26" type="line"/>
-      <point x="347" y="242" type="line"/>
-      <point x="203" y="453" type="line"/>
-      <point x="6" y="453" type="line"/>
-      <point x="165" y="212" type="line"/>
-      <point x="165" y="262" type="line"/>
+      <point x="34" y="26" type="line"/>
+      <point x="218" y="26" type="line"/>
+      <point x="386" y="242" type="line"/>
+      <point x="221" y="453" type="line"/>
+      <point x="25" y="453" type="line"/>
+      <point x="207" y="212" type="line"/>
+      <point x="207" y="262" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|guilsinglleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>guilsinglleft</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/h.glif b/src/Cantarell-Bold.ufo/glyphs/h.glif
index 60d02cb2..b40aa91b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/h.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/h.glif
@@ -1,37 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="h" format="2">
-  <advance width="579"/>
+  <advance width="595"/>
   <unicode hex="0068"/>
-  <note>
-h
-</note>
-  <anchor x="293" y="0" name="bottom"/>
-  <anchor x="165" y="595" name="center"/>
-  <anchor x="313" y="739" name="top"/>
+  <anchor x="301" y="0" name="bottom"/>
+  <anchor x="173" y="595" name="center"/>
+  <anchor x="321" y="739" name="top"/>
   <outline>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="224" y="0" type="line"/>
-      <point x="224" y="739" type="line"/>
-      <point x="54" y="739" type="line"/>
+      <point x="371" y="0" type="line"/>
+      <point x="544" y="0" type="line"/>
+      <point x="544" y="294" type="line" smooth="yes"/>
+      <point x="544" y="421"/>
+      <point x="477" y="496"/>
+      <point x="365" y="496" type="curve" smooth="yes"/>
+      <point x="295" y="496"/>
+      <point x="235" y="465"/>
+      <point x="195" y="398" type="curve"/>
+      <point x="214" y="295" type="line"/>
+      <point x="239" y="332"/>
+      <point x="266" y="346"/>
+      <point x="300" y="346" type="curve" smooth="yes"/>
+      <point x="350" y="346"/>
+      <point x="371" y="320"/>
+      <point x="371" y="265" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="363" y="0" type="line"/>
-      <point x="536" y="0" type="line"/>
-      <point x="536" y="294" type="line" smooth="yes"/>
-      <point x="536" y="421"/>
-      <point x="469" y="496"/>
-      <point x="357" y="496" type="curve" smooth="yes"/>
-      <point x="287" y="496"/>
-      <point x="227" y="465"/>
-      <point x="187" y="398" type="curve"/>
-      <point x="206" y="295" type="line"/>
-      <point x="231" y="332"/>
-      <point x="258" y="346"/>
-      <point x="292" y="346" type="curve" smooth="yes"/>
-      <point x="342" y="346"/>
-      <point x="363" y="320"/>
-      <point x="363" y="265" type="curve" smooth="yes"/>
+      <point x="62" y="0" type="line"/>
+      <point x="232" y="0" type="line"/>
+      <point x="232" y="739" type="line"/>
+      <point x="62" y="739" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ha-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ha-cy.glif
index d20a7f7b..dd0b0d87 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ha-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ha-cy.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ha-cy" format="2">
-  <advance width="524"/>
+  <advance width="527"/>
   <unicode hex="0445"/>
-  <anchor x="374" y="0" name="bottomright"/>
+  <anchor x="373" y="0" name="bottomright"/>
   <outline>
     <component base="x"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/hadescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/hadescender-cy.glif
index 24b352ad..eb49e842 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hadescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hadescender-cy.glif
@@ -1,15 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hadescender-cy" format="2">
-  <advance width="543"/>
+  <advance width="548"/>
   <unicode hex="04B3"/>
   <outline>
     <component base="ha-cy"/>
-    <component base="descender-cy" xOffset="278"/>
+    <component base="descender-cy" xOffset="277"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>ha-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>kadescender-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Bold.ufo/glyphs/hardsign-cy.glif b/src/Cantarell-Bold.ufo/glyphs/hardsign-cy.glif
index f92909e5..aa5cffc5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hardsign-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hardsign-cy.glif
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hardsign-cy" format="2">
-  <advance width="563"/>
+  <advance width="579"/>
   <unicode hex="044A"/>
   <outline>
     <contour>
-      <point x="127" y="0" type="line"/>
-      <point x="316" y="0" type="line" smooth="yes"/>
-      <point x="467" y="0"/>
-      <point x="556" y="70"/>
-      <point x="556" y="187" type="curve" smooth="yes"/>
-      <point x="556" y="281"/>
-      <point x="478" y="344"/>
-      <point x="361" y="344" type="curve" smooth="yes"/>
-      <point x="234" y="344" type="line"/>
-      <point x="234" y="220" type="line"/>
-      <point x="325" y="220" type="line" smooth="yes"/>
-      <point x="361" y="220"/>
-      <point x="387" y="202"/>
-      <point x="387" y="173" type="curve" smooth="yes"/>
-      <point x="387" y="144"/>
-      <point x="368" y="126"/>
-      <point x="337" y="126" type="curve" smooth="yes"/>
-      <point x="287" y="126" type="line"/>
-      <point x="287" y="490" type="line"/>
-      <point x="127" y="490" type="line"/>
+      <point x="134" y="0" type="line"/>
+      <point x="323" y="0" type="line" smooth="yes"/>
+      <point x="474" y="0"/>
+      <point x="563" y="70"/>
+      <point x="563" y="187" type="curve" smooth="yes"/>
+      <point x="563" y="281"/>
+      <point x="485" y="344"/>
+      <point x="368" y="344" type="curve" smooth="yes"/>
+      <point x="241" y="344" type="line"/>
+      <point x="241" y="220" type="line"/>
+      <point x="332" y="220" type="line" smooth="yes"/>
+      <point x="368" y="220"/>
+      <point x="394" y="202"/>
+      <point x="394" y="173" type="curve" smooth="yes"/>
+      <point x="394" y="144"/>
+      <point x="375" y="126"/>
+      <point x="344" y="126" type="curve" smooth="yes"/>
+      <point x="294" y="126" type="line"/>
+      <point x="294" y="490" type="line"/>
+      <point x="134" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="3" y="355" type="line"/>
-      <point x="197" y="355" type="line"/>
-      <point x="197" y="490" type="line"/>
-      <point x="3" y="490" type="line"/>
+      <point x="10" y="355" type="line"/>
+      <point x="204" y="355" type="line"/>
+      <point x="204" y="490" type="line"/>
+      <point x="10" y="490" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -43,6 +43,10 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|ge-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>softsign-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/hbar.glif b/src/Cantarell-Bold.ufo/glyphs/hbar.glif
index 09c6c482..8249880f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hbar.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hbar.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hbar" format="2">
-  <advance width="579"/>
+  <advance width="595"/>
   <unicode hex="0127"/>
   <outline>
     <component base="h"/>
-    <component base="strokeshortcomb" xOffset="-50" yOffset="296"/>
+    <component base="strokeshortcomb" xOffset="-42" yOffset="296"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/hbrevebelow.glif b/src/Cantarell-Bold.ufo/glyphs/hbrevebelow.glif
index 0d2c590a..cc9d0140 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hbrevebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hbrevebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hbrevebelow" format="2">
-  <advance width="579"/>
+  <advance width="595"/>
   <unicode hex="1E2B"/>
   <outline>
     <component base="h"/>
-    <component base="brevebelowcomb" xOffset="60"/>
+    <component base="brevebelowcomb" xOffset="68"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/hcircumflex.glif b/src/Cantarell-Bold.ufo/glyphs/hcircumflex.glif
index 0deac443..cefb5168 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hcircumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hcircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hcircumflex" format="2">
-  <advance width="579"/>
+  <advance width="595"/>
   <unicode hex="0125"/>
   <outline>
     <component base="h"/>
-    <component base="circumflexcomb.case" xOffset="114" yOffset="45"/>
+    <component base="circumflexcomb.case" xOffset="122" yOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/hdotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/hdotbelow.glif
index 87a92b0d..2c81ebd1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hdotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hdotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hdotbelow" format="2">
-  <advance width="579"/>
+  <advance width="595"/>
   <unicode hex="1E25"/>
   <outline>
     <component base="h"/>
-    <component base="dotbelowcomb" xOffset="143"/>
+    <component base="dotbelowcomb" xOffset="151"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/hryvnia.glif b/src/Cantarell-Bold.ufo/glyphs/hryvnia.glif
index b02df3ed..f3471eec 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hryvnia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hryvnia.glif
@@ -3,5 +3,67 @@
   <advance width="600"/>
   <unicode hex="20B4"/>
   <outline>
+    <contour>
+      <point x="321" y="-10" type="curve" smooth="yes"/>
+      <point x="401" y="-10"/>
+      <point x="468" y="12"/>
+      <point x="542" y="49" type="curve"/>
+      <point x="497" y="183" type="line"/>
+      <point x="442" y="157"/>
+      <point x="379" y="146"/>
+      <point x="335" y="146" type="curve" smooth="yes"/>
+      <point x="280" y="146"/>
+      <point x="255" y="165"/>
+      <point x="255" y="201" type="curve" smooth="yes"/>
+      <point x="255" y="229"/>
+      <point x="272" y="251"/>
+      <point x="312" y="270" type="curve"/>
+      <point x="82" y="270" type="line"/>
+      <point x="75" y="248"/>
+      <point x="73" y="224"/>
+      <point x="73" y="203" type="curve" smooth="yes"/>
+      <point x="73" y="70"/>
+      <point x="170" y="-10"/>
+    </contour>
+    <contour>
+      <point x="20" y="209" type="line"/>
+      <point x="580" y="209" type="line"/>
+      <point x="580" y="315" type="line"/>
+      <point x="20" y="315" type="line"/>
+    </contour>
+    <contour>
+      <point x="20" y="385" type="line"/>
+      <point x="580" y="385" type="line"/>
+      <point x="580" y="490" type="line"/>
+      <point x="20" y="490" type="line"/>
+    </contour>
+    <contour>
+      <point x="313" y="458" type="curve"/>
+      <point x="511" y="458" type="line"/>
+      <point x="521" y="480"/>
+      <point x="523" y="495"/>
+      <point x="523" y="515" type="curve" smooth="yes"/>
+      <point x="523" y="635"/>
+      <point x="437" y="704"/>
+      <point x="272" y="704" type="curve" smooth="yes"/>
+      <point x="201" y="704"/>
+      <point x="138" y="691"/>
+      <point x="85" y="665" type="curve"/>
+      <point x="123" y="523" type="line"/>
+      <point x="166" y="540"/>
+      <point x="225" y="552"/>
+      <point x="268" y="552" type="curve" smooth="yes"/>
+      <point x="315" y="552"/>
+      <point x="343" y="536"/>
+      <point x="343" y="509" type="curve" smooth="yes"/>
+      <point x="343" y="493"/>
+      <point x="326" y="469"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/hungarumlaut.glif b/src/Cantarell-Bold.ufo/glyphs/hungarumlaut.glif
index a3eb7cf3..0b022a7d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hungarumlaut.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hungarumlaut.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hungarumlaut" format="2">
-  <advance width="517"/>
+  <advance width="500"/>
   <unicode hex="02DD"/>
   <outline>
-    <component base="hungarumlautcomb" xOffset="-44"/>
+    <component base="hungarumlautcomb" xOffset="-1"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/hungarumlautcomb.case.glif 
b/src/Cantarell-Bold.ufo/glyphs/hungarumlautcomb.case.glif
index 3b4eb516..3857dcb2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hungarumlautcomb.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hungarumlautcomb.case.glif
@@ -3,18 +3,18 @@
   <anchor x="238" y="694" name="_top"/>
   <anchor x="238" y="926" name="top"/>
   <outline>
-    <contour>
-      <point x="83" y="739" type="line"/>
-      <point x="259" y="871" type="line"/>
-      <point x="140" y="986" type="line"/>
-      <point x="7" y="812" type="line"/>
-    </contour>
     <contour>
       <point x="338" y="739" type="line"/>
       <point x="514" y="871" type="line"/>
       <point x="395" y="986" type="line"/>
       <point x="262" y="812" type="line"/>
     </contour>
+    <contour>
+      <point x="83" y="739" type="line"/>
+      <point x="259" y="871" type="line"/>
+      <point x="140" y="986" type="line"/>
+      <point x="7" y="812" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/hyphen.glif b/src/Cantarell-Bold.ufo/glyphs/hyphen.glif
index f9757400..6fbf7e69 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hyphen.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hyphen.glif
@@ -2,12 +2,15 @@
 <glyph name="hyphen" format="2">
   <advance width="398"/>
   <unicode hex="002D"/>
+  <unicode hex="00AD"/>
+  <unicode hex="2010"/>
+  <unicode hex="2011"/>
   <outline>
     <contour>
-      <point x="54" y="189" type="line"/>
-      <point x="344" y="189" type="line"/>
-      <point x="344" y="329" type="line"/>
-      <point x="54" y="329" type="line"/>
+      <point x="49" y="191" type="line"/>
+      <point x="349" y="191" type="line"/>
+      <point x="349" y="331" type="line"/>
+      <point x="49" y="331" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/i-cy.glif b/src/Cantarell-Bold.ufo/glyphs/i-cy.glif
index e99c98f5..18419979 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="287"/>
+  <advance width="297"/>
   <unicode hex="0456"/>
   <outline>
     <component base="i"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/i.glif b/src/Cantarell-Bold.ufo/glyphs/i.glif
index b99280cb..f03108b2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/i.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/i.glif
@@ -1,13 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="i" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="0069"/>
-  <note>
-i
-</note>
-  <anchor x="155" y="0" name="bottom"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb"/>
+    <component base="dotaccentcomb" xOffset="5"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ia-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ia-cy.glif
index a7f6590c..4deefcd4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ia-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ia-cy.glif
@@ -1,40 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ia-cy" format="2">
-  <advance width="535"/>
+  <advance width="551"/>
   <unicode hex="044F"/>
-  <anchor x="267" y="490" name="top"/>
+  <anchor x="276" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="229" y="156" type="curve" smooth="yes"/>
-      <point x="369" y="156" type="line"/>
-      <point x="369" y="275" type="line"/>
-      <point x="251" y="275" type="line" smooth="yes"/>
-      <point x="212" y="275"/>
-      <point x="189" y="289"/>
-      <point x="189" y="317" type="curve" smooth="yes"/>
-      <point x="189" y="341"/>
-      <point x="204" y="355"/>
-      <point x="230" y="355" type="curve" smooth="yes"/>
-      <point x="369" y="355" type="line"/>
-      <point x="369" y="490" type="line"/>
-      <point x="251" y="490" type="line" smooth="yes"/>
-      <point x="117" y="490"/>
-      <point x="25" y="418"/>
-      <point x="25" y="311" type="curve" smooth="yes"/>
-      <point x="25" y="212"/>
-      <point x="100" y="156"/>
+      <point x="331" y="0" type="line"/>
+      <point x="489" y="0" type="line"/>
+      <point x="489" y="490" type="line"/>
+      <point x="260" y="490" type="line" smooth="yes"/>
+      <point x="126" y="490"/>
+      <point x="34" y="418"/>
+      <point x="34" y="311" type="curve" smooth="yes"/>
+      <point x="34" y="212"/>
+      <point x="109" y="156"/>
+      <point x="238" y="156" type="curve" smooth="yes"/>
+      <point x="378" y="156" type="line"/>
+      <point x="378" y="275" type="line"/>
+      <point x="260" y="275" type="line" smooth="yes"/>
+      <point x="221" y="275"/>
+      <point x="198" y="289"/>
+      <point x="198" y="317" type="curve" smooth="yes"/>
+      <point x="198" y="341"/>
+      <point x="213" y="355"/>
+      <point x="239" y="355" type="curve" smooth="yes"/>
+      <point x="331" y="355" type="line"/>
     </contour>
     <contour>
-      <point x="-1" y="0" type="line"/>
-      <point x="189" y="0" type="line"/>
-      <point x="326" y="188" type="line"/>
-      <point x="158" y="188" type="line"/>
-    </contour>
-    <contour>
-      <point x="322" y="0" type="line"/>
-      <point x="480" y="0" type="line"/>
-      <point x="480" y="490" type="line"/>
-      <point x="322" y="490" type="line"/>
+      <point x="8" y="0" type="line"/>
+      <point x="198" y="0" type="line"/>
+      <point x="335" y="188" type="line"/>
+      <point x="167" y="188" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -48,6 +44,8 @@
         <key>width</key>
         <integer>76</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iacute.glif b/src/Cantarell-Bold.ufo/glyphs/iacute.glif
index 31a6a9fd..43acfb4b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iacute" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="00ED"/>
   <outline>
     <component base="idotless"/>
-    <component base="acutecomb" xOffset="48"/>
+    <component base="acutecomb" xOffset="53"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ibreve.glif b/src/Cantarell-Bold.ufo/glyphs/ibreve.glif
index 6970e83e..f02ca5fa 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ibreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ibreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ibreve" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="012D"/>
   <outline>
     <component base="idotless"/>
-    <component base="brevecomb" xOffset="-72"/>
+    <component base="brevecomb" xOffset="-67"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/icaron.glif b/src/Cantarell-Bold.ufo/glyphs/icaron.glif
index 0ae8ac37..af8f5da5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/icaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/icaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="icaron" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="01D0"/>
   <outline>
     <component base="idotless"/>
-    <component base="caroncomb" xOffset="-62"/>
+    <component base="caroncomb" xOffset="-57"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/icircumflex.glif b/src/Cantarell-Bold.ufo/glyphs/icircumflex.glif
index 059d2338..4ef4c4e0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/icircumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/icircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="icircumflex" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="00EE"/>
   <outline>
     <component base="idotless"/>
-    <component base="circumflexcomb" xOffset="-59"/>
+    <component base="circumflexcomb" xOffset="-54"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/idblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/idblgrave.glif
index 27812d9d..7ad87d0c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/idblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/idblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idblgrave" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="0209"/>
   <outline>
     <component base="idotless"/>
-    <component base="dblgravecomb" xOffset="-157"/>
+    <component base="dblgravecomb" xOffset="-152"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/idieresis-cy.glif b/src/Cantarell-Bold.ufo/glyphs/idieresis-cy.glif
index 204acc81..196530d9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/idieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/idieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idieresis-cy" format="2">
-  <advance width="590"/>
+  <advance width="606"/>
   <unicode hex="04E5"/>
   <outline>
     <component base="ii-cy"/>
-    <component base="dieresiscomb" xOffset="26"/>
+    <component base="dieresiscomb" xOffset="34"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/idieresis.glif b/src/Cantarell-Bold.ufo/glyphs/idieresis.glif
index 2291d455..b683e462 100644
--- a/src/Cantarell-Bold.ufo/glyphs/idieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/idieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idieresis" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="00EF"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb" xOffset="-125"/>
+    <component base="dieresiscomb" xOffset="-120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/idieresisacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/idieresisacute.glif
index 251386aa..cb08b237 100644
--- a/src/Cantarell-Bold.ufo/glyphs/idieresisacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/idieresisacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idieresisacute" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="1E2F"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb_acutecomb" xOffset="-112"/>
+    <component base="dieresiscomb.loclVIET" xOffset="-107"/>
+    <component base="acutecomb" xOffset="53" yOffset="186"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/idotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/idotaccent.glif
index 50bf1aa3..27f3976d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/idotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/idotaccent.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotaccent" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb"/>
+    <component base="dotaccentcomb" xOffset="5"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/idotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/idotbelow.glif
index 65b704a4..a2f14034 100644
--- a/src/Cantarell-Bold.ufo/glyphs/idotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/idotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotbelow" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="1ECB"/>
   <outline>
     <component base="i"/>
-    <component base="dotbelowcomb" xOffset="5"/>
+    <component base="dotbelowcomb" xOffset="-1"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/idotless.glif b/src/Cantarell-Bold.ufo/glyphs/idotless.glif
index 2521998b..d05b161d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/idotless.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/idotless.glif
@@ -1,19 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotless" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="0131"/>
-  <note>
-dotlessi
-</note>
-  <anchor x="144" y="0" name="bottom"/>
-  <anchor x="183" y="10" name="ogonek"/>
-  <anchor x="144" y="490" name="top"/>
+  <anchor x="149" y="0" name="bottom"/>
+  <anchor x="188" y="10" name="ogonek"/>
+  <anchor x="149" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="57" y="0" type="line"/>
-      <point x="230" y="0" type="line"/>
-      <point x="230" y="490" type="line"/>
-      <point x="57" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="235" y="0" type="line"/>
+      <point x="235" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ie-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ie-cy.glif
index bf2bd3d0..2ae8c36e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ie-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ie-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ie-cy" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="0435"/>
-  <anchor x="263" y="490" name="top"/>
   <outline>
     <component base="e"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iebreve-cy.glif b/src/Cantarell-Bold.ufo/glyphs/iebreve-cy.glif
index 11197bc3..341bf594 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iebreve-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iebreve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iebreve-cy" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="04D7"/>
   <outline>
     <component base="ie-cy"/>
-    <component base="brevecomb-cy" xOffset="30"/>
+    <component base="brevecomb-cy" xOffset="49"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iegrave-cy.glif b/src/Cantarell-Bold.ufo/glyphs/iegrave-cy.glif
index 86885463..82658763 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iegrave-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iegrave-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iegrave-cy" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="0450"/>
   <outline>
     <component base="ie-cy"/>
-    <component base="gravecomb" xOffset="65"/>
+    <component base="gravecomb" xOffset="84"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/igrave.glif b/src/Cantarell-Bold.ufo/glyphs/igrave.glif
index 0c0db7e0..e92a112e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/igrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/igrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="igrave" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="00EC"/>
   <outline>
     <component base="idotless"/>
-    <component base="gravecomb" xOffset="-54"/>
+    <component base="gravecomb" xOffset="-49"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ihookabove.glif b/src/Cantarell-Bold.ufo/glyphs/ihookabove.glif
index 7cf9b54d..ce9f0714 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ihookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ihookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ihookabove" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="1EC9"/>
   <outline>
     <component base="idotless"/>
-    <component base="hookabovecomb" xOffset="-10"/>
+    <component base="hookabovecomb" xOffset="-5"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ii-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ii-cy.glif
index 7ff02ea5..2c337019 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ii-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ii-cy.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ii-cy" format="2">
-  <advance width="590"/>
+  <advance width="606"/>
   <unicode hex="0438"/>
-  <anchor x="565" y="0" name="bottomright"/>
-  <anchor x="295" y="490" name="top"/>
+  <anchor x="573" y="0" name="bottomright"/>
+  <anchor x="303" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="202" y="0" type="line"/>
-      <point x="407" y="301" type="line"/>
-      <point x="382" y="309" type="line"/>
-      <point x="382" y="0" type="line"/>
-      <point x="536" y="0" type="line"/>
-      <point x="536" y="490" type="line"/>
-      <point x="385" y="490" type="line"/>
-      <point x="180" y="181" type="line"/>
-      <point x="210" y="173" type="line"/>
-      <point x="210" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="210" y="0" type="line"/>
+      <point x="415" y="301" type="line"/>
+      <point x="390" y="309" type="line"/>
+      <point x="390" y="0" type="line"/>
+      <point x="544" y="0" type="line"/>
+      <point x="544" y="490" type="line"/>
+      <point x="393" y="490" type="line"/>
+      <point x="188" y="181" type="line"/>
+      <point x="218" y="173" type="line"/>
+      <point x="218" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -31,6 +31,10 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iigrave-cy.glif b/src/Cantarell-Bold.ufo/glyphs/iigrave-cy.glif
index 1556a3eb..e2029af7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iigrave-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iigrave-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iigrave-cy" format="2">
-  <advance width="590"/>
+  <advance width="606"/>
   <unicode hex="045D"/>
   <outline>
     <component base="ii-cy"/>
-    <component base="gravecomb" xOffset="97"/>
+    <component base="gravecomb" xOffset="105"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iinvertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/iinvertedbreve.glif
index 3192ee0c..ffc0b8e7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iinvertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iinvertedbreve" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="020B"/>
   <outline>
     <component base="idotless"/>
-    <component base="breveinvertedcomb" xOffset="-82"/>
+    <component base="breveinvertedcomb" xOffset="-77"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iishort-cy.glif b/src/Cantarell-Bold.ufo/glyphs/iishort-cy.glif
index bcef0dbd..2ffc3c58 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iishort-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iishort-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iishort-cy" format="2">
-  <advance width="590"/>
+  <advance width="606"/>
   <unicode hex="0439"/>
   <outline>
     <component base="ii-cy"/>
-    <component base="brevecomb-cy" xOffset="62"/>
+    <component base="brevecomb-cy" xOffset="70"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/imacron-cy.glif b/src/Cantarell-Bold.ufo/glyphs/imacron-cy.glif
index c0af6f8e..75a15c10 100644
--- a/src/Cantarell-Bold.ufo/glyphs/imacron-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/imacron-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="imacron-cy" format="2">
-  <advance width="590"/>
+  <advance width="606"/>
   <unicode hex="04E3"/>
   <outline>
     <component base="ii-cy"/>
-    <component base="macroncomb" xOffset="53"/>
+    <component base="macroncomb" xOffset="61"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/imacron.glif b/src/Cantarell-Bold.ufo/glyphs/imacron.glif
index 73c1ce7b..8028ceed 100644
--- a/src/Cantarell-Bold.ufo/glyphs/imacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/imacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="imacron" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="012B"/>
   <outline>
     <component base="idotless"/>
-    <component base="macroncomb.narrow" xOffset="-53"/>
+    <component base="macroncomb.narrow" xOffset="-48"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/increment.glif b/src/Cantarell-Bold.ufo/glyphs/increment.glif
index cf448b20..e4a835e0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/increment.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/increment.glif
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="increment" format="2">
-  <advance width="693"/>
+  <advance width="707"/>
   <unicode hex="2206"/>
   <outline>
     <contour>
       <point x="26" y="1" type="line"/>
-      <point x="666" y="1" type="line"/>
-      <point x="666" y="107" type="line"/>
-      <point x="466" y="694" type="line"/>
-      <point x="249" y="694" type="line"/>
-      <point x="26" y="107" type="line"/>
+      <point x="679" y="1" type="line"/>
+      <point x="679" y="116" type="line"/>
+      <point x="484" y="694" type="line"/>
+      <point x="247" y="694" type="line"/>
+      <point x="26" y="116" type="line"/>
     </contour>
     <contour>
-      <point x="191" y="136" type="line"/>
-      <point x="342" y="571" type="line"/>
-      <point x="494" y="136" type="line"/>
+      <point x="205" y="148" type="line"/>
+      <point x="349" y="563" type="line"/>
+      <point x="493" y="148" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/infinity.glif b/src/Cantarell-Bold.ufo/glyphs/infinity.glif
index 0413aeaa..9d3f949d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/infinity.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/infinity.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="infinity" format="2">
-  <advance width="950"/>
+  <advance width="970"/>
   <unicode hex="221E"/>
   <outline>
     <contour>
-      <point x="653" y="108" type="curve" smooth="yes"/>
-      <point x="803" y="108"/>
-      <point x="905" y="207"/>
-      <point x="905" y="348" type="curve" smooth="yes"/>
-      <point x="905" y="482"/>
-      <point x="813" y="570"/>
-      <point x="685" y="570" type="curve" smooth="yes"/>
-      <point x="442" y="570"/>
-      <point x="454" y="252"/>
-      <point x="303" y="252" type="curve" smooth="yes"/>
-      <point x="253" y="252"/>
-      <point x="221" y="287"/>
-      <point x="221" y="341" type="curve" smooth="yes"/>
-      <point x="221" y="392"/>
-      <point x="249" y="426"/>
-      <point x="298" y="426" type="curve" smooth="yes"/>
-      <point x="448" y="426"/>
-      <point x="384" y="108"/>
+      <point x="663" y="108" type="curve" smooth="yes"/>
+      <point x="813" y="108"/>
+      <point x="915" y="207"/>
+      <point x="915" y="348" type="curve" smooth="yes"/>
+      <point x="915" y="482"/>
+      <point x="823" y="570"/>
+      <point x="695" y="570" type="curve" smooth="yes"/>
+      <point x="452" y="570"/>
+      <point x="464" y="252"/>
+      <point x="313" y="252" type="curve" smooth="yes"/>
+      <point x="263" y="252"/>
+      <point x="231" y="287"/>
+      <point x="231" y="341" type="curve" smooth="yes"/>
+      <point x="231" y="392"/>
+      <point x="259" y="426"/>
+      <point x="308" y="426" type="curve" smooth="yes"/>
+      <point x="458" y="426"/>
+      <point x="394" y="108"/>
     </contour>
     <contour>
-      <point x="266" y="108" type="curve" smooth="yes"/>
-      <point x="508" y="108"/>
-      <point x="498" y="426"/>
-      <point x="647" y="426" type="curve" smooth="yes"/>
-      <point x="693" y="426"/>
-      <point x="729" y="396"/>
-      <point x="729" y="337" type="curve" smooth="yes"/>
-      <point x="729" y="289"/>
-      <point x="704" y="252"/>
-      <point x="655" y="252" type="curve" smooth="yes"/>
-      <point x="510" y="252"/>
-      <point x="583" y="570"/>
-      <point x="303" y="570" type="curve" smooth="yes"/>
-      <point x="150" y="570"/>
-      <point x="45" y="475"/>
-      <point x="45" y="332" type="curve" smooth="yes"/>
-      <point x="45" y="198"/>
-      <point x="137" y="108"/>
+      <point x="276" y="108" type="curve" smooth="yes"/>
+      <point x="518" y="108"/>
+      <point x="508" y="426"/>
+      <point x="657" y="426" type="curve" smooth="yes"/>
+      <point x="703" y="426"/>
+      <point x="739" y="396"/>
+      <point x="739" y="337" type="curve" smooth="yes"/>
+      <point x="739" y="289"/>
+      <point x="714" y="252"/>
+      <point x="665" y="252" type="curve" smooth="yes"/>
+      <point x="520" y="252"/>
+      <point x="593" y="570"/>
+      <point x="313" y="570" type="curve" smooth="yes"/>
+      <point x="160" y="570"/>
+      <point x="55" y="475"/>
+      <point x="55" y="332" type="curve" smooth="yes"/>
+      <point x="55" y="198"/>
+      <point x="147" y="108"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/integral.glif b/src/Cantarell-Bold.ufo/glyphs/integral.glif
index c98ad079..87660368 100644
--- a/src/Cantarell-Bold.ufo/glyphs/integral.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/integral.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="integral" format="2">
-  <advance width="395"/>
+  <advance width="419"/>
   <unicode hex="222B"/>
   <outline>
     <contour>
-      <point x="135" y="-170" type="curve" smooth="yes"/>
-      <point x="264" y="-170"/>
-      <point x="353" y="-89"/>
-      <point x="353" y="25" type="curve" smooth="yes"/>
-      <point x="353" y="171"/>
-      <point x="223" y="419"/>
-      <point x="223" y="536" type="curve" smooth="yes"/>
-      <point x="223" y="579"/>
-      <point x="239" y="601"/>
-      <point x="270" y="601" type="curve" smooth="yes"/>
-      <point x="285" y="601"/>
-      <point x="303" y="597"/>
-      <point x="316" y="591" type="curve"/>
-      <point x="362" y="731" type="line"/>
-      <point x="327" y="743"/>
-      <point x="291" y="749"/>
-      <point x="260" y="749" type="curve" smooth="yes"/>
-      <point x="136" y="749"/>
-      <point x="48" y="662"/>
-      <point x="48" y="537" type="curve" smooth="yes"/>
-      <point x="48" y="379"/>
-      <point x="176" y="131"/>
-      <point x="176" y="29" type="curve" smooth="yes"/>
-      <point x="176" y="-6"/>
-      <point x="164" y="-22"/>
-      <point x="134" y="-22" type="curve" smooth="yes"/>
-      <point x="116" y="-22"/>
-      <point x="96" y="-17"/>
-      <point x="78" y="-4" type="curve"/>
-      <point x="31" y="-147" type="line"/>
-      <point x="63" y="-164"/>
-      <point x="101" y="-170"/>
+      <point x="147" y="-170" type="curve" smooth="yes"/>
+      <point x="276" y="-170"/>
+      <point x="365" y="-89"/>
+      <point x="365" y="25" type="curve" smooth="yes"/>
+      <point x="365" y="171"/>
+      <point x="235" y="419"/>
+      <point x="235" y="536" type="curve" smooth="yes"/>
+      <point x="235" y="579"/>
+      <point x="251" y="601"/>
+      <point x="282" y="601" type="curve" smooth="yes"/>
+      <point x="297" y="601"/>
+      <point x="315" y="597"/>
+      <point x="328" y="591" type="curve"/>
+      <point x="374" y="731" type="line"/>
+      <point x="339" y="743"/>
+      <point x="303" y="749"/>
+      <point x="272" y="749" type="curve" smooth="yes"/>
+      <point x="148" y="749"/>
+      <point x="60" y="662"/>
+      <point x="60" y="537" type="curve" smooth="yes"/>
+      <point x="60" y="379"/>
+      <point x="188" y="131"/>
+      <point x="188" y="29" type="curve" smooth="yes"/>
+      <point x="188" y="-6"/>
+      <point x="176" y="-22"/>
+      <point x="146" y="-22" type="curve" smooth="yes"/>
+      <point x="128" y="-22"/>
+      <point x="108" y="-17"/>
+      <point x="90" y="-4" type="curve"/>
+      <point x="43" y="-147" type="line"/>
+      <point x="75" y="-164"/>
+      <point x="113" y="-170"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/io-cy.glif b/src/Cantarell-Bold.ufo/glyphs/io-cy.glif
index 6d839b9b..8c52725d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/io-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/io-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="io-cy" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="0451"/>
   <outline>
     <component base="ie-cy"/>
-    <component base="dieresiscomb" xOffset="-6"/>
+    <component base="dieresiscomb" xOffset="13"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iogonek.glif b/src/Cantarell-Bold.ufo/glyphs/iogonek.glif
index 36bdc509..62b0279c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iogonek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iogonek" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="012F"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb"/>
-    <component base="ogonekcomb.narrow" xOffset="-252"/>
+    <component base="dotaccentcomb" xOffset="5"/>
+    <component base="ogonekcomb.narrow" xOffset="-247"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/itilde.glif b/src/Cantarell-Bold.ufo/glyphs/itilde.glif
index 54742386..997773d3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/itilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/itilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="itilde" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="0129"/>
   <outline>
     <component base="idotless"/>
-    <component base="tildecomb" xOffset="-91"/>
+    <component base="tildecomb" xOffset="-86"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iu-cy.glif b/src/Cantarell-Bold.ufo/glyphs/iu-cy.glif
index cafe3e36..013fff01 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iu-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iu-cy.glif
@@ -1,48 +1,48 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iu-cy" format="2">
-  <advance width="819"/>
+  <advance width="842"/>
   <unicode hex="044E"/>
-  <anchor x="420" y="490" name="top"/>
+  <anchor x="428" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="535" y="-7" type="curve" smooth="yes"/>
-      <point x="695" y="-7"/>
-      <point x="801" y="93"/>
-      <point x="801" y="248" type="curve" smooth="yes"/>
-      <point x="801" y="400"/>
-      <point x="698" y="498"/>
-      <point x="542" y="498" type="curve" smooth="yes"/>
-      <point x="385" y="498"/>
-      <point x="289" y="401"/>
-      <point x="289" y="241" type="curve" smooth="yes"/>
-      <point x="289" y="85"/>
-      <point x="380" y="-7"/>
+      <point x="543" y="-7" type="curve" smooth="yes"/>
+      <point x="703" y="-7"/>
+      <point x="809" y="93"/>
+      <point x="809" y="248" type="curve" smooth="yes"/>
+      <point x="809" y="400"/>
+      <point x="706" y="498"/>
+      <point x="550" y="498" type="curve" smooth="yes"/>
+      <point x="393" y="498"/>
+      <point x="297" y="401"/>
+      <point x="297" y="241" type="curve" smooth="yes"/>
+      <point x="297" y="85"/>
+      <point x="388" y="-7"/>
     </contour>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="214" y="0" type="line"/>
-      <point x="214" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="222" y="0" type="line"/>
+      <point x="222" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="201" y="179" type="line"/>
-      <point x="373" y="179" type="line"/>
-      <point x="373" y="312" type="line"/>
-      <point x="201" y="312" type="line"/>
+      <point x="209" y="179" type="line"/>
+      <point x="381" y="179" type="line"/>
+      <point x="381" y="312" type="line"/>
+      <point x="209" y="312" type="line"/>
     </contour>
     <contour>
-      <point x="544" y="129" type="curve" smooth="yes"/>
-      <point x="488" y="129"/>
-      <point x="453" y="174"/>
-      <point x="453" y="248" type="curve" smooth="yes"/>
-      <point x="453" y="320"/>
-      <point x="484" y="361"/>
-      <point x="538" y="361" type="curve" smooth="yes"/>
-      <point x="598" y="361"/>
-      <point x="636" y="312"/>
-      <point x="636" y="241" type="curve" smooth="yes"/>
-      <point x="636" y="174"/>
-      <point x="601" y="129"/>
+      <point x="552" y="129" type="curve" smooth="yes"/>
+      <point x="496" y="129"/>
+      <point x="461" y="174"/>
+      <point x="461" y="248" type="curve" smooth="yes"/>
+      <point x="461" y="320"/>
+      <point x="492" y="361"/>
+      <point x="546" y="361" type="curve" smooth="yes"/>
+      <point x="606" y="361"/>
+      <point x="644" y="312"/>
+      <point x="644" y="241" type="curve" smooth="yes"/>
+      <point x="644" y="174"/>
+      <point x="609" y="129"/>
     </contour>
   </outline>
   <lib>
@@ -56,6 +56,10 @@
         <key>width</key>
         <integer>69</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/izhitsa-cy.glif b/src/Cantarell-Bold.ufo/glyphs/izhitsa-cy.glif
index dc07ec2f..3be32549 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="526"/>
+  <advance width="530"/>
   <unicode hex="0475"/>
   <outline>
     <contour>
-      <point x="163" y="0" type="line"/>
-      <point x="332" y="0" type="line"/>
-      <point x="423" y="282" type="line" smooth="yes"/>
-      <point x="436" y="322"/>
-      <point x="464" y="346"/>
-      <point x="525" y="346" type="curve"/>
-      <point x="506" y="493" type="line"/>
-      <point x="390" y="493"/>
-      <point x="316" y="443"/>
-      <point x="293" y="350" type="curve" smooth="yes"/>
-      <point x="236" y="122" type="line"/>
-      <point x="271" y="122" type="line"/>
-      <point x="177" y="486" type="line"/>
-      <point x="-6" 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>
@@ -29,6 +29,8 @@
         <key>width</key>
         <integer>70</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>v</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/j.glif b/src/Cantarell-Bold.ufo/glyphs/j.glif
index 3582cc23..d9939448 100644
--- a/src/Cantarell-Bold.ufo/glyphs/j.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/j.glif
@@ -1,12 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="j" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="006A"/>
-  <note>
-j
-</note>
   <outline>
     <component base="jdotless"/>
-    <component base="dotaccentcomb"/>
+    <component base="dotaccentcomb" xOffset="5"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/jacute.glif b/src/Cantarell-Bold.ufo/glyphs/jacute.glif
index afee8648..0592fe33 100644
--- a/src/Cantarell-Bold.ufo/glyphs/jacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/jacute.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jacute" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <outline>
     <component base="jdotless"/>
-    <component base="acutecomb" xOffset="48"/>
+    <component base="acutecomb" xOffset="53"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/jcircumflex.glif b/src/Cantarell-Bold.ufo/glyphs/jcircumflex.glif
index b7ee859f..d9218192 100644
--- a/src/Cantarell-Bold.ufo/glyphs/jcircumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/jcircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jcircumflex" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="0135"/>
   <outline>
     <component base="jdotless"/>
-    <component base="circumflexcomb" xOffset="-59"/>
+    <component base="circumflexcomb" xOffset="-54"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/jdotless.glif b/src/Cantarell-Bold.ufo/glyphs/jdotless.glif
index 012912be..225929af 100644
--- a/src/Cantarell-Bold.ufo/glyphs/jdotless.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/jdotless.glif
@@ -1,24 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jdotless" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="0237"/>
-  <note>
-uni0237
-</note>
-  <anchor x="134" y="0" name="bottom"/>
-  <anchor x="144" y="490" name="top"/>
+  <anchor x="139" y="0" name="bottom"/>
+  <anchor x="149" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="24" y="-232" type="line"/>
-      <point x="148" y="-191"/>
-      <point x="230" y="-88"/>
-      <point x="230" y="26" type="curve" smooth="yes"/>
-      <point x="230" y="490" type="line"/>
-      <point x="57" y="490" type="line"/>
-      <point x="57" y="26" type="line" smooth="yes"/>
-      <point x="57" y="-39"/>
-      <point x="26" y="-100"/>
-      <point x="-26" y="-138" type="curve"/>
+      <point x="29" y="-232" type="line"/>
+      <point x="153" y="-191"/>
+      <point x="235" y="-88"/>
+      <point x="235" y="26" type="curve" smooth="yes"/>
+      <point x="235" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
+      <point x="62" y="26" type="line" smooth="yes"/>
+      <point x="62" y="-39"/>
+      <point x="31" y="-100"/>
+      <point x="-21" y="-138" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/je-cy.glif b/src/Cantarell-Bold.ufo/glyphs/je-cy.glif
index 7acb3d2d..d702cdc2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/je-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/je-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="je-cy" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="0458"/>
   <outline>
     <component base="j"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/k.glif b/src/Cantarell-Bold.ufo/glyphs/k.glif
index 249d885c..87be246f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/k.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/k.glif
@@ -1,27 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="k" format="2">
-  <advance width="564"/>
+  <advance width="583"/>
   <unicode hex="006B"/>
-  <note>
-k
-</note>
-  <anchor x="304" y="0" name="bottom"/>
-  <anchor x="264" y="739" name="top"/>
+  <anchor x="312" y="0" name="bottom"/>
+  <anchor x="272" y="739" name="top"/>
   <outline>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="224" y="0" type="line"/>
-      <point x="224" y="739" type="line"/>
-      <point x="54" y="739" type="line"/>
+      <point x="371" y="0" type="line"/>
+      <point x="591" y="0" type="line"/>
+      <point x="404" y="295" type="line"/>
+      <point x="396" y="238" type="line"/>
+      <point x="575" y="490" type="line"/>
+      <point x="376" y="490" type="line"/>
+      <point x="223" y="257" type="line"/>
     </contour>
     <contour>
-      <point x="363" y="0" type="line"/>
-      <point x="583" y="0" type="line"/>
-      <point x="396" y="295" type="line"/>
-      <point x="388" y="238" type="line"/>
-      <point x="567" y="490" type="line"/>
-      <point x="368" y="490" type="line"/>
-      <point x="215" y="257" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="232" y="0" type="line"/>
+      <point x="232" y="739" type="line"/>
+      <point x="62" y="739" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ka-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ka-cy.glif
index 8e345ee8..f18d3077 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ka-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ka-cy.glif
@@ -1,30 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ka-cy" format="2">
-  <advance width="562"/>
+  <advance width="584"/>
   <unicode hex="043A"/>
-  <anchor x="432" y="0" name="bottomright"/>
-  <anchor x="287" y="490" name="top"/>
+  <anchor x="439" y="0" name="bottomright"/>
+  <anchor x="294" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="389" y="0" type="line"/>
-      <point x="574" y="0" type="line"/>
-      <point x="414" y="278" type="line"/>
-      <point x="417" y="249" type="line"/>
-      <point x="569" y="490" type="line"/>
-      <point x="390" y="490" type="line"/>
-      <point x="257" y="251" type="line"/>
+      <point x="396" y="0" type="line"/>
+      <point x="581" y="0" type="line"/>
+      <point x="421" y="278" type="line"/>
+      <point x="424" y="249" type="line"/>
+      <point x="576" y="490" type="line"/>
+      <point x="397" y="490" type="line"/>
+      <point x="264" y="251" type="line"/>
     </contour>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="220" y="0" type="line"/>
-      <point x="220" y="490" type="line"/>
-      <point x="55" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="227" y="0" type="line"/>
+      <point x="227" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="135" y="176" type="line"/>
-      <point x="297" y="176" type="line"/>
-      <point x="297" y="313" type="line"/>
-      <point x="135" y="313" type="line"/>
+      <point x="142" y="176" type="line"/>
+      <point x="304" y="176" type="line"/>
+      <point x="304" y="313" type="line"/>
+      <point x="142" y="313" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -38,6 +38,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/kabashkir-cy.glif b/src/Cantarell-Bold.ufo/glyphs/kabashkir-cy.glif
index e1cccf6a..24a942a6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/kabashkir-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/kabashkir-cy.glif
@@ -1,38 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kabashkir-cy" format="2">
-  <advance width="658"/>
+  <advance width="689"/>
   <unicode hex="04A1"/>
   <outline>
     <contour>
-      <point x="-6" y="357" type="line"/>
-      <point x="316" y="357" type="line"/>
-      <point x="316" y="490" type="line"/>
-      <point x="-6" y="490" type="line"/>
+      <point x="167" y="0" type="line"/>
+      <point x="332" y="0" type="line"/>
+      <point x="332" y="490" type="line"/>
+      <point x="10" y="490" type="line"/>
+      <point x="10" y="357" type="line"/>
+      <point x="167" y="357" type="line"/>
     </contour>
     <contour>
-      <point x="485" y="0" type="line"/>
-      <point x="670" y="0" type="line"/>
-      <point x="510" y="278" type="line"/>
-      <point x="513" y="249" type="line"/>
-      <point x="665" y="490" type="line"/>
-      <point x="486" y="490" type="line"/>
-      <point x="343" y="251" type="line"/>
+      <point x="501" y="0" type="line"/>
+      <point x="686" y="0" type="line"/>
+      <point x="526" y="278" type="line"/>
+      <point x="529" y="249" type="line"/>
+      <point x="681" y="490" type="line"/>
+      <point x="502" y="490" type="line"/>
+      <point x="359" y="251" type="line"/>
     </contour>
     <contour>
-      <point x="151" y="0" type="line"/>
-      <point x="316" y="0" type="line"/>
-      <point x="316" y="490" type="line"/>
-      <point x="151" y="490" type="line"/>
-    </contour>
-    <contour>
-      <point x="231" y="176" type="line"/>
-      <point x="393" y="176" type="line"/>
-      <point x="393" y="313" type="line"/>
-      <point x="231" y="313" type="line"/>
+      <point x="247" y="176" type="line"/>
+      <point x="409" y="176" type="line"/>
+      <point x="409" y="313" type="line"/>
+      <point x="247" y="313" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|ge-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>ka-cy</string>
     </dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/kacute.glif b/src/Cantarell-Bold.ufo/glyphs/kacute.glif
index a46691c1..13af8665 100644
--- a/src/Cantarell-Bold.ufo/glyphs/kacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/kacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kacute" format="2">
-  <advance width="564"/>
+  <advance width="583"/>
   <unicode hex="1E31"/>
   <outline>
     <component base="k"/>
-    <component base="acutecomb.case" xOffset="185" yOffset="45"/>
+    <component base="acutecomb.case" xOffset="193" yOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/kadescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/kadescender-cy.glif
index 12c6593f..fbd14ed0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/kadescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/kadescender-cy.glif
@@ -1,15 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kadescender-cy" format="2">
-  <advance width="595"/>
+  <advance width="608"/>
   <unicode hex="049B"/>
   <outline>
     <component base="ka-cy"/>
-    <component base="descender-cy" xOffset="336"/>
+    <component base="descender-cy" xOffset="343"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>ka-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>ka-cy</string>
+      <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
+      <string>=ka-cy+10</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Bold.ufo/glyphs/kaverticalstroke-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/kaverticalstroke-cy.glif
index 83911ab1..6d8d50e8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/kaverticalstroke-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/kaverticalstroke-cy.glif
@@ -1,34 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kaverticalstroke-cy" format="2">
-  <advance width="592"/>
+  <advance width="614"/>
   <unicode hex="049D"/>
   <outline>
     <contour>
-      <point x="419" y="0" type="line"/>
-      <point x="604" y="0" type="line"/>
-      <point x="454" y="278" type="line"/>
-      <point x="457" y="249" type="line"/>
-      <point x="599" y="490" type="line"/>
-      <point x="420" y="490" type="line"/>
-      <point x="287" y="251" type="line"/>
+      <point x="426" y="0" type="line"/>
+      <point x="611" y="0" type="line"/>
+      <point x="461" y="278" type="line"/>
+      <point x="464" y="249" type="line"/>
+      <point x="606" y="490" type="line"/>
+      <point x="427" y="490" type="line"/>
+      <point x="294" y="251" type="line"/>
     </contour>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="220" y="0" type="line"/>
-      <point x="220" y="490" type="line"/>
-      <point x="55" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="227" y="0" type="line"/>
+      <point x="227" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="135" y="176" type="line"/>
-      <point x="337" y="176" type="line"/>
-      <point x="337" y="313" type="line"/>
-      <point x="135" y="313" type="line"/>
+      <point x="142" y="176" type="line"/>
+      <point x="344" y="176" type="line"/>
+      <point x="344" y="313" type="line"/>
+      <point x="142" y="313" type="line"/>
     </contour>
     <contour>
-      <point x="240" y="78" type="line"/>
-      <point x="320" y="78" type="line"/>
-      <point x="320" y="418" type="line"/>
-      <point x="240" y="418" type="line"/>
+      <point x="247" y="78" type="line"/>
+      <point x="327" y="78" type="line"/>
+      <point x="327" y="418" type="line"/>
+      <point x="247" y="418" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/kcommaaccent.glif b/src/Cantarell-Bold.ufo/glyphs/kcommaaccent.glif
index 6918daf4..8407eb55 100644
--- a/src/Cantarell-Bold.ufo/glyphs/kcommaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/kcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kcommaaccent" format="2">
-  <advance width="564"/>
+  <advance width="583"/>
   <unicode hex="0137"/>
   <outline>
     <component base="k"/>
-    <component base="commaaccentcomb" xOffset="186"/>
+    <component base="commaaccentcomb" xOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/kgreenlandic.glif b/src/Cantarell-Bold.ufo/glyphs/kgreenlandic.glif
index 4b8eab82..6972e830 100644
--- a/src/Cantarell-Bold.ufo/glyphs/kgreenlandic.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/kgreenlandic.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kgreenlandic" format="2">
-  <advance width="564"/>
+  <advance width="583"/>
   <unicode hex="0138"/>
   <outline>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="227" y="0" type="line"/>
-      <point x="227" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
+      <point x="371" y="0" type="line"/>
+      <point x="591" y="0" type="line"/>
+      <point x="404" y="295" type="line"/>
+      <point x="396" y="238" type="line"/>
+      <point x="575" y="490" type="line"/>
+      <point x="376" y="490" type="line"/>
+      <point x="219" y="257" type="line"/>
     </contour>
     <contour>
-      <point x="363" y="0" type="line"/>
-      <point x="583" y="0" type="line"/>
-      <point x="396" y="295" type="line"/>
-      <point x="388" y="238" type="line"/>
-      <point x="567" y="490" type="line"/>
-      <point x="368" y="490" type="line"/>
-      <point x="211" y="257" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="235" y="0" type="line"/>
+      <point x="235" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/kip.glif b/src/Cantarell-Bold.ufo/glyphs/kip.glif
index 8bf63fb3..a992e094 100644
--- a/src/Cantarell-Bold.ufo/glyphs/kip.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/kip.glif
@@ -1,28 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kip" format="2">
-  <advance width="753"/>
+  <advance width="600"/>
   <unicode hex="20AD"/>
   <outline>
     <contour>
-      <point x="37" y="293" type="line"/>
-      <point x="699" y="293" type="line"/>
-      <point x="699" y="423" type="line"/>
-      <point x="37" y="423" type="line"/>
+      <point x="402" y="0" type="line"/>
+      <point x="607" y="0" type="line"/>
+      <point x="389" y="392" type="line"/>
+      <point x="407" y="360" type="line"/>
+      <point x="605" y="694" type="line"/>
+      <point x="408" y="694" type="line"/>
+      <point x="217" y="363" type="line"/>
     </contour>
     <contour>
-      <point x="502" y="0" type="line"/>
-      <point x="719" y="0" type="line"/>
-      <point x="452" y="394" type="line"/>
-      <point x="470" y="360" type="line"/>
-      <point x="715" y="694" type="line"/>
-      <point x="506" y="694" type="line"/>
-      <point x="269" y="363" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="229" y="0" type="line"/>
+      <point x="229" y="694" type="line"/>
+      <point x="62" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="282" y="0" type="line"/>
-      <point x="282" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="7" y="297" type="line"/>
+      <point x="565" y="297" type="line"/>
+      <point x="565" y="419" type="line"/>
+      <point x="7" y="419" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/kje-cy.glif b/src/Cantarell-Bold.ufo/glyphs/kje-cy.glif
index a7839620..f3932fe3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/kje-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/kje-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kje-cy" format="2">
-  <advance width="562"/>
+  <advance width="584"/>
   <unicode hex="045C"/>
   <outline>
     <component base="ka-cy"/>
-    <component base="acutecomb" xOffset="191"/>
+    <component base="acutecomb" xOffset="198"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/l.glif b/src/Cantarell-Bold.ufo/glyphs/l.glif
index 5da108a8..2a28e8b8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/l.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/l.glif
@@ -1,33 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="l" format="2">
-  <advance width="310"/>
+  <advance width="331"/>
   <unicode hex="006C"/>
-  <note>
-l
-</note>
-  <anchor x="168" y="0" name="bottom"/>
-  <anchor x="132" y="366" name="center"/>
-  <anchor x="310" y="363" name="periodcentered"/>
-  <anchor x="127" y="739" name="top"/>
-  <anchor x="325" y="490" name="topright"/>
+  <anchor x="184" y="0" name="bottom"/>
+  <anchor x="148" y="366" name="center"/>
+  <anchor x="331" y="363" name="periodcentered"/>
+  <anchor x="143" y="739" name="top"/>
+  <anchor x="341" y="490" name="topright"/>
   <outline>
     <contour>
-      <point x="208" y="-8" type="curve" smooth="yes"/>
-      <point x="245" y="-8"/>
-      <point x="284" y="-1"/>
-      <point x="317" y="11" type="curve"/>
-      <point x="283" y="125" type="line"/>
-      <point x="273" y="122"/>
-      <point x="262" y="121"/>
-      <point x="256" y="121" type="curve" smooth="yes"/>
-      <point x="230" y="121"/>
-      <point x="216" y="137"/>
-      <point x="216" y="168" type="curve" smooth="yes"/>
-      <point x="216" y="739" type="line"/>
-      <point x="46" y="739" type="line"/>
-      <point x="46" y="147" type="line" smooth="yes"/>
-      <point x="46" y="48"/>
-      <point x="105" y="-8"/>
+      <point x="224" y="-8" type="curve" smooth="yes"/>
+      <point x="261" y="-8"/>
+      <point x="300" y="-1"/>
+      <point x="333" y="11" type="curve"/>
+      <point x="299" y="125" type="line"/>
+      <point x="289" y="122"/>
+      <point x="278" y="121"/>
+      <point x="272" y="121" type="curve" smooth="yes"/>
+      <point x="246" y="121"/>
+      <point x="232" y="137"/>
+      <point x="232" y="168" type="curve" smooth="yes"/>
+      <point x="232" y="739" type="line"/>
+      <point x="62" y="739" type="line"/>
+      <point x="62" y="147" type="line" smooth="yes"/>
+      <point x="62" y="48"/>
+      <point x="121" y="-8"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/l.ss01.glif b/src/Cantarell-Bold.ufo/glyphs/l.ss01.glif
new file mode 100644
index 00000000..8706df16
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs/l.ss01.glif
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="l.ss01" format="2">
+  <advance width="294"/>
+  <anchor x="184" y="0" name="bottom"/>
+  <anchor x="148" y="366" name="center"/>
+  <anchor x="326" y="363" name="periodcentered"/>
+  <anchor x="143" y="739" name="top"/>
+  <anchor x="341" y="490" name="topright"/>
+  <outline>
+    <contour>
+      <point x="62" y="0" type="line"/>
+      <point x="232" y="0" type="line"/>
+      <point x="232" y="739" type="line"/>
+      <point x="62" y="739" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lacute.glif b/src/Cantarell-Bold.ufo/glyphs/lacute.glif
index 280dd549..0a618652 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lacute" format="2">
-  <advance width="310"/>
+  <advance width="331"/>
   <unicode hex="013A"/>
   <outline>
     <component base="l"/>
-    <component base="acutecomb.case" xOffset="48" yOffset="45"/>
+    <component base="acutecomb.case" xOffset="64" yOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist b/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist
index da272fcf..e2b178e8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist
+++ b/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist
@@ -690,8 +690,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph._descenderreversed-cy</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph._o.numero</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph._slash.zero</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph._slash.zero.osf</key>
@@ -740,8 +738,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.acutecomb.loclVIET</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.acutecomb_dotaccentcomb</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.adblgrave</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.adieresis</key>
@@ -771,8 +767,6 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.apostrophemod</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.approxequal</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.approxequal.tf</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.aring</key>
       <integer>1</integer>
@@ -795,7 +789,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.bar</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.be-cy</key>
-      <integer>2</integer>
+      <integer>7</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.blackCircle</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.blank</key>
@@ -822,22 +816,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb.loclVIET</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_acutecomb</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_acutecomb.case</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_gravecomb</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_gravecomb.case</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_hookabovecomb</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_hookabovecomb.case</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_tildecomb</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_tildecomb.case</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.breveinvertedcomb</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.breveinvertedcomb.case</key>
@@ -847,8 +825,6 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.bullet</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.bulletoperator</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.bulletoperator.tf</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.c</key>
       <integer>1</integer>
@@ -864,8 +840,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.caroncomb.loclVIET</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.caroncomb_dotaccentcomb</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ccaron</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ccedilla</key>
@@ -902,22 +876,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb.loclVIET</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_acutecomb</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_acutecomb.case</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_gravecomb</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_gravecomb.case</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_hookabovecomb</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_hookabovecomb.case</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_tildecomb</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_tildecomb.case</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.colon</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.colonsign</key>
@@ -932,8 +890,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.commercialMinusSign</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.commercialMinusSign.tf</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.copyright</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.currency</key>
@@ -974,21 +930,9 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.dieresiscomb.loclVIET</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.dieresiscomb_acutecomb</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.dieresiscomb_caroncomb</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.dieresiscomb_gravecomb</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.dieresiscomb_macroncomb</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.divide</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.divide.tf</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.divisionslash</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.divisionslash.tf</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.dje-cy</key>
       <integer>2</integer>
@@ -1006,8 +950,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.dotaccentcomb.loclVIET</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.dotaccentcomb_macroncomb</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.dotbelowcomb</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.doubleprimemod</key>
@@ -1068,8 +1010,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.eight.tf</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.eight.tosf</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.eightinferior</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.eightsuperior</key>
@@ -1077,7 +1017,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.einvertedbreve</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.el-cy</key>
-      <integer>2</integer>
+      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ellipsis</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.em-cy</key>
@@ -1092,8 +1032,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.emptyset</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.emquad</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.emspace</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.en-cy</key>
@@ -1106,19 +1044,13 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.enghe-cy</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.enquad</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.enspace</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.eogonek</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.equal</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.equal.tf</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.equivalence</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.equivalence.tf</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.er-cy</key>
       <integer>2</integer>
@@ -1142,12 +1074,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.f</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.f_f</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.f_f_i</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.f_f_l</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.fi</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.figuredash</key>
@@ -1159,7 +1085,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.fita-cy</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.five</key>
-      <integer>2</integer>
+      <integer>5</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.five.dnom</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.five.numr</key>
@@ -1168,8 +1094,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.five.tf</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.five.tosf</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.fiveeighths</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.fiveinferior</key>
@@ -1183,7 +1107,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.florin</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.four</key>
-      <integer>2</integer>
+      <integer>4</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.four.dnom</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.four.numr</key>
@@ -1192,8 +1116,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.four.tf</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.four.tosf</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.fourfifths</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.fourinferior</key>
@@ -1245,12 +1167,8 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.gravecomb.loclVIET</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.greater</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.greater.tf</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.greaterequal</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.greaterequal.tf</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.guarani</key>
       <integer>1</integer>
@@ -1286,8 +1204,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.hookabovecomb.loclVIET</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.horizontalbar</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.horncomb</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.hryvnia</key>
@@ -1300,8 +1216,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.hyphen</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.hyphentwo</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.i</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.i-cy</key>
@@ -1400,6 +1314,8 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.l</key>
       <integer>1</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.l.ss01</key>
+      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.lacute</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.lcaron</key>
@@ -1415,12 +1331,8 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.leftanglebracket-math</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.less</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.less.tf</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.lessequal</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.lessequal.tf</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.lira</key>
       <integer>1</integer>
@@ -1435,8 +1347,6 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.llinebelow</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.logicalnot</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.logicalnot.tf</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.lozenge</key>
       <integer>1</integer>
@@ -1460,12 +1370,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.macroncomb.narrow.case</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.macroncomb_acutecomb</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.macroncomb_dieresiscomb</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.macroncomb_gravecomb</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.manat</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.mdotbelow</key>
@@ -1473,23 +1377,17 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.micro</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.minus</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.minus.tf</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.minute</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.multiply</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.multiply.tf</key>
-      <integer>2</integer>
+      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.n</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.nacute</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.naira</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.nbspace</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ncaron</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ncommaaccent</key>
@@ -1508,8 +1406,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.nine.tf</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.nine.tosf</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.nineinferior</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ninesuperior</key>
@@ -1520,15 +1416,9 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.nlinebelow</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.nonbreakinghyphen</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.notequal</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.notequal.tf</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.notidentical</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.notidentical.tf</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ntilde</key>
       <integer>1</integer>
@@ -1619,8 +1509,6 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.one.osf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.one.tf</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.one.tosf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.oneeighth</key>
       <integer>2</integer>
@@ -1697,12 +1585,8 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.pi</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.plus</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.plus.tf</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.plusminus</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.plusminus.tf</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.primeReversed</key>
       <integer>1</integer>
@@ -1826,8 +1710,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.seven.tf</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.seven.tosf</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.seveneighths</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.seveninferior</key>
@@ -1841,7 +1723,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.shha-cy</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.six</key>
-      <integer>2</integer>
+      <integer>5</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.six.dnom</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.six.numr</key>
@@ -1850,8 +1732,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.six.tf</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.six.tosf</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.sixinferior</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.sixperemspace</key>
@@ -1868,8 +1748,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.slashshortcomb.case</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.softhyphen</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.softsign-cy</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.space</key>
@@ -1907,7 +1785,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.thorn</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.three</key>
-      <integer>2</integer>
+      <integer>4</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.three.dnom</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.three.numr</key>
@@ -1916,8 +1794,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.three.tf</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.three.tosf</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.threeeighths</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.threefifths</key>
@@ -1938,12 +1814,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.tildecomb.loclVIET</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.tildecomb_acutecomb</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.tildecomb_dieresiscomb</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.tildecomb_macroncomb</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.tlinebelow</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.trademark</key>
@@ -1957,7 +1827,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.tugrik</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.two</key>
-      <integer>2</integer>
+      <integer>4</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.two.dnom</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.two.numr</key>
@@ -1966,8 +1836,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.two.tf</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.two.tosf</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.twofifths</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.twoinferior</key>
@@ -2129,7 +1997,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.zedieresis-cy</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.zero</key>
-      <integer>2</integer>
+      <integer>4</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.zero.dnom</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.zero.numr</key>
@@ -2142,10 +2010,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.zero.tf.zero</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.zero.tosf</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.zero.tosf.zero</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.zero.zero</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.zeroinferior</key>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lcaron.glif b/src/Cantarell-Bold.ufo/glyphs/lcaron.glif
index 025a75fa..f0e316bd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lcaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lcaron.glif
@@ -4,7 +4,7 @@
   <unicode hex="013E"/>
   <outline>
     <component base="l"/>
-    <component base="caroncomb.alt" xOffset="202" yOffset="-2"/>
+    <component base="caroncomb.alt" xOffset="218" yOffset="-2"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lcommaaccent.glif b/src/Cantarell-Bold.ufo/glyphs/lcommaaccent.glif
index 63d9320d..d1de6bd1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lcommaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lcommaaccent" format="2">
-  <advance width="310"/>
+  <advance width="331"/>
   <unicode hex="013C"/>
   <outline>
     <component base="l"/>
-    <component base="commaaccentcomb" xOffset="50"/>
+    <component base="commaaccentcomb" xOffset="66"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ldot.glif b/src/Cantarell-Bold.ufo/glyphs/ldot.glif
index d10084e1..a29a7f46 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ldot.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ldot.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ldot" format="2">
-  <advance width="310"/>
+  <advance width="331"/>
   <unicode hex="0140"/>
   <outline>
     <component base="l"/>
-    <component base="periodcentered.loclCAT" xOffset="310" yOffset="8"/>
+    <component base="periodcentered.loclCAT" xOffset="331" yOffset="8"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ldotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/ldotbelow.glif
index 062f2b56..edf98648 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ldotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ldotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ldotbelow" format="2">
-  <advance width="310"/>
+  <advance width="331"/>
   <unicode hex="1E37"/>
   <outline>
     <component base="l"/>
-    <component base="dotbelowcomb" xOffset="18"/>
+    <component base="dotbelowcomb" xOffset="34"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/leftA_rrow.glif b/src/Cantarell-Bold.ufo/glyphs/leftA_rrow.glif
index 3fb23441..6ab43203 100644
--- a/src/Cantarell-Bold.ufo/glyphs/leftA_rrow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/leftA_rrow.glif
@@ -1,11 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="leftArrow" format="2">
-  <advance width="646"/>
+  <advance width="672"/>
   <unicode hex="2190"/>
-  <note>
-arrowleft
-</note>
   <outline>
-    <component base="rightArrow" xScale="-1" yScale="-1" xOffset="660" yOffset="643"/>
+    <component base="rightArrow" xScale="-1" yScale="-1" xOffset="672" yOffset="643"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|rightArrow</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|rightArrow</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/leftanglebracket-math.glif 
b/src/Cantarell-Bold.ufo/glyphs/leftanglebracket-math.glif
index 929d7e19..51791ccc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/leftanglebracket-math.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/leftanglebracket-math.glif
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="leftanglebracket-math" format="2">
-  <advance width="322"/>
+  <advance width="375"/>
   <unicode hex="27E8"/>
   <outline>
     <contour>
-      <point x="138" y="-10" type="line"/>
-      <point x="311" y="-10" type="line"/>
-      <point x="164" y="398" type="line"/>
-      <point x="164" y="351" type="line"/>
-      <point x="314" y="739" type="line"/>
-      <point x="156" y="739" type="line"/>
-      <point x="9" y="364" type="line"/>
+      <point x="164" y="-10" type="line"/>
+      <point x="358" y="-10" type="line"/>
+      <point x="189" y="399" type="line"/>
+      <point x="189" y="349" type="line"/>
+      <point x="360" y="739" type="line"/>
+      <point x="184" y="739" type="line"/>
+      <point x="16" y="362" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/less.glif b/src/Cantarell-Bold.ufo/glyphs/less.glif
index e3bb516b..16ba3c88 100644
--- a/src/Cantarell-Bold.ufo/glyphs/less.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/less.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="less" format="2">
-  <advance width="569"/>
+  <advance width="600"/>
   <unicode hex="003C"/>
   <outline>
-    <component base="greater.tf" xScale="-1" yScale="-1" xOffset="569" yOffset="679"/>
+    <component base="greater" xScale="-1" yScale="-1" xOffset="600" yOffset="619"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|greater</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lessequal.glif b/src/Cantarell-Bold.ufo/glyphs/lessequal.glif
index 9da2df1a..f2940e2f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lessequal.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lessequal.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lessequal" format="2">
-  <advance width="592"/>
+  <advance width="600"/>
   <unicode hex="2264"/>
   <outline>
-    <component base="greaterequal.tf" xScale="-1" xOffset="604"/>
+    <component base="greaterequal" xScale="-1" xOffset="600"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|greaterequal</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lira.glif b/src/Cantarell-Bold.ufo/glyphs/lira.glif
index bb27834a..4b5c13e5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lira.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lira.glif
@@ -1,46 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lira" format="2">
-  <advance width="624"/>
+  <advance width="600"/>
   <unicode hex="20A4"/>
   <outline>
     <contour>
-      <point x="61" y="0" type="line"/>
-      <point x="578" y="0" type="line"/>
-      <point x="578" y="156" type="line"/>
-      <point x="238" y="156" type="line"/>
-      <point x="287" y="175"/>
-      <point x="306" y="204"/>
-      <point x="306" y="262" type="curve" smooth="yes"/>
-      <point x="307" y="461" type="line" smooth="yes"/>
-      <point x="307" y="517"/>
-      <point x="351" y="554"/>
-      <point x="429" y="554" type="curve" smooth="yes"/>
-      <point x="464" y="554"/>
-      <point x="509" y="547"/>
-      <point x="543" y="536" type="curve"/>
-      <point x="581" y="677" type="line"/>
-      <point x="539" y="695"/>
-      <point x="490" y="704"/>
-      <point x="436" y="704" type="curve" smooth="yes"/>
-      <point x="255" y="704"/>
-      <point x="130" y="603"/>
-      <point x="132" y="451" type="curve" smooth="yes"/>
-      <point x="134" y="252" type="line" smooth="yes"/>
-      <point x="134" y="199"/>
-      <point x="114" y="173"/>
-      <point x="61" y="156" type="curve"/>
+      <point x="48" y="0" type="line"/>
+      <point x="564" y="0" type="line"/>
+      <point x="564" y="156" type="line"/>
+      <point x="226" y="156" type="line"/>
+      <point x="272" y="174"/>
+      <point x="289" y="219"/>
+      <point x="289" y="322" type="curve" smooth="yes"/>
+      <point x="289" y="461" type="line" smooth="yes"/>
+      <point x="289" y="525"/>
+      <point x="322" y="554"/>
+      <point x="395" y="554" type="curve" smooth="yes"/>
+      <point x="430" y="554"/>
+      <point x="475" y="547"/>
+      <point x="509" y="536" type="curve"/>
+      <point x="547" y="677" type="line"/>
+      <point x="505" y="695"/>
+      <point x="457" y="704"/>
+      <point x="402" y="704" type="curve" smooth="yes"/>
+      <point x="216" y="704"/>
+      <point x="113" y="613"/>
+      <point x="115" y="451" type="curve" smooth="yes"/>
+      <point x="117" y="312" type="line" smooth="yes"/>
+      <point x="118" y="221"/>
+      <point x="96" y="171"/>
+      <point x="48" y="156" type="curve"/>
     </contour>
     <contour>
-      <point x="64" y="378" type="line"/>
-      <point x="498" y="378" type="line"/>
-      <point x="498" y="488" type="line"/>
-      <point x="64" y="488" type="line"/>
+      <point x="52" y="209" type="line"/>
+      <point x="486" y="209" type="line"/>
+      <point x="486" y="315" type="line"/>
+      <point x="52" y="315" type="line"/>
     </contour>
     <contour>
-      <point x="64" y="218" type="line"/>
-      <point x="498" y="218" type="line"/>
-      <point x="498" y="328" type="line"/>
-      <point x="64" y="328" type="line"/>
+      <point x="52" y="385" type="line"/>
+      <point x="486" y="385" type="line"/>
+      <point x="486" y="490" type="line"/>
+      <point x="52" y="490" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/liraT_urkish.glif b/src/Cantarell-Bold.ufo/glyphs/liraT_urkish.glif
index 22d197db..500d42ba 100644
--- a/src/Cantarell-Bold.ufo/glyphs/liraT_urkish.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/liraT_urkish.glif
@@ -1,35 +1,38 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="liraTurkish" format="2">
-  <advance width="679"/>
+  <advance width="600"/>
   <unicode hex="20BA"/>
   <outline>
     <contour>
-      <point x="306" y="0" type="line"/>
-      <point x="513" y="0"/>
-      <point x="651" y="138"/>
-      <point x="651" y="345" type="curve"/>
-      <point x="494" y="345" type="line"/>
-      <point x="494" y="222"/>
-      <point x="420" y="140"/>
-      <point x="309" y="140" type="curve"/>
+      <point x="123" y="0" type="line"/>
+      <point x="288" y="0" type="line" smooth="yes"/>
+      <point x="466" y="0"/>
+      <point x="588" y="139"/>
+      <point x="588" y="345" type="curve"/>
+      <point x="432" y="345" type="line"/>
+      <point x="432" y="224"/>
+      <point x="374" y="140"/>
+      <point x="289" y="140" type="curve"/>
+      <point x="289" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="143" y="0" type="line"/>
-      <point x="309" y="0" type="line"/>
-      <point x="309" y="707" type="line"/>
-      <point x="143" y="707" type="line"/>
+      <point x="96" y="175" type="line"/>
+      <point x="421" y="353" type="line"/>
+      <point x="371" y="445" type="line"/>
+      <point x="45" y="267" type="line"/>
     </contour>
     <contour>
-      <point x="71" y="351" type="line"/>
-      <point x="482" y="571" type="line"/>
-      <point x="433" y="661" type="line"/>
-      <point x="23" y="441" type="line"/>
-    </contour>
-    <contour>
-      <point x="103" y="197" type="line"/>
-      <point x="482" y="400" type="line"/>
-      <point x="433" y="490" type="line"/>
-      <point x="54" y="287" type="line"/>
+      <point x="72" y="355" type="line"/>
+      <point x="407" y="544" type="line"/>
+      <point x="357" y="636" type="line"/>
+      <point x="22" y="447" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/literS_ign.glif b/src/Cantarell-Bold.ufo/glyphs/literS_ign.glif
index bf615ff4..cfdf5b55 100644
--- a/src/Cantarell-Bold.ufo/glyphs/literS_ign.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/literS_ign.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="literSign" format="2">
-  <advance width="490"/>
+  <advance width="515"/>
   <unicode hex="2113"/>
   <outline>
     <contour>
-      <point x="310" y="-10" type="curve" smooth="yes"/>
-      <point x="356" y="-10"/>
-      <point x="403" y="1"/>
-      <point x="446" y="22" type="curve"/>
-      <point x="407" y="137" type="line"/>
-      <point x="386" y="126"/>
-      <point x="360" y="119"/>
-      <point x="337" y="119" type="curve" smooth="yes"/>
-      <point x="290" y="119"/>
-      <point x="256" y="151"/>
-      <point x="256" y="197" type="curve" smooth="yes"/>
-      <point x="256" y="501" type="line" smooth="yes"/>
-      <point x="256" y="568"/>
-      <point x="270" y="613"/>
-      <point x="290" y="613" type="curve" smooth="yes"/>
-      <point x="309" y="613"/>
-      <point x="321" y="587"/>
-      <point x="321" y="546" type="curve" smooth="yes"/>
-      <point x="321" y="491"/>
-      <point x="310" y="457"/>
-      <point x="11" y="125" type="curve"/>
-      <point x="79" y="57" type="line"/>
-      <point x="358" y="329"/>
-      <point x="451" y="437"/>
-      <point x="451" y="569" type="curve" smooth="yes"/>
-      <point x="451" y="679"/>
-      <point x="387" y="749"/>
-      <point x="286" y="749" type="curve" smooth="yes"/>
-      <point x="165" y="749"/>
-      <point x="87" y="648"/>
-      <point x="87" y="491" type="curve" smooth="yes"/>
-      <point x="87" y="179" type="line" smooth="yes"/>
-      <point x="87" y="72"/>
-      <point x="185" y="-10"/>
+      <point x="323" y="-10" type="curve" smooth="yes"/>
+      <point x="369" y="-10"/>
+      <point x="416" y="1"/>
+      <point x="459" y="22" type="curve"/>
+      <point x="420" y="137" type="line"/>
+      <point x="399" y="126"/>
+      <point x="373" y="119"/>
+      <point x="350" y="119" type="curve" smooth="yes"/>
+      <point x="303" y="119"/>
+      <point x="269" y="151"/>
+      <point x="269" y="197" type="curve" smooth="yes"/>
+      <point x="269" y="501" type="line" smooth="yes"/>
+      <point x="269" y="568"/>
+      <point x="283" y="613"/>
+      <point x="303" y="613" type="curve" smooth="yes"/>
+      <point x="322" y="613"/>
+      <point x="334" y="587"/>
+      <point x="334" y="546" type="curve" smooth="yes"/>
+      <point x="334" y="491"/>
+      <point x="323" y="457"/>
+      <point x="24" y="125" type="curve"/>
+      <point x="92" y="57" type="line"/>
+      <point x="371" y="329"/>
+      <point x="464" y="437"/>
+      <point x="464" y="569" type="curve" smooth="yes"/>
+      <point x="464" y="679"/>
+      <point x="400" y="749"/>
+      <point x="299" y="749" type="curve" smooth="yes"/>
+      <point x="178" y="749"/>
+      <point x="100" y="648"/>
+      <point x="100" y="491" type="curve" smooth="yes"/>
+      <point x="100" y="179" type="line" smooth="yes"/>
+      <point x="100" y="72"/>
+      <point x="198" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lj.glif b/src/Cantarell-Bold.ufo/glyphs/lj.glif
index 0119d784..5cdee40a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lj.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lj.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lj" format="2">
-  <advance width="597"/>
+  <advance width="628"/>
   <unicode hex="01C9"/>
   <outline>
     <component base="l"/>
-    <component base="j" xOffset="310"/>
+    <component base="j" xOffset="331"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lje-cy.glif b/src/Cantarell-Bold.ufo/glyphs/lje-cy.glif
index bafea7b3..83cf204c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lje-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lje-cy.glif
@@ -1,55 +1,57 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lje-cy" format="2">
-  <advance width="861"/>
+  <advance width="859"/>
   <unicode hex="0459"/>
   <outline>
     <contour>
-      <point x="445" y="0" type="line"/>
-      <point x="615" y="0" type="line" smooth="yes"/>
-      <point x="765" y="0"/>
-      <point x="853" y="70"/>
-      <point x="853" y="187" type="curve" smooth="yes"/>
-      <point x="853" y="281"/>
-      <point x="775" y="344"/>
-      <point x="660" y="344" type="curve" smooth="yes"/>
-      <point x="445" y="344" type="line"/>
-      <point x="445" y="220" type="line"/>
-      <point x="624" y="220" type="line" smooth="yes"/>
-      <point x="658" y="220"/>
-      <point x="684" y="202"/>
-      <point x="684" y="173" type="curve" smooth="yes"/>
-      <point x="684" y="144"/>
-      <point x="665" y="126"/>
-      <point x="636" y="126" type="curve" smooth="yes"/>
-      <point x="445" y="126" type="line"/>
+      <point x="86" y="-10" type="curve" smooth="yes"/>
+      <point x="197" y="-10"/>
+      <point x="263" y="68"/>
+      <point x="263" y="200" type="curve" smooth="yes"/>
+      <point x="263" y="351" type="line"/>
+      <point x="372" y="351" type="line"/>
+      <point x="372" y="0" type="line"/>
+      <point x="538" y="0" type="line"/>
+      <point x="538" y="491" type="line"/>
+      <point x="110" y="491" type="line"/>
+      <point x="110" y="194" type="line" smooth="yes"/>
+      <point x="110" y="147"/>
+      <point x="88" y="115"/>
+      <point x="55" y="115" type="curve" smooth="yes"/>
+      <point x="41" y="115"/>
+      <point x="25" y="120"/>
+      <point x="13" y="129" type="curve"/>
+      <point x="-14" y="22" type="line"/>
+      <point x="13" y="2"/>
+      <point x="49" y="-10"/>
     </contour>
     <contour>
-      <point x="96" y="-17" type="curve" smooth="yes"/>
-      <point x="207" y="-17"/>
-      <point x="273" y="90"/>
-      <point x="273" y="200" type="curve" smooth="yes"/>
-      <point x="273" y="351" type="line"/>
-      <point x="382" y="351" type="line"/>
-      <point x="382" y="0" type="line"/>
-      <point x="548" y="0" type="line"/>
-      <point x="548" y="491" type="line"/>
-      <point x="120" y="491" type="line"/>
-      <point x="120" y="194" type="line" smooth="yes"/>
-      <point x="120" y="176"/>
-      <point x="108" y="115"/>
-      <point x="66" y="115" type="curve" smooth="yes"/>
-      <point x="58" y="115"/>
-      <point x="37" y="122"/>
-      <point x="23" y="131" type="curve"/>
-      <point x="-4" y="15" type="line"/>
-      <point x="21" y="-5"/>
-      <point x="57" y="-17"/>
+      <point x="435" y="0" type="line"/>
+      <point x="605" y="0" type="line" smooth="yes"/>
+      <point x="755" y="0"/>
+      <point x="843" y="70"/>
+      <point x="843" y="187" type="curve" smooth="yes"/>
+      <point x="843" y="281"/>
+      <point x="765" y="344"/>
+      <point x="650" y="344" type="curve" smooth="yes"/>
+      <point x="435" y="344" type="line"/>
+      <point x="435" y="220" type="line"/>
+      <point x="614" y="220" type="line" smooth="yes"/>
+      <point x="648" y="220"/>
+      <point x="674" y="202"/>
+      <point x="674" y="173" type="curve" smooth="yes"/>
+      <point x="674" y="144"/>
+      <point x="655" y="126"/>
+      <point x="626" y="126" type="curve" smooth="yes"/>
+      <point x="435" y="126" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>el-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>softsign-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/llinebelow.glif b/src/Cantarell-Bold.ufo/glyphs/llinebelow.glif
index e2217a76..85d2bc07 100644
--- a/src/Cantarell-Bold.ufo/glyphs/llinebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/llinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="llinebelow" format="2">
-  <advance width="310"/>
+  <advance width="331"/>
   <unicode hex="1E3B"/>
   <outline>
     <component base="l"/>
-    <component base="macronbelowcomb.narrow" xOffset="-50"/>
+    <component base="macronbelowcomb.narrow" xOffset="-34"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/logicalnot.glif b/src/Cantarell-Bold.ufo/glyphs/logicalnot.glif
index db7b8038..c31ab0d6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/logicalnot.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/logicalnot.glif
@@ -1,19 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="logicalnot" format="2">
-  <advance width="664"/>
+  <advance width="600"/>
   <unicode hex="00AC"/>
   <outline>
     <contour>
-      <point x="50" y="284" type="line"/>
-      <point x="584" y="284" type="line"/>
-      <point x="584" y="419" type="line"/>
-      <point x="50" y="419" type="line"/>
+      <point x="60" y="245" type="line"/>
+      <point x="540" y="245" type="line"/>
+      <point x="540" y="412" type="line"/>
+      <point x="60" y="412" type="line"/>
     </contour>
     <contour>
-      <point x="415" y="142" type="line"/>
-      <point x="583" y="142" type="line"/>
-      <point x="583" y="343" type="line"/>
-      <point x="415" y="343" type="line"/>
+      <point x="370" y="86" type="line"/>
+      <point x="540" y="86" type="line"/>
+      <point x="540" y="313" type="line"/>
+      <point x="370" y="313" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lozenge.glif b/src/Cantarell-Bold.ufo/glyphs/lozenge.glif
index 67bf2e2a..9d6538bd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lozenge.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lozenge.glif
@@ -1,21 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lozenge" format="2">
-  <advance width="563"/>
+  <advance width="587"/>
   <unicode hex="25CA"/>
   <outline>
     <contour>
-      <point x="205" y="0" type="line"/>
-      <point x="357" y="0" type="line"/>
-      <point x="544" y="352" type="line"/>
-      <point x="357" y="694" type="line"/>
-      <point x="205" y="694" type="line"/>
-      <point x="19" y="352" type="line"/>
+      <point x="217" y="0" type="line"/>
+      <point x="369" y="0" type="line"/>
+      <point x="556" y="352" type="line"/>
+      <point x="369" y="694" type="line"/>
+      <point x="217" y="694" type="line"/>
+      <point x="31" y="352" type="line"/>
     </contour>
     <contour>
-      <point x="284" y="150" type="line"/>
-      <point x="184" y="349" type="line"/>
-      <point x="284" y="546" type="line"/>
-      <point x="394" y="348" type="line"/>
+      <point x="296" y="150" type="line"/>
+      <point x="196" y="349" type="line"/>
+      <point x="296" y="546" type="line"/>
+      <point x="406" y="348" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lslash.glif b/src/Cantarell-Bold.ufo/glyphs/lslash.glif
index 288eec28..68f4c4bd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lslash.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lslash.glif
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lslash" format="2">
-  <advance width="310"/>
+  <advance width="377"/>
   <unicode hex="0142"/>
   <outline>
-    <component base="l"/>
-    <component base="slashshortcomb" xOffset="-70" yOffset="119"/>
+    <component base="l" xOffset="25"/>
+    <component base="slashshortcomb" xOffset="-29" yOffset="119"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
-        <integer>0</integer>
+        <integer>-1</integer>
         <integer>1</integer>
       </array>
     </dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/m.glif b/src/Cantarell-Bold.ufo/glyphs/m.glif
index b31f406e..4f5deb09 100644
--- a/src/Cantarell-Bold.ufo/glyphs/m.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/m.glif
@@ -1,55 +1,60 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="m" format="2">
-  <advance width="902"/>
+  <advance width="910"/>
   <unicode hex="006D"/>
-  <note>
-m
-</note>
-  <anchor x="467" y="0" name="bottom"/>
-  <anchor x="467" y="490" name="top"/>
+  <anchor x="470" y="0" name="bottom"/>
+  <anchor x="470" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="227" y="0" type="line"/>
-      <point x="227" y="376" type="line"/>
-      <point x="179" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
+      <point x="686" y="0" type="line"/>
+      <point x="859" y="0" type="line"/>
+      <point x="859" y="284" type="line" smooth="yes"/>
+      <point x="859" y="418"/>
+      <point x="794" y="496"/>
+      <point x="683" y="496" type="curve" smooth="yes"/>
+      <point x="613" y="496"/>
+      <point x="552" y="465"/>
+      <point x="512" y="408" type="curve"/>
+      <point x="531" y="305" type="line"/>
+      <point x="556" y="332"/>
+      <point x="584" y="346"/>
+      <point x="618" y="346" type="curve" smooth="yes"/>
+      <point x="665" y="346"/>
+      <point x="686" y="320"/>
+      <point x="686" y="265" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="371" y="0" type="line"/>
-      <point x="543" y="0" type="line"/>
-      <point x="543" y="294" type="line" smooth="yes"/>
-      <point x="543" y="419"/>
-      <point x="474" y="496"/>
-      <point x="362" y="496" type="curve" smooth="yes"/>
-      <point x="291" y="496"/>
-      <point x="226" y="465"/>
-      <point x="185" y="408" type="curve"/>
-      <point x="204" y="305" type="line"/>
-      <point x="231" y="332"/>
-      <point x="262" y="346"/>
-      <point x="297" y="346" type="curve" smooth="yes"/>
-      <point x="361" y="346"/>
-      <point x="371" y="302"/>
-      <point x="371" y="265" type="curve" smooth="yes"/>
+      <point x="62" y="0" type="line"/>
+      <point x="235" y="0" type="line"/>
+      <point x="235" y="376" type="line"/>
+      <point x="187" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="687" y="0" type="line"/>
-      <point x="860" y="0" type="line"/>
-      <point x="860" y="294" type="line" smooth="yes"/>
-      <point x="860" y="419"/>
-      <point x="791" y="496"/>
-      <point x="679" y="496" type="curve" smooth="yes"/>
-      <point x="603" y="496"/>
-      <point x="541" y="462"/>
-      <point x="501" y="408" type="curve"/>
-      <point x="521" y="305" type="line"/>
-      <point x="548" y="332"/>
-      <point x="578" y="346"/>
-      <point x="614" y="346" type="curve" smooth="yes"/>
-      <point x="674" y="346"/>
-      <point x="687" y="307"/>
-      <point x="687" y="265" type="curve" smooth="yes"/>
+      <point x="374" y="0" type="line"/>
+      <point x="547" y="0" type="line"/>
+      <point x="547" y="284" type="line" smooth="yes"/>
+      <point x="547" y="418"/>
+      <point x="482" y="496"/>
+      <point x="371" y="496" type="curve" smooth="yes"/>
+      <point x="301" y="496"/>
+      <point x="240" y="465"/>
+      <point x="200" y="408" type="curve"/>
+      <point x="219" y="305" type="line"/>
+      <point x="244" y="332"/>
+      <point x="272" y="346"/>
+      <point x="306" y="346" type="curve" smooth="yes"/>
+      <point x="353" y="346"/>
+      <point x="374" y="320"/>
+      <point x="374" y="265" type="curve" smooth="yes"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/macron.glif b/src/Cantarell-Bold.ufo/glyphs/macron.glif
index 84d14063..62365e59 100644
--- a/src/Cantarell-Bold.ufo/glyphs/macron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/macron.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="macron" format="2">
-  <advance width="477"/>
+  <advance width="500"/>
   <unicode hex="00AF"/>
   <outline>
-    <component base="macroncomb" xOffset="-6"/>
+    <component base="macroncomb" xOffset="8"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/manat.glif b/src/Cantarell-Bold.ufo/glyphs/manat.glif
index ce714fe2..e8dcc8ef 100644
--- a/src/Cantarell-Bold.ufo/glyphs/manat.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/manat.glif
@@ -1,33 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="manat" format="2">
-  <advance width="735"/>
+  <advance width="600"/>
   <unicode hex="20BC"/>
   <outline>
     <contour>
-      <point x="53" y="0" type="line"/>
-      <point x="223" y="0" type="line"/>
-      <point x="223" y="228" type="line" smooth="yes"/>
-      <point x="223" y="366"/>
-      <point x="278" y="458"/>
-      <point x="363" y="458" type="curve" smooth="yes"/>
-      <point x="450" y="458"/>
-      <point x="511" y="362"/>
-      <point x="511" y="218" type="curve" smooth="yes"/>
-      <point x="511" y="0" type="line"/>
-      <point x="681" y="0" type="line"/>
-      <point x="681" y="228" type="line" smooth="yes"/>
-      <point x="681" y="452"/>
-      <point x="558" y="602"/>
-      <point x="371" y="602" type="curve" smooth="yes"/>
-      <point x="182" y="602"/>
-      <point x="53" y="448"/>
-      <point x="53" y="218" type="curve" smooth="yes"/>
+      <point x="3" y="0" type="line"/>
+      <point x="164" y="0" type="line"/>
+      <point x="164" y="228" type="line" smooth="yes"/>
+      <point x="164" y="390"/>
+      <point x="211" y="475"/>
+      <point x="300" y="475" type="curve" smooth="yes"/>
+      <point x="389" y="475"/>
+      <point x="435" y="387"/>
+      <point x="435" y="218" type="curve" smooth="yes"/>
+      <point x="435" y="0" type="line"/>
+      <point x="596" y="0" type="line"/>
+      <point x="596" y="228" type="line" smooth="yes"/>
+      <point x="596" y="480"/>
+      <point x="497" y="611"/>
+      <point x="308" y="611" type="curve" smooth="yes"/>
+      <point x="108" y="611"/>
+      <point x="3" y="476"/>
+      <point x="3" y="218" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="303" y="100" type="line"/>
-      <point x="433" y="100" type="line"/>
-      <point x="433" y="694" type="line"/>
-      <point x="303" y="694" type="line"/>
+      <point x="239" y="100" type="line"/>
+      <point x="359" y="100" type="line"/>
+      <point x="359" y="694" type="line"/>
+      <point x="239" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/mdotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/mdotbelow.glif
index 73365214..ea3916cc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/mdotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/mdotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="mdotbelow" format="2">
-  <advance width="902"/>
+  <advance width="910"/>
   <unicode hex="1E43"/>
   <outline>
     <component base="m"/>
-    <component base="dotbelowcomb" xOffset="317"/>
+    <component base="dotbelowcomb" xOffset="320"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/micro.glif b/src/Cantarell-Bold.ufo/glyphs/micro.glif
index 5d9510f4..26feab13 100644
--- a/src/Cantarell-Bold.ufo/glyphs/micro.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/micro.glif
@@ -1,36 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="micro" format="2">
-  <advance width="626"/>
+  <advance width="610"/>
   <unicode hex="00B5"/>
   <outline>
     <contour>
-      <point x="316" y="-6" type="curve" smooth="yes"/>
-      <point x="367" y="-6"/>
-      <point x="424" y="25"/>
-      <point x="452" y="91" type="curve"/>
-      <point x="409" y="185" type="line"/>
-      <point x="384" y="158"/>
-      <point x="361" y="144"/>
-      <point x="330" y="144" type="curve" smooth="yes"/>
-      <point x="283" y="144"/>
-      <point x="243" y="181"/>
-      <point x="228" y="250" type="curve"/>
-      <point x="200" y="149" type="line"/>
-      <point x="207" y="24"/>
-      <point x="264" y="-6"/>
+      <point x="62" y="-217" type="line"/>
+      <point x="228" y="-217" type="line"/>
+      <point x="228" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="80" y="-217" type="line"/>
-      <point x="250" y="-217" type="line"/>
-      <point x="250" y="490" type="line"/>
-      <point x="80" y="490" type="line"/>
+      <point x="298" y="-6" type="curve" smooth="yes"/>
+      <point x="349" y="-6"/>
+      <point x="406" y="25"/>
+      <point x="434" y="91" type="curve"/>
+      <point x="391" y="185" type="line"/>
+      <point x="366" y="158"/>
+      <point x="343" y="144"/>
+      <point x="312" y="144" type="curve" smooth="yes"/>
+      <point x="265" y="144"/>
+      <point x="225" y="181"/>
+      <point x="210" y="250" type="curve"/>
+      <point x="182" y="149" type="line"/>
+      <point x="189" y="24"/>
+      <point x="246" y="-6"/>
     </contour>
     <contour>
-      <point x="421" y="0" type="line"/>
-      <point x="566" y="0" type="line"/>
-      <point x="566" y="490" type="line"/>
-      <point x="393" y="490" type="line"/>
-      <point x="393" y="114" type="line"/>
+      <point x="403" y="0" type="line"/>
+      <point x="548" y="0" type="line"/>
+      <point x="548" y="490" type="line"/>
+      <point x="375" y="490" type="line"/>
+      <point x="375" y="114" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/minus.glif b/src/Cantarell-Bold.ufo/glyphs/minus.glif
index d7a76f0e..97be2312 100644
--- a/src/Cantarell-Bold.ufo/glyphs/minus.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/minus.glif
@@ -1,13 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="minus" format="2">
-  <advance width="689"/>
+  <advance width="600"/>
   <unicode hex="2212"/>
   <outline>
     <contour>
-      <point x="80" y="256" type="line"/>
-      <point x="609" y="256" type="line"/>
-      <point x="609" y="405" type="line"/>
-      <point x="80" y="405" type="line"/>
+      <point x="60" y="245" type="line"/>
+      <point x="540" y="245" type="line"/>
+      <point x="540" y="412" type="line"/>
+      <point x="60" y="412" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/minute.glif b/src/Cantarell-Bold.ufo/glyphs/minute.glif
index 3579a673..4ba62ecf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/minute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/minute.glif
@@ -1,11 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="minute" format="2">
-  <advance width="323"/>
+  <advance width="347"/>
   <unicode hex="2032"/>
-  <note>
-minute
-</note>
   <outline>
-    <component base="quotesingle" yxScale="0.19201" xOffset="-92"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="-76"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/multiply.glif b/src/Cantarell-Bold.ufo/glyphs/multiply.glif
index 364896c8..16c85c13 100644
--- a/src/Cantarell-Bold.ufo/glyphs/multiply.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/multiply.glif
@@ -1,19 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="multiply" format="2">
-  <advance width="576"/>
+  <advance width="600"/>
   <unicode hex="00D7"/>
   <outline>
     <contour>
-      <point x="438" y="39" type="line"/>
-      <point x="551" y="152" type="line"/>
-      <point x="150" y="562" type="line"/>
-      <point x="37" y="449" type="line"/>
+      <point x="411" y="100" type="line"/>
+      <point x="71" y="439" type="line"/>
+      <point x="189" y="557" type="line"/>
+      <point x="529" y="218" type="line"/>
     </contour>
     <contour>
-      <point x="131" y="38" type="line"/>
-      <point x="548" y="452" type="line"/>
-      <point x="434" y="565" type="line"/>
-      <point x="23" y="146" type="line"/>
+      <point x="189" y="100" type="line"/>
+      <point x="71" y="218" type="line"/>
+      <point x="411" y="557" type="line"/>
+      <point x="529" y="439" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/n.glif b/src/Cantarell-Bold.ufo/glyphs/n.glif
index fbdbc64c..50cef97c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/n.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/n.glif
@@ -1,37 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="n" format="2">
-  <advance width="581"/>
+  <advance width="598"/>
   <unicode hex="006E"/>
-  <note>
-n
-</note>
-  <anchor x="296" y="0" name="bottom"/>
-  <anchor x="296" y="490" name="top"/>
+  <anchor x="304" y="0" name="bottom"/>
+  <anchor x="304" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="227" y="0" type="line"/>
-      <point x="227" y="376" type="line"/>
-      <point x="179" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
+      <point x="374" y="0" type="line"/>
+      <point x="547" y="0" type="line"/>
+      <point x="547" y="284" type="line" smooth="yes"/>
+      <point x="547" y="418"/>
+      <point x="482" y="496"/>
+      <point x="371" y="496" type="curve" smooth="yes"/>
+      <point x="301" y="496"/>
+      <point x="240" y="465"/>
+      <point x="200" y="408" type="curve"/>
+      <point x="219" y="305" type="line"/>
+      <point x="244" y="332"/>
+      <point x="272" y="346"/>
+      <point x="306" y="346" type="curve" smooth="yes"/>
+      <point x="353" y="346"/>
+      <point x="374" y="320"/>
+      <point x="374" y="265" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="366" y="0" type="line"/>
-      <point x="539" y="0" type="line"/>
-      <point x="539" y="284" type="line" smooth="yes"/>
-      <point x="539" y="418"/>
-      <point x="474" y="496"/>
-      <point x="363" y="496" type="curve" smooth="yes"/>
-      <point x="293" y="496"/>
-      <point x="232" y="465"/>
-      <point x="192" y="408" type="curve"/>
-      <point x="211" y="305" type="line"/>
-      <point x="236" y="332"/>
-      <point x="264" y="346"/>
-      <point x="298" y="346" type="curve" smooth="yes"/>
-      <point x="345" y="346"/>
-      <point x="366" y="320"/>
-      <point x="366" y="265" type="curve" smooth="yes"/>
+      <point x="62" y="0" type="line"/>
+      <point x="235" y="0" type="line"/>
+      <point x="235" y="376" type="line"/>
+      <point x="187" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nacute.glif b/src/Cantarell-Bold.ufo/glyphs/nacute.glif
index 5b227626..7e686ba1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nacute" format="2">
-  <advance width="581"/>
+  <advance width="598"/>
   <unicode hex="0144"/>
   <outline>
     <component base="n"/>
-    <component base="acutecomb" xOffset="200"/>
+    <component base="acutecomb" xOffset="208"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/naira.glif b/src/Cantarell-Bold.ufo/glyphs/naira.glif
index 85815a57..cfe1de0e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/naira.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/naira.glif
@@ -1,32 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="naira" format="2">
-  <advance width="949"/>
+  <advance width="600"/>
   <unicode hex="20A6"/>
   <outline>
     <contour>
-      <point x="763" y="514" type="line"/>
-      <point x="763" y="384" type="line"/>
-      <point x="898" y="384" type="line"/>
-      <point x="898" y="514" type="line"/>
+      <point x="70" y="0" type="line"/>
+      <point x="219" y="0" type="line"/>
+      <point x="219" y="494" type="line"/>
+      <point x="197" y="485" type="line"/>
+      <point x="349" y="0" type="line"/>
+      <point x="530" y="0" type="line"/>
+      <point x="530" y="694" type="line"/>
+      <point x="379" y="694" type="line"/>
+      <point x="377" y="193" type="line"/>
+      <point x="406" y="202" type="line"/>
+      <point x="254" y="694" type="line"/>
+      <point x="70" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="763" y="314" type="line"/>
-      <point x="763" y="184" type="line"/>
-      <point x="898" y="184" type="line"/>
-      <point x="898" y="314" type="line"/>
+      <point x="0" y="208" type="line"/>
+      <point x="95" y="208" type="line"/>
+      <point x="95" y="314" type="line"/>
+      <point x="0" y="314" type="line"/>
     </contour>
     <contour>
-      <point x="187" y="184" type="line"/>
-      <point x="187" y="314" type="line"/>
-      <point x="51" y="314" type="line"/>
-      <point x="51" y="184" type="line"/>
+      <point x="0" y="384" type="line"/>
+      <point x="95" y="384" type="line"/>
+      <point x="95" y="490" type="line"/>
+      <point x="0" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="187" y="384" type="line"/>
-      <point x="187" y="514" type="line"/>
-      <point x="51" y="514" type="line"/>
-      <point x="51" y="384" type="line"/>
+      <point x="505" y="208" type="line"/>
+      <point x="600" y="208" type="line"/>
+      <point x="600" y="314" type="line"/>
+      <point x="505" y="314" type="line"/>
+    </contour>
+    <contour>
+      <point x="505" y="384" type="line"/>
+      <point x="600" y="384" type="line"/>
+      <point x="600" y="490" type="line"/>
+      <point x="505" y="490" type="line"/>
     </contour>
-    <component base="N" xOffset="71"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ncaron.glif b/src/Cantarell-Bold.ufo/glyphs/ncaron.glif
index 7d6ef76e..46e78848 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ncaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ncaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ncaron" format="2">
-  <advance width="581"/>
+  <advance width="598"/>
   <unicode hex="0148"/>
   <outline>
     <component base="n"/>
-    <component base="caroncomb" xOffset="90"/>
+    <component base="caroncomb" xOffset="98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ncommaaccent.glif b/src/Cantarell-Bold.ufo/glyphs/ncommaaccent.glif
index 419f5dda..d2bba076 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ncommaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ncommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ncommaaccent" format="2">
-  <advance width="581"/>
+  <advance width="598"/>
   <unicode hex="0146"/>
   <outline>
     <component base="n"/>
-    <component base="commaaccentcomb" xOffset="178"/>
+    <component base="commaaccentcomb" xOffset="186"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ndotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/ndotaccent.glif
index 43d6993b..b1be363f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ndotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ndotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ndotaccent" format="2">
-  <advance width="581"/>
+  <advance width="598"/>
   <unicode hex="1E45"/>
   <outline>
     <component base="n"/>
-    <component base="dotaccentcomb" xOffset="152"/>
+    <component base="dotaccentcomb" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ndotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/ndotbelow.glif
index be280ad0..b439c1c2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ndotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ndotbelow" format="2">
-  <advance width="581"/>
+  <advance width="598"/>
   <unicode hex="1E47"/>
   <outline>
     <component base="n"/>
-    <component base="dotbelowcomb" xOffset="146"/>
+    <component base="dotbelowcomb" xOffset="154"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nine.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/nine.dnom.glif
index b4a1e6d7..40b4feb9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nine.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nine.dnom.glif
@@ -1,49 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine.dnom" format="2">
-  <advance width="462"/>
-  <note>
-nine
-</note>
+  <advance width="430"/>
   <outline>
     <contour>
-      <point x="229" y="486" type="curve" smooth="yes"/>
-      <point x="106" y="486"/>
-      <point x="23" y="417"/>
-      <point x="23" y="314" type="curve" smooth="yes"/>
-      <point x="23" y="223"/>
-      <point x="85" y="164"/>
-      <point x="177" y="164" type="curve" smooth="yes"/>
-      <point x="245" y="164"/>
-      <point x="298" y="193"/>
-      <point x="330" y="251" type="curve"/>
-      <point x="292" y="299" type="line"/>
-      <point x="270" y="287"/>
-      <point x="244" y="282"/>
-      <point x="225" y="282" type="curve" smooth="yes"/>
-      <point x="190" y="282"/>
-      <point x="168" y="300"/>
-      <point x="168" y="324" type="curve" smooth="yes"/>
-      <point x="168" y="347"/>
-      <point x="188" y="363"/>
-      <point x="217" y="363" type="curve" smooth="yes"/>
-      <point x="267" y="363"/>
-      <point x="294" y="314"/>
-      <point x="294" y="244" type="curve" smooth="yes"/>
-      <point x="294" y="156"/>
-      <point x="252" y="114"/>
-      <point x="175" y="114" type="curve" smooth="yes"/>
-      <point x="144" y="114"/>
-      <point x="102" y="121"/>
-      <point x="69" y="133" type="curve"/>
-      <point x="31" y="22" type="line"/>
-      <point x="72" y="4"/>
-      <point x="121" y="-7"/>
-      <point x="180" y="-7" type="curve" smooth="yes"/>
-      <point x="351" y="-7"/>
-      <point x="441" y="86"/>
-      <point x="441" y="251" type="curve" smooth="yes"/>
-      <point x="441" y="405"/>
-      <point x="363" y="486"/>
+      <point x="172" y="-6" type="curve" smooth="yes"/>
+      <point x="318" y="-6"/>
+      <point x="398" y="76"/>
+      <point x="398" y="216" type="curve" smooth="yes"/>
+      <point x="398" y="352"/>
+      <point x="331" y="422"/>
+      <point x="214" y="422" type="curve" smooth="yes"/>
+      <point x="106" y="422"/>
+      <point x="35" y="362"/>
+      <point x="35" y="273" type="curve" smooth="yes"/>
+      <point x="35" y="195"/>
+      <point x="89" y="143"/>
+      <point x="170" y="143" type="curve" smooth="yes"/>
+      <point x="229" y="143"/>
+      <point x="278" y="169"/>
+      <point x="303" y="218" type="curve"/>
+      <point x="271" y="259" type="line"/>
+      <point x="256" y="251"/>
+      <point x="231" y="244"/>
+      <point x="209" y="244" type="curve" smooth="yes"/>
+      <point x="178" y="244"/>
+      <point x="158" y="260"/>
+      <point x="158" y="283" type="curve" smooth="yes"/>
+      <point x="158" y="305"/>
+      <point x="177" y="320"/>
+      <point x="204" y="320" type="curve" smooth="yes"/>
+      <point x="247" y="320"/>
+      <point x="273" y="278"/>
+      <point x="273" y="206" type="curve" smooth="yes"/>
+      <point x="273" y="136"/>
+      <point x="237" y="97"/>
+      <point x="167" y="97" type="curve" smooth="yes"/>
+      <point x="140" y="97"/>
+      <point x="102" y="104"/>
+      <point x="73" y="115" type="curve"/>
+      <point x="41" y="20" type="line"/>
+      <point x="75" y="4"/>
+      <point x="122" y="-6"/>
     </contour>
   </outline>
   <lib>
@@ -51,11 +48,11 @@ nine
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>69</integer>
+        <integer>60</integer>
         <key>weight</key>
-        <integer>-23</integer>
+        <integer>-45</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>65</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nine.glif b/src/Cantarell-Bold.ufo/glyphs/nine.glif
index e1d42fa5..acc2c745 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nine.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nine.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine" format="2">
-  <advance width="600"/>
+  <advance width="609"/>
   <unicode hex="0039"/>
   <outline>
-    <component base="six" xScale="-1" yScale="-1" xOffset="601" yOffset="694"/>
+    <component base="six" xScale="-1" yScale="-1" xOffset="609" yOffset="694"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|six</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|six</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nine.numr.glif b/src/Cantarell-Bold.ufo/glyphs/nine.numr.glif
index f7220bc9..4a7b6aa6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nine.numr.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nine.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine.numr" format="2">
-  <advance width="462"/>
+  <advance width="430"/>
   <outline>
     <component base="nine.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nine.osf.glif b/src/Cantarell-Bold.ufo/glyphs/nine.osf.glif
index e83af3e9..ca8dd437 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nine.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nine.osf.glif
@@ -1,46 +1,54 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine.osf" format="2">
-  <advance width="594"/>
+  <advance width="603"/>
   <outline>
     <contour>
-      <point x="291" y="604" type="curve" smooth="yes"/>
-      <point x="134" y="604"/>
-      <point x="28" y="507"/>
-      <point x="28" y="363" type="curve" smooth="yes"/>
-      <point x="28" y="236"/>
-      <point x="111" y="149"/>
-      <point x="235" y="149" type="curve" smooth="yes"/>
-      <point x="330" y="149"/>
-      <point x="402" y="198"/>
-      <point x="444" y="283" type="curve"/>
-      <point x="403" y="342" type="line"/>
-      <point x="375" y="306"/>
-      <point x="332" y="282"/>
-      <point x="287" y="282" type="curve" smooth="yes"/>
-      <point x="230" y="282"/>
-      <point x="189" y="320"/>
-      <point x="189" y="376" type="curve" smooth="yes"/>
-      <point x="189" y="430"/>
-      <point x="225" y="467"/>
-      <point x="279" y="467" type="curve" smooth="yes"/>
-      <point x="358" y="467"/>
-      <point x="402" y="384"/>
-      <point x="402" y="250" type="curve" smooth="yes"/>
-      <point x="402" y="106"/>
-      <point x="340" y="24"/>
-      <point x="225" y="24" type="curve" smooth="yes"/>
-      <point x="180" y="24"/>
-      <point x="121" y="37"/>
-      <point x="82" y="55" type="curve"/>
-      <point x="39" y="-69" type="line"/>
-      <point x="91" y="-95"/>
-      <point x="158" y="-110"/>
-      <point x="230" y="-110" type="curve" smooth="yes"/>
-      <point x="448" y="-110"/>
-      <point x="565" y="26"/>
-      <point x="565" y="264" type="curve" smooth="yes"/>
-      <point x="565" y="487"/>
-      <point x="464" y="604"/>
+      <point x="233" y="-110" type="curve" smooth="yes"/>
+      <point x="451" y="-110"/>
+      <point x="568" y="26"/>
+      <point x="568" y="264" type="curve" smooth="yes"/>
+      <point x="568" y="487"/>
+      <point x="467" y="604"/>
+      <point x="294" y="604" type="curve" smooth="yes"/>
+      <point x="137" y="604"/>
+      <point x="31" y="507"/>
+      <point x="31" y="363" type="curve" smooth="yes"/>
+      <point x="31" y="236"/>
+      <point x="114" y="149"/>
+      <point x="238" y="149" type="curve" smooth="yes"/>
+      <point x="333" y="149"/>
+      <point x="405" y="198"/>
+      <point x="447" y="283" type="curve"/>
+      <point x="406" y="342" type="line"/>
+      <point x="378" y="306"/>
+      <point x="335" y="282"/>
+      <point x="290" y="282" type="curve" smooth="yes"/>
+      <point x="233" y="282"/>
+      <point x="192" y="320"/>
+      <point x="192" y="376" type="curve" smooth="yes"/>
+      <point x="192" y="430"/>
+      <point x="228" y="467"/>
+      <point x="282" y="467" type="curve" smooth="yes"/>
+      <point x="361" y="467"/>
+      <point x="405" y="384"/>
+      <point x="405" y="250" type="curve" smooth="yes"/>
+      <point x="405" y="106"/>
+      <point x="343" y="24"/>
+      <point x="228" y="24" type="curve" smooth="yes"/>
+      <point x="183" y="24"/>
+      <point x="124" y="37"/>
+      <point x="85" y="55" type="curve"/>
+      <point x="42" y="-69" type="line"/>
+      <point x="94" y="-95"/>
+      <point x="161" y="-110"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>nine</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>nine</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nine.tf.glif b/src/Cantarell-Bold.ufo/glyphs/nine.tf.glif
index 4c6435df..211b6bdf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nine.tf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nine.tf.glif
@@ -1,47 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine.tf" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <outline>
-    <contour>
-      <point x="285" y="704" type="curve" smooth="yes"/>
-      <point x="129" y="704"/>
-      <point x="25" y="607"/>
-      <point x="25" y="460" type="curve" smooth="yes"/>
-      <point x="25" y="332"/>
-      <point x="105" y="248"/>
-      <point x="227" y="248" type="curve" smooth="yes"/>
-      <point x="316" y="248"/>
-      <point x="387" y="292"/>
-      <point x="429" y="379" type="curve"/>
-      <point x="387" y="439" type="line"/>
-      <point x="357" y="403"/>
-      <point x="316" y="385"/>
-      <point x="280" y="385" type="curve" smooth="yes"/>
-      <point x="227" y="385"/>
-      <point x="191" y="421"/>
-      <point x="191" y="475" type="curve" smooth="yes"/>
-      <point x="191" y="527"/>
-      <point x="224" y="561"/>
-      <point x="273" y="561" type="curve" smooth="yes"/>
-      <point x="347" y="561"/>
-      <point x="388" y="480"/>
-      <point x="388" y="355" type="curve" smooth="yes"/>
-      <point x="388" y="206"/>
-      <point x="329" y="130"/>
-      <point x="219" y="130" type="curve" smooth="yes"/>
-      <point x="176" y="130"/>
-      <point x="119" y="142"/>
-      <point x="79" y="160" type="curve"/>
-      <point x="36" y="31" type="line"/>
-      <point x="88" y="5"/>
-      <point x="152" y="-10"/>
-      <point x="226" y="-10" type="curve" smooth="yes"/>
-      <point x="441" y="-10"/>
-      <point x="556" y="125"/>
-      <point x="556" y="364" type="curve" smooth="yes"/>
-      <point x="556" y="587"/>
-      <point x="457" y="704"/>
-    </contour>
+    <component base="nine" xOffset="5"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nineinferior.glif b/src/Cantarell-Bold.ufo/glyphs/nineinferior.glif
index 82d3b862..86858945 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nineinferior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nineinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nineinferior" format="2">
-  <advance width="462"/>
+  <advance width="430"/>
   <unicode hex="2089"/>
   <outline>
     <component base="nine.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ninesuperior.glif b/src/Cantarell-Bold.ufo/glyphs/ninesuperior.glif
index de4a2e89..064f96a1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ninesuperior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ninesuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ninesuperior" format="2">
-  <advance width="462"/>
+  <advance width="430"/>
   <unicode hex="2079"/>
   <outline>
     <component base="nine.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nj.glif b/src/Cantarell-Bold.ufo/glyphs/nj.glif
index b9bc9fc5..436d7937 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nj.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nj.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nj" format="2">
-  <advance width="868"/>
+  <advance width="895"/>
   <unicode hex="01CC"/>
   <outline>
     <component base="n"/>
-    <component base="j" xOffset="581"/>
+    <component base="j" xOffset="598"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nje-cy.glif b/src/Cantarell-Bold.ufo/glyphs/nje-cy.glif
index 865a9dc6..b2b74ca9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nje-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nje-cy.glif
@@ -1,45 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nje-cy" format="2">
-  <advance width="857"/>
+  <advance width="873"/>
   <unicode hex="045A"/>
   <outline>
     <contour>
-      <point x="374" y="0" type="line"/>
-      <point x="542" y="0" type="line"/>
-      <point x="542" y="490" type="line"/>
-      <point x="374" y="490" type="line"/>
+      <point x="449" y="0" type="line"/>
+      <point x="619" y="0" type="line" smooth="yes"/>
+      <point x="763" y="0"/>
+      <point x="857" y="62"/>
+      <point x="857" y="163" type="curve" smooth="yes"/>
+      <point x="857" y="254"/>
+      <point x="780" y="314"/>
+      <point x="664" y="314" type="curve" smooth="yes"/>
+      <point x="449" y="314" type="line"/>
+      <point x="449" y="191" type="line"/>
+      <point x="628" y="191" type="line" smooth="yes"/>
+      <point x="667" y="191"/>
+      <point x="688" y="178"/>
+      <point x="688" y="156" type="curve" smooth="yes"/>
+      <point x="688" y="135"/>
+      <point x="669" y="120"/>
+      <point x="640" y="120" type="curve" smooth="yes"/>
+      <point x="449" y="120" type="line"/>
     </contour>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="222" y="0" type="line"/>
-      <point x="222" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="230" y="0" type="line"/>
+      <point x="230" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="204" y="179" type="line"/>
-      <point x="392" y="179" type="line"/>
-      <point x="392" y="314" type="line"/>
-      <point x="204" y="314" type="line"/>
+      <point x="212" y="179" type="line"/>
+      <point x="400" y="179" type="line"/>
+      <point x="400" y="314" type="line"/>
+      <point x="212" y="314" type="line"/>
     </contour>
     <contour>
-      <point x="441" y="0" type="line"/>
-      <point x="611" y="0" type="line" smooth="yes"/>
-      <point x="761" y="0"/>
-      <point x="849" y="70"/>
-      <point x="849" y="187" type="curve" smooth="yes"/>
-      <point x="849" y="281"/>
-      <point x="771" y="344"/>
-      <point x="656" y="344" type="curve" smooth="yes"/>
-      <point x="441" y="344" type="line"/>
-      <point x="441" y="220" type="line"/>
-      <point x="620" y="220" type="line" smooth="yes"/>
-      <point x="654" y="220"/>
-      <point x="680" y="202"/>
-      <point x="680" y="173" type="curve" smooth="yes"/>
-      <point x="680" y="144"/>
-      <point x="661" y="126"/>
-      <point x="632" y="126" type="curve" smooth="yes"/>
-      <point x="441" y="126" type="line"/>
+      <point x="382" y="0" type="line"/>
+      <point x="550" y="0" type="line"/>
+      <point x="550" y="490" type="line"/>
+      <point x="382" y="490" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>softsign-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nlinebelow.glif b/src/Cantarell-Bold.ufo/glyphs/nlinebelow.glif
index 1df032c4..09688483 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nlinebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nlinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nlinebelow" format="2">
-  <advance width="581"/>
+  <advance width="598"/>
   <unicode hex="1E49"/>
   <outline>
     <component base="n"/>
-    <component base="macronbelowcomb" xOffset="51"/>
+    <component base="macronbelowcomb" xOffset="59"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/notequal.glif b/src/Cantarell-Bold.ufo/glyphs/notequal.glif
index 558c12ec..5405914c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/notequal.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/notequal.glif
@@ -1,25 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="notequal" format="2">
-  <advance width="631"/>
+  <advance width="600"/>
   <unicode hex="2260"/>
   <outline>
     <contour>
-      <point x="58" y="371" type="line"/>
-      <point x="573" y="371" type="line"/>
-      <point x="573" y="521" type="line"/>
-      <point x="58" y="521" type="line"/>
+      <point x="197" y="-24" type="line"/>
+      <point x="489" y="602" type="line"/>
+      <point x="378" y="654" type="line"/>
+      <point x="93" y="25" type="line"/>
     </contour>
     <contour>
-      <point x="199" y="11" type="line"/>
-      <point x="535" y="578" type="line"/>
-      <point x="427" y="639" type="line"/>
-      <point x="96" y="69" type="line"/>
+      <point x="60" y="116" type="line"/>
+      <point x="540" y="116" type="line"/>
+      <point x="540" y="283" type="line"/>
+      <point x="60" y="283" type="line"/>
     </contour>
     <contour>
-      <point x="58" y="131" type="line"/>
-      <point x="573" y="131" type="line"/>
-      <point x="573" y="281" type="line"/>
-      <point x="58" y="281" type="line"/>
+      <point x="60" y="359" type="line"/>
+      <point x="540" y="359" type="line"/>
+      <point x="540" y="526" type="line"/>
+      <point x="60" y="526" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minus</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/notidentical.glif b/src/Cantarell-Bold.ufo/glyphs/notidentical.glif
index 8ee34c04..e5a99600 100644
--- a/src/Cantarell-Bold.ufo/glyphs/notidentical.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/notidentical.glif
@@ -1,31 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="notidentical" format="2">
-  <advance width="620"/>
+  <advance width="600"/>
   <unicode hex="2262"/>
   <outline>
     <contour>
-      <point x="154" y="-85" type="line"/>
-      <point x="557" y="699" type="line"/>
-      <point x="469" y="748" type="line"/>
+      <point x="152" y="-85" type="line"/>
+      <point x="536" y="699" type="line"/>
+      <point x="450" y="748" type="line"/>
       <point x="69" y="-39" type="line"/>
     </contour>
     <contour>
-      <point x="62" y="462" type="line"/>
-      <point x="558" y="462" type="line"/>
-      <point x="558" y="597" type="line"/>
-      <point x="62" y="597" type="line"/>
+      <point x="60" y="82" type="line"/>
+      <point x="540" y="82" type="line"/>
+      <point x="540" y="217" type="line"/>
+      <point x="60" y="217" type="line"/>
     </contour>
     <contour>
-      <point x="62" y="82" type="line"/>
-      <point x="558" y="82" type="line"/>
-      <point x="558" y="217" type="line"/>
-      <point x="62" y="217" type="line"/>
+      <point x="60" y="272" type="line"/>
+      <point x="540" y="272" type="line"/>
+      <point x="540" y="407" type="line"/>
+      <point x="60" y="407" type="line"/>
     </contour>
     <contour>
-      <point x="62" y="272" type="line"/>
-      <point x="558" y="272" type="line"/>
-      <point x="558" y="407" type="line"/>
-      <point x="62" y="407" type="line"/>
+      <point x="60" y="462" type="line"/>
+      <point x="540" y="462" type="line"/>
+      <point x="540" y="597" type="line"/>
+      <point x="60" y="597" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minus</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ntilde.glif b/src/Cantarell-Bold.ufo/glyphs/ntilde.glif
index a905e173..fea4801e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ntilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ntilde" format="2">
-  <advance width="581"/>
+  <advance width="598"/>
   <unicode hex="00F1"/>
   <outline>
     <component base="n"/>
-    <component base="tildecomb" xOffset="61"/>
+    <component base="tildecomb" xOffset="69"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/numbersign.glif b/src/Cantarell-Bold.ufo/glyphs/numbersign.glif
index 38de223e..f2a09bb2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/numbersign.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/numbersign.glif
@@ -1,31 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="numbersign" format="2">
-  <advance width="689"/>
+  <advance width="725"/>
   <unicode hex="0023"/>
   <outline>
     <contour>
-      <point x="414" y="0" type="line"/>
-      <point x="574" y="0" type="line"/>
-      <point x="574" y="694" type="line"/>
-      <point x="414" y="694" type="line"/>
+      <point x="438" y="0" type="line"/>
+      <point x="588" y="0" type="line"/>
+      <point x="585" y="694" type="line"/>
+      <point x="435" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="22" y="151" type="line"/>
-      <point x="667" y="151" type="line"/>
-      <point x="667" y="276" type="line"/>
-      <point x="22" y="276" type="line"/>
+      <point x="38" y="122" type="line"/>
+      <point x="687" y="122" type="line"/>
+      <point x="687" y="269" type="line"/>
+      <point x="38" y="269" type="line"/>
     </contour>
     <contour>
-      <point x="120" y="0" type="line"/>
-      <point x="281" y="0" type="line"/>
-      <point x="281" y="694" type="line"/>
-      <point x="120" y="694" type="line"/>
+      <point x="142" y="0" type="line"/>
+      <point x="292" y="0" type="line"/>
+      <point x="289" y="694" type="line"/>
+      <point x="139" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="22" y="421" type="line"/>
-      <point x="667" y="421" type="line"/>
-      <point x="667" y="546" type="line"/>
-      <point x="22" y="546" type="line"/>
+      <point x="38" y="418" type="line"/>
+      <point x="687" y="418" type="line"/>
+      <point x="687" y="565" type="line"/>
+      <point x="38" y="565" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/numero.glif b/src/Cantarell-Bold.ufo/glyphs/numero.glif
index d8f6470b..eef8adc5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/numero.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/numero.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="numero" format="2">
-  <advance width="1358"/>
+  <advance width="1238"/>
   <unicode hex="2116"/>
   <outline>
-    <component base="N" xOffset="13"/>
-    <component base="_o.numero" xOffset="770"/>
+    <component base="N"/>
+    <component base="ordmasculine" xOffset="788"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
-        <integer>-1</integer>
         <integer>0</integer>
+        <integer>1</integer>
       </array>
     </dict>
   </lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/o-cy.glif b/src/Cantarell-Bold.ufo/glyphs/o-cy.glif
index d11bc2f9..6be29358 100644
--- a/src/Cantarell-Bold.ufo/glyphs/o-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/o-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="o-cy" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="043E"/>
-  <anchor x="284" y="490" name="top"/>
   <outline>
     <component base="o"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/o.glif b/src/Cantarell-Bold.ufo/glyphs/o.glif
index 0788592e..e2dd3261 100644
--- a/src/Cantarell-Bold.ufo/glyphs/o.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/o.glif
@@ -1,43 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="o" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="006F"/>
-  <note>
-o
-</note>
-  <anchor x="282" y="0" name="bottom"/>
-  <anchor x="282" y="245" name="center"/>
-  <anchor x="368" y="10" name="ogonek"/>
-  <anchor x="282" y="490" name="top"/>
-  <anchor x="478" y="490" name="topright"/>
+  <anchor x="297" y="0" name="bottom"/>
+  <anchor x="297" y="245" name="center"/>
+  <anchor x="383" y="10" name="ogonek"/>
+  <anchor x="297" y="490" name="top"/>
+  <anchor x="493" y="490" name="topright"/>
   <outline>
     <contour>
-      <point x="275" y="-10" type="curve" smooth="yes"/>
-      <point x="439" y="-10"/>
-      <point x="549" y="96"/>
-      <point x="549" y="254" type="curve" smooth="yes"/>
-      <point x="549" y="403"/>
-      <point x="449" y="500"/>
-      <point x="293" y="500" type="curve" smooth="yes"/>
-      <point x="128" y="500"/>
-      <point x="18" y="394"/>
-      <point x="18" y="235" type="curve" smooth="yes"/>
-      <point x="18" y="87"/>
-      <point x="118" y="-10"/>
+      <point x="290" y="-10" type="curve" smooth="yes"/>
+      <point x="454" y="-10"/>
+      <point x="564" y="96"/>
+      <point x="564" y="254" type="curve" smooth="yes"/>
+      <point x="564" y="403"/>
+      <point x="464" y="500"/>
+      <point x="308" y="500" type="curve" smooth="yes"/>
+      <point x="143" y="500"/>
+      <point x="33" y="394"/>
+      <point x="33" y="235" type="curve" smooth="yes"/>
+      <point x="33" y="87"/>
+      <point x="133" y="-10"/>
     </contour>
     <contour>
-      <point x="286" y="134" type="curve" smooth="yes"/>
-      <point x="228" y="134"/>
-      <point x="194" y="176"/>
-      <point x="194" y="246" type="curve" smooth="yes"/>
-      <point x="194" y="315"/>
-      <point x="226" y="356"/>
-      <point x="281" y="356" type="curve" smooth="yes"/>
-      <point x="339" y="356"/>
-      <point x="373" y="313"/>
-      <point x="373" y="240" type="curve" smooth="yes"/>
-      <point x="373" y="173"/>
-      <point x="341" y="134"/>
+      <point x="301" y="134" type="curve" smooth="yes"/>
+      <point x="243" y="134"/>
+      <point x="209" y="176"/>
+      <point x="209" y="246" type="curve" smooth="yes"/>
+      <point x="209" y="315"/>
+      <point x="241" y="356"/>
+      <point x="296" y="356" type="curve" smooth="yes"/>
+      <point x="354" y="356"/>
+      <point x="388" y="313"/>
+      <point x="388" y="240" type="curve" smooth="yes"/>
+      <point x="388" y="173"/>
+      <point x="356" y="134"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/oacute.glif b/src/Cantarell-Bold.ufo/glyphs/oacute.glif
index 509d34b4..b2adce5d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/oacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/oacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oacute" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="00F3"/>
   <outline>
     <component base="o"/>
-    <component base="acutecomb" xOffset="186"/>
+    <component base="acutecomb" xOffset="201"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/obarred-cy.glif b/src/Cantarell-Bold.ufo/glyphs/obarred-cy.glif
index 93cbfd54..ed2e7dc9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/obarred-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/obarred-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="obarred-cy" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="04E9"/>
   <outline>
     <component base="o"/>
-    <component base="strokeshortcomb" xOffset="67" yOffset="-54"/>
+    <component base="strokeshortcomb" xOffset="82" yOffset="-54"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/obreve.glif b/src/Cantarell-Bold.ufo/glyphs/obreve.glif
index 37c8f1d4..076cad43 100644
--- a/src/Cantarell-Bold.ufo/glyphs/obreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/obreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="obreve" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="014F"/>
   <outline>
     <component base="o"/>
-    <component base="brevecomb" xOffset="66"/>
+    <component base="brevecomb" xOffset="81"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ocaron.glif b/src/Cantarell-Bold.ufo/glyphs/ocaron.glif
index 30eed9f5..8ee71577 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ocaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ocaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocaron" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="01D2"/>
   <outline>
     <component base="o"/>
-    <component base="caroncomb" xOffset="76"/>
+    <component base="caroncomb" xOffset="91"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ocircumflex.glif b/src/Cantarell-Bold.ufo/glyphs/ocircumflex.glif
index 92137739..8db1df46 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ocircumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ocircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflex" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="00F4"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb" xOffset="79"/>
+    <component base="circumflexcomb" xOffset="94"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ocircumflexacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/ocircumflexacute.glif
index d9595d40..3f704da3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ocircumflexacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ocircumflexacute.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflexacute" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="1ED1"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb_acutecomb" xOffset="78"/>
+    <component base="circumflexcomb.loclVIET" xOffset="93"/>
+    <component base="acutecomb.loclVIET" xOffset="388" yOffset="123"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ocircumflexdotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/ocircumflexdotbelow.glif
index ca770345..dd02a8a0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ocircumflexdotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ocircumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflexdotbelow" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="1ED9"/>
   <outline>
     <component base="o"/>
-    <component base="dotbelowcomb" xOffset="132"/>
-    <component base="circumflexcomb" xOffset="79"/>
+    <component base="dotbelowcomb" xOffset="147"/>
+    <component base="circumflexcomb" xOffset="94"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ocircumflexgrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/ocircumflexgrave.glif
index 5f88fd8b..d8e3e931 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ocircumflexgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ocircumflexgrave.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflexgrave" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="1ED3"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb_gravecomb" xOffset="78"/>
+    <component base="circumflexcomb.loclVIET" xOffset="93"/>
+    <component base="gravecomb.loclVIET" xOffset="298" yOffset="123"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ocircumflexhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/ocircumflexhookabove.glif
index 4230e665..bf7899ca 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ocircumflexhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ocircumflexhookabove.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflexhookabove" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="1ED5"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb_hookabovecomb" xOffset="78"/>
+    <component base="circumflexcomb.loclVIET" xOffset="93"/>
+    <component base="hookabovecomb.loclVIET" xOffset="321" yOffset="122"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ocircumflextilde.glif 
b/src/Cantarell-Bold.ufo/glyphs/ocircumflextilde.glif
index b9ca4318..89f9d8f1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ocircumflextilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ocircumflextilde.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflextilde" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="1ED7"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb_tildecomb" xOffset="60"/>
+    <component base="circumflexcomb.loclVIET" xOffset="93"/>
+    <component base="tildecomb.loclVIET" xOffset="79" yOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/odblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/odblgrave.glif
index caaf9be8..e5d540d4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/odblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/odblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odblgrave" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="020D"/>
   <outline>
     <component base="o"/>
-    <component base="dblgravecomb" xOffset="-19"/>
+    <component base="dblgravecomb" xOffset="-4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/odieresis-cy.glif b/src/Cantarell-Bold.ufo/glyphs/odieresis-cy.glif
index 16f859ea..398f6dfe 100644
--- a/src/Cantarell-Bold.ufo/glyphs/odieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/odieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odieresis-cy" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="04E7"/>
   <outline>
     <component base="o-cy"/>
-    <component base="dieresiscomb" xOffset="15"/>
+    <component base="dieresiscomb" xOffset="28"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/odieresis.glif b/src/Cantarell-Bold.ufo/glyphs/odieresis.glif
index 3f54f018..8d3db2fd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/odieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/odieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odieresis" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="00F6"/>
   <outline>
     <component base="o"/>
-    <component base="dieresiscomb" xOffset="13"/>
+    <component base="dieresiscomb" xOffset="28"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/odieresismacron.glif 
b/src/Cantarell-Bold.ufo/glyphs/odieresismacron.glif
index 6be8bd0e..fa2a9eb3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/odieresismacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/odieresismacron.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odieresismacron" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="022B"/>
   <outline>
     <component base="o"/>
-    <component base="dieresiscomb_macroncomb" xOffset="26"/>
+    <component base="dieresiscomb.loclVIET" xOffset="41"/>
+    <component base="macroncomb" xOffset="55" yOffset="186"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/odotaccentmacron.glif 
b/src/Cantarell-Bold.ufo/glyphs/odotaccentmacron.glif
index 1f3edb5a..ef18b924 100644
--- a/src/Cantarell-Bold.ufo/glyphs/odotaccentmacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/odotaccentmacron.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odotaccentmacron" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="0231"/>
   <outline>
     <component base="o"/>
-    <component base="dotaccentcomb_macroncomb" xOffset="-9"/>
+    <component base="dotaccentcomb.loclVIET" xOffset="153"/>
+    <component base="macroncomb" xOffset="55" yOffset="186"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/odotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/odotbelow.glif
index 86f38628..5a63cff2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/odotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/odotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odotbelow" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="1ECD"/>
   <outline>
     <component base="o"/>
-    <component base="dotbelowcomb" xOffset="132"/>
+    <component base="dotbelowcomb" xOffset="147"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/oe.glif b/src/Cantarell-Bold.ufo/glyphs/oe.glif
index eca35590..98a1298c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/oe.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/oe.glif
@@ -1,70 +1,70 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oe" format="2">
-  <advance width="881"/>
+  <advance width="901"/>
   <unicode hex="0153"/>
-  <anchor x="481" y="0" name="bottom"/>
-  <anchor x="481" y="490" name="top"/>
+  <anchor x="496" y="0" name="bottom"/>
+  <anchor x="496" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="259" y="-10" type="curve" smooth="yes"/>
-      <point x="404" y="-10"/>
-      <point x="499" y="94"/>
-      <point x="499" y="253" type="curve" smooth="yes"/>
-      <point x="499" y="405"/>
-      <point x="412" y="500"/>
-      <point x="274" y="500" type="curve" smooth="yes"/>
-      <point x="124" y="500"/>
-      <point x="18" y="391"/>
-      <point x="18" y="237" type="curve" smooth="yes"/>
-      <point x="18" y="90"/>
-      <point x="115" y="-10"/>
+      <point x="274" y="-10" type="curve" smooth="yes"/>
+      <point x="419" y="-10"/>
+      <point x="514" y="94"/>
+      <point x="514" y="253" type="curve" smooth="yes"/>
+      <point x="514" y="405"/>
+      <point x="427" y="500"/>
+      <point x="289" y="500" type="curve" smooth="yes"/>
+      <point x="139" y="500"/>
+      <point x="33" y="391"/>
+      <point x="33" y="237" type="curve" smooth="yes"/>
+      <point x="33" y="90"/>
+      <point x="130" y="-10"/>
     </contour>
     <contour>
-      <point x="286" y="134" type="curve" smooth="yes"/>
-      <point x="231" y="134"/>
-      <point x="194" y="179"/>
-      <point x="194" y="246" type="curve" smooth="yes"/>
-      <point x="194" y="313"/>
-      <point x="228" y="356"/>
-      <point x="281" y="356" type="curve" smooth="yes"/>
-      <point x="336" y="356"/>
-      <point x="373" y="310"/>
-      <point x="373" y="240" type="curve" smooth="yes"/>
-      <point x="373" y="176"/>
-      <point x="339" y="134"/>
+      <point x="301" y="134" type="curve" smooth="yes"/>
+      <point x="246" y="134"/>
+      <point x="209" y="179"/>
+      <point x="209" y="246" type="curve" smooth="yes"/>
+      <point x="209" y="313"/>
+      <point x="243" y="356"/>
+      <point x="296" y="356" type="curve" smooth="yes"/>
+      <point x="351" y="356"/>
+      <point x="388" y="310"/>
+      <point x="388" y="240" type="curve" smooth="yes"/>
+      <point x="388" y="176"/>
+      <point x="354" y="134"/>
     </contour>
     <contour>
-      <point x="663" y="-10" type="curve" smooth="yes"/>
-      <point x="718" y="-10"/>
-      <point x="782" y="1"/>
-      <point x="844" y="22" type="curve"/>
-      <point x="806" y="139" type="line"/>
-      <point x="765" y="125"/>
-      <point x="726" y="118"/>
-      <point x="686" y="118" type="curve" smooth="yes"/>
-      <point x="589" y="118"/>
-      <point x="544" y="160"/>
-      <point x="544" y="261" type="curve" smooth="yes"/>
-      <point x="544" y="337"/>
-      <point x="572" y="373"/>
-      <point x="619" y="373" type="curve" smooth="yes"/>
-      <point x="660" y="373"/>
-      <point x="690" y="347"/>
-      <point x="690" y="297" type="curve"/>
-      <point x="523" y="297" type="line"/>
-      <point x="523" y="197" type="line"/>
-      <point x="846" y="197" type="line"/>
-      <point x="850" y="222"/>
-      <point x="853" y="247"/>
-      <point x="853" y="273" type="curve" smooth="yes"/>
-      <point x="853" y="416"/>
-      <point x="769" y="500"/>
-      <point x="635" y="500" type="curve" smooth="yes"/>
-      <point x="483" y="500"/>
-      <point x="373" y="394"/>
-      <point x="373" y="248" type="curve" smooth="yes"/>
-      <point x="373" y="96"/>
-      <point x="492" y="-10"/>
+      <point x="678" y="-10" type="curve" smooth="yes"/>
+      <point x="733" y="-10"/>
+      <point x="797" y="1"/>
+      <point x="859" y="22" type="curve"/>
+      <point x="821" y="139" type="line"/>
+      <point x="780" y="125"/>
+      <point x="741" y="118"/>
+      <point x="701" y="118" type="curve" smooth="yes"/>
+      <point x="604" y="118"/>
+      <point x="559" y="160"/>
+      <point x="559" y="261" type="curve" smooth="yes"/>
+      <point x="559" y="337"/>
+      <point x="587" y="373"/>
+      <point x="634" y="373" type="curve" smooth="yes"/>
+      <point x="675" y="373"/>
+      <point x="705" y="347"/>
+      <point x="705" y="297" type="curve"/>
+      <point x="538" y="297" type="line"/>
+      <point x="538" y="197" type="line"/>
+      <point x="861" y="197" type="line"/>
+      <point x="865" y="222"/>
+      <point x="868" y="247"/>
+      <point x="868" y="273" type="curve" smooth="yes"/>
+      <point x="868" y="416"/>
+      <point x="784" y="500"/>
+      <point x="650" y="500" type="curve" smooth="yes"/>
+      <point x="498" y="500"/>
+      <point x="388" y="394"/>
+      <point x="388" y="248" type="curve" smooth="yes"/>
+      <point x="388" y="96"/>
+      <point x="507" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ogonek.glif b/src/Cantarell-Bold.ufo/glyphs/ogonek.glif
index 401eb8b9..9743b669 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ogonek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ogonek.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ogonek" format="2">
-  <advance width="600"/>
+  <advance width="500"/>
   <unicode hex="02DB"/>
   <outline>
-    <component base="ogonekcomb"/>
+    <component base="ogonekcomb" xOffset="-132"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ograve.glif b/src/Cantarell-Bold.ufo/glyphs/ograve.glif
index 82ed2f23..77bbf8b0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ograve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ograve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ograve" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="00F2"/>
   <outline>
     <component base="o"/>
-    <component base="gravecomb" xOffset="84"/>
+    <component base="gravecomb" xOffset="99"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ohookabove.glif b/src/Cantarell-Bold.ufo/glyphs/ohookabove.glif
index 285572e4..84d2bdf8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ohookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ohookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohookabove" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="1ECF"/>
   <outline>
     <component base="o"/>
-    <component base="hookabovecomb" xOffset="128"/>
+    <component base="hookabovecomb" xOffset="143"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ohorn.glif b/src/Cantarell-Bold.ufo/glyphs/ohorn.glif
index 7f733ea5..4ac0e4a2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ohorn.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ohorn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohorn" format="2">
-  <advance width="685"/>
+  <advance width="715"/>
   <unicode hex="01A1"/>
   <outline>
     <component base="o"/>
-    <component base="horncomb" xOffset="407" yOffset="8"/>
+    <component base="horncomb" xOffset="422" yOffset="8"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ohornacute.glif b/src/Cantarell-Bold.ufo/glyphs/ohornacute.glif
index 54513707..d06fe3a6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ohornacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ohornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohornacute" format="2">
-  <advance width="685"/>
+  <advance width="715"/>
   <unicode hex="1EDB"/>
   <outline>
     <component base="ohorn"/>
-    <component base="acutecomb" xOffset="186"/>
+    <component base="acutecomb" xOffset="201"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ohorndotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/ohorndotbelow.glif
index 971252c3..606a2506 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ohorndotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ohorndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohorndotbelow" format="2">
-  <advance width="685"/>
+  <advance width="715"/>
   <unicode hex="1EE3"/>
   <outline>
     <component base="ohorn"/>
-    <component base="dotbelowcomb" xOffset="132"/>
+    <component base="dotbelowcomb" xOffset="147"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ohorngrave.glif b/src/Cantarell-Bold.ufo/glyphs/ohorngrave.glif
index 87c5e682..1a59be87 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ohorngrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ohorngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohorngrave" format="2">
-  <advance width="685"/>
+  <advance width="715"/>
   <unicode hex="1EDD"/>
   <outline>
     <component base="ohorn"/>
-    <component base="gravecomb" xOffset="84"/>
+    <component base="gravecomb" xOffset="99"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ohornhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/ohornhookabove.glif
index 34956112..fb7e8ee4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ohornhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ohornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohornhookabove" format="2">
-  <advance width="685"/>
+  <advance width="715"/>
   <unicode hex="1EDF"/>
   <outline>
     <component base="ohorn"/>
-    <component base="hookabovecomb" xOffset="128"/>
+    <component base="hookabovecomb" xOffset="143"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ohorntilde.glif b/src/Cantarell-Bold.ufo/glyphs/ohorntilde.glif
index 5b0c2ab1..9a246beb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ohorntilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ohorntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohorntilde" format="2">
-  <advance width="685"/>
+  <advance width="715"/>
   <unicode hex="1EE1"/>
   <outline>
     <component base="ohorn"/>
-    <component base="tildecomb" xOffset="47"/>
+    <component base="tildecomb" xOffset="62"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ohungarumlaut.glif 
b/src/Cantarell-Bold.ufo/glyphs/ohungarumlaut.glif
index 0ca486ec..5c70749d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ohungarumlaut.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ohungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohungarumlaut" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="0151"/>
   <outline>
     <component base="o"/>
-    <component base="hungarumlautcomb" xOffset="67"/>
+    <component base="hungarumlautcomb" xOffset="82"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/oinvertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/oinvertedbreve.glif
index e71537af..54950a31 100644
--- a/src/Cantarell-Bold.ufo/glyphs/oinvertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/oinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oinvertedbreve" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="020F"/>
   <outline>
     <component base="o"/>
-    <component base="breveinvertedcomb" xOffset="56"/>
+    <component base="breveinvertedcomb" xOffset="71"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omacron.glif b/src/Cantarell-Bold.ufo/glyphs/omacron.glif
index 5097e5e5..a7392e78 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omacron" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="014D"/>
   <outline>
     <component base="o"/>
-    <component base="macroncomb" xOffset="40"/>
+    <component base="macroncomb" xOffset="55"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omacronacute.glif b/src/Cantarell-Bold.ufo/glyphs/omacronacute.glif
index 9d2f2a0c..1420eb51 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omacronacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omacronacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omacronacute" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="1E53"/>
   <outline>
     <component base="o"/>
-    <component base="macroncomb_acutecomb" xOffset="43"/>
+    <component base="macroncomb.loclVIET" xOffset="58"/>
+    <component base="acutecomb" xOffset="201" yOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omacrongrave.glif b/src/Cantarell-Bold.ufo/glyphs/omacrongrave.glif
index 47f94437..12e18e06 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omacrongrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omacrongrave.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omacrongrave" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="1E51"/>
   <outline>
     <component base="o"/>
-    <component base="macroncomb_gravecomb" xOffset="43"/>
+    <component base="macroncomb.loclVIET" xOffset="58"/>
+    <component base="gravecomb" xOffset="99" yOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/one.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/one.dnom.glif
index 07ed9d3b..4f1a0ce9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/one.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/one.dnom.glif
@@ -1,25 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.dnom" format="2">
-  <advance width="381"/>
-  <note>
-one
-</note>
+  <advance width="339"/>
   <outline>
     <contour>
-      <point x="139" y="115" type="line"/>
-      <point x="288" y="115" type="line"/>
-      <point x="288" y="479" type="line"/>
-      <point x="199" y="479" type="line"/>
-      <point x="10" y="379" type="line"/>
-      <point x="66" y="271" type="line"/>
-      <point x="185" y="323" type="line"/>
-      <point x="139" y="371" type="line"/>
-    </contour>
-    <contour>
-      <point x="41" y="0" type="line"/>
-      <point x="379" y="0" type="line"/>
-      <point x="379" y="128" type="line"/>
-      <point x="41" y="128" type="line"/>
+      <point x="140" y="0" type="line"/>
+      <point x="277" y="0" type="line"/>
+      <point x="277" y="416" type="line"/>
+      <point x="196" y="416" type="line"/>
+      <point x="5" y="329" type="line"/>
+      <point x="57" y="230" type="line"/>
+      <point x="182" y="279" type="line"/>
+      <point x="140" y="318" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -27,11 +18,11 @@ one
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>69</integer>
+        <integer>60</integer>
         <key>weight</key>
-        <integer>-23</integer>
+        <integer>-35</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>65</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/one.glif b/src/Cantarell-Bold.ufo/glyphs/one.glif
index fd323d2e..ab8bf889 100644
--- a/src/Cantarell-Bold.ufo/glyphs/one.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/one.glif
@@ -1,23 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one" format="2">
-  <advance width="492"/>
+  <advance width="486"/>
   <unicode hex="0031"/>
   <outline>
     <contour>
-      <point x="178" y="131" type="line"/>
-      <point x="351" y="131" type="line"/>
-      <point x="351" y="694" type="line"/>
-      <point x="248" y="694" type="line"/>
-      <point x="9" y="556" type="line"/>
-      <point x="74" y="432" type="line"/>
-      <point x="232" y="514" type="line"/>
-      <point x="178" y="569" type="line"/>
-    </contour>
-    <contour>
-      <point x="44" y="0" type="line"/>
-      <point x="485" y="0" type="line"/>
-      <point x="485" y="148" type="line"/>
-      <point x="44" y="148" type="line"/>
+      <point x="220" y="0" type="line"/>
+      <point x="393" y="0" type="line"/>
+      <point x="393" y="694" type="line"/>
+      <point x="290" y="694" type="line"/>
+      <point x="11" y="555" type="line"/>
+      <point x="76" y="431" type="line"/>
+      <point x="274" y="514" type="line"/>
+      <point x="220" y="569" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/one.numr.glif b/src/Cantarell-Bold.ufo/glyphs/one.numr.glif
index 1c05c6e4..8bed591a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/one.numr.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/one.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.numr" format="2">
-  <advance width="381"/>
+  <advance width="339"/>
   <outline>
     <component base="one.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/one.osf.glif b/src/Cantarell-Bold.ufo/glyphs/one.osf.glif
index 4eaa06d0..01fe1aa1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/one.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/one.osf.glif
@@ -1,22 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.osf" format="2">
-  <advance width="484"/>
+  <advance width="486"/>
   <outline>
     <contour>
-      <point x="182" y="126" type="line"/>
-      <point x="347" y="126" type="line"/>
-      <point x="347" y="594" type="line"/>
-      <point x="248" y="594" type="line"/>
-      <point x="14" y="473" type="line"/>
-      <point x="76" y="355" type="line"/>
-      <point x="234" y="422" type="line"/>
-      <point x="182" y="475" type="line"/>
-    </contour>
-    <contour>
-      <point x="47" y="0" type="line"/>
-      <point x="470" y="0" type="line"/>
-      <point x="470" y="141" type="line"/>
-      <point x="47" y="141" type="line"/>
+      <point x="225" y="0" type="line"/>
+      <point x="393" y="0" type="line"/>
+      <point x="393" y="594" type="line"/>
+      <point x="290" y="594" type="line"/>
+      <point x="11" y="455" type="line"/>
+      <point x="76" y="331" type="line"/>
+      <point x="274" y="414" type="line"/>
+      <point x="225" y="469" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>one</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>one</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/one.tf.glif b/src/Cantarell-Bold.ufo/glyphs/one.tf.glif
index 44a670d7..f0dcf4fa 100644
--- a/src/Cantarell-Bold.ufo/glyphs/one.tf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/one.tf.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.tf" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <outline>
     <contour>
-      <point x="230" y="131" type="line"/>
-      <point x="404" y="131" type="line"/>
-      <point x="404" y="694" type="line"/>
-      <point x="300" y="694" type="line"/>
-      <point x="33" y="556" type="line"/>
-      <point x="98" y="432" type="line"/>
-      <point x="286" y="514" type="line"/>
-      <point x="230" y="569" type="line"/>
+      <point x="243" y="131" type="line"/>
+      <point x="420" y="131" type="line"/>
+      <point x="420" y="694" type="line"/>
+      <point x="313" y="694" type="line"/>
+      <point x="47" y="556" type="line"/>
+      <point x="112" y="432" type="line"/>
+      <point x="299" y="514" type="line"/>
+      <point x="243" y="569" type="line"/>
     </contour>
     <contour>
-      <point x="69" y="0" type="line"/>
-      <point x="550" y="0" type="line"/>
-      <point x="550" y="148" type="line"/>
-      <point x="69" y="148" type="line"/>
+      <point x="101" y="0" type="line"/>
+      <point x="553" y="0" type="line"/>
+      <point x="553" y="148" type="line"/>
+      <point x="101" y="148" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/oneeighth.glif b/src/Cantarell-Bold.ufo/glyphs/oneeighth.glif
index af4810f4..25b7b5ce 100644
--- a/src/Cantarell-Bold.ufo/glyphs/oneeighth.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/oneeighth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneeighth" format="2">
-  <advance width="1188"/>
+  <advance width="1025"/>
   <unicode hex="215B"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="381"/>
-    <component base="eight.dnom" xOffset="719"/>
+    <component base="fraction" xOffset="339"/>
+    <component base="eight.dnom" xOffset="588"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/onefifth.glif b/src/Cantarell-Bold.ufo/glyphs/onefifth.glif
index 18e3be0d..1e57f5ed 100644
--- a/src/Cantarell-Bold.ufo/glyphs/onefifth.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/onefifth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onefifth" format="2">
-  <advance width="1167"/>
+  <advance width="1007"/>
   <unicode hex="2155"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="381"/>
-    <component base="five.dnom" xOffset="719"/>
+    <component base="fraction" xOffset="339"/>
+    <component base="five.dnom" xOffset="588"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/onefraction.glif b/src/Cantarell-Bold.ufo/glyphs/onefraction.glif
index e058357b..f81514bf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/onefraction.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/onefraction.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onefraction" format="2">
-  <advance width="719"/>
+  <advance width="588"/>
   <unicode hex="215F"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="381"/>
+    <component base="fraction" xOffset="339"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/onehalf.glif b/src/Cantarell-Bold.ufo/glyphs/onehalf.glif
index 9f3f5f6a..38bb2c4f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/onehalf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/onehalf.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onehalf" format="2">
-  <advance width="1157"/>
+  <advance width="1005"/>
   <unicode hex="00BD"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="381"/>
-    <component base="two.dnom" xOffset="719"/>
+    <component base="fraction" xOffset="339"/>
+    <component base="two.dnom" xOffset="588"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/oneinferior.glif b/src/Cantarell-Bold.ufo/glyphs/oneinferior.glif
index c8386acc..0f74da49 100644
--- a/src/Cantarell-Bold.ufo/glyphs/oneinferior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/oneinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneinferior" format="2">
-  <advance width="381"/>
+  <advance width="339"/>
   <unicode hex="2081"/>
   <outline>
     <component base="one.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/oneninth.glif b/src/Cantarell-Bold.ufo/glyphs/oneninth.glif
index 39e605ab..572e17bb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/oneninth.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/oneninth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneninth" format="2">
-  <advance width="1181"/>
+  <advance width="1018"/>
   <unicode hex="2151"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="381"/>
-    <component base="nine.dnom" xOffset="719"/>
+    <component base="fraction" xOffset="339"/>
+    <component base="nine.dnom" xOffset="588"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/onequarter.glif b/src/Cantarell-Bold.ufo/glyphs/onequarter.glif
index 8ec7a40b..75a5a14d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/onequarter.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/onequarter.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onequarter" format="2">
-  <advance width="1197"/>
+  <advance width="1025"/>
   <unicode hex="00BC"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="381"/>
-    <component base="four.dnom" xOffset="719"/>
+    <component base="fraction" xOffset="339"/>
+    <component base="four.dnom" xOffset="588"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/oneseventh.glif b/src/Cantarell-Bold.ufo/glyphs/oneseventh.glif
index 2a1d605b..d9afc27d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/oneseventh.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/oneseventh.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneseventh" format="2">
-  <advance width="1122"/>
+  <advance width="966"/>
   <unicode hex="2150"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="381"/>
-    <component base="seven.dnom" xOffset="719"/>
+    <component base="fraction" xOffset="339"/>
+    <component base="seven.dnom" xOffset="588"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/onesixth.glif b/src/Cantarell-Bold.ufo/glyphs/onesixth.glif
index 830ba809..e6383ca2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/onesixth.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/onesixth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onesixth" format="2">
-  <advance width="1181"/>
+  <advance width="1018"/>
   <unicode hex="2159"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="381"/>
-    <component base="six.dnom" xOffset="719"/>
+    <component base="fraction" xOffset="339"/>
+    <component base="six.dnom" xOffset="588"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/onesuperior.glif b/src/Cantarell-Bold.ufo/glyphs/onesuperior.glif
index 18dcc41e..c0f11b7f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/onesuperior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/onesuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onesuperior" format="2">
-  <advance width="381"/>
+  <advance width="339"/>
   <unicode hex="00B9"/>
   <outline>
     <component base="one.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/onetenth.glif b/src/Cantarell-Bold.ufo/glyphs/onetenth.glif
index 3c0db278..e22f9293 100644
--- a/src/Cantarell-Bold.ufo/glyphs/onetenth.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/onetenth.glif
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onetenth" format="2">
-  <advance width="1593"/>
+  <advance width="1391"/>
   <unicode hex="2152"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="381"/>
-    <component base="one.dnom" xOffset="719"/>
-    <component base="zero.dnom" xOffset="1100"/>
+    <component base="fraction" xOffset="339"/>
+    <component base="one.dnom" xOffset="588"/>
+    <component base="zero.dnom" xOffset="927"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/onethird.glif b/src/Cantarell-Bold.ufo/glyphs/onethird.glif
index c8320b4a..8dc045f7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/onethird.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/onethird.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onethird" format="2">
-  <advance width="1154"/>
+  <advance width="1000"/>
   <unicode hex="2153"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="381"/>
-    <component base="three.dnom" xOffset="719"/>
+    <component base="fraction" xOffset="339"/>
+    <component base="three.dnom" xOffset="588"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/oogonek.glif b/src/Cantarell-Bold.ufo/glyphs/oogonek.glif
index c1df5503..880702cf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/oogonek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/oogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oogonek" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="01EB"/>
   <outline>
     <component base="o"/>
-    <component base="ogonekcomb.tall" xOffset="-92" yOffset="-1"/>
+    <component base="ogonekcomb.tall" xOffset="-77" yOffset="-1"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ordfeminine.glif b/src/Cantarell-Bold.ufo/glyphs/ordfeminine.glif
index e1dd63bb..4410514f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ordfeminine.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ordfeminine.glif
@@ -1,48 +1,48 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ordfeminine" format="2">
-  <advance width="399"/>
+  <advance width="429"/>
   <unicode hex="00AA"/>
   <outline>
     <contour>
-      <point x="277" y="376" type="line"/>
-      <point x="364" y="376" type="line"/>
-      <point x="364" y="585" type="line" smooth="yes"/>
-      <point x="364" y="692"/>
-      <point x="304" y="750"/>
-      <point x="186" y="750" type="curve" smooth="yes"/>
-      <point x="130" y="750"/>
-      <point x="71" y="737"/>
-      <point x="26" y="714" type="curve"/>
-      <point x="55" y="630" type="line"/>
-      <point x="97" y="646"/>
-      <point x="132" y="651"/>
-      <point x="161" y="651" type="curve" smooth="yes"/>
-      <point x="214" y="651"/>
-      <point x="245" y="633"/>
-      <point x="245" y="597" type="curve" smooth="yes"/>
-      <point x="245" y="458" type="line"/>
+      <point x="292" y="376" type="line"/>
+      <point x="379" y="376" type="line"/>
+      <point x="379" y="585" type="line" smooth="yes"/>
+      <point x="379" y="692"/>
+      <point x="319" y="750"/>
+      <point x="201" y="750" type="curve" smooth="yes"/>
+      <point x="145" y="750"/>
+      <point x="86" y="737"/>
+      <point x="41" y="714" type="curve"/>
+      <point x="70" y="630" type="line"/>
+      <point x="112" y="646"/>
+      <point x="147" y="651"/>
+      <point x="176" y="651" type="curve" smooth="yes"/>
+      <point x="229" y="651"/>
+      <point x="260" y="633"/>
+      <point x="260" y="597" type="curve" smooth="yes"/>
+      <point x="260" y="458" type="line"/>
     </contour>
     <contour>
-      <point x="151" y="369" type="curve" smooth="yes"/>
-      <point x="234" y="369"/>
-      <point x="293" y="417"/>
-      <point x="309" y="503" type="curve"/>
-      <point x="270" y="518" type="line"/>
-      <point x="263" y="485"/>
-      <point x="229" y="462"/>
-      <point x="192" y="462" type="curve" smooth="yes"/>
-      <point x="164" y="462"/>
-      <point x="143" y="476"/>
-      <point x="143" y="497" type="curve" smooth="yes"/>
-      <point x="143" y="523"/>
-      <point x="176" y="533"/>
-      <point x="265" y="533" type="curve"/>
-      <point x="265" y="598" type="line"/>
-      <point x="96" y="598"/>
-      <point x="21" y="562"/>
-      <point x="21" y="480" type="curve" smooth="yes"/>
-      <point x="21" y="413"/>
-      <point x="71" y="369"/>
+      <point x="166" y="369" type="curve" smooth="yes"/>
+      <point x="249" y="369"/>
+      <point x="308" y="417"/>
+      <point x="324" y="503" type="curve"/>
+      <point x="285" y="518" type="line"/>
+      <point x="278" y="485"/>
+      <point x="244" y="462"/>
+      <point x="207" y="462" type="curve" smooth="yes"/>
+      <point x="179" y="462"/>
+      <point x="158" y="476"/>
+      <point x="158" y="497" type="curve" smooth="yes"/>
+      <point x="158" y="523"/>
+      <point x="191" y="533"/>
+      <point x="280" y="533" type="curve"/>
+      <point x="280" y="598" type="line"/>
+      <point x="111" y="598"/>
+      <point x="36" y="562"/>
+      <point x="36" y="480" type="curve" smooth="yes"/>
+      <point x="36" y="413"/>
+      <point x="86" y="369"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ordmasculine.glif b/src/Cantarell-Bold.ufo/glyphs/ordmasculine.glif
index fca973fe..74f39021 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ordmasculine.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ordmasculine.glif
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ordmasculine" format="2">
-  <advance width="428"/>
+  <advance width="450"/>
   <unicode hex="00BA"/>
   <outline>
     <contour>
-      <point x="207" y="369" type="curve" smooth="yes"/>
-      <point x="327" y="369"/>
-      <point x="409" y="448"/>
-      <point x="409" y="566" type="curve" smooth="yes"/>
-      <point x="409" y="678"/>
-      <point x="335" y="750"/>
-      <point x="221" y="750" type="curve" smooth="yes"/>
-      <point x="100" y="750"/>
-      <point x="19" y="671"/>
-      <point x="19" y="552" type="curve" smooth="yes"/>
-      <point x="19" y="441"/>
-      <point x="92" y="369"/>
+      <point x="218" y="369" type="curve" smooth="yes"/>
+      <point x="338" y="369"/>
+      <point x="420" y="448"/>
+      <point x="420" y="566" type="curve" smooth="yes"/>
+      <point x="420" y="678"/>
+      <point x="346" y="750"/>
+      <point x="232" y="750" type="curve" smooth="yes"/>
+      <point x="111" y="750"/>
+      <point x="30" y="671"/>
+      <point x="30" y="552" type="curve" smooth="yes"/>
+      <point x="30" y="441"/>
+      <point x="103" y="369"/>
     </contour>
     <contour>
-      <point x="217" y="468" type="curve" smooth="yes"/>
-      <point x="169" y="468"/>
-      <point x="139" y="505"/>
-      <point x="139" y="561" type="curve" smooth="yes"/>
-      <point x="139" y="616"/>
-      <point x="166" y="650"/>
-      <point x="211" y="650" type="curve" smooth="yes"/>
-      <point x="258" y="650"/>
-      <point x="289" y="613"/>
-      <point x="289" y="555" type="curve" smooth="yes"/>
-      <point x="289" y="502"/>
-      <point x="262" y="468"/>
+      <point x="228" y="468" type="curve" smooth="yes"/>
+      <point x="180" y="468"/>
+      <point x="150" y="505"/>
+      <point x="150" y="561" type="curve" smooth="yes"/>
+      <point x="150" y="616"/>
+      <point x="177" y="650"/>
+      <point x="222" y="650" type="curve" smooth="yes"/>
+      <point x="269" y="650"/>
+      <point x="300" y="613"/>
+      <point x="300" y="555" type="curve" smooth="yes"/>
+      <point x="300" y="502"/>
+      <point x="273" y="468"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/oslash.glif b/src/Cantarell-Bold.ufo/glyphs/oslash.glif
index 2f094df7..9011a4a3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/oslash.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/oslash.glif
@@ -1,42 +1,50 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oslash" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="00F8"/>
-  <anchor x="284" y="490" name="top"/>
+  <anchor x="299" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="275" y="-10" type="curve" smooth="yes"/>
-      <point x="439" y="-10"/>
-      <point x="549" y="96"/>
-      <point x="549" y="254" type="curve" smooth="yes"/>
-      <point x="549" y="403"/>
-      <point x="449" y="500"/>
-      <point x="293" y="500" type="curve" smooth="yes"/>
-      <point x="128" y="500"/>
-      <point x="18" y="394"/>
-      <point x="18" y="235" type="curve" smooth="yes"/>
-      <point x="18" y="87"/>
-      <point x="118" y="-10"/>
+      <point x="142" y="-62" type="line"/>
+      <point x="527" y="509" type="line"/>
+      <point x="455" y="552" type="line"/>
+      <point x="72" y="-19" type="line"/>
     </contour>
     <contour>
-      <point x="286" y="134" type="curve" smooth="yes"/>
-      <point x="226" y="134"/>
-      <point x="191" y="176"/>
-      <point x="191" y="246" type="curve" smooth="yes"/>
-      <point x="191" y="315"/>
-      <point x="224" y="356"/>
-      <point x="281" y="356" type="curve" smooth="yes"/>
-      <point x="341" y="356"/>
-      <point x="376" y="313"/>
-      <point x="376" y="240" type="curve" smooth="yes"/>
-      <point x="376" y="173"/>
-      <point x="343" y="134"/>
+      <point x="290" y="-10" type="curve" smooth="yes"/>
+      <point x="454" y="-10"/>
+      <point x="564" y="96"/>
+      <point x="564" y="254" type="curve" smooth="yes"/>
+      <point x="564" y="403"/>
+      <point x="464" y="500"/>
+      <point x="308" y="500" type="curve" smooth="yes"/>
+      <point x="143" y="500"/>
+      <point x="33" y="394"/>
+      <point x="33" y="235" type="curve" smooth="yes"/>
+      <point x="33" y="87"/>
+      <point x="133" y="-10"/>
     </contour>
     <contour>
-      <point x="127" y="-62" type="line"/>
-      <point x="512" y="509" type="line"/>
-      <point x="440" y="552" type="line"/>
-      <point x="57" y="-19" type="line"/>
+      <point x="301" y="134" type="curve" smooth="yes"/>
+      <point x="241" y="134"/>
+      <point x="206" y="176"/>
+      <point x="206" y="246" type="curve" smooth="yes"/>
+      <point x="206" y="315"/>
+      <point x="239" y="356"/>
+      <point x="296" y="356" type="curve" smooth="yes"/>
+      <point x="356" y="356"/>
+      <point x="391" y="313"/>
+      <point x="391" y="240" type="curve" smooth="yes"/>
+      <point x="391" y="173"/>
+      <point x="358" y="134"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/oslashacute.glif b/src/Cantarell-Bold.ufo/glyphs/oslashacute.glif
index 39c8041a..0c18ff14 100644
--- a/src/Cantarell-Bold.ufo/glyphs/oslashacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/oslashacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oslashacute" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="01FF"/>
   <outline>
     <component base="oslash"/>
-    <component base="acutecomb" xOffset="188"/>
+    <component base="acutecomb" xOffset="203"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/otilde.glif b/src/Cantarell-Bold.ufo/glyphs/otilde.glif
index c86f873f..1f4458a5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/otilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/otilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="otilde" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="00F5"/>
   <outline>
     <component base="o"/>
-    <component base="tildecomb" xOffset="47"/>
+    <component base="tildecomb" xOffset="62"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/otildeacute.glif b/src/Cantarell-Bold.ufo/glyphs/otildeacute.glif
index fada5634..e8c7523e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/otildeacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/otildeacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="otildeacute" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="1E4D"/>
   <outline>
     <component base="o"/>
-    <component base="tildecomb_acutecomb" xOffset="47"/>
+    <component base="tildecomb" xOffset="62"/>
+    <component base="acutecomb" xOffset="201" yOffset="211"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/otildedieresis.glif 
b/src/Cantarell-Bold.ufo/glyphs/otildedieresis.glif
index 0a88d574..383b3ada 100644
--- a/src/Cantarell-Bold.ufo/glyphs/otildedieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/otildedieresis.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="otildedieresis" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="1E4F"/>
   <outline>
     <component base="o"/>
-    <component base="tildecomb_dieresiscomb" xOffset="47"/>
+    <component base="tildecomb" xOffset="62"/>
+    <component base="dieresiscomb" xOffset="28" yOffset="211"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/otildemacron.glif b/src/Cantarell-Bold.ufo/glyphs/otildemacron.glif
index ebe920d9..ed42d8eb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/otildemacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/otildemacron.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="otildemacron" format="2">
-  <advance width="567"/>
+  <advance width="597"/>
   <unicode hex="022D"/>
   <outline>
     <component base="o"/>
-    <component base="tildecomb_macroncomb" xOffset="47"/>
+    <component base="tildecomb" xOffset="62"/>
+    <component base="macroncomb" xOffset="55" yOffset="211"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/p.glif b/src/Cantarell-Bold.ufo/glyphs/p.glif
index 9b8fa1f2..911ff241 100644
--- a/src/Cantarell-Bold.ufo/glyphs/p.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/p.glif
@@ -1,47 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="p" format="2">
-  <advance width="574"/>
+  <advance width="595"/>
   <unicode hex="0070"/>
-  <note>
-p
-</note>
-  <anchor x="288" y="0" name="bottom"/>
-  <anchor x="288" y="490" name="top"/>
+  <anchor x="296" y="0" name="bottom"/>
+  <anchor x="296" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="54" y="-217" type="line"/>
-      <point x="219" y="-217" type="line"/>
-      <point x="219" y="370" type="line"/>
-      <point x="169" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
+      <point x="336" y="-10" type="curve" smooth="yes"/>
+      <point x="465" y="-10"/>
+      <point x="562" y="101"/>
+      <point x="562" y="251" type="curve" smooth="yes"/>
+      <point x="562" y="396"/>
+      <point x="471" y="500"/>
+      <point x="345" y="500" type="curve" smooth="yes"/>
+      <point x="261" y="500"/>
+      <point x="197" y="452"/>
+      <point x="165" y="372" type="curve"/>
+      <point x="211" y="305" type="line"/>
+      <point x="227" y="337"/>
+      <point x="258" y="356"/>
+      <point x="295" y="356" type="curve" smooth="yes"/>
+      <point x="351" y="356"/>
+      <point x="386" y="314"/>
+      <point x="386" y="242" type="curve" smooth="yes"/>
+      <point x="386" y="174"/>
+      <point x="354" y="134"/>
+      <point x="299" y="134" type="curve" smooth="yes"/>
+      <point x="263" y="134"/>
+      <point x="232" y="152"/>
+      <point x="214" y="182" type="curve"/>
+      <point x="175" y="88" type="line"/>
+      <point x="208" y="26"/>
+      <point x="264" y="-10"/>
     </contour>
     <contour>
-      <point x="328" y="-10" type="curve" smooth="yes"/>
-      <point x="457" y="-10"/>
-      <point x="554" y="101"/>
-      <point x="554" y="251" type="curve" smooth="yes"/>
-      <point x="554" y="396"/>
-      <point x="463" y="500"/>
-      <point x="337" y="500" type="curve" smooth="yes"/>
-      <point x="253" y="500"/>
-      <point x="189" y="452"/>
-      <point x="157" y="372" type="curve"/>
-      <point x="203" y="305" type="line"/>
-      <point x="219" y="337"/>
-      <point x="250" y="356"/>
-      <point x="287" y="356" type="curve" smooth="yes"/>
-      <point x="343" y="356"/>
-      <point x="378" y="314"/>
-      <point x="378" y="242" type="curve" smooth="yes"/>
-      <point x="378" y="174"/>
-      <point x="346" y="134"/>
-      <point x="291" y="134" type="curve" smooth="yes"/>
-      <point x="255" y="134"/>
-      <point x="224" y="152"/>
-      <point x="206" y="182" type="curve"/>
-      <point x="167" y="88" type="line"/>
-      <point x="200" y="26"/>
-      <point x="256" y="-10"/>
+      <point x="62" y="-217" type="line"/>
+      <point x="227" y="-217" type="line"/>
+      <point x="227" y="370" type="line"/>
+      <point x="177" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/palochka-cy.glif b/src/Cantarell-Bold.ufo/glyphs/palochka-cy.glif
index 7464a37a..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="310"/>
+  <advance width="318"/>
   <unicode hex="04CF"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/paragraph.glif b/src/Cantarell-Bold.ufo/glyphs/paragraph.glif
index 2f33aa36..f4c0e43b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/paragraph.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/paragraph.glif
@@ -1,23 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="paragraph" format="2">
-  <advance width="758"/>
+  <advance width="734"/>
   <unicode hex="00B6"/>
   <outline>
     <contour>
-      <point x="248" y="-177" type="line"/>
-      <point x="406" y="-177" type="line"/>
-      <point x="406" y="554" type="line"/>
-      <point x="515" y="554" type="line"/>
-      <point x="515" y="-177" type="line"/>
-      <point x="678" y="-177" type="line"/>
-      <point x="678" y="694" type="line"/>
-      <point x="278" y="694" type="line" smooth="yes"/>
-      <point x="127" y="694"/>
-      <point x="27" y="604"/>
-      <point x="27" y="454" type="curve" smooth="yes"/>
-      <point x="27" y="313"/>
-      <point x="115" y="209"/>
-      <point x="248" y="209" type="curve"/>
+      <point x="233" y="-177" type="line"/>
+      <point x="391" y="-177" type="line"/>
+      <point x="391" y="554" type="line"/>
+      <point x="500" y="554" type="line"/>
+      <point x="500" y="-177" type="line"/>
+      <point x="663" y="-177" type="line"/>
+      <point x="663" y="694" type="line"/>
+      <point x="263" y="694" type="line" smooth="yes"/>
+      <point x="112" y="694"/>
+      <point x="12" y="604"/>
+      <point x="12" y="454" type="curve" smooth="yes"/>
+      <point x="12" y="313"/>
+      <point x="100" y="209"/>
+      <point x="233" y="209" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|P</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/parenleft.glif b/src/Cantarell-Bold.ufo/glyphs/parenleft.glif
index 0bc83bb0..bfadc76c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/parenleft.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/parenleft.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="parenleft" format="2">
-  <advance width="310"/>
+  <advance width="341"/>
   <unicode hex="0028"/>
   <outline>
     <contour>
-      <point x="180" y="-205" type="curve"/>
-      <point x="296" y="-140" type="line"/>
-      <point x="232" y="-39"/>
-      <point x="191" y="121"/>
-      <point x="191" y="275" type="curve" smooth="yes"/>
-      <point x="191" y="424"/>
-      <point x="236" y="574"/>
-      <point x="304" y="688" type="curve"/>
-      <point x="186" y="749" type="line"/>
-      <point x="89" y="635"/>
-      <point x="25" y="444"/>
-      <point x="25" y="265" type="curve" smooth="yes"/>
-      <point x="25" y="90"/>
-      <point x="85" y="-93"/>
+      <point x="194" y="-199" type="curve"/>
+      <point x="315" y="-127" type="line"/>
+      <point x="250" y="-42"/>
+      <point x="207" y="117"/>
+      <point x="207" y="270" type="curve" smooth="yes"/>
+      <point x="207" y="412"/>
+      <point x="245" y="562"/>
+      <point x="314" y="684" type="curve"/>
+      <point x="190" y="749" type="line"/>
+      <point x="101" y="628"/>
+      <point x="41" y="435"/>
+      <point x="41" y="265" type="curve" smooth="yes"/>
+      <point x="41" y="89"/>
+      <point x="101" y="-93"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/parenright.glif b/src/Cantarell-Bold.ufo/glyphs/parenright.glif
index 5863e6ed..daef64a8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/parenright.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/parenright.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="parenright" format="2">
-  <advance width="308"/>
+  <advance width="341"/>
   <unicode hex="0029"/>
   <outline>
-    <component base="parenleft" xScale="-1" xOffset="308"/>
+    <component base="parenleft" xScale="-1" xOffset="341"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|parenleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>parenleft</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/partialdiff.glif b/src/Cantarell-Bold.ufo/glyphs/partialdiff.glif
index 080c50d9..d8cd14e7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/partialdiff.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/partialdiff.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="partialdiff" format="2">
-  <advance width="624"/>
+  <advance width="649"/>
   <unicode hex="2202"/>
   <outline>
     <contour>
-      <point x="274" y="-12" type="curve" smooth="yes"/>
-      <point x="463" y="-12"/>
-      <point x="582" y="137"/>
-      <point x="582" y="366" type="curve" smooth="yes"/>
-      <point x="582" y="581"/>
-      <point x="477" y="701"/>
-      <point x="287" y="701" type="curve" smooth="yes"/>
-      <point x="216" y="701"/>
-      <point x="139" y="685"/>
-      <point x="85" y="658" type="curve"/>
-      <point x="124" y="527" type="line"/>
-      <point x="168" y="545"/>
-      <point x="222" y="557"/>
-      <point x="264" y="557" type="curve" smooth="yes"/>
-      <point x="361" y="557"/>
-      <point x="406" y="494"/>
-      <point x="406" y="358" type="curve" smooth="yes"/>
-      <point x="406" y="222"/>
-      <point x="361" y="132"/>
-      <point x="286" y="132" type="curve" smooth="yes"/>
-      <point x="237" y="132"/>
-      <point x="207" y="170"/>
-      <point x="207" y="219" type="curve" smooth="yes"/>
-      <point x="207" y="271"/>
-      <point x="242" y="302"/>
-      <point x="300" y="302" type="curve" smooth="yes"/>
-      <point x="369" y="302"/>
-      <point x="410" y="259"/>
-      <point x="410" y="185" type="curve"/>
-      <point x="444" y="309" type="line"/>
-      <point x="444" y="391"/>
-      <point x="376" y="446"/>
-      <point x="273" y="446" type="curve" smooth="yes"/>
-      <point x="137" y="446"/>
-      <point x="31" y="348"/>
-      <point x="31" y="209" type="curve" smooth="yes"/>
-      <point x="31" y="75"/>
-      <point x="129" y="-12"/>
+      <point x="286" y="-12" type="curve" smooth="yes"/>
+      <point x="475" y="-12"/>
+      <point x="594" y="137"/>
+      <point x="594" y="366" type="curve" smooth="yes"/>
+      <point x="594" y="581"/>
+      <point x="489" y="701"/>
+      <point x="299" y="701" type="curve" smooth="yes"/>
+      <point x="228" y="701"/>
+      <point x="151" y="685"/>
+      <point x="97" y="658" type="curve"/>
+      <point x="136" y="527" type="line"/>
+      <point x="180" y="545"/>
+      <point x="234" y="557"/>
+      <point x="276" y="557" type="curve" smooth="yes"/>
+      <point x="373" y="557"/>
+      <point x="418" y="494"/>
+      <point x="418" y="358" type="curve" smooth="yes"/>
+      <point x="418" y="222"/>
+      <point x="373" y="132"/>
+      <point x="298" y="132" type="curve" smooth="yes"/>
+      <point x="249" y="132"/>
+      <point x="219" y="170"/>
+      <point x="219" y="219" type="curve" smooth="yes"/>
+      <point x="219" y="271"/>
+      <point x="254" y="302"/>
+      <point x="312" y="302" type="curve" smooth="yes"/>
+      <point x="381" y="302"/>
+      <point x="422" y="259"/>
+      <point x="422" y="185" type="curve"/>
+      <point x="456" y="309" type="line"/>
+      <point x="456" y="391"/>
+      <point x="388" y="446"/>
+      <point x="285" y="446" type="curve" smooth="yes"/>
+      <point x="149" y="446"/>
+      <point x="43" y="348"/>
+      <point x="43" y="209" type="curve" smooth="yes"/>
+      <point x="43" y="75"/>
+      <point x="141" y="-12"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/pe-cy.glif b/src/Cantarell-Bold.ufo/glyphs/pe-cy.glif
index 5446f1da..62a6a29f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/pe-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/pe-cy.glif
@@ -1,18 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="pe-cy" format="2">
-  <advance width="577"/>
+  <advance width="593"/>
   <unicode hex="043F"/>
-  <anchor x="550" y="0" name="bottomright"/>
+  <anchor x="558" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="214" y="0" type="line"/>
-      <point x="214" y="352" type="line"/>
-      <point x="363" y="352" type="line"/>
-      <point x="363" y="0" type="line"/>
-      <point x="523" y="0" type="line"/>
-      <point x="523" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="222" y="0" type="line"/>
+      <point x="222" y="352" type="line"/>
+      <point x="371" y="352" type="line"/>
+      <point x="371" y="0" type="line"/>
+      <point x="531" y="0" type="line"/>
+      <point x="531" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -26,6 +26,10 @@
         <key>width</key>
         <integer>79</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/percent.glif b/src/Cantarell-Bold.ufo/glyphs/percent.glif
index 56b76013..67c927d0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/percent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/percent.glif
@@ -1,69 +1,75 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="percent" format="2">
-  <advance width="1022"/>
+  <advance width="1038"/>
   <unicode hex="0025"/>
   <outline>
     <contour>
-      <point x="241" y="0" type="line"/>
-      <point x="394" y="0" type="line"/>
-      <point x="791" y="694" type="line"/>
-      <point x="621" y="694" type="line"/>
+      <point x="249" y="0" type="line"/>
+      <point x="402" y="0" type="line"/>
+      <point x="799" y="694" type="line"/>
+      <point x="629" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="226" y="259" type="curve" smooth="yes"/>
-      <point x="348" y="259"/>
-      <point x="426" y="346"/>
-      <point x="426" y="486" type="curve" smooth="yes"/>
-      <point x="426" y="621"/>
-      <point x="350" y="704"/>
-      <point x="231" y="704" type="curve" smooth="yes"/>
-      <point x="109" y="704"/>
-      <point x="31" y="618"/>
-      <point x="31" y="479" type="curve" smooth="yes"/>
-      <point x="31" y="343"/>
-      <point x="107" y="259"/>
+      <point x="234" y="259" type="curve" smooth="yes"/>
+      <point x="356" y="259"/>
+      <point x="434" y="346"/>
+      <point x="434" y="486" type="curve" smooth="yes"/>
+      <point x="434" y="621"/>
+      <point x="358" y="704"/>
+      <point x="239" y="704" type="curve" smooth="yes"/>
+      <point x="117" y="704"/>
+      <point x="39" y="618"/>
+      <point x="39" y="479" type="curve" smooth="yes"/>
+      <point x="39" y="343"/>
+      <point x="115" y="259"/>
     </contour>
     <contour>
-      <point x="230" y="377" type="curve" smooth="yes"/>
-      <point x="193" y="377"/>
-      <point x="173" y="418"/>
-      <point x="173" y="486" type="curve" smooth="yes"/>
-      <point x="173" y="549"/>
-      <point x="193" y="585"/>
-      <point x="227" y="585" type="curve" smooth="yes"/>
-      <point x="262" y="585"/>
-      <point x="284" y="546"/>
-      <point x="284" y="479" type="curve" smooth="yes"/>
-      <point x="284" y="414"/>
-      <point x="264" y="377"/>
+      <point x="238" y="377" type="curve" smooth="yes"/>
+      <point x="201" y="377"/>
+      <point x="181" y="418"/>
+      <point x="181" y="486" type="curve" smooth="yes"/>
+      <point x="181" y="549"/>
+      <point x="201" y="585"/>
+      <point x="235" y="585" type="curve" smooth="yes"/>
+      <point x="270" y="585"/>
+      <point x="292" y="546"/>
+      <point x="292" y="479" type="curve" smooth="yes"/>
+      <point x="292" y="414"/>
+      <point x="272" y="377"/>
     </contour>
     <contour>
-      <point x="791" y="-6" type="curve" smooth="yes"/>
-      <point x="913" y="-6"/>
-      <point x="991" y="81"/>
-      <point x="991" y="221" type="curve" smooth="yes"/>
-      <point x="991" y="356"/>
-      <point x="915" y="439"/>
-      <point x="796" y="439" type="curve" smooth="yes"/>
-      <point x="674" y="439"/>
-      <point x="596" y="353"/>
-      <point x="596" y="214" type="curve" smooth="yes"/>
-      <point x="596" y="78"/>
-      <point x="672" y="-6"/>
+      <point x="799" y="-6" type="curve" smooth="yes"/>
+      <point x="921" y="-6"/>
+      <point x="999" y="81"/>
+      <point x="999" y="221" type="curve" smooth="yes"/>
+      <point x="999" y="356"/>
+      <point x="923" y="439"/>
+      <point x="804" y="439" type="curve" smooth="yes"/>
+      <point x="682" y="439"/>
+      <point x="604" y="353"/>
+      <point x="604" y="214" type="curve" smooth="yes"/>
+      <point x="604" y="78"/>
+      <point x="680" y="-6"/>
     </contour>
     <contour>
-      <point x="795" y="112" type="curve" smooth="yes"/>
-      <point x="758" y="112"/>
-      <point x="738" y="153"/>
-      <point x="738" y="221" type="curve" smooth="yes"/>
-      <point x="738" y="284"/>
-      <point x="758" y="320"/>
-      <point x="792" y="320" type="curve" smooth="yes"/>
-      <point x="827" y="320"/>
-      <point x="849" y="281"/>
-      <point x="849" y="214" type="curve" smooth="yes"/>
-      <point x="849" y="149"/>
-      <point x="829" y="112"/>
+      <point x="803" y="112" type="curve" smooth="yes"/>
+      <point x="766" y="112"/>
+      <point x="746" y="153"/>
+      <point x="746" y="221" type="curve" smooth="yes"/>
+      <point x="746" y="284"/>
+      <point x="766" y="320"/>
+      <point x="800" y="320" type="curve" smooth="yes"/>
+      <point x="835" y="320"/>
+      <point x="857" y="281"/>
+      <point x="857" y="214" type="curve" smooth="yes"/>
+      <point x="857" y="149"/>
+      <point x="837" y="112"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/period.glif b/src/Cantarell-Bold.ufo/glyphs/period.glif
index 9464e30f..49db919a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/period.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/period.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="period" format="2">
-  <advance width="282"/>
+  <advance width="286"/>
   <unicode hex="002E"/>
   <outline>
     <contour>
-      <point x="141" y="-10" type="curve" smooth="yes"/>
-      <point x="205" y="-10"/>
-      <point x="247" y="36"/>
-      <point x="247" y="96" type="curve" smooth="yes"/>
-      <point x="247" y="160"/>
-      <point x="205" y="206"/>
-      <point x="141" y="206" type="curve" smooth="yes"/>
-      <point x="77" y="206"/>
-      <point x="35" y="160"/>
-      <point x="35" y="96" type="curve" smooth="yes"/>
-      <point x="35" y="36"/>
-      <point x="77" y="-10"/>
+      <point x="143" y="-10" type="curve" smooth="yes"/>
+      <point x="207" y="-10"/>
+      <point x="249" y="36"/>
+      <point x="249" y="96" type="curve" smooth="yes"/>
+      <point x="249" y="160"/>
+      <point x="207" y="206"/>
+      <point x="143" y="206" type="curve" smooth="yes"/>
+      <point x="79" y="206"/>
+      <point x="37" y="160"/>
+      <point x="37" y="96" type="curve" smooth="yes"/>
+      <point x="37" y="36"/>
+      <point x="79" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/periodcentered.glif 
b/src/Cantarell-Bold.ufo/glyphs/periodcentered.glif
index d14598e2..80221e76 100644
--- a/src/Cantarell-Bold.ufo/glyphs/periodcentered.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/periodcentered.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="periodcentered" format="2">
-  <advance width="282"/>
+  <advance width="286"/>
   <unicode hex="00B7"/>
   <outline>
     <component base="period" yOffset="170"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>period</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>period</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/periodcentered.loclC_A_T_.glif 
b/src/Cantarell-Bold.ufo/glyphs/periodcentered.loclC_A_T_.glif
index 0f69ef5d..28f652dc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/periodcentered.loclC_A_T_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/periodcentered.loclC_A_T_.glif
@@ -3,18 +3,18 @@
   <anchor x="0" y="355" name="_periodcentered"/>
   <outline>
     <contour>
-      <point x="-24" y="304" type="curve" smooth="yes"/>
-      <point x="16" y="304"/>
-      <point x="42" y="331"/>
-      <point x="42" y="371" type="curve" smooth="yes"/>
-      <point x="42" y="413"/>
-      <point x="16" y="440"/>
-      <point x="-24" y="440" type="curve" smooth="yes"/>
-      <point x="-64" y="440"/>
-      <point x="-91" y="413"/>
-      <point x="-91" y="371" type="curve" smooth="yes"/>
-      <point x="-91" y="331"/>
-      <point x="-64" y="304"/>
+      <point x="-20" y="304" type="curve" smooth="yes"/>
+      <point x="20" y="304"/>
+      <point x="46" y="331"/>
+      <point x="46" y="371" type="curve" smooth="yes"/>
+      <point x="46" y="413"/>
+      <point x="20" y="440"/>
+      <point x="-20" y="440" type="curve" smooth="yes"/>
+      <point x="-60" y="440"/>
+      <point x="-87" y="413"/>
+      <point x="-87" y="371" type="curve" smooth="yes"/>
+      <point x="-87" y="331"/>
+      <point x="-60" y="304"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/perthousand.glif b/src/Cantarell-Bold.ufo/glyphs/perthousand.glif
index d71ab822..aace2694 100644
--- a/src/Cantarell-Bold.ufo/glyphs/perthousand.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/perthousand.glif
@@ -1,97 +1,105 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="perthousand" format="2">
-  <advance width="1451"/>
+  <advance width="1467"/>
   <unicode hex="2030"/>
   <outline>
     <contour>
-      <point x="241" y="0" type="line"/>
-      <point x="394" y="0" type="line"/>
-      <point x="791" y="694" type="line"/>
-      <point x="621" y="694" type="line"/>
+      <point x="249" y="0" type="line"/>
+      <point x="402" y="0" type="line"/>
+      <point x="799" y="694" type="line"/>
+      <point x="629" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="226" y="259" type="curve" smooth="yes"/>
-      <point x="348" y="259"/>
-      <point x="426" y="346"/>
-      <point x="426" y="486" type="curve" smooth="yes"/>
-      <point x="426" y="621"/>
-      <point x="350" y="704"/>
-      <point x="231" y="704" type="curve" smooth="yes"/>
-      <point x="109" y="704"/>
-      <point x="31" y="618"/>
-      <point x="31" y="479" type="curve" smooth="yes"/>
-      <point x="31" y="343"/>
-      <point x="107" y="259"/>
+      <point x="234" y="259" type="curve" smooth="yes"/>
+      <point x="356" y="259"/>
+      <point x="434" y="346"/>
+      <point x="434" y="486" type="curve" smooth="yes"/>
+      <point x="434" y="621"/>
+      <point x="358" y="704"/>
+      <point x="239" y="704" type="curve" smooth="yes"/>
+      <point x="117" y="704"/>
+      <point x="39" y="618"/>
+      <point x="39" y="479" type="curve" smooth="yes"/>
+      <point x="39" y="343"/>
+      <point x="115" y="259"/>
     </contour>
     <contour>
-      <point x="230" y="377" type="curve" smooth="yes"/>
-      <point x="193" y="377"/>
-      <point x="173" y="418"/>
-      <point x="173" y="486" type="curve" smooth="yes"/>
-      <point x="173" y="549"/>
-      <point x="193" y="585"/>
-      <point x="227" y="585" type="curve" smooth="yes"/>
-      <point x="262" y="585"/>
-      <point x="284" y="546"/>
-      <point x="284" y="479" type="curve" smooth="yes"/>
-      <point x="284" y="414"/>
-      <point x="264" y="377"/>
+      <point x="238" y="377" type="curve" smooth="yes"/>
+      <point x="201" y="377"/>
+      <point x="181" y="418"/>
+      <point x="181" y="486" type="curve" smooth="yes"/>
+      <point x="181" y="549"/>
+      <point x="201" y="585"/>
+      <point x="235" y="585" type="curve" smooth="yes"/>
+      <point x="270" y="585"/>
+      <point x="292" y="546"/>
+      <point x="292" y="479" type="curve" smooth="yes"/>
+      <point x="292" y="414"/>
+      <point x="272" y="377"/>
     </contour>
     <contour>
-      <point x="791" y="-6" type="curve" smooth="yes"/>
-      <point x="913" y="-6"/>
-      <point x="991" y="81"/>
-      <point x="991" y="221" type="curve" smooth="yes"/>
-      <point x="991" y="356"/>
-      <point x="915" y="439"/>
-      <point x="796" y="439" type="curve" smooth="yes"/>
-      <point x="674" y="439"/>
-      <point x="596" y="353"/>
-      <point x="596" y="214" type="curve" smooth="yes"/>
-      <point x="596" y="78"/>
-      <point x="672" y="-6"/>
+      <point x="799" y="-6" type="curve" smooth="yes"/>
+      <point x="921" y="-6"/>
+      <point x="999" y="81"/>
+      <point x="999" y="221" type="curve" smooth="yes"/>
+      <point x="999" y="356"/>
+      <point x="923" y="439"/>
+      <point x="804" y="439" type="curve" smooth="yes"/>
+      <point x="682" y="439"/>
+      <point x="604" y="353"/>
+      <point x="604" y="214" type="curve" smooth="yes"/>
+      <point x="604" y="78"/>
+      <point x="680" y="-6"/>
     </contour>
     <contour>
-      <point x="795" y="112" type="curve" smooth="yes"/>
-      <point x="758" y="112"/>
-      <point x="738" y="153"/>
-      <point x="738" y="221" type="curve" smooth="yes"/>
-      <point x="738" y="284"/>
-      <point x="758" y="320"/>
-      <point x="792" y="320" type="curve" smooth="yes"/>
-      <point x="827" y="320"/>
-      <point x="849" y="281"/>
-      <point x="849" y="214" type="curve" smooth="yes"/>
-      <point x="849" y="149"/>
-      <point x="829" y="112"/>
+      <point x="803" y="112" type="curve" smooth="yes"/>
+      <point x="766" y="112"/>
+      <point x="746" y="153"/>
+      <point x="746" y="221" type="curve" smooth="yes"/>
+      <point x="746" y="284"/>
+      <point x="766" y="320"/>
+      <point x="800" y="320" type="curve" smooth="yes"/>
+      <point x="835" y="320"/>
+      <point x="857" y="281"/>
+      <point x="857" y="214" type="curve" smooth="yes"/>
+      <point x="857" y="149"/>
+      <point x="837" y="112"/>
     </contour>
     <contour>
-      <point x="1220" y="-6" type="curve" smooth="yes"/>
-      <point x="1342" y="-6"/>
-      <point x="1420" y="81"/>
-      <point x="1420" y="221" type="curve" smooth="yes"/>
-      <point x="1420" y="356"/>
-      <point x="1344" y="439"/>
-      <point x="1225" y="439" type="curve" smooth="yes"/>
-      <point x="1103" y="439"/>
-      <point x="1025" y="353"/>
-      <point x="1025" y="214" type="curve" smooth="yes"/>
-      <point x="1025" y="78"/>
-      <point x="1101" y="-6"/>
+      <point x="1228" y="-6" type="curve" smooth="yes"/>
+      <point x="1350" y="-6"/>
+      <point x="1428" y="81"/>
+      <point x="1428" y="221" type="curve" smooth="yes"/>
+      <point x="1428" y="356"/>
+      <point x="1352" y="439"/>
+      <point x="1233" y="439" type="curve" smooth="yes"/>
+      <point x="1111" y="439"/>
+      <point x="1033" y="353"/>
+      <point x="1033" y="214" type="curve" smooth="yes"/>
+      <point x="1033" y="78"/>
+      <point x="1109" y="-6"/>
     </contour>
     <contour>
-      <point x="1224" y="112" type="curve" smooth="yes"/>
-      <point x="1187" y="112"/>
-      <point x="1167" y="153"/>
-      <point x="1167" y="221" type="curve" smooth="yes"/>
-      <point x="1167" y="284"/>
-      <point x="1187" y="320"/>
-      <point x="1221" y="320" type="curve" smooth="yes"/>
-      <point x="1256" y="320"/>
-      <point x="1278" y="281"/>
-      <point x="1278" y="214" type="curve" smooth="yes"/>
-      <point x="1278" y="149"/>
-      <point x="1258" y="112"/>
+      <point x="1232" y="112" type="curve" smooth="yes"/>
+      <point x="1195" y="112"/>
+      <point x="1175" y="153"/>
+      <point x="1175" y="221" type="curve" smooth="yes"/>
+      <point x="1175" y="284"/>
+      <point x="1195" y="320"/>
+      <point x="1229" y="320" type="curve" smooth="yes"/>
+      <point x="1264" y="320"/>
+      <point x="1286" y="281"/>
+      <point x="1286" y="214" type="curve" smooth="yes"/>
+      <point x="1286" y="149"/>
+      <point x="1266" y="112"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>percent</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>percent</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/peseta.glif b/src/Cantarell-Bold.ufo/glyphs/peseta.glif
index 63888d2a..22273cb4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/peseta.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/peseta.glif
@@ -1,20 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="peseta" format="2">
-  <advance width="773"/>
+  <advance width="600"/>
   <unicode hex="20A7"/>
   <outline>
     <contour>
-      <point x="612" y="507" type="line"/>
-      <point x="612" y="372" type="line"/>
-      <point x="742" y="372" type="line"/>
-      <point x="742" y="507" type="line"/>
+      <point x="68" y="0" type="line"/>
+      <point x="236" y="0" type="line"/>
+      <point x="236" y="204" type="line"/>
+      <point x="266" y="204" type="line" smooth="yes"/>
+      <point x="432" y="204"/>
+      <point x="540" y="307"/>
+      <point x="540" y="463" type="curve" smooth="yes"/>
+      <point x="540" y="608"/>
+      <point x="450" y="694"/>
+      <point x="295" y="694" type="curve" smooth="yes"/>
+      <point x="68" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="161" y="372" type="line"/>
-      <point x="161" y="507" type="line"/>
-      <point x="31" y="507" type="line"/>
-      <point x="31" y="372" type="line"/>
+      <point x="-11" y="372" type="line"/>
+      <point x="105" y="372" type="line"/>
+      <point x="105" y="507" type="line"/>
+      <point x="-11" y="507" type="line"/>
+    </contour>
+    <contour>
+      <point x="236" y="356" type="line"/>
+      <point x="236" y="542" type="line"/>
+      <point x="282" y="542" type="line" smooth="yes"/>
+      <point x="329" y="542"/>
+      <point x="360" y="504"/>
+      <point x="360" y="446" type="curve" smooth="yes"/>
+      <point x="360" y="390"/>
+      <point x="335" y="356"/>
+      <point x="297" y="356" type="curve" smooth="yes"/>
+    </contour>
+    <contour>
+      <point x="494" y="372" type="line"/>
+      <point x="621" y="372" type="line"/>
+      <point x="621" y="507" type="line"/>
+      <point x="494" y="507" type="line"/>
     </contour>
-    <component base="P" xOffset="44"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/peso.glif b/src/Cantarell-Bold.ufo/glyphs/peso.glif
index 3be0f7a4..fe375e14 100644
--- a/src/Cantarell-Bold.ufo/glyphs/peso.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/peso.glif
@@ -1,57 +1,61 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="peso" format="2">
-  <advance width="801"/>
+  <advance width="600"/>
   <unicode hex="20B1"/>
   <outline>
     <contour>
-      <point x="595" y="590" type="line"/>
-      <point x="595" y="470" type="line"/>
-      <point x="752" y="470" type="line"/>
-      <point x="752" y="590" type="line"/>
+      <point x="68" y="0" type="line"/>
+      <point x="236" y="0" type="line"/>
+      <point x="236" y="204" type="line"/>
+      <point x="266" y="204" type="line" smooth="yes"/>
+      <point x="432" y="204"/>
+      <point x="540" y="307"/>
+      <point x="540" y="463" type="curve" smooth="yes"/>
+      <point x="540" y="608"/>
+      <point x="450" y="694"/>
+      <point x="295" y="694" type="curve" smooth="yes"/>
+      <point x="68" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="189" y="470" type="line"/>
-      <point x="189" y="590" type="line"/>
-      <point x="49" y="590" type="line"/>
-      <point x="49" y="470" type="line"/>
+      <point x="-10" y="308" type="line"/>
+      <point x="105" y="308" type="line"/>
+      <point x="105" y="414" type="line"/>
+      <point x="-10" y="414" type="line"/>
     </contour>
     <contour>
-      <point x="595" y="410" type="line"/>
-      <point x="595" y="290" type="line"/>
-      <point x="752" y="290" type="line"/>
-      <point x="752" y="410" type="line"/>
+      <point x="-10" y="484" type="line"/>
+      <point x="105" y="484" type="line"/>
+      <point x="105" y="590" type="line"/>
+      <point x="-10" y="590" type="line"/>
     </contour>
     <contour>
-      <point x="189" y="290" type="line"/>
-      <point x="189" y="410" type="line"/>
-      <point x="49" y="410" type="line"/>
-      <point x="49" y="290" type="line"/>
+      <point x="236" y="356" type="line"/>
+      <point x="236" y="542" type="line"/>
+      <point x="282" y="542" type="line" smooth="yes"/>
+      <point x="329" y="542"/>
+      <point x="360" y="504"/>
+      <point x="360" y="446" type="curve" smooth="yes"/>
+      <point x="360" y="390"/>
+      <point x="335" y="356"/>
+      <point x="297" y="356" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="139" y="0" type="line"/>
-      <point x="312" y="0" type="line"/>
-      <point x="312" y="694" type="line"/>
-      <point x="139" y="694" type="line"/>
+      <point x="474" y="308" type="line"/>
+      <point x="605" y="308" type="line"/>
+      <point x="605" y="414" type="line"/>
+      <point x="474" y="414" type="line"/>
     </contour>
     <contour>
-      <point x="248" y="204" type="line"/>
-      <point x="369" y="204" type="line" smooth="yes"/>
-      <point x="557" y="204"/>
-      <point x="681" y="307"/>
-      <point x="681" y="463" type="curve" smooth="yes"/>
-      <point x="681" y="608"/>
-      <point x="575" y="694"/>
-      <point x="398" y="694" type="curve" smooth="yes"/>
-      <point x="248" y="694" type="line"/>
-      <point x="248" y="552" type="line"/>
-      <point x="384" y="552" type="line" smooth="yes"/>
-      <point x="454" y="552"/>
-      <point x="501" y="510"/>
-      <point x="501" y="446" type="curve" smooth="yes"/>
-      <point x="501" y="386"/>
-      <point x="461" y="346"/>
-      <point x="400" y="346" type="curve" smooth="yes"/>
-      <point x="248" y="346" type="line"/>
+      <point x="474" y="484" type="line"/>
+      <point x="605" y="484" type="line"/>
+      <point x="605" y="590" type="line"/>
+      <point x="474" y="590" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/plus.glif b/src/Cantarell-Bold.ufo/glyphs/plus.glif
index 3fc5d8eb..67f1d176 100644
--- a/src/Cantarell-Bold.ufo/glyphs/plus.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/plus.glif
@@ -1,19 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="plus" format="2">
-  <advance width="606"/>
+  <advance width="600"/>
   <unicode hex="002B"/>
   <outline>
     <contour>
-      <point x="224" y="59" type="line"/>
-      <point x="384" y="59" type="line"/>
-      <point x="384" y="593" type="line"/>
-      <point x="224" y="593" type="line"/>
+      <point x="216" y="86" type="line"/>
+      <point x="386" y="86" type="line"/>
+      <point x="386" y="566" type="line"/>
+      <point x="216" y="566" type="line"/>
     </contour>
     <contour>
-      <point x="36" y="251" type="line"/>
-      <point x="570" y="251" type="line"/>
-      <point x="570" y="406" type="line"/>
-      <point x="36" y="406" type="line"/>
+      <point x="60" y="245" type="line"/>
+      <point x="540" y="245" type="line"/>
+      <point x="540" y="412" type="line"/>
+      <point x="60" y="412" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minus</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/plusminus.glif b/src/Cantarell-Bold.ufo/glyphs/plusminus.glif
index b23b72dc..86575919 100644
--- a/src/Cantarell-Bold.ufo/glyphs/plusminus.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/plusminus.glif
@@ -1,25 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="plusminus" format="2">
-  <advance width="597"/>
+  <advance width="600"/>
   <unicode hex="00B1"/>
   <outline>
     <contour>
-      <point x="226" y="199" type="line"/>
-      <point x="366" y="199" type="line"/>
-      <point x="366" y="654" type="line"/>
-      <point x="226" y="654" type="line"/>
+      <point x="223" y="171" type="line"/>
+      <point x="373" y="171" type="line"/>
+      <point x="373" y="624" type="line"/>
+      <point x="223" y="624" type="line"/>
     </contour>
     <contour>
-      <point x="50" y="36" type="line"/>
-      <point x="547" y="36" type="line"/>
-      <point x="547" y="166" type="line"/>
-      <point x="50" y="166" type="line"/>
+      <point x="61" y="2" type="line"/>
+      <point x="541" y="2" type="line"/>
+      <point x="541" y="140" type="line"/>
+      <point x="61" y="140" type="line"/>
     </contour>
     <contour>
-      <point x="50" y="350" type="line"/>
-      <point x="547" y="350" type="line"/>
-      <point x="547" y="490" type="line"/>
-      <point x="50" y="490" type="line"/>
+      <point x="56" y="321" type="line"/>
+      <point x="545" y="321" type="line"/>
+      <point x="545" y="469" type="line"/>
+      <point x="56" y="469" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/primeR_eversed.glif 
b/src/Cantarell-Bold.ufo/glyphs/primeR_eversed.glif
index 80db1c38..b21eedca 100644
--- a/src/Cantarell-Bold.ufo/glyphs/primeR_eversed.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/primeR_eversed.glif
@@ -2,9 +2,6 @@
 <glyph name="primeReversed" format="2">
   <advance width="291"/>
   <unicode hex="2035"/>
-  <note>
-uni2035
-</note>
   <outline>
     <component base="quotesingle" xScale="-1" yxScale="-0.19201" xOffset="387"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/primemod.glif b/src/Cantarell-Bold.ufo/glyphs/primemod.glif
index 5462a835..c534eef5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/primemod.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/primemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="primemod" format="2">
-  <advance width="341"/>
+  <advance width="226"/>
   <unicode hex="02B9"/>
   <outline>
-    <component base="minute"/>
+    <component base="minute" xOffset="-60"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/product.glif b/src/Cantarell-Bold.ufo/glyphs/product.glif
index 0747199d..8c9ead8c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/product.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/product.glif
@@ -1,17 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="product" format="2">
-  <advance width="789"/>
+  <advance width="771"/>
   <unicode hex="220F"/>
   <outline>
     <contour>
-      <point x="80" y="-95" type="line"/>
-      <point x="256" y="-95" type="line"/>
-      <point x="256" y="538" type="line"/>
-      <point x="533" y="538" type="line"/>
-      <point x="533" y="-95" type="line"/>
-      <point x="709" y="-95" type="line"/>
-      <point x="709" y="694" type="line"/>
-      <point x="80" y="694" type="line"/>
+      <point x="71" y="-95" type="line"/>
+      <point x="247" y="-95" type="line"/>
+      <point x="247" y="538" type="line"/>
+      <point x="524" y="538" type="line"/>
+      <point x="524" y="-95" type="line"/>
+      <point x="700" y="-95" type="line"/>
+      <point x="700" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/punctuationspace.glif 
b/src/Cantarell-Bold.ufo/glyphs/punctuationspace.glif
index 3200da11..144d6025 100644
--- a/src/Cantarell-Bold.ufo/glyphs/punctuationspace.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/punctuationspace.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="punctuationspace" format="2">
-  <advance width="160"/>
+  <advance width="286"/>
   <unicode hex="2008"/>
   <outline>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
-      <string>space</string>
+      <string>period</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/q.glif b/src/Cantarell-Bold.ufo/glyphs/q.glif
index a0351a2a..d4e3a9e1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/q.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/q.glif
@@ -1,47 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="q" format="2">
-  <advance width="577"/>
+  <advance width="596"/>
   <unicode hex="0071"/>
-  <note>
-q
-</note>
-  <anchor x="291" y="0" name="bottom"/>
-  <anchor x="291" y="490" name="top"/>
+  <anchor x="302" y="0" name="bottom"/>
+  <anchor x="302" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="357" y="-217" type="line"/>
-      <point x="523" y="-217" type="line"/>
-      <point x="523" y="490" type="line"/>
-      <point x="408" y="490" type="line"/>
-      <point x="357" y="370" type="line"/>
+      <point x="241" y="-10" type="curve" smooth="yes"/>
+      <point x="328" y="-10"/>
+      <point x="393" y="43"/>
+      <point x="426" y="130" type="curve"/>
+      <point x="381" y="184" type="line"/>
+      <point x="365" y="153"/>
+      <point x="335" y="134"/>
+      <point x="295" y="134" type="curve" smooth="yes"/>
+      <point x="241" y="134"/>
+      <point x="209" y="176"/>
+      <point x="209" y="248" type="curve" smooth="yes"/>
+      <point x="209" y="316"/>
+      <point x="240" y="356"/>
+      <point x="293" y="356" type="curve" smooth="yes"/>
+      <point x="334" y="356"/>
+      <point x="365" y="333"/>
+      <point x="381" y="294" type="curve"/>
+      <point x="430" y="383" type="line"/>
+      <point x="405" y="460"/>
+      <point x="347" y="500"/>
+      <point x="261" y="500" type="curve" smooth="yes"/>
+      <point x="125" y="500"/>
+      <point x="33" y="397"/>
+      <point x="33" y="242" type="curve" smooth="yes"/>
+      <point x="33" y="91"/>
+      <point x="117" y="-10"/>
     </contour>
     <contour>
-      <point x="230" y="-10" type="curve" smooth="yes"/>
-      <point x="317" y="-10"/>
-      <point x="382" y="43"/>
-      <point x="415" y="130" type="curve"/>
-      <point x="370" y="184" type="line"/>
-      <point x="354" y="153"/>
-      <point x="324" y="134"/>
-      <point x="284" y="134" type="curve" smooth="yes"/>
-      <point x="230" y="134"/>
-      <point x="198" y="176"/>
-      <point x="198" y="248" type="curve" smooth="yes"/>
-      <point x="198" y="316"/>
-      <point x="229" y="356"/>
-      <point x="282" y="356" type="curve" smooth="yes"/>
-      <point x="323" y="356"/>
-      <point x="354" y="333"/>
-      <point x="370" y="294" type="curve"/>
-      <point x="419" y="383" type="line"/>
-      <point x="394" y="460"/>
-      <point x="336" y="500"/>
-      <point x="250" y="500" type="curve" smooth="yes"/>
-      <point x="114" y="500"/>
-      <point x="22" y="397"/>
-      <point x="22" y="242" type="curve" smooth="yes"/>
-      <point x="22" y="91"/>
-      <point x="106" y="-10"/>
+      <point x="368" y="-217" type="line"/>
+      <point x="534" y="-217" type="line"/>
+      <point x="534" y="490" type="line"/>
+      <point x="419" y="490" type="line"/>
+      <point x="368" y="370" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/qa-cy.glif b/src/Cantarell-Bold.ufo/glyphs/qa-cy.glif
index 9b4ffcbd..ec69f863 100644
--- a/src/Cantarell-Bold.ufo/glyphs/qa-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/qa-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="qa-cy" format="2">
-  <advance width="577"/>
+  <advance width="596"/>
   <unicode hex="051B"/>
   <outline>
     <component base="q"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/question.glif b/src/Cantarell-Bold.ufo/glyphs/question.glif
index 079f591d..54628567 100644
--- a/src/Cantarell-Bold.ufo/glyphs/question.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/question.glif
@@ -1,45 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="question" format="2">
-  <advance width="441"/>
+  <advance width="470"/>
   <unicode hex="003F"/>
   <outline>
     <contour>
-      <point x="138" y="267" type="line"/>
-      <point x="313" y="267" type="line"/>
-      <point x="313" y="294" type="line" smooth="yes"/>
-      <point x="313" y="351"/>
-      <point x="442" y="380"/>
-      <point x="442" y="526" type="curve" smooth="yes"/>
-      <point x="442" y="639"/>
-      <point x="356" y="704"/>
-      <point x="204" y="704" type="curve" smooth="yes"/>
-      <point x="130" y="704"/>
-      <point x="55" y="687"/>
-      <point x="-9" y="659" type="curve"/>
-      <point x="31" y="528" type="line"/>
-      <point x="73" y="546"/>
-      <point x="116" y="554"/>
-      <point x="160" y="554" type="curve" smooth="yes"/>
-      <point x="226" y="554"/>
-      <point x="262" y="535"/>
-      <point x="262" y="500" type="curve" smooth="yes"/>
-      <point x="262" y="431"/>
-      <point x="138" y="388"/>
-      <point x="138" y="294" type="curve" smooth="yes"/>
+      <point x="143" y="267" type="line"/>
+      <point x="318" y="267" type="line"/>
+      <point x="318" y="294" type="line" smooth="yes"/>
+      <point x="318" y="350"/>
+      <point x="447" y="382"/>
+      <point x="447" y="523" type="curve" smooth="yes"/>
+      <point x="447" y="639"/>
+      <point x="361" y="704"/>
+      <point x="209" y="704" type="curve" smooth="yes"/>
+      <point x="135" y="704"/>
+      <point x="60" y="687"/>
+      <point x="-4" y="659" type="curve"/>
+      <point x="36" y="528" type="line"/>
+      <point x="78" y="546"/>
+      <point x="121" y="554"/>
+      <point x="165" y="554" type="curve" smooth="yes"/>
+      <point x="231" y="554"/>
+      <point x="267" y="535"/>
+      <point x="267" y="499" type="curve" smooth="yes"/>
+      <point x="267" y="432"/>
+      <point x="143" y="388"/>
+      <point x="143" y="294" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="231" y="-10" type="curve" smooth="yes"/>
-      <point x="293" y="-10"/>
-      <point x="337" y="34"/>
-      <point x="337" y="96" type="curve" smooth="yes"/>
-      <point x="337" y="161"/>
-      <point x="294" y="206"/>
-      <point x="231" y="206" type="curve" smooth="yes"/>
-      <point x="168" y="206"/>
-      <point x="125" y="161"/>
-      <point x="125" y="96" type="curve" smooth="yes"/>
-      <point x="125" y="34"/>
-      <point x="169" y="-10"/>
+      <point x="229" y="-10" type="curve" smooth="yes"/>
+      <point x="291" y="-10"/>
+      <point x="335" y="34"/>
+      <point x="335" y="96" type="curve" smooth="yes"/>
+      <point x="335" y="161"/>
+      <point x="292" y="206"/>
+      <point x="229" y="206" type="curve" smooth="yes"/>
+      <point x="166" y="206"/>
+      <point x="123" y="161"/>
+      <point x="123" y="96" type="curve" smooth="yes"/>
+      <point x="123" y="34"/>
+      <point x="167" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/questiondown.glif b/src/Cantarell-Bold.ufo/glyphs/questiondown.glif
index 5e4ba78d..3785cdf2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/questiondown.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/questiondown.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="questiondown" format="2">
-  <advance width="417"/>
+  <advance width="470"/>
   <unicode hex="00BF"/>
   <outline>
-    <component base="question" xScale="-1" yScale="-1" xOffset="431" yOffset="479"/>
+    <component base="question" xScale="-1" yScale="-1" xOffset="470" yOffset="479"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|question</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|question</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/quotedbl.glif b/src/Cantarell-Bold.ufo/glyphs/quotedbl.glif
index 8b071139..aed180e9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/quotedbl.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/quotedbl.glif
@@ -1,9 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotedbl" format="2">
-  <advance width="499"/>
+  <advance width="515"/>
   <unicode hex="0022"/>
   <outline>
     <component base="quotesingle"/>
     <component base="quotesingle" xOffset="230"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>quotesingle</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>quotesingle</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/quotedblbase.glif b/src/Cantarell-Bold.ufo/glyphs/quotedblbase.glif
index 29ce8997..8677abc4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/quotedblbase.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/quotedblbase.glif
@@ -1,13 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotedblbase" format="2">
-  <advance width="531"/>
+  <advance width="540"/>
   <unicode hex="201E"/>
   <outline>
-    <component base="_typoquote" xOffset="202"/>
-    <component base="_typoquote" xOffset="-38"/>
+    <component base="_typoquote" xOffset="198"/>
+    <component base="_typoquote" xOffset="-47"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>quoteright</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>quoteright</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Bold.ufo/glyphs/quotedblleft.glif b/src/Cantarell-Bold.ufo/glyphs/quotedblleft.glif
index de43b4db..166d4943 100644
--- a/src/Cantarell-Bold.ufo/glyphs/quotedblleft.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/quotedblleft.glif
@@ -1,9 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotedblleft" format="2">
-  <advance width="545"/>
+  <advance width="540"/>
   <unicode hex="201C"/>
   <outline>
     <component base="quoteleft" xOffset="245"/>
     <component base="quoteleft"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>quoteleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>quoteleft</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/quotedblright.glif 
b/src/Cantarell-Bold.ufo/glyphs/quotedblright.glif
index 98ebfdd9..747e3011 100644
--- a/src/Cantarell-Bold.ufo/glyphs/quotedblright.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/quotedblright.glif
@@ -1,9 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotedblright" format="2">
-  <advance width="531"/>
+  <advance width="540"/>
   <unicode hex="201D"/>
   <outline>
-    <component base="quoteright" xOffset="240" yOffset="-1"/>
+    <component base="quoteright" xOffset="245" yOffset="-1"/>
     <component base="quoteright" yOffset="-1"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>quoteright</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>quoteright</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/quoteleft.glif b/src/Cantarell-Bold.ufo/glyphs/quoteleft.glif
index a3f1663a..b9ae03f5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/quoteleft.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/quoteleft.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quoteleft" format="2">
-  <advance width="300"/>
+  <advance width="295"/>
   <unicode hex="2018"/>
   <outline>
-    <component base="_typoquote" xScale="-1" yScale="-1" xOffset="339" yOffset="585"/>
+    <component base="_typoquote" xScale="-1" yScale="-1" xOffset="342" yOffset="585"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/quoteright.glif b/src/Cantarell-Bold.ufo/glyphs/quoteright.glif
index d263ed28..7162e6d4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/quoteright.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/quoteright.glif
@@ -1,12 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quoteright" format="2">
-  <advance width="291"/>
+  <advance width="295"/>
   <unicode hex="2019"/>
   <outline>
-    <component base="_typoquote" xOffset="-38" yOffset="631"/>
+    <component base="_typoquote" xOffset="-47" yOffset="631"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|quoteleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>quoteleft</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Bold.ufo/glyphs/quotesinglbase.glif 
b/src/Cantarell-Bold.ufo/glyphs/quotesinglbase.glif
index 834a4bfa..5d8f4f26 100644
--- a/src/Cantarell-Bold.ufo/glyphs/quotesinglbase.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/quotesinglbase.glif
@@ -1,12 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotesinglbase" format="2">
-  <advance width="291"/>
+  <advance width="295"/>
   <unicode hex="201A"/>
   <outline>
-    <component base="_typoquote" xOffset="-38"/>
+    <component base="_typoquote" xOffset="-47"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>quoteright</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>quoteleft</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Bold.ufo/glyphs/quotesingle.glif b/src/Cantarell-Bold.ufo/glyphs/quotesingle.glif
index 50b14cab..5da4b45f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/quotesingle.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/quotesingle.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotesingle" format="2">
-  <advance width="269"/>
+  <advance width="285"/>
   <unicode hex="0027"/>
   <outline>
     <contour>
-      <point x="64" y="406" type="line"/>
-      <point x="205" y="406" type="line"/>
-      <point x="226" y="704" type="line"/>
-      <point x="43" y="704" type="line"/>
+      <point x="72" y="406" type="line"/>
+      <point x="213" y="406" type="line"/>
+      <point x="234" y="704" type="line"/>
+      <point x="51" y="704" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/r.glif b/src/Cantarell-Bold.ufo/glyphs/r.glif
index 627292f3..e097bb52 100644
--- a/src/Cantarell-Bold.ufo/glyphs/r.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/r.glif
@@ -1,35 +1,38 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="r" format="2">
-  <advance width="435"/>
+  <advance width="441"/>
   <unicode hex="0072"/>
-  <note>
-r
-</note>
-  <anchor x="142" y="0" name="bottom"/>
-  <anchor x="214" y="490" name="top"/>
+  <anchor x="149" y="0" name="bottom"/>
+  <anchor x="221" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="228" y="0" type="line"/>
-      <point x="228" y="299" type="line"/>
-      <point x="190" y="490" type="line"/>
-      <point x="55" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="235" y="0" type="line"/>
+      <point x="235" y="299" type="line"/>
+      <point x="197" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="197" y="252" type="line"/>
-      <point x="224" y="309"/>
-      <point x="271" y="342"/>
-      <point x="325" y="342" type="curve" smooth="yes"/>
-      <point x="351" y="342"/>
-      <point x="381" y="335"/>
-      <point x="402" y="324" type="curve"/>
-      <point x="441" y="472" type="line"/>
-      <point x="417" y="486"/>
-      <point x="384" y="494"/>
-      <point x="354" y="494" type="curve" smooth="yes"/>
-      <point x="291" y="494"/>
-      <point x="233" y="460"/>
-      <point x="197" y="402" type="curve"/>
+      <point x="204" y="242" type="line"/>
+      <point x="231" y="299"/>
+      <point x="278" y="332"/>
+      <point x="332" y="332" type="curve" smooth="yes"/>
+      <point x="354" y="332"/>
+      <point x="382" y="327"/>
+      <point x="402" y="320" type="curve"/>
+      <point x="441" y="478" type="line"/>
+      <point x="421" y="488"/>
+      <point x="391" y="494"/>
+      <point x="361" y="494" type="curve" smooth="yes"/>
+      <point x="298" y="494"/>
+      <point x="240" y="460"/>
+      <point x="204" y="402" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/racute.glif b/src/Cantarell-Bold.ufo/glyphs/racute.glif
index 68a78a45..a4b086b3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/racute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/racute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="racute" format="2">
-  <advance width="435"/>
+  <advance width="441"/>
   <unicode hex="0155"/>
   <outline>
     <component base="r"/>
-    <component base="acutecomb" xOffset="118"/>
+    <component base="acutecomb" xOffset="125"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/radical.glif b/src/Cantarell-Bold.ufo/glyphs/radical.glif
index ff43a9b8..ed98305b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/radical.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/radical.glif
@@ -1,18 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="radical" format="2">
-  <advance width="604"/>
+  <advance width="618"/>
   <unicode hex="221A"/>
   <outline>
     <contour>
-      <point x="273" y="-59" type="line"/>
-      <point x="423" y="-59" type="line"/>
-      <point x="583" y="739" type="line"/>
-      <point x="413" y="739" type="line"/>
-      <point x="316" y="190" type="line"/>
-      <point x="259" y="343" type="line"/>
-      <point x="24" y="343" type="line"/>
-      <point x="24" y="193" type="line"/>
-      <point x="166" y="193" type="line"/>
+      <point x="279" y="-59" type="line"/>
+      <point x="429" y="-59" type="line"/>
+      <point x="589" y="739" type="line"/>
+      <point x="419" y="739" type="line"/>
+      <point x="322" y="190" type="line"/>
+      <point x="265" y="343" type="line"/>
+      <point x="30" y="343" type="line"/>
+      <point x="30" y="193" type="line"/>
+      <point x="172" y="193" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ratio.glif b/src/Cantarell-Bold.ufo/glyphs/ratio.glif
index 277873c6..f27841df 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ratio.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ratio.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ratio" format="2">
-  <advance width="323"/>
+  <advance width="286"/>
   <unicode hex="2236"/>
   <outline>
-    <component base="colon" xOffset="26" yOffset="100"/>
+    <component base="colon" yOffset="100"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>colon</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>colon</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/rcaron.glif b/src/Cantarell-Bold.ufo/glyphs/rcaron.glif
index 9837491f..3ef496b0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/rcaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/rcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rcaron" format="2">
-  <advance width="435"/>
+  <advance width="441"/>
   <unicode hex="0159"/>
   <outline>
     <component base="r"/>
-    <component base="caroncomb" xOffset="8"/>
+    <component base="caroncomb" xOffset="15"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/rcommaaccent.glif b/src/Cantarell-Bold.ufo/glyphs/rcommaaccent.glif
index e718f6bb..04f3387b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/rcommaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/rcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rcommaaccent" format="2">
-  <advance width="435"/>
+  <advance width="441"/>
   <unicode hex="0157"/>
   <outline>
     <component base="r"/>
-    <component base="commaaccentcomb" xOffset="24"/>
+    <component base="commaaccentcomb" xOffset="31"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/rdblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/rdblgrave.glif
index 7f4e891c..c6d13b92 100644
--- a/src/Cantarell-Bold.ufo/glyphs/rdblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/rdblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rdblgrave" format="2">
-  <advance width="435"/>
+  <advance width="441"/>
   <unicode hex="0211"/>
   <outline>
     <component base="r"/>
-    <component base="dblgravecomb" xOffset="-87"/>
+    <component base="dblgravecomb" xOffset="-80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/rdotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/rdotbelow.glif
index b2c45c19..9e7dc487 100644
--- a/src/Cantarell-Bold.ufo/glyphs/rdotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/rdotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rdotbelow" format="2">
-  <advance width="435"/>
+  <advance width="441"/>
   <unicode hex="1E5B"/>
   <outline>
     <component base="r"/>
-    <component base="dotbelowcomb" xOffset="-8"/>
+    <component base="dotbelowcomb" xOffset="-1"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/registered.glif b/src/Cantarell-Bold.ufo/glyphs/registered.glif
index fedbc1c1..3001324c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/registered.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/registered.glif
@@ -1,67 +1,73 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="registered" format="2">
-  <advance width="597"/>
+  <advance width="621"/>
   <unicode hex="00AE"/>
   <outline>
     <contour>
-      <point x="296" y="266" type="curve" smooth="yes"/>
-      <point x="450" y="266"/>
-      <point x="553" y="365"/>
-      <point x="553" y="515" type="curve" smooth="yes"/>
-      <point x="553" y="663"/>
-      <point x="452" y="762"/>
-      <point x="301" y="762" type="curve" smooth="yes"/>
-      <point x="147" y="762"/>
-      <point x="44" y="661"/>
-      <point x="44" y="510" type="curve" smooth="yes"/>
-      <point x="44" y="363"/>
-      <point x="145" y="266"/>
+      <point x="308" y="266" type="curve" smooth="yes"/>
+      <point x="462" y="266"/>
+      <point x="565" y="365"/>
+      <point x="565" y="515" type="curve" smooth="yes"/>
+      <point x="565" y="663"/>
+      <point x="464" y="762"/>
+      <point x="313" y="762" type="curve" smooth="yes"/>
+      <point x="159" y="762"/>
+      <point x="56" y="661"/>
+      <point x="56" y="510" type="curve" smooth="yes"/>
+      <point x="56" y="363"/>
+      <point x="157" y="266"/>
     </contour>
     <contour>
-      <point x="302" y="336" type="curve" smooth="yes"/>
-      <point x="191" y="336"/>
-      <point x="115" y="408"/>
-      <point x="115" y="516" type="curve" smooth="yes"/>
-      <point x="115" y="622"/>
-      <point x="188" y="692"/>
-      <point x="296" y="692" type="curve" smooth="yes"/>
-      <point x="407" y="692"/>
-      <point x="482" y="620"/>
-      <point x="482" y="510" type="curve" smooth="yes"/>
-      <point x="482" y="405"/>
-      <point x="409" y="336"/>
+      <point x="202" y="380" type="line"/>
+      <point x="285" y="380" type="line"/>
+      <point x="285" y="658" type="line"/>
+      <point x="202" y="658" type="line"/>
     </contour>
     <contour>
-      <point x="190" y="380" type="line"/>
-      <point x="273" y="380" type="line"/>
-      <point x="273" y="658" type="line"/>
-      <point x="190" y="658" type="line"/>
+      <point x="353" y="380" type="line"/>
+      <point x="450" y="380" type="line"/>
+      <point x="369" y="516" type="line"/>
+      <point x="275" y="516" type="line"/>
     </contour>
     <contour>
-      <point x="245" y="471" type="line"/>
-      <point x="306" y="471" type="line" smooth="yes"/>
-      <point x="371" y="471"/>
-      <point x="415" y="513"/>
-      <point x="415" y="570" type="curve" smooth="yes"/>
-      <point x="415" y="625"/>
-      <point x="374" y="658"/>
-      <point x="313" y="658" type="curve" smooth="yes"/>
-      <point x="245" y="658" type="line"/>
-      <point x="245" y="586" type="line"/>
-      <point x="306" y="586" type="line" smooth="yes"/>
-      <point x="321" y="586"/>
-      <point x="331" y="577"/>
-      <point x="331" y="563" type="curve" smooth="yes"/>
-      <point x="331" y="550"/>
-      <point x="323" y="540"/>
-      <point x="312" y="540" type="curve" smooth="yes"/>
-      <point x="245" y="540" type="line"/>
+      <point x="314" y="336" type="curve" smooth="yes"/>
+      <point x="203" y="336"/>
+      <point x="127" y="408"/>
+      <point x="127" y="516" type="curve" smooth="yes"/>
+      <point x="127" y="622"/>
+      <point x="200" y="692"/>
+      <point x="308" y="692" type="curve" smooth="yes"/>
+      <point x="419" y="692"/>
+      <point x="494" y="620"/>
+      <point x="494" y="510" type="curve" smooth="yes"/>
+      <point x="494" y="405"/>
+      <point x="421" y="336"/>
     </contour>
     <contour>
-      <point x="341" y="380" type="line"/>
-      <point x="438" y="380" type="line"/>
-      <point x="357" y="516" type="line"/>
-      <point x="263" y="516" type="line"/>
+      <point x="257" y="471" type="line"/>
+      <point x="318" y="471" type="line" smooth="yes"/>
+      <point x="383" y="471"/>
+      <point x="427" y="513"/>
+      <point x="427" y="570" type="curve" smooth="yes"/>
+      <point x="427" y="625"/>
+      <point x="386" y="658"/>
+      <point x="325" y="658" type="curve" smooth="yes"/>
+      <point x="257" y="658" type="line"/>
+      <point x="257" y="586" type="line"/>
+      <point x="318" y="586" type="line" smooth="yes"/>
+      <point x="333" y="586"/>
+      <point x="343" y="577"/>
+      <point x="343" y="563" type="curve" smooth="yes"/>
+      <point x="343" y="550"/>
+      <point x="335" y="540"/>
+      <point x="324" y="540" type="curve" smooth="yes"/>
+      <point x="257" y="540" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/rightA_rrow.glif b/src/Cantarell-Bold.ufo/glyphs/rightA_rrow.glif
index 316a0eca..994d3115 100644
--- a/src/Cantarell-Bold.ufo/glyphs/rightA_rrow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/rightA_rrow.glif
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rightArrow" format="2">
-  <advance width="646"/>
+  <advance width="672"/>
   <unicode hex="2192"/>
-  <note>
-arrowright
-</note>
   <outline>
     <contour>
-      <point x="315" y="7" type="line"/>
-      <point x="633" y="311" type="line"/>
-      <point x="633" y="320" type="line"/>
-      <point x="322" y="620" type="line"/>
-      <point x="207" y="510" type="line"/>
-      <point x="373" y="385" type="line"/>
-      <point x="29" y="389" type="line"/>
-      <point x="29" y="239" type="line"/>
-      <point x="373" y="242" type="line"/>
-      <point x="211" y="115" type="line"/>
+      <point x="329" y="7" type="line"/>
+      <point x="647" y="311" type="line"/>
+      <point x="647" y="320" type="line"/>
+      <point x="336" y="620" type="line"/>
+      <point x="221" y="510" type="line"/>
+      <point x="387" y="385" type="line"/>
+      <point x="43" y="389" type="line"/>
+      <point x="43" y="239" type="line"/>
+      <point x="387" y="242" type="line"/>
+      <point x="225" y="115" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/rightanglebracket-math.glif 
b/src/Cantarell-Bold.ufo/glyphs/rightanglebracket-math.glif
index 17e8b83a..862815e2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/rightanglebracket-math.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/rightanglebracket-math.glif
@@ -1,16 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rightanglebracket-math" format="2">
-  <advance width="320"/>
+  <advance width="368"/>
   <unicode hex="27E9"/>
   <outline>
     <contour>
-      <point x="14" y="-10" type="line"/>
-      <point x="182" y="-10" type="line"/>
-      <point x="310" y="362" type="line"/>
-      <point x="175" y="739" type="line"/>
-      <point x="6" y="739" type="line"/>
-      <point x="164" y="334" type="line"/>
-      <point x="164" y="381" type="line"/>
+      <point x="20" y="-10" type="line"/>
+      <point x="208" y="-10" type="line"/>
+      <point x="352" y="360" type="line"/>
+      <point x="199" y="739" type="line"/>
+      <point x="15" y="739" type="line"/>
+      <point x="188" y="330" type="line"/>
+      <point x="189" y="380" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|leftanglebracket-math</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|leftanglebracket-math</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ring.glif b/src/Cantarell-Bold.ufo/glyphs/ring.glif
index 838f010a..2b216710 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ring.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ring.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ring" format="2">
-  <advance width="332"/>
+  <advance width="500"/>
   <unicode hex="02DA"/>
   <outline>
-    <component base="ringcomb"/>
+    <component base="ringcomb" xOffset="83"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ringhalfleft.glif b/src/Cantarell-Bold.ufo/glyphs/ringhalfleft.glif
index 9811999c..ccc5f1c2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ringhalfleft.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ringhalfleft.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ringhalfleft" format="2">
-  <advance width="232"/>
+  <advance width="176"/>
   <unicode hex="02BF"/>
   <outline>
-    <component base="ringhalfright" xScale="-1" xOffset="232"/>
+    <component base="ringhalfright" xScale="-1" xOffset="176"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|ringhalfright</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|ringhalfright</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ringhalfright.glif 
b/src/Cantarell-Bold.ufo/glyphs/ringhalfright.glif
index a57a8dfb..0b38f261 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ringhalfright.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ringhalfright.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ringhalfright" format="2">
-  <advance width="233"/>
+  <advance width="176"/>
   <unicode hex="02BE"/>
   <outline>
     <contour>
-      <point x="57" y="548" type="line"/>
-      <point x="146" y="549"/>
-      <point x="193" y="587"/>
-      <point x="193" y="659" type="curve" smooth="yes"/>
-      <point x="193" y="729"/>
-      <point x="146" y="766"/>
-      <point x="57" y="766" type="curve"/>
-      <point x="57" y="687" type="line"/>
-      <point x="84" y="687"/>
-      <point x="98" y="677"/>
-      <point x="98" y="658" type="curve" smooth="yes"/>
-      <point x="98" y="639"/>
-      <point x="83" y="628"/>
-      <point x="57" y="627" type="curve"/>
+      <point x="27" y="548" type="line"/>
+      <point x="116" y="549"/>
+      <point x="163" y="587"/>
+      <point x="163" y="659" type="curve" smooth="yes"/>
+      <point x="163" y="729"/>
+      <point x="116" y="766"/>
+      <point x="27" y="766" type="curve"/>
+      <point x="27" y="687" type="line"/>
+      <point x="54" y="687"/>
+      <point x="68" y="677"/>
+      <point x="68" y="658" type="curve" smooth="yes"/>
+      <point x="68" y="639"/>
+      <point x="53" y="628"/>
+      <point x="27" y="627" type="curve"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/rinvertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/rinvertedbreve.glif
index 57e25871..bd522809 100644
--- a/src/Cantarell-Bold.ufo/glyphs/rinvertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/rinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rinvertedbreve" format="2">
-  <advance width="435"/>
+  <advance width="441"/>
   <unicode hex="0213"/>
   <outline>
     <component base="r"/>
-    <component base="breveinvertedcomb" xOffset="-12"/>
+    <component base="breveinvertedcomb" xOffset="-5"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/rlinebelow.glif b/src/Cantarell-Bold.ufo/glyphs/rlinebelow.glif
index f4339c6a..eb1b0fb6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/rlinebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/rlinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rlinebelow" format="2">
-  <advance width="435"/>
+  <advance width="441"/>
   <unicode hex="1E5F"/>
   <outline>
     <component base="r"/>
-    <component base="macronbelowcomb.narrow" xOffset="-76"/>
+    <component base="macronbelowcomb.narrow" xOffset="-69"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ruble.glif b/src/Cantarell-Bold.ufo/glyphs/ruble.glif
index 0c7cd7df..72bb746a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ruble.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ruble.glif
@@ -1,39 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ruble" format="2">
-  <advance width="711"/>
+  <advance width="600"/>
   <unicode hex="20BD"/>
   <outline>
     <contour>
-      <point x="167" y="0" type="line"/>
-      <point x="340" y="0" type="line"/>
-      <point x="340" y="694" type="line"/>
-      <point x="167" y="694" type="line"/>
+      <point x="30" y="250" type="line"/>
+      <point x="302" y="250" type="line" smooth="yes"/>
+      <point x="481" y="250"/>
+      <point x="581" y="333"/>
+      <point x="581" y="480" type="curve" smooth="yes"/>
+      <point x="581" y="619"/>
+      <point x="492" y="694"/>
+      <point x="331" y="694" type="curve" smooth="yes"/>
+      <point x="182" y="694" type="line"/>
+      <point x="182" y="542" type="line"/>
+      <point x="318" y="542" type="line" smooth="yes"/>
+      <point x="367" y="542"/>
+      <point x="401" y="508"/>
+      <point x="401" y="451" type="curve" smooth="yes"/>
+      <point x="401" y="400"/>
+      <point x="374" y="362"/>
+      <point x="333" y="362" type="curve" smooth="yes"/>
+      <point x="30" y="362" type="line"/>
     </contour>
     <contour>
-      <point x="46" y="80" type="line"/>
-      <point x="472" y="80" type="line"/>
-      <point x="472" y="180" type="line"/>
-      <point x="46" y="180" type="line"/>
+      <point x="30" y="80" type="line"/>
+      <point x="411" y="80" type="line"/>
+      <point x="411" y="180" type="line"/>
+      <point x="30" y="180" type="line"/>
     </contour>
     <contour>
-      <point x="46" y="244" type="line"/>
-      <point x="365" y="244" type="line" smooth="yes"/>
-      <point x="566" y="244"/>
-      <point x="677" y="326"/>
-      <point x="677" y="473" type="curve" smooth="yes"/>
-      <point x="677" y="615"/>
-      <point x="575" y="694"/>
-      <point x="394" y="694" type="curve" smooth="yes"/>
-      <point x="244" y="694" type="line"/>
-      <point x="244" y="542" type="line"/>
-      <point x="380" y="542" type="line" smooth="yes"/>
-      <point x="450" y="542"/>
-      <point x="497" y="504"/>
-      <point x="497" y="446" type="curve" smooth="yes"/>
-      <point x="497" y="390"/>
-      <point x="458" y="356"/>
-      <point x="396" y="356" type="curve" smooth="yes"/>
-      <point x="46" y="356" type="line"/>
+      <point x="108" y="0" type="line"/>
+      <point x="281" y="0" type="line"/>
+      <point x="281" y="694" type="line"/>
+      <point x="108" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/rupeeI_ndian.glif b/src/Cantarell-Bold.ufo/glyphs/rupeeI_ndian.glif
index 192e01af..d279aa48 100644
--- a/src/Cantarell-Bold.ufo/glyphs/rupeeI_ndian.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/rupeeI_ndian.glif
@@ -1,45 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rupeeIndian" format="2">
-  <advance width="639"/>
+  <advance width="600"/>
   <unicode hex="20B9"/>
   <outline>
     <contour>
-      <point x="62" y="214" type="line"/>
-      <point x="241" y="214" type="line" smooth="yes"/>
-      <point x="417" y="214"/>
-      <point x="527" y="333"/>
-      <point x="527" y="482" type="curve" smooth="yes"/>
-      <point x="527" y="629"/>
-      <point x="420" y="694"/>
-      <point x="246" y="694" type="curve" smooth="yes"/>
-      <point x="62" y="694" type="line"/>
-      <point x="62" y="593" type="line"/>
-      <point x="241" y="593" type="line" smooth="yes"/>
-      <point x="309" y="593"/>
-      <point x="347" y="534"/>
-      <point x="347" y="474" type="curve" smooth="yes"/>
-      <point x="347" y="417"/>
-      <point x="313" y="364"/>
-      <point x="246" y="364" type="curve" smooth="yes"/>
-      <point x="62" y="364" type="line"/>
+      <point x="43" y="204" type="line"/>
+      <point x="222" y="204" type="line" smooth="yes"/>
+      <point x="394" y="204"/>
+      <point x="508" y="312"/>
+      <point x="508" y="473" type="curve" smooth="yes"/>
+      <point x="508" y="618"/>
+      <point x="411" y="694"/>
+      <point x="227" y="694" type="curve" smooth="yes"/>
+      <point x="43" y="694" type="line"/>
+      <point x="43" y="594" type="line"/>
+      <point x="222" y="594" type="line" smooth="yes"/>
+      <point x="286" y="594"/>
+      <point x="328" y="542"/>
+      <point x="328" y="465" type="curve" smooth="yes"/>
+      <point x="328" y="394"/>
+      <point x="292" y="354"/>
+      <point x="227" y="354" type="curve" smooth="yes"/>
+      <point x="43" y="354" type="line"/>
     </contour>
     <contour>
-      <point x="382" y="0" type="line"/>
-      <point x="575" y="0" type="line"/>
-      <point x="376" y="281" type="line"/>
-      <point x="196" y="281" type="line"/>
+      <point x="383" y="0" type="line"/>
+      <point x="576" y="0" type="line"/>
+      <point x="367" y="271" type="line"/>
+      <point x="187" y="271" type="line"/>
     </contour>
     <contour>
-      <point x="64" y="425" type="line"/>
-      <point x="596" y="425" type="line"/>
-      <point x="596" y="525" type="line"/>
-      <point x="64" y="525" type="line"/>
+      <point x="43" y="424" type="line"/>
+      <point x="577" y="424" type="line"/>
+      <point x="577" y="524" type="line"/>
+      <point x="43" y="524" type="line"/>
     </contour>
     <contour>
-      <point x="64" y="594" type="line"/>
-      <point x="596" y="594" type="line"/>
-      <point x="596" y="694" type="line"/>
-      <point x="64" y="694" type="line"/>
+      <point x="45" y="594" type="line"/>
+      <point x="577" y="594" type="line"/>
+      <point x="577" y="694" type="line"/>
+      <point x="45" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/s.glif b/src/Cantarell-Bold.ufo/glyphs/s.glif
index 017baba1..89feff90 100644
--- a/src/Cantarell-Bold.ufo/glyphs/s.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/s.glif
@@ -1,46 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="s" format="2">
-  <advance width="477"/>
+  <advance width="493"/>
   <unicode hex="0073"/>
-  <note>
-s
-</note>
-  <anchor x="240" y="0" name="bottom"/>
-  <anchor x="238" y="490" name="top"/>
+  <anchor x="249" y="0" name="bottom"/>
+  <anchor x="247" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="225" y="-10" type="curve" smooth="yes"/>
-      <point x="373" y="-10"/>
-      <point x="457" y="51"/>
-      <point x="457" y="157" type="curve" smooth="yes"/>
-      <point x="457" y="344"/>
-      <point x="195" y="287"/>
-      <point x="195" y="343" type="curve" smooth="yes"/>
-      <point x="195" y="360"/>
-      <point x="219" y="370"/>
-      <point x="267" y="370" type="curve" smooth="yes"/>
-      <point x="306" y="370"/>
-      <point x="354" y="363"/>
-      <point x="403" y="351" type="curve"/>
-      <point x="436" y="476" type="line"/>
-      <point x="388" y="491"/>
-      <point x="323" y="500"/>
-      <point x="264" y="500" type="curve" smooth="yes"/>
-      <point x="112" y="500"/>
-      <point x="30" y="442"/>
-      <point x="30" y="335" type="curve" smooth="yes"/>
-      <point x="30" y="146"/>
-      <point x="286" y="212"/>
-      <point x="286" y="152" type="curve" smooth="yes"/>
-      <point x="286" y="133"/>
-      <point x="259" y="120"/>
-      <point x="216" y="120" type="curve" smooth="yes"/>
-      <point x="173" y="120"/>
-      <point x="111" y="132"/>
-      <point x="60" y="150" type="curve"/>
-      <point x="23" y="27" type="line"/>
-      <point x="79" y="4"/>
-      <point x="154" y="-10"/>
+      <point x="234" y="-10" type="curve" smooth="yes"/>
+      <point x="382" y="-10"/>
+      <point x="466" y="51"/>
+      <point x="466" y="157" type="curve" smooth="yes"/>
+      <point x="466" y="344"/>
+      <point x="204" y="287"/>
+      <point x="204" y="343" type="curve" smooth="yes"/>
+      <point x="204" y="360"/>
+      <point x="228" y="370"/>
+      <point x="276" y="370" type="curve" smooth="yes"/>
+      <point x="315" y="370"/>
+      <point x="363" y="363"/>
+      <point x="412" y="351" type="curve"/>
+      <point x="445" y="476" type="line"/>
+      <point x="397" y="491"/>
+      <point x="332" y="500"/>
+      <point x="273" y="500" type="curve" smooth="yes"/>
+      <point x="121" y="500"/>
+      <point x="39" y="442"/>
+      <point x="39" y="335" type="curve" smooth="yes"/>
+      <point x="39" y="146"/>
+      <point x="295" y="212"/>
+      <point x="295" y="152" type="curve" smooth="yes"/>
+      <point x="295" y="133"/>
+      <point x="268" y="120"/>
+      <point x="225" y="120" type="curve" smooth="yes"/>
+      <point x="182" y="120"/>
+      <point x="120" y="132"/>
+      <point x="69" y="150" type="curve"/>
+      <point x="32" y="27" type="line"/>
+      <point x="88" y="4"/>
+      <point x="163" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/sacute.glif b/src/Cantarell-Bold.ufo/glyphs/sacute.glif
index 7b1dd3d7..e538cdfc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/sacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/sacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sacute" format="2">
-  <advance width="477"/>
+  <advance width="493"/>
   <unicode hex="015B"/>
   <outline>
     <component base="s"/>
-    <component base="acutecomb" xOffset="142"/>
+    <component base="acutecomb" xOffset="151"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/sacutedotaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/sacutedotaccent.glif
index 947fa265..82d8f1cf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/sacutedotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/sacutedotaccent.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sacutedotaccent" format="2">
-  <advance width="477"/>
+  <advance width="493"/>
   <unicode hex="1E65"/>
   <outline>
     <component base="s"/>
-    <component base="acutecomb_dotaccentcomb" xOffset="152" yOffset="1"/>
+    <component base="acutecomb.loclVIET" xOffset="161" yOffset="1"/>
+    <component base="dotaccentcomb.loclVIET" xOffset="28" yOffset="169"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_dot</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>dotaccentcomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/saltillo.glif b/src/Cantarell-Bold.ufo/glyphs/saltillo.glif
index d0e37101..cd28ef81 100644
--- a/src/Cantarell-Bold.ufo/glyphs/saltillo.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/saltillo.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="saltillo" format="2">
-  <advance width="177"/>
+  <advance width="307"/>
   <unicode hex="A78C"/>
   <outline>
-    <component base="quotesingle" yScale="1.40024" xOffset="-51" yOffset="-278"/>
+    <component base="quotesingle" yScale="1.40024" xOffset="11" yOffset="-278"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/scaron.glif b/src/Cantarell-Bold.ufo/glyphs/scaron.glif
index 9e00e591..2cb57edf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/scaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/scaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scaron" format="2">
-  <advance width="477"/>
+  <advance width="493"/>
   <unicode hex="0161"/>
   <outline>
     <component base="s"/>
-    <component base="caroncomb" xOffset="32"/>
+    <component base="caroncomb" xOffset="41"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/scarondotaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/scarondotaccent.glif
index 71270b6d..51b5d3e4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/scarondotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/scarondotaccent.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scarondotaccent" format="2">
-  <advance width="477"/>
+  <advance width="493"/>
   <unicode hex="1E67"/>
   <outline>
     <component base="s"/>
-    <component base="caroncomb_dotaccentcomb" xOffset="30"/>
+    <component base="caroncomb.loclVIET" xOffset="39"/>
+    <component base="dotaccentcomb.loclVIET" xOffset="103" yOffset="195"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/scedilla.glif b/src/Cantarell-Bold.ufo/glyphs/scedilla.glif
index df742982..a3aa763d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/scedilla.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/scedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scedilla" format="2">
-  <advance width="477"/>
+  <advance width="493"/>
   <unicode hex="015F"/>
   <outline>
     <component base="s"/>
-    <component base="cedillacomb" xOffset="82"/>
+    <component base="cedillacomb" xOffset="91"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/schwa-cy.glif b/src/Cantarell-Bold.ufo/glyphs/schwa-cy.glif
index cfc85fa0..e1d9c5fe 100644
--- a/src/Cantarell-Bold.ufo/glyphs/schwa-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/schwa-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="schwa-cy" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="04D9"/>
   <outline>
     <component base="schwa"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/schwa.glif b/src/Cantarell-Bold.ufo/glyphs/schwa.glif
index 4a387f7c..67fbc4c7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/schwa.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/schwa.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="schwa" format="2">
-  <advance width="526"/>
+  <advance width="546"/>
   <unicode hex="0259"/>
   <outline>
-    <component base="e" xScale="-1" yScale="-1" xOffset="526" yOffset="490"/>
+    <component base="e" xScale="-1" yScale="-1" xOffset="546" yOffset="490"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/scircumflex.glif b/src/Cantarell-Bold.ufo/glyphs/scircumflex.glif
index 6117e6f7..67221333 100644
--- a/src/Cantarell-Bold.ufo/glyphs/scircumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/scircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scircumflex" format="2">
-  <advance width="477"/>
+  <advance width="493"/>
   <unicode hex="015D"/>
   <outline>
     <component base="s"/>
-    <component base="circumflexcomb" xOffset="35"/>
+    <component base="circumflexcomb" xOffset="44"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/scommaaccent.glif b/src/Cantarell-Bold.ufo/glyphs/scommaaccent.glif
index 3888ba5b..f7866257 100644
--- a/src/Cantarell-Bold.ufo/glyphs/scommaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/scommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scommaaccent" format="2">
-  <advance width="477"/>
+  <advance width="493"/>
   <unicode hex="0219"/>
   <outline>
     <component base="s"/>
-    <component base="commaaccentcomb" xOffset="122"/>
+    <component base="commaaccentcomb" xOffset="131"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/sdotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/sdotaccent.glif
index 72212e9e..b4b4ab03 100644
--- a/src/Cantarell-Bold.ufo/glyphs/sdotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/sdotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sdotaccent" format="2">
-  <advance width="477"/>
+  <advance width="493"/>
   <unicode hex="1E61"/>
   <outline>
     <component base="s"/>
-    <component base="dotaccentcomb" xOffset="94"/>
+    <component base="dotaccentcomb" xOffset="103"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/sdotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/sdotbelow.glif
index 74f16492..cc6a4456 100644
--- a/src/Cantarell-Bold.ufo/glyphs/sdotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/sdotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sdotbelow" format="2">
-  <advance width="477"/>
+  <advance width="493"/>
   <unicode hex="1E63"/>
   <outline>
     <component base="s"/>
-    <component base="dotbelowcomb" xOffset="90"/>
+    <component base="dotbelowcomb" xOffset="99"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/sdotbelowdotaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/sdotbelowdotaccent.glif
index 4b578fef..d44b2a66 100644
--- a/src/Cantarell-Bold.ufo/glyphs/sdotbelowdotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/sdotbelowdotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sdotbelowdotaccent" format="2">
-  <advance width="477"/>
+  <advance width="493"/>
   <unicode hex="1E69"/>
   <outline>
     <component base="s"/>
-    <component base="dotbelowcomb" xOffset="90"/>
-    <component base="dotaccentcomb" xOffset="94"/>
+    <component base="dotbelowcomb" xOffset="99"/>
+    <component base="dotaccentcomb" xOffset="103"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/second.glif b/src/Cantarell-Bold.ufo/glyphs/second.glif
index dafa36d3..ec5cb476 100644
--- a/src/Cantarell-Bold.ufo/glyphs/second.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/second.glif
@@ -1,12 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="second" format="2">
-  <advance width="553"/>
+  <advance width="577"/>
   <unicode hex="2033"/>
-  <note>
-second
-</note>
   <outline>
-    <component base="quotesingle" yxScale="0.19201" xOffset="-84"/>
-    <component base="quotesingle" yxScale="0.19201" xOffset="146"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="-76"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="154"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minute</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>minute</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/secondtonechinese.glif 
b/src/Cantarell-Bold.ufo/glyphs/secondtonechinese.glif
index f683199c..9539b6c9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/secondtonechinese.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/secondtonechinese.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="secondtonechinese" format="2">
-  <advance width="287"/>
+  <advance width="203"/>
   <unicode hex="02CA"/>
   <outline>
-    <component base="acutecomb"/>
+    <component base="acutecomb" xOffset="-40"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/section.glif b/src/Cantarell-Bold.ufo/glyphs/section.glif
index f5a4b17c..e830356e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/section.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/section.glif
@@ -1,63 +1,63 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="section" format="2">
-  <advance width="539"/>
+  <advance width="561"/>
   <unicode hex="00A7"/>
   <outline>
     <contour>
-      <point x="252" y="-61" type="curve" smooth="yes"/>
-      <point x="407" y="-61"/>
-      <point x="489" y="1"/>
-      <point x="489" y="115" type="curve" smooth="yes"/>
-      <point x="489" y="322"/>
-      <point x="227" y="250"/>
-      <point x="227" y="325" type="curve" smooth="yes"/>
-      <point x="227" y="349"/>
-      <point x="251" y="370"/>
-      <point x="281" y="370" type="curve"/>
-      <point x="301" y="453" type="line"/>
-      <point x="148" y="453"/>
-      <point x="58" y="394"/>
-      <point x="58" y="294" type="curve" smooth="yes"/>
-      <point x="58" y="118"/>
-      <point x="320" y="170"/>
-      <point x="320" y="104" type="curve" smooth="yes"/>
-      <point x="320" y="84"/>
-      <point x="296" y="73"/>
-      <point x="252" y="73" type="curve" smooth="yes"/>
-      <point x="202" y="73"/>
-      <point x="141" y="85"/>
-      <point x="88" y="106" type="curve"/>
-      <point x="51" y="-23" type="line"/>
-      <point x="105" y="-47"/>
-      <point x="183" y="-61"/>
+      <point x="263" y="-61" type="curve" smooth="yes"/>
+      <point x="418" y="-61"/>
+      <point x="500" y="1"/>
+      <point x="500" y="115" type="curve" smooth="yes"/>
+      <point x="500" y="322"/>
+      <point x="238" y="250"/>
+      <point x="238" y="325" type="curve" smooth="yes"/>
+      <point x="238" y="349"/>
+      <point x="262" y="370"/>
+      <point x="292" y="370" type="curve"/>
+      <point x="312" y="453" type="line"/>
+      <point x="159" y="453"/>
+      <point x="69" y="394"/>
+      <point x="69" y="294" type="curve" smooth="yes"/>
+      <point x="69" y="118"/>
+      <point x="331" y="170"/>
+      <point x="331" y="104" type="curve" smooth="yes"/>
+      <point x="331" y="84"/>
+      <point x="307" y="73"/>
+      <point x="263" y="73" type="curve" smooth="yes"/>
+      <point x="213" y="73"/>
+      <point x="152" y="85"/>
+      <point x="99" y="106" type="curve"/>
+      <point x="62" y="-23" type="line"/>
+      <point x="116" y="-47"/>
+      <point x="194" y="-61"/>
     </contour>
     <contour>
-      <point x="251" y="199" type="line"/>
-      <point x="404" y="199"/>
-      <point x="489" y="254"/>
-      <point x="489" y="350" type="curve" smooth="yes"/>
-      <point x="489" y="522"/>
-      <point x="227" y="483"/>
-      <point x="227" y="540" type="curve" smooth="yes"/>
-      <point x="227" y="558"/>
-      <point x="253" y="570"/>
-      <point x="291" y="570" type="curve" smooth="yes"/>
-      <point x="333" y="570"/>
-      <point x="383" y="561"/>
-      <point x="430" y="547" type="curve"/>
-      <point x="467" y="676" type="line"/>
-      <point x="413" y="694"/>
-      <point x="356" y="704"/>
-      <point x="301" y="704" type="curve" smooth="yes"/>
-      <point x="148" y="704"/>
-      <point x="58" y="636"/>
-      <point x="58" y="523" type="curve" smooth="yes"/>
-      <point x="58" y="325"/>
-      <point x="320" y="399"/>
-      <point x="320" y="319" type="curve" smooth="yes"/>
-      <point x="320" y="293"/>
-      <point x="295" y="274"/>
-      <point x="262" y="274" type="curve"/>
+      <point x="262" y="199" type="line"/>
+      <point x="415" y="199"/>
+      <point x="500" y="254"/>
+      <point x="500" y="350" type="curve" smooth="yes"/>
+      <point x="500" y="522"/>
+      <point x="238" y="483"/>
+      <point x="238" y="540" type="curve" smooth="yes"/>
+      <point x="238" y="558"/>
+      <point x="264" y="570"/>
+      <point x="302" y="570" type="curve" smooth="yes"/>
+      <point x="344" y="570"/>
+      <point x="394" y="561"/>
+      <point x="441" y="547" type="curve"/>
+      <point x="478" y="676" type="line"/>
+      <point x="424" y="694"/>
+      <point x="367" y="704"/>
+      <point x="312" y="704" type="curve" smooth="yes"/>
+      <point x="159" y="704"/>
+      <point x="69" y="636"/>
+      <point x="69" y="523" type="curve" smooth="yes"/>
+      <point x="69" y="325"/>
+      <point x="331" y="399"/>
+      <point x="331" y="319" type="curve" smooth="yes"/>
+      <point x="331" y="293"/>
+      <point x="306" y="274"/>
+      <point x="273" y="274" type="curve"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/semicolon.glif b/src/Cantarell-Bold.ufo/glyphs/semicolon.glif
index cf010836..dfcfe599 100644
--- a/src/Cantarell-Bold.ufo/glyphs/semicolon.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/semicolon.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="semicolon" format="2">
-  <advance width="282"/>
+  <advance width="286"/>
   <unicode hex="003B"/>
   <outline>
-    <component base="comma" xOffset="-4"/>
-    <component base="period" xOffset="-7" yOffset="284"/>
+    <component base="comma"/>
+    <component base="period" xOffset="5" yOffset="284"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/seven.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/seven.dnom.glif
index d76308f6..6ca69e23 100644
--- a/src/Cantarell-Bold.ufo/glyphs/seven.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/seven.dnom.glif
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven.dnom" format="2">
-  <advance width="403"/>
-  <note>
-seven
-</note>
+  <advance width="378"/>
   <outline>
     <contour>
-      <point x="40" y="0" type="line"/>
-      <point x="198" y="0" type="line"/>
-      <point x="401" y="389" type="line"/>
-      <point x="401" y="479" type="line"/>
-      <point x="7" y="479" type="line"/>
-      <point x="7" y="349" type="line"/>
-      <point x="267" y="349" type="line"/>
-      <point x="245" y="385" type="line"/>
+      <point x="37" y="0" type="line"/>
+      <point x="189" y="0" type="line"/>
+      <point x="368" y="352" type="line"/>
+      <point x="368" y="416" type="line"/>
+      <point x="19" y="416" type="line"/>
+      <point x="19" y="299" type="line"/>
+      <point x="247" y="299" type="line"/>
+      <point x="211" y="332" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -21,11 +18,11 @@ seven
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>69</integer>
+        <integer>60</integer>
         <key>weight</key>
-        <integer>-23</integer>
+        <integer>-35</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>65</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/seven.glif b/src/Cantarell-Bold.ufo/glyphs/seven.glif
index 43badede..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="531"/>
+  <advance width="535"/>
   <unicode hex="0037"/>
   <outline>
     <contour>
       <point x="65" y="0" type="line"/>
-      <point x="247" y="0" type="line"/>
-      <point x="524" y="590" type="line"/>
-      <point x="524" y="694" type="line"/>
-      <point x="9" y="694" type="line"/>
-      <point x="9" y="544" type="line"/>
-      <point x="370" y="544" type="line"/>
-      <point x="344" y="587" 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/seven.numr.glif b/src/Cantarell-Bold.ufo/glyphs/seven.numr.glif
index ec73070d..f62a5e0c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/seven.numr.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/seven.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven.numr" format="2">
-  <advance width="403"/>
+  <advance width="378"/>
   <outline>
     <component base="seven.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/seven.osf.glif b/src/Cantarell-Bold.ufo/glyphs/seven.osf.glif
index fc36b998..ebef7d1b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/seven.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/seven.osf.glif
@@ -1,16 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven.osf" format="2">
-  <advance width="528"/>
+  <advance width="532"/>
   <outline>
     <contour>
-      <point x="67" y="-100" type="line"/>
-      <point x="244" y="-100" type="line"/>
-      <point x="521" y="493" type="line"/>
-      <point x="521" y="594" type="line"/>
-      <point x="9" y="594" type="line"/>
-      <point x="9" y="449" type="line"/>
-      <point x="372" y="449" type="line"/>
-      <point x="346" y="490" type="line"/>
+      <point x="70" y="-100" type="line"/>
+      <point x="247" y="-100" type="line"/>
+      <point x="524" y="493" type="line"/>
+      <point x="524" y="594" type="line"/>
+      <point x="12" y="594" type="line"/>
+      <point x="12" y="449" type="line"/>
+      <point x="375" y="449" type="line"/>
+      <point x="349" y="490" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>seven</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>seven</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/seven.tf.glif b/src/Cantarell-Bold.ufo/glyphs/seven.tf.glif
index 0bda52ac..6d3a29fd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/seven.tf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/seven.tf.glif
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven.tf" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <outline>
     <contour>
-      <point x="83" y="0" type="line"/>
-      <point x="266" y="0" type="line"/>
-      <point x="563" y="590" type="line"/>
-      <point x="563" y="694" type="line"/>
-      <point x="19" y="694" type="line"/>
-      <point x="19" y="544" type="line"/>
-      <point x="410" y="544" type="line"/>
-      <point x="383" y="587" type="line"/>
+      <point x="93" y="0" type="line"/>
+      <point x="276" y="0" type="line"/>
+      <point x="569" y="612" type="line"/>
+      <point x="569" y="694" type="line"/>
+      <point x="34" y="694" type="line"/>
+      <point x="34" y="544" type="line"/>
+      <point x="416" y="544" type="line"/>
+      <point x="380" y="589" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/seveneighths.glif b/src/Cantarell-Bold.ufo/glyphs/seveneighths.glif
index 54903fb6..b8d15506 100644
--- a/src/Cantarell-Bold.ufo/glyphs/seveneighths.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/seveneighths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seveneighths" format="2">
-  <advance width="1210"/>
+  <advance width="1064"/>
   <unicode hex="215E"/>
   <outline>
     <component base="seven.numr"/>
-    <component base="fraction" xOffset="403"/>
-    <component base="eight.dnom" xOffset="741"/>
+    <component base="fraction" xOffset="378"/>
+    <component base="eight.dnom" xOffset="627"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/seveninferior.glif 
b/src/Cantarell-Bold.ufo/glyphs/seveninferior.glif
index 69ce8085..f18437bd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/seveninferior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/seveninferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seveninferior" format="2">
-  <advance width="403"/>
+  <advance width="378"/>
   <unicode hex="2087"/>
   <outline>
     <component base="seven.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/sevensuperior.glif 
b/src/Cantarell-Bold.ufo/glyphs/sevensuperior.glif
index 31b68470..9ebdea3f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/sevensuperior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/sevensuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sevensuperior" format="2">
-  <advance width="403"/>
+  <advance width="378"/>
   <unicode hex="2077"/>
   <outline>
     <component base="seven.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/sha-cy.glif b/src/Cantarell-Bold.ufo/glyphs/sha-cy.glif
index 2833d76e..61e2a0ef 100644
--- a/src/Cantarell-Bold.ufo/glyphs/sha-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/sha-cy.glif
@@ -1,23 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sha-cy" format="2">
-  <advance width="854"/>
+  <advance width="870"/>
   <unicode hex="0448"/>
+  <anchor x="728" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="800" y="0" type="line"/>
-      <point x="800" y="490" type="line"/>
-      <point x="640" y="490" type="line"/>
-      <point x="640" y="133" type="line"/>
-      <point x="215" y="133" type="line"/>
-      <point x="215" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="808" y="0" type="line"/>
+      <point x="808" y="490" type="line"/>
+      <point x="648" y="490" type="line"/>
+      <point x="648" y="133" type="line"/>
+      <point x="223" y="133" type="line"/>
+      <point x="223" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="346" y="58" type="line"/>
-      <point x="507" y="58" type="line"/>
-      <point x="507" y="490" type="line"/>
-      <point x="346" y="490" type="line"/>
+      <point x="354" y="58" type="line"/>
+      <point x="515" y="58" type="line"/>
+      <point x="515" y="490" type="line"/>
+      <point x="354" y="490" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -31,6 +32,10 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/shcha-cy.glif b/src/Cantarell-Bold.ufo/glyphs/shcha-cy.glif
index 79fa8176..5bbd2893 100644
--- a/src/Cantarell-Bold.ufo/glyphs/shcha-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/shcha-cy.glif
@@ -1,30 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="shcha-cy" format="2">
-  <advance width="898"/>
+  <advance width="895"/>
   <unicode hex="0449"/>
   <outline>
-    <contour>
-      <point x="740" y="-135" type="line"/>
-      <point x="896" y="-135" type="line"/>
-      <point x="896" y="133" type="line"/>
-      <point x="214" y="133" type="line"/>
-      <point x="214" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
-      <point x="54" y="0" type="line"/>
-      <point x="740" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="347" y="68" type="line"/>
-      <point x="507" y="68" type="line"/>
-      <point x="507" y="490" type="line"/>
-      <point x="347" y="490" type="line"/>
-    </contour>
-    <contour>
-      <point x="643" y="68" type="line"/>
-      <point x="802" y="68" type="line"/>
-      <point x="802" y="490" type="line"/>
-      <point x="643" y="490" type="line"/>
-    </contour>
+    <component base="sha-cy"/>
+    <component base="descender-cy" xOffset="632"/>
   </outline>
   <lib>
     <dict>
@@ -37,6 +17,15 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>tse-cy</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>-1</integer>
+        <integer>0</integer>
+      </array>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/shha-cy.glif b/src/Cantarell-Bold.ufo/glyphs/shha-cy.glif
index d4813a3e..e7be9314 100644
--- a/src/Cantarell-Bold.ufo/glyphs/shha-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/shha-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="shha-cy" format="2">
-  <advance width="579"/>
+  <advance width="595"/>
   <unicode hex="04BB"/>
   <outline>
     <component base="h"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/six.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/six.dnom.glif
index 6d535350..43447be3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/six.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/six.dnom.glif
@@ -1,49 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six.dnom" format="2">
-  <advance width="462"/>
-  <note>
-six
-</note>
+  <advance width="430"/>
   <outline>
     <contour>
-      <point x="233" y="-7" type="curve" smooth="yes"/>
-      <point x="356" y="-7"/>
-      <point x="439" y="62"/>
-      <point x="439" y="165" type="curve" smooth="yes"/>
-      <point x="439" y="255"/>
-      <point x="377" y="315"/>
-      <point x="284" y="315" type="curve" smooth="yes"/>
-      <point x="218" y="315"/>
-      <point x="163" y="286"/>
-      <point x="132" y="227" type="curve"/>
-      <point x="170" y="180" type="line"/>
-      <point x="191" y="191"/>
-      <point x="214" y="197"/>
-      <point x="237" y="197" type="curve" smooth="yes"/>
-      <point x="271" y="197"/>
-      <point x="294" y="179"/>
-      <point x="294" y="155" type="curve" smooth="yes"/>
-      <point x="294" y="132"/>
-      <point x="274" y="116"/>
-      <point x="245" y="116" type="curve" smooth="yes"/>
-      <point x="195" y="116"/>
-      <point x="168" y="164"/>
-      <point x="168" y="235" type="curve" smooth="yes"/>
-      <point x="168" y="322"/>
-      <point x="209" y="365"/>
-      <point x="287" y="365" type="curve" smooth="yes"/>
-      <point x="320" y="365"/>
-      <point x="362" y="357"/>
-      <point x="393" y="346" type="curve"/>
-      <point x="431" y="457" type="line"/>
-      <point x="390" y="475"/>
-      <point x="339" y="486"/>
-      <point x="280" y="486" type="curve" smooth="yes"/>
-      <point x="111" y="486"/>
-      <point x="21" y="393"/>
-      <point x="21" y="227" type="curve" smooth="yes"/>
-      <point x="21" y="74"/>
-      <point x="98" y="-7"/>
+      <point x="216" y="-6" type="curve" smooth="yes"/>
+      <point x="323" y="-6"/>
+      <point x="395" y="54"/>
+      <point x="395" y="144" type="curve" smooth="yes"/>
+      <point x="395" y="221"/>
+      <point x="341" y="273"/>
+      <point x="260" y="273" type="curve" smooth="yes"/>
+      <point x="202" y="273"/>
+      <point x="152" y="248"/>
+      <point x="126" y="198" type="curve"/>
+      <point x="158" y="158" type="line"/>
+      <point x="174" y="165"/>
+      <point x="197" y="172"/>
+      <point x="220" y="172" type="curve" smooth="yes"/>
+      <point x="252" y="172"/>
+      <point x="272" y="156"/>
+      <point x="272" y="134" type="curve" smooth="yes"/>
+      <point x="272" y="112"/>
+      <point x="253" y="96"/>
+      <point x="226" y="96" type="curve" smooth="yes"/>
+      <point x="182" y="96"/>
+      <point x="157" y="138"/>
+      <point x="157" y="211" type="curve" smooth="yes"/>
+      <point x="157" y="281"/>
+      <point x="193" y="319"/>
+      <point x="263" y="319" type="curve" smooth="yes"/>
+      <point x="293" y="319"/>
+      <point x="332" y="311"/>
+      <point x="357" y="302" type="curve"/>
+      <point x="389" y="397" type="line"/>
+      <point x="353" y="413"/>
+      <point x="307" y="422"/>
+      <point x="258" y="422" type="curve" smooth="yes"/>
+      <point x="111" y="422"/>
+      <point x="32" y="340"/>
+      <point x="32" y="200" type="curve" smooth="yes"/>
+      <point x="32" y="64"/>
+      <point x="99" y="-6"/>
     </contour>
   </outline>
   <lib>
@@ -51,11 +48,11 @@ six
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>69</integer>
+        <integer>60</integer>
         <key>weight</key>
-        <integer>-23</integer>
+        <integer>-45</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>65</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/six.glif b/src/Cantarell-Bold.ufo/glyphs/six.glif
index e6184737..f6df36d1 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="598"/>
+  <advance width="609"/>
   <unicode hex="0036"/>
   <outline>
     <contour>
-      <point x="306" y="-10" type="curve" smooth="yes"/>
-      <point x="466" y="-10"/>
-      <point x="572" y="87"/>
-      <point x="572" y="232" type="curve" smooth="yes"/>
-      <point x="572" y="362"/>
-      <point x="489" y="446"/>
-      <point x="365" y="446" type="curve" smooth="yes"/>
-      <point x="273" y="446"/>
-      <point x="200" y="402"/>
-      <point x="157" y="315" type="curve"/>
-      <point x="200" y="255" type="line"/>
-      <point x="229" y="289"/>
-      <point x="270" y="309"/>
-      <point x="311" y="309" type="curve" smooth="yes"/>
-      <point x="367" y="309"/>
-      <point x="404" y="273"/>
-      <point x="404" y="219" type="curve" smooth="yes"/>
-      <point x="404" y="167"/>
-      <point x="370" y="133"/>
-      <point x="318" y="133" type="curve" smooth="yes"/>
-      <point x="242" y="133"/>
-      <point x="199" y="211"/>
-      <point x="199" y="344" type="curve" smooth="yes"/>
-      <point x="199" y="487"/>
-      <point x="260" y="564"/>
-      <point x="374" y="564" type="curve" smooth="yes"/>
-      <point x="419" y="564"/>
-      <point x="476" y="552"/>
-      <point x="517" y="534" type="curve"/>
-      <point x="561" y="663" type="line"/>
-      <point x="508" y="689"/>
-      <point x="442" y="704"/>
-      <point x="367" y="704" type="curve" smooth="yes"/>
-      <point x="146" y="704"/>
-      <point x="29" y="569"/>
-      <point x="29" y="330" type="curve" smooth="yes"/>
-      <point x="29" y="107"/>
-      <point x="130" y="-10"/>
+      <point x="312" y="-10" type="curve" smooth="yes"/>
+      <point x="472" y="-10"/>
+      <point x="578" y="87"/>
+      <point x="578" y="232" type="curve" smooth="yes"/>
+      <point x="578" y="362"/>
+      <point x="495" y="446"/>
+      <point x="371" y="446" type="curve" smooth="yes"/>
+      <point x="279" y="446"/>
+      <point x="206" y="402"/>
+      <point x="163" y="315" type="curve"/>
+      <point x="206" y="255" type="line"/>
+      <point x="235" y="289"/>
+      <point x="276" y="309"/>
+      <point x="317" y="309" type="curve" smooth="yes"/>
+      <point x="373" y="309"/>
+      <point x="410" y="273"/>
+      <point x="410" y="219" type="curve" smooth="yes"/>
+      <point x="410" y="167"/>
+      <point x="376" y="133"/>
+      <point x="324" y="133" type="curve" smooth="yes"/>
+      <point x="248" y="133"/>
+      <point x="205" y="211"/>
+      <point x="205" y="344" type="curve" smooth="yes"/>
+      <point x="205" y="487"/>
+      <point x="266" y="564"/>
+      <point x="380" y="564" type="curve" smooth="yes"/>
+      <point x="425" y="564"/>
+      <point x="482" y="552"/>
+      <point x="523" y="534" type="curve"/>
+      <point x="567" y="663" type="line"/>
+      <point x="514" y="689"/>
+      <point x="448" y="704"/>
+      <point x="373" y="704" type="curve" smooth="yes"/>
+      <point x="152" y="704"/>
+      <point x="35" y="569"/>
+      <point x="35" y="330" type="curve" smooth="yes"/>
+      <point x="35" y="107"/>
+      <point x="136" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/six.numr.glif b/src/Cantarell-Bold.ufo/glyphs/six.numr.glif
index 3e1a3db0..c9ced413 100644
--- a/src/Cantarell-Bold.ufo/glyphs/six.numr.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/six.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six.numr" format="2">
-  <advance width="462"/>
+  <advance width="430"/>
   <outline>
     <component base="six.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/six.osf.glif b/src/Cantarell-Bold.ufo/glyphs/six.osf.glif
index 9529b946..1560b269 100644
--- a/src/Cantarell-Bold.ufo/glyphs/six.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/six.osf.glif
@@ -1,46 +1,54 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six.osf" format="2">
-  <advance width="592"/>
+  <advance width="603"/>
   <outline>
     <contour>
-      <point x="304" y="-10" type="curve" smooth="yes"/>
-      <point x="460" y="-10"/>
-      <point x="566" y="87"/>
-      <point x="566" y="231" type="curve" smooth="yes"/>
-      <point x="566" y="360"/>
-      <point x="482" y="445"/>
-      <point x="360" y="445" type="curve" smooth="yes"/>
-      <point x="263" y="445"/>
-      <point x="190" y="393"/>
-      <point x="150" y="310" type="curve"/>
-      <point x="192" y="252" type="line"/>
-      <point x="221" y="289"/>
-      <point x="263" y="312"/>
-      <point x="308" y="312" type="curve" smooth="yes"/>
-      <point x="366" y="312"/>
-      <point x="405" y="274"/>
-      <point x="405" y="218" type="curve" smooth="yes"/>
-      <point x="405" y="164"/>
-      <point x="370" y="127"/>
-      <point x="316" y="127" type="curve" smooth="yes"/>
-      <point x="237" y="127"/>
-      <point x="192" y="209"/>
-      <point x="192" y="344" type="curve" smooth="yes"/>
-      <point x="192" y="489"/>
-      <point x="255" y="570"/>
-      <point x="370" y="570" type="curve" smooth="yes"/>
-      <point x="417" y="570"/>
-      <point x="475" y="556"/>
-      <point x="513" y="539" type="curve"/>
-      <point x="555" y="663" type="line"/>
-      <point x="504" y="689"/>
-      <point x="437" y="704"/>
-      <point x="364" y="704" type="curve" smooth="yes"/>
-      <point x="146" y="704"/>
-      <point x="29" y="568"/>
-      <point x="29" y="330" type="curve" smooth="yes"/>
-      <point x="29" y="107"/>
-      <point x="130" y="-10"/>
+      <point x="310" y="-10" type="curve" smooth="yes"/>
+      <point x="466" y="-10"/>
+      <point x="572" y="87"/>
+      <point x="572" y="231" type="curve" smooth="yes"/>
+      <point x="572" y="360"/>
+      <point x="488" y="445"/>
+      <point x="366" y="445" type="curve" smooth="yes"/>
+      <point x="269" y="445"/>
+      <point x="196" y="393"/>
+      <point x="156" y="310" type="curve"/>
+      <point x="198" y="252" type="line"/>
+      <point x="227" y="289"/>
+      <point x="269" y="312"/>
+      <point x="314" y="312" type="curve" smooth="yes"/>
+      <point x="372" y="312"/>
+      <point x="411" y="274"/>
+      <point x="411" y="218" type="curve" smooth="yes"/>
+      <point x="411" y="164"/>
+      <point x="376" y="127"/>
+      <point x="322" y="127" type="curve" smooth="yes"/>
+      <point x="243" y="127"/>
+      <point x="198" y="209"/>
+      <point x="198" y="344" type="curve" smooth="yes"/>
+      <point x="198" y="489"/>
+      <point x="261" y="570"/>
+      <point x="376" y="570" type="curve" smooth="yes"/>
+      <point x="423" y="570"/>
+      <point x="481" y="556"/>
+      <point x="519" y="539" type="curve"/>
+      <point x="561" y="663" type="line"/>
+      <point x="510" y="689"/>
+      <point x="443" y="704"/>
+      <point x="370" y="704" type="curve" smooth="yes"/>
+      <point x="152" y="704"/>
+      <point x="35" y="568"/>
+      <point x="35" y="330" type="curve" smooth="yes"/>
+      <point x="35" y="107"/>
+      <point x="136" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>six</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>six</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/six.tf.glif b/src/Cantarell-Bold.ufo/glyphs/six.tf.glif
index f132ae34..2fdde2db 100644
--- a/src/Cantarell-Bold.ufo/glyphs/six.tf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/six.tf.glif
@@ -1,47 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six.tf" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <outline>
-    <contour>
-      <point x="296" y="-10" type="curve" smooth="yes"/>
-      <point x="450" y="-10"/>
-      <point x="557" y="84"/>
-      <point x="557" y="233" type="curve" smooth="yes"/>
-      <point x="557" y="362"/>
-      <point x="476" y="446"/>
-      <point x="355" y="446" type="curve" smooth="yes"/>
-      <point x="266" y="446"/>
-      <point x="194" y="402"/>
-      <point x="152" y="315" type="curve"/>
-      <point x="195" y="255" type="line"/>
-      <point x="223" y="289"/>
-      <point x="262" y="309"/>
-      <point x="301" y="309" type="curve" smooth="yes"/>
-      <point x="355" y="309"/>
-      <point x="391" y="273"/>
-      <point x="391" y="219" type="curve" smooth="yes"/>
-      <point x="391" y="167"/>
-      <point x="358" y="133"/>
-      <point x="309" y="133" type="curve" smooth="yes"/>
-      <point x="235" y="133"/>
-      <point x="193" y="212"/>
-      <point x="193" y="338" type="curve" smooth="yes"/>
-      <point x="193" y="489"/>
-      <point x="253" y="564"/>
-      <point x="362" y="564" type="curve" smooth="yes"/>
-      <point x="406" y="564"/>
-      <point x="463" y="552"/>
-      <point x="503" y="534" type="curve"/>
-      <point x="546" y="663" type="line"/>
-      <point x="494" y="689"/>
-      <point x="431" y="704"/>
-      <point x="356" y="704" type="curve" smooth="yes"/>
-      <point x="140" y="704"/>
-      <point x="25" y="569"/>
-      <point x="25" y="330" type="curve" smooth="yes"/>
-      <point x="25" y="107"/>
-      <point x="124" y="-10"/>
-    </contour>
+    <component base="six" xOffset="6"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/sixinferior.glif b/src/Cantarell-Bold.ufo/glyphs/sixinferior.glif
index 39516591..985931b8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/sixinferior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/sixinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sixinferior" format="2">
-  <advance width="462"/>
+  <advance width="430"/>
   <unicode hex="2086"/>
   <outline>
     <component base="six.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/sixsuperior.glif b/src/Cantarell-Bold.ufo/glyphs/sixsuperior.glif
index 97b53921..df958cd6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/sixsuperior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/sixsuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sixsuperior" format="2">
-  <advance width="462"/>
+  <advance width="430"/>
   <unicode hex="2076"/>
   <outline>
     <component base="six.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/slash.glif b/src/Cantarell-Bold.ufo/glyphs/slash.glif
index 3d696498..5d04dada 100644
--- a/src/Cantarell-Bold.ufo/glyphs/slash.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/slash.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="slash" format="2">
-  <advance width="364"/>
+  <advance width="393"/>
   <unicode hex="002F"/>
   <outline>
     <contour>
-      <point x="-10" y="-115" type="line"/>
-      <point x="148" y="-115" type="line"/>
-      <point x="375" y="739" type="line"/>
-      <point x="206" y="739" type="line"/>
+      <point x="4" y="-115" type="line"/>
+      <point x="162" y="-115" type="line"/>
+      <point x="389" y="739" type="line"/>
+      <point x="220" y="739" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/softsign-cy.glif b/src/Cantarell-Bold.ufo/glyphs/softsign-cy.glif
index cf7b3abe..54e10f80 100644
--- a/src/Cantarell-Bold.ufo/glyphs/softsign-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/softsign-cy.glif
@@ -1,29 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="softsign-cy" format="2">
-  <advance width="515"/>
+  <advance width="531"/>
   <unicode hex="044C"/>
   <outline>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="269" y="0" type="line" smooth="yes"/>
-      <point x="419" y="0"/>
-      <point x="507" y="70"/>
-      <point x="507" y="187" type="curve" smooth="yes"/>
-      <point x="507" y="281"/>
-      <point x="429" y="344"/>
-      <point x="314" y="344" type="curve" smooth="yes"/>
-      <point x="161" y="344" type="line"/>
-      <point x="161" y="220" type="line"/>
-      <point x="278" y="220" type="line" smooth="yes"/>
-      <point x="312" y="220"/>
-      <point x="338" y="202"/>
-      <point x="338" y="173" type="curve" smooth="yes"/>
-      <point x="338" y="144"/>
-      <point x="319" y="126"/>
-      <point x="290" y="126" type="curve" smooth="yes"/>
-      <point x="214" y="126" type="line"/>
-      <point x="214" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="277" y="0" type="line" smooth="yes"/>
+      <point x="427" y="0"/>
+      <point x="515" y="70"/>
+      <point x="515" y="187" type="curve" smooth="yes"/>
+      <point x="515" y="281"/>
+      <point x="437" y="344"/>
+      <point x="322" y="344" type="curve" smooth="yes"/>
+      <point x="169" y="344" type="line"/>
+      <point x="169" y="220" type="line"/>
+      <point x="286" y="220" type="line" smooth="yes"/>
+      <point x="320" y="220"/>
+      <point x="346" y="202"/>
+      <point x="346" y="173" type="curve" smooth="yes"/>
+      <point x="346" y="144"/>
+      <point x="327" y="126"/>
+      <point x="298" y="126" type="curve" smooth="yes"/>
+      <point x="222" y="126" type="line"/>
+      <point x="222" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -37,6 +37,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/space.glif b/src/Cantarell-Bold.ufo/glyphs/space.glif
index 2e45f71c..ba93c5d2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/space.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/space.glif
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="space" format="2">
-  <advance width="160"/>
+  <advance width="200"/>
   <unicode hex="0020"/>
-  <note>
-space
-</note>
+  <unicode hex="00A0"/>
   <outline>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/sterling.glif b/src/Cantarell-Bold.ufo/glyphs/sterling.glif
index fd873a93..143811fc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/sterling.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/sterling.glif
@@ -1,40 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sterling" format="2">
-  <advance width="615"/>
+  <advance width="600"/>
   <unicode hex="00A3"/>
   <outline>
     <contour>
-      <point x="52" y="0" type="line"/>
-      <point x="569" y="0" type="line"/>
-      <point x="569" y="156" type="line"/>
-      <point x="229" y="156" type="line"/>
-      <point x="276" y="174"/>
-      <point x="296" y="222"/>
-      <point x="297" y="322" type="curve" smooth="yes"/>
-      <point x="298" y="461" type="line" smooth="yes"/>
-      <point x="298" y="517"/>
-      <point x="342" y="554"/>
-      <point x="420" y="554" type="curve" smooth="yes"/>
-      <point x="455" y="554"/>
-      <point x="500" y="547"/>
-      <point x="534" y="536" type="curve"/>
-      <point x="572" y="677" type="line"/>
-      <point x="530" y="695"/>
-      <point x="481" y="704"/>
-      <point x="427" y="704" type="curve" smooth="yes"/>
-      <point x="246" y="704"/>
-      <point x="121" y="603"/>
-      <point x="123" y="451" type="curve" smooth="yes"/>
-      <point x="125" y="312" type="line" smooth="yes"/>
-      <point x="126" y="226"/>
-      <point x="100" y="171"/>
-      <point x="52" y="156" type="curve"/>
+      <point x="48" y="0" type="line"/>
+      <point x="564" y="0" type="line"/>
+      <point x="564" y="156" type="line"/>
+      <point x="226" y="156" type="line"/>
+      <point x="272" y="174"/>
+      <point x="289" y="219"/>
+      <point x="289" y="322" type="curve" smooth="yes"/>
+      <point x="289" y="461" type="line" smooth="yes"/>
+      <point x="289" y="525"/>
+      <point x="322" y="554"/>
+      <point x="395" y="554" type="curve" smooth="yes"/>
+      <point x="430" y="554"/>
+      <point x="475" y="547"/>
+      <point x="509" y="536" type="curve"/>
+      <point x="547" y="677" type="line"/>
+      <point x="505" y="695"/>
+      <point x="457" y="704"/>
+      <point x="402" y="704" type="curve" smooth="yes"/>
+      <point x="216" y="704"/>
+      <point x="113" y="613"/>
+      <point x="115" y="451" type="curve" smooth="yes"/>
+      <point x="117" y="312" type="line" smooth="yes"/>
+      <point x="118" y="221"/>
+      <point x="96" y="171"/>
+      <point x="48" y="156" type="curve"/>
     </contour>
     <contour>
-      <point x="50" y="292" type="line"/>
-      <point x="472" y="292" type="line"/>
-      <point x="472" y="413" type="line"/>
-      <point x="50" y="413" type="line"/>
+      <point x="54" y="292" type="line"/>
+      <point x="446" y="292" type="line"/>
+      <point x="446" y="413" type="line"/>
+      <point x="54" y="413" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/summation.glif b/src/Cantarell-Bold.ufo/glyphs/summation.glif
index 94c484f7..ff3b7bd5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/summation.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/summation.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="summation" format="2">
-  <advance width="635"/>
+  <advance width="659"/>
   <unicode hex="2211"/>
   <outline>
     <contour>
-      <point x="35" y="-95" type="line"/>
-      <point x="595" y="-95" type="line"/>
-      <point x="595" y="61" type="line"/>
-      <point x="259" y="61" type="line"/>
-      <point x="477" y="299" type="line"/>
-      <point x="262" y="538" type="line"/>
-      <point x="595" y="538" type="line"/>
-      <point x="595" y="694" type="line"/>
-      <point x="35" y="694" type="line"/>
-      <point x="35" y="573" type="line"/>
-      <point x="278" y="299" type="line"/>
-      <point x="35" y="28" type="line"/>
+      <point x="47" y="-95" type="line"/>
+      <point x="607" y="-95" type="line"/>
+      <point x="607" y="61" type="line"/>
+      <point x="271" y="61" type="line"/>
+      <point x="489" y="299" type="line"/>
+      <point x="274" y="538" type="line"/>
+      <point x="607" y="538" type="line"/>
+      <point x="607" y="694" type="line"/>
+      <point x="47" y="694" type="line"/>
+      <point x="47" y="573" type="line"/>
+      <point x="290" y="299" type="line"/>
+      <point x="47" y="28" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/t.glif b/src/Cantarell-Bold.ufo/glyphs/t.glif
index 57c0568c..3207161f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/t.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/t.glif
@@ -1,38 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="t" format="2">
-  <advance width="397"/>
+  <advance width="405"/>
   <unicode hex="0074"/>
-  <note>
-t
-</note>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="182" y="243" name="center"/>
-  <anchor x="161" y="631" name="top"/>
-  <anchor x="349" y="490" name="topright"/>
+  <anchor x="232" y="0" name="bottom"/>
+  <anchor x="189" y="243" name="center"/>
+  <anchor x="168" y="631" name="top"/>
+  <anchor x="356" y="490" name="topright"/>
   <outline>
     <contour>
-      <point x="274" y="-8" type="curve" smooth="yes"/>
-      <point x="308" y="-8"/>
-      <point x="346" y="-3"/>
-      <point x="385" y="8" type="curve"/>
-      <point x="352" y="130" type="line"/>
-      <point x="339" y="125"/>
-      <point x="325" y="123"/>
-      <point x="312" y="123" type="curve" smooth="yes"/>
-      <point x="270" y="123"/>
-      <point x="245" y="145"/>
-      <point x="245" y="181" type="curve" smooth="yes"/>
-      <point x="245" y="631" type="line"/>
-      <point x="75" y="631" type="line"/>
-      <point x="75" y="176" type="line" smooth="yes"/>
-      <point x="75" y="60"/>
-      <point x="147" y="-8"/>
+      <point x="281" y="-8" type="curve" smooth="yes"/>
+      <point x="315" y="-8"/>
+      <point x="353" y="-3"/>
+      <point x="392" y="8" type="curve"/>
+      <point x="359" y="130" type="line"/>
+      <point x="346" y="125"/>
+      <point x="332" y="123"/>
+      <point x="319" y="123" type="curve" smooth="yes"/>
+      <point x="277" y="123"/>
+      <point x="252" y="145"/>
+      <point x="252" y="181" type="curve" smooth="yes"/>
+      <point x="252" y="631" type="line"/>
+      <point x="82" y="631" type="line"/>
+      <point x="82" y="176" type="line" smooth="yes"/>
+      <point x="82" y="60"/>
+      <point x="154" y="-8"/>
     </contour>
     <contour>
-      <point x="5" y="355" type="line"/>
-      <point x="358" y="355" type="line"/>
-      <point x="358" y="490" type="line"/>
-      <point x="5" y="490" type="line"/>
+      <point x="12" y="355" type="line"/>
+      <point x="365" y="355" type="line"/>
+      <point x="365" y="490" type="line"/>
+      <point x="12" y="490" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tbar.glif b/src/Cantarell-Bold.ufo/glyphs/tbar.glif
index 18e908ee..908798ab 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tbar.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tbar.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tbar" format="2">
-  <advance width="397"/>
+  <advance width="405"/>
   <unicode hex="0167"/>
   <outline>
     <component base="t"/>
-    <component base="strokeshortcomb" xOffset="-33" yOffset="-56"/>
+    <component base="strokeshortcomb" xOffset="-26" yOffset="-56"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tcaron.glif b/src/Cantarell-Bold.ufo/glyphs/tcaron.glif
index 57ef2fc8..c9b88b38 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tcaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tcaron" format="2">
-  <advance width="397"/>
+  <advance width="405"/>
   <unicode hex="0165"/>
   <outline>
     <component base="t"/>
-    <component base="caroncomb.alt" xOffset="226" yOffset="-2"/>
+    <component base="caroncomb.alt" xOffset="233" yOffset="-2"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tcedilla.glif b/src/Cantarell-Bold.ufo/glyphs/tcedilla.glif
index edaed1ba..a1321c11 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tcedilla.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tcedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tcedilla" format="2">
-  <advance width="397"/>
+  <advance width="405"/>
   <unicode hex="0163"/>
   <outline>
     <component base="t"/>
-    <component base="cedillacomb" xOffset="67"/>
+    <component base="cedillacomb" xOffset="74"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tcommaaccent.glif b/src/Cantarell-Bold.ufo/glyphs/tcommaaccent.glif
index 35b645ea..4f07a02e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tcommaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tcommaaccent" format="2">
-  <advance width="397"/>
+  <advance width="405"/>
   <unicode hex="021B"/>
   <outline>
     <component base="t"/>
-    <component base="commaaccentcomb" xOffset="107"/>
+    <component base="commaaccentcomb" xOffset="114"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tdieresis.glif b/src/Cantarell-Bold.ufo/glyphs/tdieresis.glif
index c43f1716..78c10178 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tdieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tdieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tdieresis" format="2">
-  <advance width="397"/>
+  <advance width="405"/>
   <unicode hex="1E97"/>
   <outline>
     <component base="t"/>
-    <component base="dieresiscomb" xOffset="-108" yOffset="141"/>
+    <component base="dieresiscomb" xOffset="-101" yOffset="141"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tdotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/tdotbelow.glif
index 71901b4f..8ce8d245 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tdotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tdotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tdotbelow" format="2">
-  <advance width="397"/>
+  <advance width="405"/>
   <unicode hex="1E6D"/>
   <outline>
     <component base="t"/>
-    <component base="dotbelowcomb" xOffset="75"/>
+    <component base="dotbelowcomb" xOffset="82"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/te-cy.glif b/src/Cantarell-Bold.ufo/glyphs/te-cy.glif
index 98a03c81..e1dff285 100644
--- a/src/Cantarell-Bold.ufo/glyphs/te-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/te-cy.glif
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="te-cy" format="2">
-  <advance width="494"/>
+  <advance width="514"/>
   <unicode hex="0442"/>
-  <anchor x="477" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="166" y="0" type="line"/>
-      <point x="326" y="0" type="line"/>
-      <point x="326" y="460" type="line"/>
-      <point x="166" y="460" type="line"/>
-    </contour>
-    <contour>
-      <point x="0" y="355" type="line"/>
-      <point x="494" y="355" type="line"/>
-      <point x="494" y="490" type="line"/>
-      <point x="0" y="490" type="line"/>
+      <point x="176" y="0" type="line"/>
+      <point x="336" y="0" type="line"/>
+      <point x="336" y="355" type="line"/>
+      <point x="504" y="355" type="line"/>
+      <point x="504" y="490" type="line"/>
+      <point x="10" y="490" type="line"/>
+      <point x="10" y="355" type="line"/>
+      <point x="176" y="355" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -28,6 +25,10 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|ge-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>ge-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tenge.glif b/src/Cantarell-Bold.ufo/glyphs/tenge.glif
index a067c2d7..81cdfacc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tenge.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tenge.glif
@@ -3,5 +3,27 @@
   <advance width="600"/>
   <unicode hex="20B8"/>
   <outline>
+    <contour>
+      <point x="208" y="0" type="line"/>
+      <point x="378" y="0" type="line"/>
+      <point x="378" y="424" type="line"/>
+      <point x="566" y="424" type="line"/>
+      <point x="566" y="524" type="line"/>
+      <point x="34" y="524" type="line"/>
+      <point x="34" y="424" type="line"/>
+      <point x="208" y="424" type="line"/>
+    </contour>
+    <contour>
+      <point x="34" y="594" type="line"/>
+      <point x="566" y="594" type="line"/>
+      <point x="566" y="694" type="line"/>
+      <point x="34" y="694" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/thorn.glif b/src/Cantarell-Bold.ufo/glyphs/thorn.glif
index 85c3fe0a..2137f21f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/thorn.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/thorn.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="thorn" format="2">
-  <advance width="574"/>
+  <advance width="595"/>
   <unicode hex="00FE"/>
   <outline>
     <contour>
-      <point x="54" y="-217" type="line"/>
-      <point x="219" y="-217" type="line"/>
-      <point x="219" y="739" type="line"/>
-      <point x="54" y="739" type="line"/>
+      <point x="336" y="-10" type="curve" smooth="yes"/>
+      <point x="465" y="-10"/>
+      <point x="562" y="101"/>
+      <point x="562" y="251" type="curve" smooth="yes"/>
+      <point x="562" y="396"/>
+      <point x="471" y="500"/>
+      <point x="345" y="500" type="curve" smooth="yes"/>
+      <point x="261" y="500"/>
+      <point x="197" y="452"/>
+      <point x="165" y="372" type="curve"/>
+      <point x="211" y="305" type="line"/>
+      <point x="227" y="337"/>
+      <point x="258" y="356"/>
+      <point x="294" y="356" type="curve" smooth="yes"/>
+      <point x="352" y="356"/>
+      <point x="386" y="310"/>
+      <point x="386" y="241" type="curve" smooth="yes"/>
+      <point x="386" y="176"/>
+      <point x="355" y="134"/>
+      <point x="299" y="134" type="curve" smooth="yes"/>
+      <point x="263" y="134"/>
+      <point x="232" y="152"/>
+      <point x="214" y="182" type="curve"/>
+      <point x="175" y="88" type="line"/>
+      <point x="208" y="26"/>
+      <point x="264" y="-10"/>
     </contour>
     <contour>
-      <point x="328" y="-10" type="curve" smooth="yes"/>
-      <point x="457" y="-10"/>
-      <point x="554" y="101"/>
-      <point x="554" y="251" type="curve" smooth="yes"/>
-      <point x="554" y="396"/>
-      <point x="463" y="500"/>
-      <point x="337" y="500" type="curve" smooth="yes"/>
-      <point x="253" y="500"/>
-      <point x="189" y="452"/>
-      <point x="157" y="372" type="curve"/>
-      <point x="203" y="305" type="line"/>
-      <point x="219" y="337"/>
-      <point x="250" y="356"/>
-      <point x="286" y="356" type="curve" smooth="yes"/>
-      <point x="344" y="356"/>
-      <point x="378" y="310"/>
-      <point x="378" y="241" type="curve" smooth="yes"/>
-      <point x="378" y="176"/>
-      <point x="347" y="134"/>
-      <point x="291" y="134" type="curve" smooth="yes"/>
-      <point x="255" y="134"/>
-      <point x="224" y="152"/>
-      <point x="206" y="182" type="curve"/>
-      <point x="167" y="88" type="line"/>
-      <point x="200" y="26"/>
-      <point x="256" y="-10"/>
+      <point x="62" y="-217" type="line"/>
+      <point x="227" y="-217" type="line"/>
+      <point x="227" y="739" type="line"/>
+      <point x="62" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/three.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/three.dnom.glif
index 3b29a572..61b09d70 100644
--- a/src/Cantarell-Bold.ufo/glyphs/three.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/three.dnom.glif
@@ -1,51 +1,50 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three.dnom" format="2">
-  <advance width="435"/>
-  <note>
-three
-</note>
+  <advance width="412"/>
   <outline>
     <contour>
-      <point x="177" y="-7" type="curve" smooth="yes"/>
-      <point x="324" y="-7"/>
-      <point x="420" y="51"/>
-      <point x="420" y="139" type="curve" smooth="yes"/>
-      <point x="420" y="202"/>
-      <point x="369" y="252"/>
-      <point x="296" y="258" type="curve"/>
-      <point x="273" y="250" type="line"/>
-      <point x="345" y="248"/>
-      <point x="391" y="289"/>
-      <point x="391" y="355" type="curve" smooth="yes"/>
-      <point x="391" y="438"/>
-      <point x="321" y="486"/>
-      <point x="203" y="486" type="curve" smooth="yes"/>
-      <point x="140" y="486"/>
-      <point x="77" y="472"/>
-      <point x="18" y="443" type="curve"/>
-      <point x="51" y="332" type="line"/>
-      <point x="97" y="348"/>
-      <point x="135" y="358"/>
-      <point x="173" y="358" type="curve" smooth="yes"/>
-      <point x="209" y="358"/>
-      <point x="236" y="349"/>
-      <point x="236" y="334" type="curve" smooth="yes"/>
-      <point x="236" y="314"/>
-      <point x="192" y="297"/>
-      <point x="117" y="297" type="curve"/>
-      <point x="117" y="185" type="line"/>
-      <point x="207" y="185"/>
-      <point x="265" y="168"/>
-      <point x="265" y="145" type="curve" smooth="yes"/>
-      <point x="265" y="128"/>
-      <point x="235" y="121"/>
-      <point x="190" y="121" type="curve" smooth="yes"/>
-      <point x="144" y="121"/>
-      <point x="93" y="128"/>
-      <point x="51" y="143" type="curve"/>
-      <point x="16" y="27" type="line"/>
-      <point x="73" y="2"/>
-      <point x="119" y="-7"/>
+      <point x="172" y="-6" type="curve" smooth="yes"/>
+      <point x="300" y="-6"/>
+      <point x="385" y="45"/>
+      <point x="385" y="121" type="curve" smooth="yes"/>
+      <point x="385" y="176"/>
+      <point x="341" y="218"/>
+      <point x="276" y="225" type="curve"/>
+      <point x="255" y="218" type="line"/>
+      <point x="318" y="216"/>
+      <point x="359" y="252"/>
+      <point x="359" y="309" type="curve" smooth="yes"/>
+      <point x="359" y="380"/>
+      <point x="297" y="422"/>
+      <point x="193" y="422" type="curve" smooth="yes"/>
+      <point x="135" y="422"/>
+      <point x="80" y="410"/>
+      <point x="28" y="386" type="curve"/>
+      <point x="58" y="287" type="line"/>
+      <point x="106" y="304"/>
+      <point x="140" y="311"/>
+      <point x="169" y="311" type="curve" smooth="yes"/>
+      <point x="202" y="311"/>
+      <point x="222" y="302"/>
+      <point x="222" y="287" type="curve" smooth="yes"/>
+      <point x="222" y="269"/>
+      <point x="192" y="257"/>
+      <point x="148" y="257" type="curve" smooth="yes"/>
+      <point x="116" y="257" type="line"/>
+      <point x="116" y="162" type="line"/>
+      <point x="148" y="162" type="line" smooth="yes"/>
+      <point x="210" y="162"/>
+      <point x="247" y="149"/>
+      <point x="247" y="130" type="curve" smooth="yes"/>
+      <point x="247" y="114"/>
+      <point x="222" y="105"/>
+      <point x="180" y="105" type="curve" smooth="yes"/>
+      <point x="141" y="105"/>
+      <point x="98" y="112"/>
+      <point x="57" y="126" type="curve"/>
+      <point x="27" y="23" type="line"/>
+      <point x="76" y="3"/>
+      <point x="119" y="-6"/>
     </contour>
   </outline>
   <lib>
@@ -53,11 +52,11 @@ three
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>69</integer>
+        <integer>60</integer>
         <key>weight</key>
-        <integer>-23</integer>
+        <integer>-40</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>65</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/three.glif b/src/Cantarell-Bold.ufo/glyphs/three.glif
index eae0c533..ff67d009 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="564"/>
+  <advance width="586"/>
   <unicode hex="0033"/>
   <outline>
     <contour>
-      <point x="236" y="-10" type="curve" smooth="yes"/>
-      <point x="423" y="-10"/>
-      <point x="546" y="71"/>
-      <point x="546" y="194" type="curve" smooth="yes"/>
-      <point x="546" y="290"/>
-      <point x="475" y="360"/>
-      <point x="368" y="370" type="curve"/>
-      <point x="342" y="360" type="line"/>
-      <point x="442" y="359"/>
-      <point x="507" y="422"/>
-      <point x="507" y="518" type="curve" smooth="yes"/>
-      <point x="507" y="634"/>
-      <point x="415" y="704"/>
-      <point x="261" y="704" type="curve" smooth="yes"/>
-      <point x="179" y="704"/>
-      <point x="97" y="684"/>
-      <point x="21" y="643" type="curve"/>
-      <point x="60" y="514" type="line"/>
-      <point x="122" y="541"/>
-      <point x="176" y="556"/>
-      <point x="225" y="556" type="curve" smooth="yes"/>
-      <point x="287" y="556"/>
-      <point x="327" y="532"/>
-      <point x="327" y="492" type="curve" smooth="yes"/>
-      <point x="327" y="444"/>
-      <point x="272" y="415"/>
-      <point x="180" y="415" type="curve" smooth="yes"/>
-      <point x="152" y="415" type="line"/>
-      <point x="152" y="285" type="line"/>
-      <point x="180" y="285" type="line" smooth="yes"/>
-      <point x="296" y="285"/>
-      <point x="366" y="253"/>
-      <point x="366" y="200" type="curve" smooth="yes"/>
-      <point x="366" y="159"/>
-      <point x="321" y="138"/>
-      <point x="243" y="138" type="curve" smooth="yes"/>
-      <point x="182" y="138"/>
-      <point x="114" y="151"/>
-      <point x="56" y="175" type="curve"/>
-      <point x="16" y="40" type="line"/>
-      <point x="90" y="5"/>
-      <point x="154" y="-10"/>
+      <point x="243" y="-10" type="curve" smooth="yes"/>
+      <point x="430" y="-10"/>
+      <point x="553" y="71"/>
+      <point x="553" y="194" type="curve" smooth="yes"/>
+      <point x="553" y="290"/>
+      <point x="482" y="360"/>
+      <point x="375" y="370" type="curve"/>
+      <point x="349" y="360" type="line"/>
+      <point x="449" y="359"/>
+      <point x="514" y="422"/>
+      <point x="514" y="518" type="curve" smooth="yes"/>
+      <point x="514" y="634"/>
+      <point x="422" y="704"/>
+      <point x="268" y="704" type="curve" smooth="yes"/>
+      <point x="186" y="704"/>
+      <point x="104" y="684"/>
+      <point x="28" y="643" type="curve"/>
+      <point x="67" y="514" type="line"/>
+      <point x="129" y="541"/>
+      <point x="183" y="556"/>
+      <point x="232" y="556" type="curve" smooth="yes"/>
+      <point x="294" y="556"/>
+      <point x="334" y="532"/>
+      <point x="334" y="492" type="curve" smooth="yes"/>
+      <point x="334" y="446"/>
+      <point x="283" y="415"/>
+      <point x="207" y="415" type="curve" smooth="yes"/>
+      <point x="159" y="415" type="line"/>
+      <point x="159" y="285" type="line"/>
+      <point x="207" y="285" type="line" smooth="yes"/>
+      <point x="308" y="285"/>
+      <point x="373" y="252"/>
+      <point x="373" y="202" type="curve" smooth="yes"/>
+      <point x="373" y="161"/>
+      <point x="329" y="138"/>
+      <point x="250" y="138" type="curve" smooth="yes"/>
+      <point x="189" y="138"/>
+      <point x="121" y="151"/>
+      <point x="63" y="175" type="curve"/>
+      <point x="23" y="40" type="line"/>
+      <point x="97" y="5"/>
+      <point x="161" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/three.numr.glif b/src/Cantarell-Bold.ufo/glyphs/three.numr.glif
index 0b0f0175..493d7045 100644
--- a/src/Cantarell-Bold.ufo/glyphs/three.numr.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/three.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three.numr" format="2">
-  <advance width="435"/>
+  <advance width="412"/>
   <outline>
     <component base="three.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/three.osf.glif b/src/Cantarell-Bold.ufo/glyphs/three.osf.glif
index 70690ea8..19078828 100644
--- a/src/Cantarell-Bold.ufo/glyphs/three.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/three.osf.glif
@@ -1,48 +1,56 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three.osf" format="2">
-  <advance width="560"/>
+  <advance width="582"/>
   <outline>
     <contour>
-      <point x="236" y="-110" type="curve" smooth="yes"/>
-      <point x="419" y="-110"/>
-      <point x="542" y="-29"/>
-      <point x="542" y="94" type="curve" smooth="yes"/>
-      <point x="542" y="187"/>
-      <point x="471" y="260"/>
-      <point x="361" y="270" type="curve"/>
-      <point x="338" y="260" type="line"/>
-      <point x="438" y="259"/>
-      <point x="503" y="325"/>
-      <point x="503" y="418" type="curve" smooth="yes"/>
-      <point x="503" y="534"/>
-      <point x="409" y="604"/>
-      <point x="260" y="604" type="curve" smooth="yes"/>
-      <point x="179" y="604"/>
-      <point x="97" y="584"/>
-      <point x="21" y="543" type="curve"/>
-      <point x="60" y="420" type="line"/>
-      <point x="129" y="450"/>
-      <point x="181" y="462"/>
-      <point x="226" y="462" type="curve" smooth="yes"/>
-      <point x="287" y="462"/>
-      <point x="330" y="435"/>
-      <point x="330" y="395" type="curve" smooth="yes"/>
-      <point x="330" y="345"/>
-      <point x="264" y="312"/>
-      <point x="152" y="312" type="curve"/>
-      <point x="152" y="188" type="line"/>
-      <point x="287" y="188"/>
-      <point x="369" y="152"/>
-      <point x="369" y="96" type="curve" smooth="yes"/>
-      <point x="369" y="56"/>
-      <point x="322" y="32"/>
-      <point x="243" y="32" type="curve" smooth="yes"/>
-      <point x="182" y="32"/>
-      <point x="111" y="46"/>
-      <point x="55" y="71" type="curve"/>
-      <point x="16" y="-60" type="line"/>
-      <point x="90" y="-95"/>
-      <point x="156" y="-110"/>
+      <point x="243" y="-110" type="curve" smooth="yes"/>
+      <point x="426" y="-110"/>
+      <point x="549" y="-29"/>
+      <point x="549" y="94" type="curve" smooth="yes"/>
+      <point x="549" y="187"/>
+      <point x="478" y="260"/>
+      <point x="368" y="270" type="curve"/>
+      <point x="345" y="260" type="line"/>
+      <point x="445" y="259"/>
+      <point x="510" y="325"/>
+      <point x="510" y="418" type="curve" smooth="yes"/>
+      <point x="510" y="534"/>
+      <point x="416" y="604"/>
+      <point x="267" y="604" type="curve" smooth="yes"/>
+      <point x="186" y="604"/>
+      <point x="104" y="584"/>
+      <point x="28" y="543" type="curve"/>
+      <point x="67" y="420" type="line"/>
+      <point x="136" y="450"/>
+      <point x="188" y="462"/>
+      <point x="233" y="462" type="curve" smooth="yes"/>
+      <point x="294" y="462"/>
+      <point x="337" y="435"/>
+      <point x="337" y="395" type="curve" smooth="yes"/>
+      <point x="337" y="345"/>
+      <point x="271" y="312"/>
+      <point x="159" y="312" type="curve"/>
+      <point x="159" y="188" type="line"/>
+      <point x="294" y="188"/>
+      <point x="376" y="152"/>
+      <point x="376" y="96" type="curve" smooth="yes"/>
+      <point x="376" y="56"/>
+      <point x="329" y="32"/>
+      <point x="250" y="32" type="curve" smooth="yes"/>
+      <point x="189" y="32"/>
+      <point x="118" y="46"/>
+      <point x="62" y="71" type="curve"/>
+      <point x="23" y="-60" type="line"/>
+      <point x="97" y="-95"/>
+      <point x="163" y="-110"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>three</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>three</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/three.tf.glif b/src/Cantarell-Bold.ufo/glyphs/three.tf.glif
index 56c252e5..fa705767 100644
--- a/src/Cantarell-Bold.ufo/glyphs/three.tf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/three.tf.glif
@@ -1,49 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three.tf" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <outline>
-    <contour>
-      <point x="244" y="-10" type="curve" smooth="yes"/>
-      <point x="433" y="-10"/>
-      <point x="559" y="71"/>
-      <point x="559" y="194" type="curve" smooth="yes"/>
-      <point x="559" y="290"/>
-      <point x="486" y="360"/>
-      <point x="376" y="370" type="curve"/>
-      <point x="350" y="360" type="line"/>
-      <point x="452" y="359"/>
-      <point x="519" y="422"/>
-      <point x="519" y="518" type="curve" smooth="yes"/>
-      <point x="519" y="634"/>
-      <point x="424" y="704"/>
-      <point x="269" y="704" type="curve" smooth="yes"/>
-      <point x="185" y="704"/>
-      <point x="102" y="684"/>
-      <point x="24" y="643" type="curve"/>
-      <point x="64" y="514" type="line"/>
-      <point x="127" y="541"/>
-      <point x="183" y="556"/>
-      <point x="234" y="556" type="curve" smooth="yes"/>
-      <point x="297" y="556"/>
-      <point x="339" y="531"/>
-      <point x="339" y="494" type="curve" smooth="yes"/>
-      <point x="339" y="445"/>
-      <point x="271" y="415"/>
-      <point x="158" y="415" type="curve"/>
-      <point x="158" y="285" type="line"/>
-      <point x="294" y="285"/>
-      <point x="379" y="252"/>
-      <point x="379" y="199" type="curve" smooth="yes"/>
-      <point x="379" y="160"/>
-      <point x="332" y="138"/>
-      <point x="251" y="138" type="curve" smooth="yes"/>
-      <point x="186" y="138"/>
-      <point x="116" y="152"/>
-      <point x="59" y="175" type="curve"/>
-      <point x="19" y="40" type="line"/>
-      <point x="94" y="5"/>
-      <point x="161" y="-10"/>
-    </contour>
+    <component base="three" xOffset="22"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/threeeighths.glif b/src/Cantarell-Bold.ufo/glyphs/threeeighths.glif
index fdda6184..9d3bca24 100644
--- a/src/Cantarell-Bold.ufo/glyphs/threeeighths.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/threeeighths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="threeeighths" format="2">
-  <advance width="1242"/>
+  <advance width="1098"/>
   <unicode hex="215C"/>
   <outline>
     <component base="three.numr"/>
-    <component base="fraction" xOffset="435"/>
-    <component base="eight.dnom" xOffset="773"/>
+    <component base="fraction" xOffset="412"/>
+    <component base="eight.dnom" xOffset="661"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/threefifths.glif b/src/Cantarell-Bold.ufo/glyphs/threefifths.glif
index 5fb03d78..d9839d49 100644
--- a/src/Cantarell-Bold.ufo/glyphs/threefifths.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/threefifths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="threefifths" format="2">
-  <advance width="1221"/>
+  <advance width="1080"/>
   <unicode hex="2157"/>
   <outline>
     <component base="three.numr"/>
-    <component base="fraction" xOffset="435"/>
-    <component base="five.dnom" xOffset="773"/>
+    <component base="fraction" xOffset="412"/>
+    <component base="five.dnom" xOffset="661"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/threeinferior.glif 
b/src/Cantarell-Bold.ufo/glyphs/threeinferior.glif
index a346d34c..df62ac2e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/threeinferior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/threeinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="threeinferior" format="2">
-  <advance width="435"/>
+  <advance width="412"/>
   <unicode hex="2083"/>
   <outline>
     <component base="three.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/threequarters.glif 
b/src/Cantarell-Bold.ufo/glyphs/threequarters.glif
index 038a78bf..f73d8e6f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/threequarters.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/threequarters.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="threequarters" format="2">
-  <advance width="1251"/>
+  <advance width="1098"/>
   <unicode hex="00BE"/>
   <outline>
     <component base="three.numr"/>
-    <component base="fraction" xOffset="435"/>
-    <component base="four.dnom" xOffset="773"/>
+    <component base="fraction" xOffset="412"/>
+    <component base="four.dnom" xOffset="661"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/threesuperior.glif 
b/src/Cantarell-Bold.ufo/glyphs/threesuperior.glif
index 07d8b646..a377f0fb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/threesuperior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/threesuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="threesuperior" format="2">
-  <advance width="435"/>
+  <advance width="412"/>
   <unicode hex="00B3"/>
   <outline>
     <component base="three.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tilde.glif b/src/Cantarell-Bold.ufo/glyphs/tilde.glif
index 85ee6bb0..4fc22983 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tilde.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tilde" format="2">
-  <advance width="458"/>
+  <advance width="500"/>
   <unicode hex="02DC"/>
   <outline>
-    <component base="tildecomb" xOffset="-2"/>
+    <component base="tildecomb" xOffset="14"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tlinebelow.glif b/src/Cantarell-Bold.ufo/glyphs/tlinebelow.glif
index 56850226..a8754c1a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tlinebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tlinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tlinebelow" format="2">
-  <advance width="397"/>
+  <advance width="405"/>
   <unicode hex="1E6F"/>
   <outline>
     <component base="t"/>
-    <component base="macronbelowcomb" xOffset="-20"/>
+    <component base="macronbelowcomb" xOffset="-13"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/trademark.glif b/src/Cantarell-Bold.ufo/glyphs/trademark.glif
index a7622767..281e372d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/trademark.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/trademark.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="trademark" format="2">
-  <advance width="743"/>
+  <advance width="767"/>
   <unicode hex="2122"/>
   <outline>
     <contour>
-      <point x="122" y="382" type="line"/>
-      <point x="214" y="382" type="line"/>
-      <point x="214" y="658" type="line"/>
-      <point x="122" y="658" type="line"/>
+      <point x="337" y="382" type="line"/>
+      <point x="414" y="382" type="line"/>
+      <point x="414" y="574" type="line"/>
+      <point x="400" y="572" type="line"/>
+      <point x="482" y="430" type="line"/>
+      <point x="534" y="430" type="line"/>
+      <point x="612" y="573" type="line"/>
+      <point x="599" y="574" type="line"/>
+      <point x="599" y="382" type="line"/>
+      <point x="675" y="382" type="line"/>
+      <point x="675" y="694" type="line"/>
+      <point x="598" y="694" type="line"/>
+      <point x="506" y="528" type="line"/>
+      <point x="515" y="528" type="line"/>
+      <point x="420" y="694" type="line"/>
+      <point x="337" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="31" y="613" type="line"/>
-      <point x="306" y="613" type="line"/>
-      <point x="306" y="694" type="line"/>
-      <point x="31" y="694" type="line"/>
+      <point x="134" y="382" type="line"/>
+      <point x="226" y="382" type="line"/>
+      <point x="226" y="658" type="line"/>
+      <point x="134" y="658" type="line"/>
     </contour>
     <contour>
-      <point x="325" y="382" type="line"/>
-      <point x="402" y="382" type="line"/>
-      <point x="402" y="574" type="line"/>
-      <point x="388" y="572" type="line"/>
-      <point x="470" y="430" type="line"/>
-      <point x="522" y="430" type="line"/>
-      <point x="600" y="573" type="line"/>
-      <point x="587" y="574" type="line"/>
-      <point x="587" y="382" type="line"/>
-      <point x="663" y="382" type="line"/>
-      <point x="663" y="694" type="line"/>
-      <point x="586" y="694" type="line"/>
-      <point x="494" y="528" type="line"/>
-      <point x="503" y="528" type="line"/>
-      <point x="408" y="694" type="line"/>
-      <point x="325" y="694" type="line"/>
+      <point x="43" y="613" type="line"/>
+      <point x="318" y="613" type="line"/>
+      <point x="318" y="694" type="line"/>
+      <point x="43" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tripleprime.glif b/src/Cantarell-Bold.ufo/glyphs/tripleprime.glif
index 43b8f22b..313af985 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tripleprime.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tripleprime.glif
@@ -2,9 +2,6 @@
 <glyph name="tripleprime" format="2">
   <advance width="771"/>
   <unicode hex="2034"/>
-  <note>
-uni2034
-</note>
   <outline>
     <component base="quotesingle" yxScale="0.19201" xOffset="-96"/>
     <component base="quotesingle" yxScale="0.19201" xOffset="144"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tse-cy.glif b/src/Cantarell-Bold.ufo/glyphs/tse-cy.glif
index 193f8939..0e5fead6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tse-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tse-cy.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tse-cy" format="2">
-  <advance width="641"/>
+  <advance width="618"/>
   <unicode hex="0446"/>
   <outline>
     <contour>
-      <point x="483" y="-136" type="line"/>
-      <point x="639" y="-136" type="line"/>
-      <point x="639" y="133" type="line"/>
-      <point x="220" y="133" type="line"/>
-      <point x="220" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
-      <point x="54" y="0" type="line"/>
-      <point x="483" y="0" type="line"/>
+      <point x="451" y="-136" type="line"/>
+      <point x="607" y="-136" type="line"/>
+      <point x="607" y="133" type="line"/>
+      <point x="228" y="133" type="line"/>
+      <point x="228" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="451" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="357" y="71" type="line"/>
-      <point x="523" y="71" type="line"/>
-      <point x="523" y="490" type="line"/>
-      <point x="357" y="490" type="line"/>
+      <point x="365" y="71" type="line"/>
+      <point x="531" y="71" type="line"/>
+      <point x="531" y="490" type="line"/>
+      <point x="365" y="490" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -31,6 +31,10 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>de-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tshe-cy.glif b/src/Cantarell-Bold.ufo/glyphs/tshe-cy.glif
index b1ecb053..27ac54a7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tshe-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tshe-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tshe-cy" format="2">
-  <advance width="579"/>
+  <advance width="595"/>
   <unicode hex="045B"/>
   <anchor x="449" y="0" name="bottom"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tugrik.glif b/src/Cantarell-Bold.ufo/glyphs/tugrik.glif
index f5d41ab5..212df2a6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tugrik.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tugrik.glif
@@ -3,5 +3,33 @@
   <advance width="600"/>
   <unicode hex="20AE"/>
   <outline>
+    <contour>
+      <point x="219" y="0" type="line"/>
+      <point x="379" y="0" type="line"/>
+      <point x="379" y="542" type="line"/>
+      <point x="550" y="542" type="line"/>
+      <point x="550" y="694" type="line"/>
+      <point x="50" y="694" type="line"/>
+      <point x="50" y="542" type="line"/>
+      <point x="219" y="542" type="line"/>
+    </contour>
+    <contour>
+      <point x="157" y="58" type="line"/>
+      <point x="513" y="219" type="line"/>
+      <point x="472" y="312" type="line"/>
+      <point x="115" y="151" type="line"/>
+    </contour>
+    <contour>
+      <point x="133" y="238" type="line"/>
+      <point x="499" y="410" type="line"/>
+      <point x="458" y="503" type="line"/>
+      <point x="92" y="331" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/two.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/two.dnom.glif
index ee77bb70..0f33f2f9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/two.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/two.dnom.glif
@@ -1,35 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two.dnom" format="2">
-  <advance width="438"/>
-  <note>
-two
-</note>
+  <advance width="417"/>
   <outline>
     <contour>
-      <point x="35" y="0" type="line"/>
-      <point x="411" y="0" type="line"/>
-      <point x="411" y="130" type="line"/>
-      <point x="212" y="130" type="line"/>
-      <point x="212" y="99" type="line"/>
-      <point x="328" y="156"/>
-      <point x="399" y="247"/>
-      <point x="399" y="333" type="curve" smooth="yes"/>
-      <point x="399" y="425"/>
-      <point x="319" y="486"/>
-      <point x="198" y="486" type="curve" smooth="yes"/>
-      <point x="128" y="486"/>
-      <point x="65" y="466"/>
-      <point x="12" y="427" type="curve"/>
-      <point x="50" y="317" type="line"/>
-      <point x="92" y="342"/>
-      <point x="133" y="355"/>
-      <point x="169" y="355" type="curve" smooth="yes"/>
-      <point x="209" y="355"/>
-      <point x="243" y="339"/>
-      <point x="243" y="307" type="curve" smooth="yes"/>
-      <point x="243" y="255"/>
-      <point x="153" y="180"/>
-      <point x="35" y="107" type="curve"/>
+      <point x="45" y="0" type="line"/>
+      <point x="378" y="0" type="line"/>
+      <point x="378" y="119" type="line"/>
+      <point x="207" y="119" type="line"/>
+      <point x="208" y="91" type="line"/>
+      <point x="304" y="132"/>
+      <point x="368" y="212"/>
+      <point x="368" y="289" type="curve" smooth="yes"/>
+      <point x="368" y="369"/>
+      <point x="297" y="422"/>
+      <point x="190" y="422" type="curve" smooth="yes"/>
+      <point x="124" y="422"/>
+      <point x="67" y="405"/>
+      <point x="24" y="371" type="curve"/>
+      <point x="58" y="270" type="line"/>
+      <point x="98" y="292"/>
+      <point x="133" y="303"/>
+      <point x="163" y="303" type="curve" smooth="yes"/>
+      <point x="200" y="303"/>
+      <point x="225" y="287"/>
+      <point x="225" y="263" type="curve" smooth="yes"/>
+      <point x="225" y="224"/>
+      <point x="157" y="162"/>
+      <point x="45" y="98" type="curve"/>
     </contour>
   </outline>
   <lib>
@@ -37,11 +34,11 @@ two
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>69</integer>
+        <integer>60</integer>
         <key>weight</key>
-        <integer>-23</integer>
+        <integer>-35</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>65</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/two.glif b/src/Cantarell-Bold.ufo/glyphs/two.glif
index 008b0ba1..4ab6bbda 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="554"/>
+  <advance width="576"/>
   <unicode hex="0032"/>
   <outline>
     <contour>
-      <point x="38" y="0" type="line"/>
-      <point x="528" y="0" type="line"/>
-      <point x="528" y="150" type="line"/>
-      <point x="242" y="150" type="line"/>
-      <point x="243" y="114" type="line"/>
-      <point x="421" y="244"/>
-      <point x="510" y="368"/>
-      <point x="510" y="489" type="curve" smooth="yes"/>
-      <point x="510" y="619"/>
-      <point x="408" y="704"/>
-      <point x="251" y="704" type="curve" smooth="yes"/>
-      <point x="161" y="704"/>
-      <point x="79" y="676"/>
-      <point x="12" y="621" type="curve"/>
-      <point x="56" y="494" type="line"/>
-      <point x="112" y="533"/>
-      <point x="167" y="553"/>
-      <point x="217" y="553" type="curve" smooth="yes"/>
-      <point x="286" y="553"/>
-      <point x="330" y="516"/>
-      <point x="330" y="462" type="curve" smooth="yes"/>
-      <point x="330" y="376"/>
-      <point x="219" y="272"/>
-      <point x="38" y="122" type="curve"/>
+      <point x="46" y="0" type="line"/>
+      <point x="536" y="0" type="line"/>
+      <point x="536" y="150" type="line"/>
+      <point x="250" y="150" type="line"/>
+      <point x="251" y="114" type="line"/>
+      <point x="429" y="244"/>
+      <point x="518" y="368"/>
+      <point x="518" y="489" type="curve" smooth="yes"/>
+      <point x="518" y="619"/>
+      <point x="416" y="704"/>
+      <point x="259" y="704" type="curve" smooth="yes"/>
+      <point x="169" y="704"/>
+      <point x="87" y="676"/>
+      <point x="20" y="621" type="curve"/>
+      <point x="64" y="494" type="line"/>
+      <point x="120" y="533"/>
+      <point x="175" y="553"/>
+      <point x="225" y="553" type="curve" smooth="yes"/>
+      <point x="294" y="553"/>
+      <point x="338" y="516"/>
+      <point x="338" y="462" type="curve" smooth="yes"/>
+      <point x="338" y="376"/>
+      <point x="227" y="272"/>
+      <point x="46" y="122" type="curve"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/two.numr.glif b/src/Cantarell-Bold.ufo/glyphs/two.numr.glif
index ff644ea0..14d09152 100644
--- a/src/Cantarell-Bold.ufo/glyphs/two.numr.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/two.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two.numr" format="2">
-  <advance width="438"/>
+  <advance width="417"/>
   <outline>
     <component base="two.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/two.osf.glif b/src/Cantarell-Bold.ufo/glyphs/two.osf.glif
index 6159f54c..d266bb44 100644
--- a/src/Cantarell-Bold.ufo/glyphs/two.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/two.osf.glif
@@ -1,32 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two.osf" format="2">
-  <advance width="549"/>
+  <advance width="571"/>
   <outline>
     <contour>
-      <point x="37" y="0" type="line"/>
-      <point x="523" y="0" type="line"/>
-      <point x="523" y="145" type="line"/>
-      <point x="234" y="145" type="line"/>
-      <point x="235" y="111" type="line"/>
-      <point x="415" y="200"/>
-      <point x="504" y="310"/>
-      <point x="504" y="412" type="curve" smooth="yes"/>
-      <point x="504" y="524"/>
-      <point x="403" y="598"/>
-      <point x="249" y="598" type="curve" smooth="yes"/>
-      <point x="159" y="598"/>
-      <point x="78" y="574"/>
-      <point x="12" y="527" type="curve"/>
-      <point x="55" y="404" type="line"/>
-      <point x="108" y="435"/>
-      <point x="165" y="453"/>
-      <point x="216" y="453" type="curve" smooth="yes"/>
-      <point x="286" y="453"/>
-      <point x="331" y="425"/>
-      <point x="331" y="386" type="curve" smooth="yes"/>
-      <point x="331" y="316"/>
-      <point x="222" y="226"/>
-      <point x="37" y="118" type="curve"/>
+      <point x="45" y="0" type="line"/>
+      <point x="531" y="0" type="line"/>
+      <point x="531" y="145" type="line"/>
+      <point x="242" y="145" type="line"/>
+      <point x="243" y="111" type="line"/>
+      <point x="423" y="200"/>
+      <point x="512" y="310"/>
+      <point x="512" y="412" type="curve" smooth="yes"/>
+      <point x="512" y="524"/>
+      <point x="411" y="598"/>
+      <point x="257" y="598" type="curve" smooth="yes"/>
+      <point x="167" y="598"/>
+      <point x="86" y="574"/>
+      <point x="20" y="527" type="curve"/>
+      <point x="63" y="404" type="line"/>
+      <point x="116" y="435"/>
+      <point x="173" y="453"/>
+      <point x="224" y="453" type="curve" smooth="yes"/>
+      <point x="293" y="453"/>
+      <point x="339" y="425"/>
+      <point x="339" y="382" type="curve" smooth="yes"/>
+      <point x="339" y="320"/>
+      <point x="242" y="233"/>
+      <point x="45" y="118" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>two</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>two</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/two.tf.glif b/src/Cantarell-Bold.ufo/glyphs/two.tf.glif
index 7d8f7fd7..a6880787 100644
--- a/src/Cantarell-Bold.ufo/glyphs/two.tf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/two.tf.glif
@@ -1,33 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two.tf" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <outline>
-    <contour>
-      <point x="43" y="0" type="line"/>
-      <point x="549" y="0" type="line"/>
-      <point x="549" y="150" type="line"/>
-      <point x="246" y="150" type="line"/>
-      <point x="248" y="114" type="line"/>
-      <point x="436" y="244"/>
-      <point x="529" y="368"/>
-      <point x="529" y="489" type="curve" smooth="yes"/>
-      <point x="529" y="619"/>
-      <point x="424" y="704"/>
-      <point x="263" y="704" type="curve" smooth="yes"/>
-      <point x="172" y="704"/>
-      <point x="85" y="676"/>
-      <point x="17" y="621" type="curve"/>
-      <point x="61" y="494" type="line"/>
-      <point x="119" y="533"/>
-      <point x="176" y="553"/>
-      <point x="229" y="553" type="curve" smooth="yes"/>
-      <point x="302" y="553"/>
-      <point x="349" y="516"/>
-      <point x="349" y="462" type="curve" smooth="yes"/>
-      <point x="349" y="376"/>
-      <point x="236" y="272"/>
-      <point x="43" y="122" type="curve"/>
-    </contour>
+    <component base="two" xOffset="26"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/twofifths.glif b/src/Cantarell-Bold.ufo/glyphs/twofifths.glif
index 009a2135..1809d260 100644
--- a/src/Cantarell-Bold.ufo/glyphs/twofifths.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/twofifths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="twofifths" format="2">
-  <advance width="1224"/>
+  <advance width="1085"/>
   <unicode hex="2156"/>
   <outline>
     <component base="two.numr"/>
-    <component base="fraction" xOffset="438"/>
-    <component base="five.dnom" xOffset="776"/>
+    <component base="fraction" xOffset="417"/>
+    <component base="five.dnom" xOffset="666"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/twoinferior.glif b/src/Cantarell-Bold.ufo/glyphs/twoinferior.glif
index 4bfa9205..fdaf27c7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/twoinferior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/twoinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="twoinferior" format="2">
-  <advance width="438"/>
+  <advance width="417"/>
   <unicode hex="2082"/>
   <outline>
     <component base="two.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/twosuperior.glif b/src/Cantarell-Bold.ufo/glyphs/twosuperior.glif
index 117c2c0f..ba559ee8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/twosuperior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/twosuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="twosuperior" format="2">
-  <advance width="438"/>
+  <advance width="417"/>
   <unicode hex="00B2"/>
   <outline>
     <component base="two.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/twothirds.glif b/src/Cantarell-Bold.ufo/glyphs/twothirds.glif
index 3da57e43..2b74297e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/twothirds.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/twothirds.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="twothirds" format="2">
-  <advance width="1211"/>
+  <advance width="1078"/>
   <unicode hex="2154"/>
   <outline>
     <component base="two.numr"/>
-    <component base="fraction" xOffset="438"/>
-    <component base="three.dnom" xOffset="776"/>
+    <component base="fraction" xOffset="417"/>
+    <component base="three.dnom" xOffset="666"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/u-cy.glif b/src/Cantarell-Bold.ufo/glyphs/u-cy.glif
index d034e187..69f77cb6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/u-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/u-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="u-cy" format="2">
-  <advance width="532"/>
+  <advance width="538"/>
   <unicode hex="0443"/>
-  <anchor x="266" y="490" name="top"/>
   <outline>
     <component base="y"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/u.glif b/src/Cantarell-Bold.ufo/glyphs/u.glif
index 2f3a3faa..695d25c8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/u.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/u.glif
@@ -1,39 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="u" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="0075"/>
-  <note>
-u
-</note>
-  <anchor x="282" y="0" name="bottom"/>
-  <anchor x="476" y="10" name="ogonek"/>
-  <anchor x="282" y="490" name="top"/>
-  <anchor x="522" y="490" name="topright"/>
+  <anchor x="286" y="0" name="bottom"/>
+  <anchor x="475" y="10" name="ogonek"/>
+  <anchor x="286" y="490" name="top"/>
+  <anchor x="518" y="490" name="topright"/>
   <outline>
     <contour>
-      <point x="523" y="490" type="line"/>
-      <point x="350" y="490" type="line"/>
-      <point x="350" y="114" type="line"/>
-      <point x="398" y="0" type="line"/>
-      <point x="523" y="0" type="line"/>
+      <point x="218" y="-6" type="curve" smooth="yes"/>
+      <point x="285" y="-6"/>
+      <point x="344" y="25"/>
+      <point x="384" y="82" type="curve"/>
+      <point x="365" y="185" type="line"/>
+      <point x="343" y="160"/>
+      <point x="317" y="144"/>
+      <point x="286" y="144" type="curve" smooth="yes"/>
+      <point x="223" y="144"/>
+      <point x="224" y="205"/>
+      <point x="224" y="225" type="curve" smooth="yes"/>
+      <point x="224" y="490" type="line"/>
+      <point x="51" y="490" type="line"/>
+      <point x="51" y="186" type="line" smooth="yes"/>
+      <point x="51" y="68"/>
+      <point x="119" y="-6"/>
     </contour>
     <contour>
-      <point x="217" y="490" type="line"/>
-      <point x="44" y="490" type="line"/>
-      <point x="44" y="186" type="line" smooth="yes"/>
-      <point x="44" y="68"/>
-      <point x="112" y="-6"/>
-      <point x="216" y="-6" type="curve" smooth="yes"/>
-      <point x="284" y="-6"/>
-      <point x="345" y="25"/>
-      <point x="385" y="82" type="curve"/>
-      <point x="366" y="185" type="line"/>
-      <point x="344" y="160"/>
-      <point x="316" y="144"/>
-      <point x="282" y="144" type="curve" smooth="yes"/>
-      <point x="225" y="144"/>
-      <point x="217" y="189"/>
-      <point x="217" y="225" type="curve" smooth="yes"/>
+      <point x="397" y="0" type="line"/>
+      <point x="522" y="0" type="line"/>
+      <point x="522" y="490" type="line"/>
+      <point x="349" y="490" type="line"/>
+      <point x="349" y="114" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uacute.glif b/src/Cantarell-Bold.ufo/glyphs/uacute.glif
index a3c8c239..899228dc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uacute" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="00FA"/>
   <outline>
     <component base="u"/>
-    <component base="acutecomb" xOffset="186"/>
+    <component base="acutecomb" xOffset="190"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ubreve.glif b/src/Cantarell-Bold.ufo/glyphs/ubreve.glif
index 4257c18b..6edac6ac 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ubreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ubreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ubreve" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="016D"/>
   <outline>
     <component base="u"/>
-    <component base="brevecomb" xOffset="66"/>
+    <component base="brevecomb" xOffset="70"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ucaron.glif b/src/Cantarell-Bold.ufo/glyphs/ucaron.glif
index 22f6be1a..7027862c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ucaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ucaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ucaron" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="01D4"/>
   <outline>
     <component base="u"/>
-    <component base="caroncomb" xOffset="76"/>
+    <component base="caroncomb" xOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ucircumflex.glif b/src/Cantarell-Bold.ufo/glyphs/ucircumflex.glif
index 31b6e23b..8e0fc618 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ucircumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ucircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ucircumflex" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="00FB"/>
   <outline>
     <component base="u"/>
-    <component base="circumflexcomb" xOffset="79"/>
+    <component base="circumflexcomb" xOffset="83"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/udblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/udblgrave.glif
index 24030dc0..9e76f375 100644
--- a/src/Cantarell-Bold.ufo/glyphs/udblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/udblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udblgrave" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="0215"/>
   <outline>
     <component base="u"/>
-    <component base="dblgravecomb" xOffset="-19"/>
+    <component base="dblgravecomb" xOffset="-15"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/udieresis-cy.glif b/src/Cantarell-Bold.ufo/glyphs/udieresis-cy.glif
index 98901bc3..6df39061 100644
--- a/src/Cantarell-Bold.ufo/glyphs/udieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/udieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresis-cy" format="2">
-  <advance width="532"/>
+  <advance width="538"/>
   <unicode hex="04F1"/>
   <outline>
     <component base="u-cy"/>
-    <component base="dieresiscomb" xOffset="-3"/>
+    <component base="dieresiscomb" xOffset="-4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/udieresis.glif b/src/Cantarell-Bold.ufo/glyphs/udieresis.glif
index 1cd38caa..513934d7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/udieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/udieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresis" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="00FC"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb" xOffset="13"/>
+    <component base="dieresiscomb" xOffset="17"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/udieresisacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/udieresisacute.glif
index c926d985..2a67428c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/udieresisacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/udieresisacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresisacute" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="01D8"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_acutecomb" xOffset="26"/>
+    <component base="dieresiscomb.loclVIET" xOffset="30"/>
+    <component base="acutecomb" xOffset="190" yOffset="186"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/udieresiscaron.glif 
b/src/Cantarell-Bold.ufo/glyphs/udieresiscaron.glif
index 20fb1174..c72a1147 100644
--- a/src/Cantarell-Bold.ufo/glyphs/udieresiscaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/udieresiscaron.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresiscaron" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="01DA"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_caroncomb" xOffset="26"/>
+    <component base="dieresiscomb.loclVIET" xOffset="30"/>
+    <component base="caroncomb" xOffset="80" yOffset="186"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/udieresisgrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/udieresisgrave.glif
index c8875ee0..6a5aae9f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/udieresisgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/udieresisgrave.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresisgrave" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="01DC"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_gravecomb" xOffset="26"/>
+    <component base="dieresiscomb.loclVIET" xOffset="30"/>
+    <component base="gravecomb" xOffset="88" yOffset="186"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/udieresismacron.glif 
b/src/Cantarell-Bold.ufo/glyphs/udieresismacron.glif
index 3a63be6a..d1b830bc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/udieresismacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/udieresismacron.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresismacron" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="01D6"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_macroncomb" xOffset="26"/>
+    <component base="dieresiscomb.loclVIET" xOffset="30"/>
+    <component base="macroncomb" xOffset="44" yOffset="186"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/udotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/udotbelow.glif
index 6d5b07a9..30e98e21 100644
--- a/src/Cantarell-Bold.ufo/glyphs/udotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/udotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udotbelow" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="1EE5"/>
   <outline>
     <component base="u"/>
-    <component base="dotbelowcomb" xOffset="132"/>
+    <component base="dotbelowcomb" xOffset="136"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ugrave.glif b/src/Cantarell-Bold.ufo/glyphs/ugrave.glif
index 2ec0aa1c..ed9616fd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ugrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ugrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ugrave" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="00F9"/>
   <outline>
     <component base="u"/>
-    <component base="gravecomb" xOffset="84"/>
+    <component base="gravecomb" xOffset="88"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uhookabove.glif b/src/Cantarell-Bold.ufo/glyphs/uhookabove.glif
index 4529768a..4458ce6d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhookabove" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="1EE7"/>
   <outline>
     <component base="u"/>
-    <component base="hookabovecomb" xOffset="128"/>
+    <component base="hookabovecomb" xOffset="132"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uhorn.glif b/src/Cantarell-Bold.ufo/glyphs/uhorn.glif
index acf189b6..8c00acd7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uhorn.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uhorn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorn" format="2">
-  <advance width="730"/>
+  <advance width="737"/>
   <unicode hex="01B0"/>
   <outline>
     <component base="u"/>
-    <component base="horncomb" xOffset="451" yOffset="8"/>
+    <component base="horncomb" xOffset="447" yOffset="8"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uhornacute.glif b/src/Cantarell-Bold.ufo/glyphs/uhornacute.glif
index 19ed1347..253b9c62 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uhornacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uhornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhornacute" format="2">
-  <advance width="730"/>
+  <advance width="737"/>
   <unicode hex="1EE9"/>
   <outline>
     <component base="uhorn"/>
-    <component base="acutecomb" xOffset="186"/>
+    <component base="acutecomb" xOffset="190"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uhorndotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/uhorndotbelow.glif
index e83d8839..b7606682 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uhorndotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uhorndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorndotbelow" format="2">
-  <advance width="730"/>
+  <advance width="737"/>
   <unicode hex="1EF1"/>
   <outline>
     <component base="uhorn"/>
-    <component base="dotbelowcomb" xOffset="132"/>
+    <component base="dotbelowcomb" xOffset="136"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uhorngrave.glif b/src/Cantarell-Bold.ufo/glyphs/uhorngrave.glif
index 9c2c06cd..26214f73 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uhorngrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uhorngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorngrave" format="2">
-  <advance width="730"/>
+  <advance width="737"/>
   <unicode hex="1EEB"/>
   <outline>
     <component base="uhorn"/>
-    <component base="gravecomb" xOffset="84"/>
+    <component base="gravecomb" xOffset="88"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uhornhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/uhornhookabove.glif
index 609eebf4..ff10846c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uhornhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uhornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhornhookabove" format="2">
-  <advance width="730"/>
+  <advance width="737"/>
   <unicode hex="1EED"/>
   <outline>
     <component base="uhorn"/>
-    <component base="hookabovecomb" xOffset="128"/>
+    <component base="hookabovecomb" xOffset="132"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uhorntilde.glif b/src/Cantarell-Bold.ufo/glyphs/uhorntilde.glif
index 363865a0..9ce85bb8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uhorntilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uhorntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorntilde" format="2">
-  <advance width="730"/>
+  <advance width="737"/>
   <unicode hex="1EEF"/>
   <outline>
     <component base="uhorn"/>
-    <component base="tildecomb" xOffset="47"/>
+    <component base="tildecomb" xOffset="51"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uhungarumlaut-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/uhungarumlaut-cy.glif
index 7d779780..8d796776 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uhungarumlaut-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uhungarumlaut-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhungarumlaut-cy" format="2">
-  <advance width="532"/>
+  <advance width="538"/>
   <unicode hex="04F3"/>
   <outline>
     <component base="u-cy"/>
-    <component base="hungarumlautcomb" xOffset="51"/>
+    <component base="hungarumlautcomb" xOffset="50"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uhungarumlaut.glif 
b/src/Cantarell-Bold.ufo/glyphs/uhungarumlaut.glif
index eeaeac05..8ff46ce9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uhungarumlaut.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uhungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhungarumlaut" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="0171"/>
   <outline>
     <component base="u"/>
-    <component base="hungarumlautcomb" xOffset="67"/>
+    <component base="hungarumlautcomb" xOffset="71"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uinvertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/uinvertedbreve.glif
index 5af34b1d..592e9b4d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uinvertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uinvertedbreve" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="0217"/>
   <outline>
     <component base="u"/>
-    <component base="breveinvertedcomb" xOffset="56"/>
+    <component base="breveinvertedcomb" xOffset="60"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/umacron-cy.glif b/src/Cantarell-Bold.ufo/glyphs/umacron-cy.glif
index ce243e38..6d78af7a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/umacron-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/umacron-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="umacron-cy" format="2">
-  <advance width="532"/>
+  <advance width="538"/>
   <unicode hex="04EF"/>
   <outline>
     <component base="u-cy"/>
-    <component base="macroncomb" xOffset="24"/>
+    <component base="macroncomb" xOffset="23"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/umacron.glif b/src/Cantarell-Bold.ufo/glyphs/umacron.glif
index d3f11cee..d7c31464 100644
--- a/src/Cantarell-Bold.ufo/glyphs/umacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/umacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="umacron" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="016B"/>
   <outline>
     <component base="u"/>
-    <component base="macroncomb" xOffset="40"/>
+    <component base="macroncomb" xOffset="44"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/umacrondieresis.glif 
b/src/Cantarell-Bold.ufo/glyphs/umacrondieresis.glif
index bf34e0c6..9b701ffe 100644
--- a/src/Cantarell-Bold.ufo/glyphs/umacrondieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/umacrondieresis.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="umacrondieresis" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="1E7B"/>
   <outline>
     <component base="u"/>
-    <component base="macroncomb_dieresiscomb" xOffset="-10"/>
+    <component base="macroncomb.loclVIET" xOffset="47"/>
+    <component base="dieresiscomb" xOffset="17" yOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/underscore.glif b/src/Cantarell-Bold.ufo/glyphs/underscore.glif
index 2915bb4e..53292f64 100644
--- a/src/Cantarell-Bold.ufo/glyphs/underscore.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/underscore.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="underscore" format="2">
-  <advance width="558"/>
+  <advance width="500"/>
   <unicode hex="005F"/>
   <outline>
     <contour>
-      <point x="54" y="-148" type="line"/>
-      <point x="504" y="-148" type="line"/>
-      <point x="504" y="0" type="line"/>
-      <point x="54" y="0" type="line"/>
+      <point x="-10" y="-198" type="line"/>
+      <point x="510" y="-198" type="line"/>
+      <point x="510" y="-50" type="line"/>
+      <point x="-10" y="-50" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uogonek.glif b/src/Cantarell-Bold.ufo/glyphs/uogonek.glif
index 04d2ebe8..d319bee6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uogonek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uogonek" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="0173"/>
   <outline>
     <component base="u"/>
-    <component base="ogonekcomb" xOffset="16"/>
+    <component base="ogonekcomb" xOffset="15"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upA_rrow.glif b/src/Cantarell-Bold.ufo/glyphs/upA_rrow.glif
index dc1b66b5..999a39fa 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upA_rrow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upA_rrow.glif
@@ -1,22 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upArrow" format="2">
-  <advance width="619"/>
+  <advance width="643"/>
   <unicode hex="2191"/>
-  <note>
-arrowup
-</note>
   <outline>
     <contour>
-      <point x="228" y="40" type="line"/>
-      <point x="388" y="40" type="line"/>
-      <point x="381" y="331" type="line"/>
-      <point x="500" y="202" type="line"/>
-      <point x="606" y="309" type="line"/>
-      <point x="310" y="608" type="line"/>
-      <point x="306" y="608" type="line"/>
-      <point x="13" y="309" type="line"/>
-      <point x="119" y="205" type="line"/>
-      <point x="236" y="336" type="line"/>
+      <point x="240" y="40" type="line"/>
+      <point x="400" y="40" type="line"/>
+      <point x="393" y="331" type="line"/>
+      <point x="512" y="202" type="line"/>
+      <point x="618" y="309" type="line"/>
+      <point x="322" y="608" type="line"/>
+      <point x="318" y="608" type="line"/>
+      <point x="25" y="309" type="line"/>
+      <point x="131" y="205" type="line"/>
+      <point x="248" y="336" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uring.glif b/src/Cantarell-Bold.ufo/glyphs/uring.glif
index afb0b582..24785887 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uring.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uring" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="016F"/>
   <outline>
     <component base="u"/>
-    <component base="ringcomb" xOffset="116"/>
+    <component base="ringcomb" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ushort-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ushort-cy.glif
index 2262887c..173b9820 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ushort-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ushort-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ushort-cy" format="2">
-  <advance width="532"/>
+  <advance width="538"/>
   <unicode hex="045E"/>
   <outline>
     <component base="u-cy"/>
-    <component base="brevecomb-cy" xOffset="33"/>
+    <component base="brevecomb-cy" xOffset="32"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ustraight-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ustraight-cy.glif
index f91b0478..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="534"/>
+  <advance width="541"/>
   <unicode hex="04AF"/>
   <anchor x="270" y="-53" name="center"/>
   <outline>
@@ -12,4 +12,12 @@
     </contour>
     <component base="v"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>v</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>v</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ustraightstroke-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/ustraightstroke-cy.glif
index 39e60d97..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="534"/>
+  <advance width="541"/>
   <unicode hex="04B1"/>
   <outline>
     <component base="ustraight-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/utilde.glif b/src/Cantarell-Bold.ufo/glyphs/utilde.glif
index 857667f6..ca728c3f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/utilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/utilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="utilde" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="0169"/>
   <outline>
     <component base="u"/>
-    <component base="tildecomb" xOffset="47"/>
+    <component base="tildecomb" xOffset="51"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/utildeacute.glif b/src/Cantarell-Bold.ufo/glyphs/utildeacute.glif
index a1a3e758..a410dc77 100644
--- a/src/Cantarell-Bold.ufo/glyphs/utildeacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/utildeacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="utildeacute" format="2">
-  <advance width="577"/>
+  <advance width="584"/>
   <unicode hex="1E79"/>
   <outline>
     <component base="u"/>
-    <component base="tildecomb_acutecomb" xOffset="47"/>
+    <component base="tildecomb" xOffset="51"/>
+    <component base="acutecomb" xOffset="190" yOffset="211"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/v.glif b/src/Cantarell-Bold.ufo/glyphs/v.glif
index 07047555..18684626 100644
--- a/src/Cantarell-Bold.ufo/glyphs/v.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/v.glif
@@ -1,22 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="v" format="2">
-  <advance width="534"/>
+  <advance width="541"/>
   <unicode hex="0076"/>
-  <note>
-v
-</note>
-  <anchor x="265" y="0" name="bottom"/>
-  <anchor x="265" y="490" name="top"/>
+  <anchor x="268" y="0" name="bottom"/>
+  <anchor x="268" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="180" y="0" type="line"/>
-      <point x="353" y="0" type="line"/>
-      <point x="543" y="490" type="line"/>
-      <point x="369" y="490" type="line"/>
-      <point x="258" y="124" type="line"/>
-      <point x="281" y="124" type="line"/>
-      <point x="182" y="490" type="line"/>
-      <point x="-8" 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>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ve-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ve-cy.glif
index 9ba57ce8..035e3231 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ve-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ve-cy.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ve-cy" format="2">
-  <advance width="533"/>
+  <advance width="549"/>
   <unicode hex="0432"/>
   <outline>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="308" y="0" type="line" smooth="yes"/>
-      <point x="432" y="0"/>
-      <point x="515" y="69"/>
-      <point x="515" y="166" type="curve" smooth="yes"/>
-      <point x="515" y="256"/>
-      <point x="449" y="303"/>
-      <point x="323" y="303" type="curve" smooth="yes"/>
-      <point x="177" y="303" type="line"/>
-      <point x="177" y="194" type="line"/>
-      <point x="294" y="194" type="line" smooth="yes"/>
-      <point x="330" y="194"/>
-      <point x="347" y="181"/>
-      <point x="347" y="154" type="curve" smooth="yes"/>
-      <point x="347" y="128"/>
-      <point x="330" y="112"/>
-      <point x="304" y="112" type="curve" smooth="yes"/>
-      <point x="219" y="112" type="line"/>
-      <point x="219" y="378" type="line"/>
-      <point x="275" y="378" type="line" smooth="yes"/>
-      <point x="303" y="378"/>
-      <point x="322" y="367"/>
-      <point x="322" y="337" type="curve" smooth="yes"/>
-      <point x="322" y="311"/>
-      <point x="306" y="295"/>
-      <point x="271" y="286" type="curve"/>
-      <point x="404" y="265" type="line"/>
-      <point x="457" y="281"/>
-      <point x="485" y="319"/>
-      <point x="485" y="373" type="curve" smooth="yes"/>
-      <point x="485" y="451"/>
-      <point x="425" y="490"/>
-      <point x="306" y="490" type="curve" smooth="yes"/>
-      <point x="54" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="316" y="0" type="line" smooth="yes"/>
+      <point x="440" y="0"/>
+      <point x="523" y="69"/>
+      <point x="523" y="166" type="curve" smooth="yes"/>
+      <point x="523" y="256"/>
+      <point x="457" y="303"/>
+      <point x="331" y="303" type="curve" smooth="yes"/>
+      <point x="185" y="303" type="line"/>
+      <point x="185" y="194" type="line"/>
+      <point x="302" y="194" type="line" smooth="yes"/>
+      <point x="338" y="194"/>
+      <point x="355" y="181"/>
+      <point x="355" y="154" type="curve" smooth="yes"/>
+      <point x="355" y="128"/>
+      <point x="338" y="112"/>
+      <point x="312" y="112" type="curve" smooth="yes"/>
+      <point x="227" y="112" type="line"/>
+      <point x="227" y="380" type="line"/>
+      <point x="283" y="380" type="line" smooth="yes"/>
+      <point x="311" y="380"/>
+      <point x="330" y="369"/>
+      <point x="330" y="339" type="curve" smooth="yes"/>
+      <point x="330" y="313"/>
+      <point x="314" y="297"/>
+      <point x="279" y="288" type="curve"/>
+      <point x="412" y="267" type="line"/>
+      <point x="465" y="283"/>
+      <point x="493" y="321"/>
+      <point x="493" y="375" type="curve" smooth="yes"/>
+      <point x="493" y="453"/>
+      <point x="433" y="492"/>
+      <point x="314" y="492" type="curve" smooth="yes"/>
+      <point x="62" y="492" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -51,6 +51,8 @@
         <key>width</key>
         <integer>82</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/verticallineabovecomb.glif 
b/src/Cantarell-Bold.ufo/glyphs/verticallineabovecomb.glif
index 95b763eb..fc55ee69 100644
--- a/src/Cantarell-Bold.ufo/glyphs/verticallineabovecomb.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/verticallineabovecomb.glif
@@ -5,10 +5,10 @@
   <anchor x="113" y="760" name="top"/>
   <outline>
     <contour>
-      <point x="180" y="760" type="line"/>
-      <point x="45" y="760" type="line"/>
       <point x="54" y="556" type="line"/>
       <point x="170" y="556" type="line"/>
+      <point x="180" y="760" type="line"/>
+      <point x="45" y="760" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/verticallinelowmod.glif 
b/src/Cantarell-Bold.ufo/glyphs/verticallinelowmod.glif
index e80f0e49..e54fcdda 100644
--- a/src/Cantarell-Bold.ufo/glyphs/verticallinelowmod.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/verticallinelowmod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="verticallinelowmod" format="2">
-  <advance width="224"/>
+  <advance width="189"/>
   <unicode hex="02CC"/>
   <outline>
-    <component base="verticallinebelowcomb"/>
+    <component base="verticallinebelowcomb" xOffset="-18"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/verticallinemod.glif 
b/src/Cantarell-Bold.ufo/glyphs/verticallinemod.glif
index bf2fc3b2..a52e092e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/verticallinemod.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/verticallinemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="verticallinemod" format="2">
-  <advance width="224"/>
+  <advance width="189"/>
   <unicode hex="02C8"/>
   <outline>
-    <component base="verticallineabovecomb"/>
+    <component base="verticallineabovecomb" xOffset="-18"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/w.glif b/src/Cantarell-Bold.ufo/glyphs/w.glif
index a06dd814..b565cedc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/w.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/w.glif
@@ -1,30 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="w" format="2">
-  <advance width="843"/>
+  <advance width="848"/>
   <unicode hex="0077"/>
-  <note>
-w
-</note>
-  <anchor x="424" y="0" name="bottom"/>
-  <anchor x="424" y="490" name="top"/>
+  <anchor x="428" y="0" name="bottom"/>
+  <anchor x="428" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="172" y="0" type="line"/>
-      <point x="333" y="0" type="line"/>
-      <point x="435" y="382" type="line"/>
-      <point x="385" y="382" type="line"/>
-      <point x="501" y="0" type="line"/>
-      <point x="673" y="0" type="line"/>
-      <point x="851" y="490" type="line"/>
-      <point x="683" y="490" type="line"/>
-      <point x="563" y="86" type="line"/>
-      <point x="620" y="86" type="line"/>
-      <point x="508" y="488" type="line"/>
-      <point x="345" y="488" type="line"/>
-      <point x="236" y="76" type="line"/>
-      <point x="289" y="76" type="line"/>
-      <point x="179" y="490" type="line"/>
-      <point x="-8" y="490" type="line"/>
+      <point x="166" y="0" type="line"/>
+      <point x="329" y="0" type="line"/>
+      <point x="441" y="382" type="line"/>
+      <point x="389" y="382" type="line"/>
+      <point x="515" y="0" type="line"/>
+      <point x="687" y="0" type="line"/>
+      <point x="852" y="490" type="line"/>
+      <point x="684" y="490" type="line"/>
+      <point x="577" y="86" type="line"/>
+      <point x="636" y="86" type="line"/>
+      <point x="514" y="488" type="line"/>
+      <point x="349" y="488" type="line"/>
+      <point x="230" y="76" type="line"/>
+      <point x="283" y="76" type="line"/>
+      <point x="183" y="490" type="line"/>
+      <point x="-4" y="490" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/wacute.glif b/src/Cantarell-Bold.ufo/glyphs/wacute.glif
index cc3e19e6..a7d02deb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/wacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/wacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wacute" format="2">
-  <advance width="843"/>
+  <advance width="848"/>
   <unicode hex="1E83"/>
   <outline>
     <component base="w"/>
-    <component base="acutecomb" xOffset="328"/>
+    <component base="acutecomb" xOffset="332"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/wcircumflex.glif b/src/Cantarell-Bold.ufo/glyphs/wcircumflex.glif
index c63cd259..e2837142 100644
--- a/src/Cantarell-Bold.ufo/glyphs/wcircumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/wcircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wcircumflex" format="2">
-  <advance width="843"/>
+  <advance width="848"/>
   <unicode hex="0175"/>
   <outline>
     <component base="w"/>
-    <component base="circumflexcomb" xOffset="221"/>
+    <component base="circumflexcomb" xOffset="225"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/wdieresis.glif b/src/Cantarell-Bold.ufo/glyphs/wdieresis.glif
index a65d5fd5..a27db5ef 100644
--- a/src/Cantarell-Bold.ufo/glyphs/wdieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/wdieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wdieresis" format="2">
-  <advance width="843"/>
+  <advance width="848"/>
   <unicode hex="1E85"/>
   <outline>
     <component base="w"/>
-    <component base="dieresiscomb" xOffset="155"/>
+    <component base="dieresiscomb" xOffset="159"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/we-cy.glif b/src/Cantarell-Bold.ufo/glyphs/we-cy.glif
index 79a56693..8ecfdcd5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/we-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/we-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="we-cy" format="2">
-  <advance width="843"/>
+  <advance width="848"/>
   <unicode hex="051D"/>
   <outline>
     <component base="w"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/wgrave.glif b/src/Cantarell-Bold.ufo/glyphs/wgrave.glif
index 49727a84..7c69debc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/wgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/wgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wgrave" format="2">
-  <advance width="843"/>
+  <advance width="848"/>
   <unicode hex="1E81"/>
   <outline>
     <component base="w"/>
-    <component base="gravecomb" xOffset="226"/>
+    <component base="gravecomb" xOffset="230"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/whiteC_ircle.glif b/src/Cantarell-Bold.ufo/glyphs/whiteC_ircle.glif
index a62d1e7a..d6ef3a5d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/whiteC_ircle.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/whiteC_ircle.glif
@@ -1,38 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="whiteCircle" format="2">
-  <advance width="592"/>
+  <advance width="614"/>
   <unicode hex="25CB"/>
-  <note>
-circle
-</note>
   <outline>
     <contour>
-      <point x="293" y="114" type="curve" smooth="yes"/>
-      <point x="452" y="114"/>
-      <point x="546" y="201"/>
-      <point x="546" y="347" type="curve" smooth="yes"/>
-      <point x="546" y="493"/>
-      <point x="455" y="580"/>
-      <point x="300" y="580" type="curve" smooth="yes"/>
-      <point x="140" y="580"/>
-      <point x="46" y="492"/>
-      <point x="46" y="344" type="curve" smooth="yes"/>
-      <point x="46" y="199"/>
-      <point x="138" y="114"/>
+      <point x="304" y="114" type="curve" smooth="yes"/>
+      <point x="463" y="114"/>
+      <point x="557" y="201"/>
+      <point x="557" y="347" type="curve" smooth="yes"/>
+      <point x="557" y="493"/>
+      <point x="466" y="580"/>
+      <point x="311" y="580" type="curve" smooth="yes"/>
+      <point x="151" y="580"/>
+      <point x="57" y="492"/>
+      <point x="57" y="344" type="curve" smooth="yes"/>
+      <point x="57" y="199"/>
+      <point x="149" y="114"/>
     </contour>
     <contour>
-      <point x="301" y="246" type="curve" smooth="yes"/>
-      <point x="240" y="246"/>
-      <point x="199" y="287"/>
-      <point x="199" y="349" type="curve" smooth="yes"/>
-      <point x="199" y="408"/>
-      <point x="237" y="448"/>
-      <point x="293" y="448" type="curve" smooth="yes"/>
-      <point x="353" y="448"/>
-      <point x="393" y="407"/>
-      <point x="393" y="345" type="curve" smooth="yes"/>
-      <point x="393" y="286"/>
-      <point x="356" y="246"/>
+      <point x="312" y="246" type="curve" smooth="yes"/>
+      <point x="251" y="246"/>
+      <point x="210" y="287"/>
+      <point x="210" y="349" type="curve" smooth="yes"/>
+      <point x="210" y="408"/>
+      <point x="248" y="448"/>
+      <point x="304" y="448" type="curve" smooth="yes"/>
+      <point x="364" y="448"/>
+      <point x="404" y="407"/>
+      <point x="404" y="345" type="curve" smooth="yes"/>
+      <point x="404" y="286"/>
+      <point x="367" y="246"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>blackCircle</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>blackCircle</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/won.glif b/src/Cantarell-Bold.ufo/glyphs/won.glif
index a5505141..d1fc892d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/won.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/won.glif
@@ -1,32 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="won" format="2">
-  <advance width="1176"/>
+  <advance width="600"/>
   <unicode hex="20A9"/>
   <outline>
     <contour>
-      <point x="56" y="192" type="line"/>
-      <point x="268" y="192" type="line"/>
-      <point x="268" y="312" type="line"/>
-      <point x="56" y="312" type="line"/>
+      <point x="106" y="0" type="line"/>
+      <point x="255" y="0" type="line"/>
+      <point x="320" y="644" type="line"/>
+      <point x="276" y="644" type="line"/>
+      <point x="350" y="0" type="line"/>
+      <point x="495" y="0" type="line"/>
+      <point x="602" y="694" type="line"/>
+      <point x="468" y="694" type="line"/>
+      <point x="403" y="48" type="line"/>
+      <point x="435" y="48" type="line"/>
+      <point x="376" y="685" type="line"/>
+      <point x="237" y="685" type="line"/>
+      <point x="170" y="53" type="line"/>
+      <point x="198" y="53" type="line"/>
+      <point x="149" y="694" type="line"/>
+      <point x="-1" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="56" y="392" type="line"/>
-      <point x="488" y="392" type="line"/>
-      <point x="488" y="512" type="line"/>
-      <point x="56" y="512" type="line"/>
+      <point x="-1" y="208" type="line"/>
+      <point x="131" y="208" type="line"/>
+      <point x="131" y="314" type="line"/>
+      <point x="-1" y="314" type="line"/>
     </contour>
     <contour>
-      <point x="1120" y="192" type="line"/>
-      <point x="1120" y="312" type="line"/>
-      <point x="898" y="312" type="line"/>
-      <point x="898" y="192" type="line"/>
+      <point x="0" y="385" type="line"/>
+      <point x="601" y="385" type="line"/>
+      <point x="601" y="490" type="line"/>
+      <point x="0" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="1120" y="392" type="line"/>
-      <point x="1120" y="512" type="line"/>
-      <point x="678" y="512" type="line"/>
-      <point x="678" y="392" type="line"/>
+      <point x="468" y="208" type="line"/>
+      <point x="600" y="208" type="line"/>
+      <point x="600" y="314" type="line"/>
+      <point x="468" y="314" type="line"/>
     </contour>
-    <component base="W" xOffset="73"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/x.glif b/src/Cantarell-Bold.ufo/glyphs/x.glif
index 037b3307..faa0aa37 100644
--- a/src/Cantarell-Bold.ufo/glyphs/x.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/x.glif
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="x" format="2">
-  <advance width="524"/>
+  <advance width="527"/>
   <unicode hex="0078"/>
-  <note>
-x
-</note>
   <anchor x="282" y="0" name="bottom"/>
   <anchor x="281" y="490" name="top"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/y.glif b/src/Cantarell-Bold.ufo/glyphs/y.glif
index e128f82d..166a7e17 100644
--- a/src/Cantarell-Bold.ufo/glyphs/y.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/y.glif
@@ -1,28 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="y" format="2">
-  <advance width="532"/>
+  <advance width="538"/>
   <unicode hex="0079"/>
-  <note>
-y
-</note>
-  <anchor x="444" y="0" name="bottom"/>
-  <anchor x="262" y="490" name="top"/>
+  <anchor x="447" y="0" name="bottom"/>
+  <anchor x="265" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="180" y="0" type="line"/>
-      <point x="355" y="0" type="line"/>
-      <point x="540" y="490" type="line"/>
-      <point x="368" y="490" type="line"/>
-      <point x="259" y="124" type="line"/>
-      <point x="281" y="124" type="line"/>
-      <point x="183" y="490" type="line"/>
-      <point x="-8" y="490" type="line"/>
-    </contour>
-    <contour>
-      <point x="91" y="-217" type="line"/>
-      <point x="279" y="-217" type="line"/>
-      <point x="355" y="0" type="line"/>
-      <point x="180" 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>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>v</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>v</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/yacute.glif b/src/Cantarell-Bold.ufo/glyphs/yacute.glif
index 69a2a4a7..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="532"/>
+  <advance width="538"/>
   <unicode hex="00FD"/>
   <outline>
     <component base="y"/>
-    <component base="acutecomb" xOffset="166"/>
+    <component base="acutecomb" xOffset="169"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/yat-cy.glif b/src/Cantarell-Bold.ufo/glyphs/yat-cy.glif
index 11dc72b6..54e76dae 100644
--- a/src/Cantarell-Bold.ufo/glyphs/yat-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/yat-cy.glif
@@ -1,35 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yat-cy" format="2">
-  <advance width="525"/>
+  <advance width="541"/>
   <unicode hex="0463"/>
   <outline>
     <contour>
-      <point x="69" y="0" type="line"/>
-      <point x="279" y="0" type="line" smooth="yes"/>
-      <point x="429" y="0"/>
-      <point x="517" y="70"/>
-      <point x="517" y="187" type="curve" smooth="yes"/>
-      <point x="517" y="281"/>
-      <point x="439" y="344"/>
-      <point x="324" y="344" type="curve" smooth="yes"/>
-      <point x="171" y="344" type="line"/>
-      <point x="171" y="220" type="line"/>
-      <point x="288" y="220" type="line" smooth="yes"/>
-      <point x="322" y="220"/>
-      <point x="348" y="202"/>
-      <point x="348" y="173" type="curve" smooth="yes"/>
-      <point x="348" y="144"/>
-      <point x="329" y="126"/>
-      <point x="300" y="126" type="curve" smooth="yes"/>
-      <point x="224" y="126" type="line"/>
-      <point x="224" y="739" type="line"/>
-      <point x="69" y="739" type="line"/>
+      <point x="77" y="0" type="line"/>
+      <point x="287" y="0" type="line" smooth="yes"/>
+      <point x="437" y="0"/>
+      <point x="525" y="70"/>
+      <point x="525" y="187" type="curve" smooth="yes"/>
+      <point x="525" y="281"/>
+      <point x="447" y="344"/>
+      <point x="332" y="344" type="curve" smooth="yes"/>
+      <point x="179" y="344" type="line"/>
+      <point x="179" y="220" type="line"/>
+      <point x="296" y="220" type="line" smooth="yes"/>
+      <point x="330" y="220"/>
+      <point x="356" y="202"/>
+      <point x="356" y="173" type="curve" smooth="yes"/>
+      <point x="356" y="144"/>
+      <point x="337" y="126"/>
+      <point x="308" y="126" type="curve" smooth="yes"/>
+      <point x="232" y="126" type="line"/>
+      <point x="232" y="739" type="line"/>
+      <point x="77" y="739" type="line"/>
     </contour>
     <contour>
-      <point x="-5" y="425" type="line"/>
-      <point x="358" y="425" type="line"/>
-      <point x="358" y="560" type="line"/>
-      <point x="-5" y="560" type="line"/>
+      <point x="3" y="425" type="line"/>
+      <point x="366" y="425" type="line"/>
+      <point x="366" y="560" type="line"/>
+      <point x="3" y="560" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>softsign-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ycircumflex.glif b/src/Cantarell-Bold.ufo/glyphs/ycircumflex.glif
index fa3c6949..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="532"/>
+  <advance width="538"/>
   <unicode hex="0177"/>
   <outline>
     <component base="y"/>
-    <component base="circumflexcomb" xOffset="59"/>
+    <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 1e41a739..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="532"/>
+  <advance width="538"/>
   <unicode hex="00FF"/>
   <outline>
     <component base="y"/>
-    <component base="dieresiscomb" xOffset="-7"/>
+    <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 5483fd57..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="532"/>
+  <advance width="538"/>
   <unicode hex="1E8F"/>
   <outline>
     <component base="y"/>
-    <component base="dotaccentcomb" xOffset="118"/>
+    <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 42f38a8f..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="532"/>
+  <advance width="538"/>
   <unicode hex="1EF5"/>
   <outline>
     <component base="y"/>
-    <component base="dotbelowcomb" xOffset="294"/>
+    <component base="dotbelowcomb" xOffset="297"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/yen.glif b/src/Cantarell-Bold.ufo/glyphs/yen.glif
index cbd81e35..69c60040 100644
--- a/src/Cantarell-Bold.ufo/glyphs/yen.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/yen.glif
@@ -1,31 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yen" format="2">
-  <advance width="728"/>
+  <advance width="600"/>
   <unicode hex="00A5"/>
   <outline>
     <contour>
-      <point x="92" y="67" type="line"/>
-      <point x="643" y="67" type="line"/>
-      <point x="643" y="187" type="line"/>
-      <point x="92" y="187" type="line"/>
+      <point x="219" y="0" type="line"/>
+      <point x="392" y="0" type="line"/>
+      <point x="392" y="297" type="line"/>
+      <point x="611" y="694" type="line"/>
+      <point x="417" y="694" type="line"/>
+      <point x="300" y="410" type="line"/>
+      <point x="322" y="410" type="line"/>
+      <point x="193" y="694" type="line"/>
+      <point x="-11" y="694" type="line"/>
+      <point x="219" y="301" type="line"/>
     </contour>
     <contour>
-      <point x="92" y="258" type="line"/>
-      <point x="643" y="258" type="line"/>
-      <point x="643" y="378" type="line"/>
-      <point x="92" y="378" type="line"/>
+      <point x="61" y="82" type="line"/>
+      <point x="550" y="82" type="line"/>
+      <point x="550" y="188" type="line"/>
+      <point x="61" y="188" type="line"/>
     </contour>
     <contour>
-      <point x="281" y="0" type="line"/>
-      <point x="454" y="0" type="line"/>
-      <point x="454" y="297" type="line"/>
-      <point x="708" y="694" type="line"/>
-      <point x="514" y="694" type="line"/>
-      <point x="362" y="410" type="line"/>
-      <point x="384" y="410" type="line"/>
-      <point x="220" y="694" type="line"/>
-      <point x="16" y="694" type="line"/>
-      <point x="281" y="301" type="line"/>
+      <point x="61" y="258" type="line"/>
+      <point x="550" y="258" type="line"/>
+      <point x="550" y="364" type="line"/>
+      <point x="61" y="364" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/yeru-cy.glif b/src/Cantarell-Bold.ufo/glyphs/yeru-cy.glif
index 658dc1b4..a4fc4eb0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/yeru-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/yeru-cy.glif
@@ -1,36 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yeru-cy" format="2">
-  <advance width="767"/>
+  <advance width="773"/>
   <unicode hex="044B"/>
-  <anchor x="384" y="490" name="top"/>
+  <anchor x="392" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="547" y="-3" type="line"/>
-      <point x="713" y="-3" type="line"/>
-      <point x="713" y="490" type="line"/>
-      <point x="547" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="253" y="0" type="line" smooth="yes"/>
+      <point x="403" y="0"/>
+      <point x="492" y="70"/>
+      <point x="492" y="187" type="curve" smooth="yes"/>
+      <point x="492" y="281"/>
+      <point x="413" y="344"/>
+      <point x="297" y="344" type="curve" smooth="yes"/>
+      <point x="169" y="344" type="line"/>
+      <point x="169" y="220" type="line"/>
+      <point x="261" y="220" type="line" smooth="yes"/>
+      <point x="296" y="220"/>
+      <point x="323" y="202"/>
+      <point x="323" y="173" type="curve" smooth="yes"/>
+      <point x="323" y="144"/>
+      <point x="304" y="126"/>
+      <point x="273" y="126" type="curve" smooth="yes"/>
+      <point x="222" y="126" type="line"/>
+      <point x="222" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="255" y="0" type="line" smooth="yes"/>
-      <point x="405" y="0"/>
-      <point x="494" y="70"/>
-      <point x="494" y="187" type="curve" smooth="yes"/>
-      <point x="494" y="281"/>
-      <point x="415" y="344"/>
-      <point x="299" y="344" type="curve" smooth="yes"/>
-      <point x="161" y="344" type="line"/>
-      <point x="161" y="220" type="line"/>
-      <point x="263" y="220" type="line" smooth="yes"/>
-      <point x="298" y="220"/>
-      <point x="325" y="202"/>
-      <point x="325" y="173" type="curve" smooth="yes"/>
-      <point x="325" y="144"/>
-      <point x="306" y="126"/>
-      <point x="275" y="126" type="curve" smooth="yes"/>
-      <point x="214" y="126" type="line"/>
-      <point x="214" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
+      <point x="545" y="-3" type="line"/>
+      <point x="711" y="-3" type="line"/>
+      <point x="711" y="490" type="line"/>
+      <point x="545" y="490" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -44,6 +44,10 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/yerudieresis-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/yerudieresis-cy.glif
index 857ab13f..2a60043c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/yerudieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/yerudieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yerudieresis-cy" format="2">
-  <advance width="767"/>
+  <advance width="773"/>
   <unicode hex="04F9"/>
   <outline>
     <component base="yeru-cy"/>
-    <component base="dieresiscomb" xOffset="115"/>
+    <component base="dieresiscomb" xOffset="123"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ygrave.glif b/src/Cantarell-Bold.ufo/glyphs/ygrave.glif
index 4f4c4ae9..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="532"/>
+  <advance width="538"/>
   <unicode hex="1EF3"/>
   <outline>
     <component base="y"/>
-    <component base="gravecomb" xOffset="64"/>
+    <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 c2beb87c..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="532"/>
+  <advance width="538"/>
   <unicode hex="1EF7"/>
   <outline>
     <component base="y"/>
-    <component base="hookabovecomb" xOffset="108"/>
+    <component base="hookabovecomb" xOffset="111"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/yi-cy.glif b/src/Cantarell-Bold.ufo/glyphs/yi-cy.glif
index 73fdfce1..5f1dae5c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/yi-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/yi-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yi-cy" format="2">
-  <advance width="287"/>
+  <advance width="297"/>
   <unicode hex="0457"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb" xOffset="-125"/>
+    <component base="dieresiscomb" xOffset="-120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ymacron.glif b/src/Cantarell-Bold.ufo/glyphs/ymacron.glif
index 66e9d015..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="532"/>
+  <advance width="538"/>
   <unicode hex="0233"/>
   <outline>
     <component base="y"/>
-    <component base="macroncomb" xOffset="20"/>
+    <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 02642acb..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="532"/>
+  <advance width="538"/>
   <unicode hex="1EF9"/>
   <outline>
     <component base="y"/>
-    <component base="tildecomb" xOffset="27"/>
+    <component base="tildecomb" xOffset="30"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/yusbig-cy.glif b/src/Cantarell-Bold.ufo/glyphs/yusbig-cy.glif
index d0ce569c..3112b823 100644
--- a/src/Cantarell-Bold.ufo/glyphs/yusbig-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/yusbig-cy.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yusbig-cy" format="2">
-  <advance width="635"/>
+  <advance width="653"/>
   <unicode hex="046B"/>
   <outline>
     <contour>
-      <point x="184" y="253" type="line"/>
-      <point x="341" y="253" type="line"/>
-      <point x="197" y="423" type="line"/>
-      <point x="168" y="369" type="line"/>
-      <point x="464" y="369" type="line"/>
-      <point x="431" y="423" type="line"/>
-      <point x="300" y="270" type="line"/>
-      <point x="449" y="270" type="line"/>
-      <point x="567" y="365" type="line"/>
-      <point x="567" y="489" type="line"/>
-      <point x="64" y="489" type="line"/>
-      <point x="64" y="365" type="line"/>
+      <point x="16" y="0" type="curve"/>
+      <point x="166" y="0" type="line"/>
+      <point x="166" y="123"/>
+      <point x="214" y="179"/>
+      <point x="319" y="179" type="curve" smooth="yes"/>
+      <point x="434" y="179"/>
+      <point x="486" y="123"/>
+      <point x="486" y="0" type="curve"/>
+      <point x="637" y="0" type="line"/>
+      <point x="637" y="198"/>
+      <point x="541" y="294"/>
+      <point x="331" y="294" type="curve" smooth="yes"/>
+      <point x="115" y="294"/>
+      <point x="16" y="198"/>
     </contour>
     <contour>
-      <point x="388" y="192" type="line"/>
-      <point x="248" y="192" type="line"/>
-      <point x="248" y="0" type="line"/>
-      <point x="388" y="0" type="line"/>
+      <point x="256" y="0" type="line"/>
+      <point x="396" y="0" type="line"/>
+      <point x="396" y="192" type="line"/>
+      <point x="256" y="192" type="line"/>
     </contour>
     <contour>
-      <point x="158" y="0" type="line"/>
-      <point x="158" y="123"/>
-      <point x="206" y="179"/>
-      <point x="311" y="179" type="curve" smooth="yes"/>
-      <point x="426" y="179"/>
-      <point x="478" y="123"/>
-      <point x="478" y="0" type="curve"/>
-      <point x="629" y="0" type="line"/>
-      <point x="629" y="198"/>
-      <point x="533" y="294"/>
-      <point x="323" y="294" type="curve" smooth="yes"/>
-      <point x="107" y="294"/>
-      <point x="8" y="198"/>
-      <point x="8" y="0" type="curve"/>
+      <point x="192" y="253" type="line"/>
+      <point x="349" y="253" type="line"/>
+      <point x="205" y="423" type="line"/>
+      <point x="176" y="369" type="line"/>
+      <point x="472" y="369" type="line"/>
+      <point x="439" y="423" type="line"/>
+      <point x="308" y="270" type="line"/>
+      <point x="457" y="270" type="line"/>
+      <point x="575" y="365" type="line"/>
+      <point x="575" y="489" type="line"/>
+      <point x="72" y="489" type="line"/>
+      <point x="72" y="365" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -51,6 +51,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/z.glif b/src/Cantarell-Bold.ufo/glyphs/z.glif
index 10cff279..a13d6bfe 100644
--- a/src/Cantarell-Bold.ufo/glyphs/z.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/z.glif
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="z" format="2">
-  <advance width="490"/>
+  <advance width="515"/>
   <unicode hex="007A"/>
-  <note>
-z
-</note>
-  <anchor x="245" y="0" name="bottom"/>
-  <anchor x="245" y="490" name="top"/>
+  <anchor x="257" y="0" name="bottom"/>
+  <anchor x="257" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="28" y="0" type="line"/>
-      <point x="467" y="0" type="line"/>
-      <point x="467" y="141" type="line"/>
-      <point x="170" y="141" type="line"/>
-      <point x="198" y="80" type="line"/>
-      <point x="454" y="386" type="line"/>
-      <point x="454" y="490" type="line"/>
-      <point x="28" y="490" type="line"/>
-      <point x="28" y="349" type="line"/>
-      <point x="313" y="349" type="line"/>
-      <point x="285" y="411" type="line"/>
-      <point x="28" y="103" type="line"/>
+      <point x="40" y="0" type="line"/>
+      <point x="479" y="0" type="line"/>
+      <point x="479" y="141" type="line"/>
+      <point x="182" y="141" type="line"/>
+      <point x="210" y="80" type="line"/>
+      <point x="466" y="386" type="line"/>
+      <point x="466" y="490" type="line"/>
+      <point x="40" y="490" type="line"/>
+      <point x="40" y="349" type="line"/>
+      <point x="325" y="349" type="line"/>
+      <point x="297" y="411" type="line"/>
+      <point x="40" y="103" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zacute.glif b/src/Cantarell-Bold.ufo/glyphs/zacute.glif
index 564f2df3..eeec12be 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zacute" format="2">
-  <advance width="490"/>
+  <advance width="515"/>
   <unicode hex="017A"/>
   <outline>
     <component base="z"/>
-    <component base="acutecomb" xOffset="149"/>
+    <component base="acutecomb" xOffset="161"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zcaron.glif b/src/Cantarell-Bold.ufo/glyphs/zcaron.glif
index 9f435c07..7370904f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zcaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zcaron" format="2">
-  <advance width="490"/>
+  <advance width="515"/>
   <unicode hex="017E"/>
   <outline>
     <component base="z"/>
-    <component base="caroncomb" xOffset="39"/>
+    <component base="caroncomb" xOffset="51"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zdotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/zdotaccent.glif
index d39c5215..ff2afa50 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zdotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zdotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zdotaccent" format="2">
-  <advance width="490"/>
+  <advance width="515"/>
   <unicode hex="017C"/>
   <outline>
     <component base="z"/>
-    <component base="dotaccentcomb" xOffset="101"/>
+    <component base="dotaccentcomb" xOffset="113"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zdotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/zdotbelow.glif
index 75df0837..19fc8773 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zdotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zdotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zdotbelow" format="2">
-  <advance width="490"/>
+  <advance width="515"/>
   <unicode hex="1E93"/>
   <outline>
     <component base="z"/>
-    <component base="dotbelowcomb" xOffset="95"/>
+    <component base="dotbelowcomb" xOffset="107"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ze-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ze-cy.glif
index de65131b..eb5e8a48 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ze-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ze-cy.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ze-cy" format="2">
-  <advance width="469"/>
+  <advance width="490"/>
   <unicode hex="0437"/>
-  <anchor x="235" y="0" name="bottom"/>
-  <anchor x="235" y="490" name="top"/>
+  <anchor x="246" y="0" name="bottom"/>
+  <anchor x="246" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="188" y="-7" type="curve" smooth="yes"/>
-      <point x="345" y="-7"/>
-      <point x="449" y="57"/>
-      <point x="449" y="154" type="curve" smooth="yes"/>
-      <point x="449" y="221"/>
-      <point x="397" y="264"/>
-      <point x="308" y="267" type="curve"/>
-      <point x="306" y="260" type="line"/>
-      <point x="382" y="260"/>
-      <point x="433" y="302"/>
-      <point x="433" y="366" type="curve" smooth="yes"/>
-      <point x="433" y="448"/>
-      <point x="348" y="500"/>
-      <point x="216" y="500" type="curve" smooth="yes"/>
-      <point x="150" y="500"/>
-      <point x="79" y="484"/>
-      <point x="17" y="456" type="curve"/>
-      <point x="52" y="343" type="line"/>
-      <point x="101" y="361"/>
-      <point x="147" y="370"/>
-      <point x="193" y="370" type="curve" smooth="yes"/>
-      <point x="243" y="370"/>
-      <point x="268" y="359"/>
-      <point x="268" y="338" type="curve" smooth="yes"/>
-      <point x="268" y="314"/>
-      <point x="236" y="300"/>
-      <point x="179" y="300" type="curve" smooth="yes"/>
-      <point x="109" y="300" type="line"/>
-      <point x="109" y="191" type="line"/>
-      <point x="181" y="191" type="line" smooth="yes"/>
-      <point x="245" y="191"/>
-      <point x="283" y="178"/>
-      <point x="283" y="156" type="curve" smooth="yes"/>
-      <point x="283" y="134"/>
-      <point x="254" y="123"/>
-      <point x="198" y="123" type="curve" smooth="yes"/>
-      <point x="149" y="123"/>
-      <point x="93" y="132"/>
-      <point x="50" y="146" type="curve"/>
-      <point x="14" y="27" type="line"/>
-      <point x="66" y="5"/>
-      <point x="121" y="-7"/>
+      <point x="199" y="-7" type="curve" smooth="yes"/>
+      <point x="356" y="-7"/>
+      <point x="460" y="57"/>
+      <point x="460" y="154" type="curve" smooth="yes"/>
+      <point x="460" y="221"/>
+      <point x="408" y="264"/>
+      <point x="319" y="267" type="curve"/>
+      <point x="317" y="260" type="line"/>
+      <point x="393" y="260"/>
+      <point x="444" y="302"/>
+      <point x="444" y="366" type="curve" smooth="yes"/>
+      <point x="444" y="448"/>
+      <point x="359" y="500"/>
+      <point x="227" y="500" type="curve" smooth="yes"/>
+      <point x="161" y="500"/>
+      <point x="90" y="484"/>
+      <point x="28" y="456" type="curve"/>
+      <point x="63" y="343" type="line"/>
+      <point x="112" y="361"/>
+      <point x="158" y="370"/>
+      <point x="204" y="370" type="curve" smooth="yes"/>
+      <point x="254" y="370"/>
+      <point x="279" y="359"/>
+      <point x="279" y="338" type="curve" smooth="yes"/>
+      <point x="279" y="314"/>
+      <point x="247" y="300"/>
+      <point x="190" y="300" type="curve" smooth="yes"/>
+      <point x="120" y="300" type="line"/>
+      <point x="120" y="191" type="line"/>
+      <point x="192" y="191" type="line" smooth="yes"/>
+      <point x="256" y="191"/>
+      <point x="294" y="178"/>
+      <point x="294" y="156" type="curve" smooth="yes"/>
+      <point x="294" y="134"/>
+      <point x="265" y="123"/>
+      <point x="209" y="123" type="curve" smooth="yes"/>
+      <point x="160" y="123"/>
+      <point x="104" y="132"/>
+      <point x="61" y="146" type="curve"/>
+      <point x="25" y="27" type="line"/>
+      <point x="77" y="5"/>
+      <point x="132" y="-7"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zedescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/zedescender-cy.glif
index b9b6c267..780b3673 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zedescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zedescender-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zedescender-cy" format="2">
-  <advance width="469"/>
+  <advance width="490"/>
   <unicode hex="0499"/>
   <outline>
     <component base="ze-cy"/>
-    <component base="cedillacomb" xOffset="77"/>
+    <component base="cedillacomb" xOffset="88"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zedieresis-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/zedieresis-cy.glif
index d6d74e7c..54d8544b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zedieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zedieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zedieresis-cy" format="2">
-  <advance width="469"/>
+  <advance width="490"/>
   <unicode hex="04DF"/>
   <outline>
     <component base="ze-cy"/>
-    <component base="dieresiscomb" xOffset="-34"/>
+    <component base="dieresiscomb" xOffset="-23"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zero.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/zero.dnom.glif
index 5619fbad..a0423d80 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zero.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zero.dnom.glif
@@ -1,38 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.dnom" format="2">
-  <advance width="493"/>
-  <note>
-zero
-</note>
-  <anchor x="247" y="237" name="slash"/>
+  <advance width="464"/>
+  <anchor x="232" y="206" name="slash"/>
   <outline>
     <contour>
-      <point x="245" y="-7" type="curve" smooth="yes"/>
-      <point x="384" y="-7"/>
-      <point x="474" y="96"/>
-      <point x="474" y="242" type="curve" smooth="yes"/>
-      <point x="474" y="389"/>
-      <point x="383" y="487"/>
-      <point x="249" y="487" type="curve" smooth="yes"/>
-      <point x="112" y="487"/>
-      <point x="19" y="387"/>
-      <point x="19" y="238" type="curve" smooth="yes"/>
-      <point x="19" y="92"/>
-      <point x="110" y="-7"/>
+      <point x="230" y="-6" type="curve" smooth="yes"/>
+      <point x="352" y="-6"/>
+      <point x="435" y="81"/>
+      <point x="435" y="212" type="curve" smooth="yes"/>
+      <point x="435" y="339"/>
+      <point x="354" y="424"/>
+      <point x="234" y="424" type="curve" smooth="yes"/>
+      <point x="111" y="424"/>
+      <point x="29" y="336"/>
+      <point x="29" y="207" type="curve" smooth="yes"/>
+      <point x="29" y="80"/>
+      <point x="110" y="-6"/>
     </contour>
     <contour>
-      <point x="247" y="121" type="curve" smooth="yes"/>
-      <point x="202" y="121"/>
-      <point x="173" y="172"/>
-      <point x="173" y="242" type="curve" smooth="yes"/>
-      <point x="173" y="312"/>
-      <point x="202" y="359"/>
-      <point x="245" y="359" type="curve" smooth="yes"/>
-      <point x="290" y="359"/>
-      <point x="320" y="309"/>
-      <point x="320" y="238" type="curve" smooth="yes"/>
-      <point x="320" y="169"/>
-      <point x="291" y="121"/>
+      <point x="233" y="111" type="curve" smooth="yes"/>
+      <point x="195" y="111"/>
+      <point x="170" y="151"/>
+      <point x="170" y="212" type="curve" smooth="yes"/>
+      <point x="170" y="269"/>
+      <point x="195" y="306"/>
+      <point x="231" y="306" type="curve" smooth="yes"/>
+      <point x="268" y="306"/>
+      <point x="293" y="266"/>
+      <point x="293" y="206" type="curve" smooth="yes"/>
+      <point x="293" y="150"/>
+      <point x="269" y="111"/>
     </contour>
   </outline>
   <lib>
@@ -40,11 +37,11 @@ zero
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>69</integer>
+        <integer>60</integer>
         <key>weight</key>
-        <integer>-23</integer>
+        <integer>-35</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>65</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zero.glif b/src/Cantarell-Bold.ufo/glyphs/zero.glif
index 6d53a0f7..dfb84e08 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zero.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zero.glif
@@ -1,36 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero" format="2">
-  <advance width="640"/>
+  <advance width="646"/>
   <unicode hex="0030"/>
-  <anchor x="322" y="345" name="slash"/>
+  <anchor x="325" y="345" name="slash"/>
   <outline>
     <contour>
-      <point x="318" y="-10" type="curve" smooth="yes"/>
-      <point x="494" y="-10"/>
-      <point x="613" y="134"/>
-      <point x="613" y="351" type="curve" smooth="yes"/>
-      <point x="613" y="563"/>
-      <point x="496" y="704"/>
-      <point x="323" y="704" type="curve" smooth="yes"/>
-      <point x="146" y="704"/>
-      <point x="27" y="560"/>
-      <point x="27" y="344" type="curve" smooth="yes"/>
-      <point x="27" y="132"/>
-      <point x="144" 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="322" y="138" type="curve" smooth="yes"/>
-      <point x="251" y="138"/>
-      <point x="205" y="223"/>
-      <point x="205" y="350" type="curve" smooth="yes"/>
-      <point x="205" y="474"/>
-      <point x="251" y="556"/>
-      <point x="319" y="556" type="curve" smooth="yes"/>
-      <point x="388" y="556"/>
-      <point x="435" y="471"/>
-      <point x="435" y="343" type="curve" smooth="yes"/>
-      <point x="435" y="220"/>
-      <point x="389" 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>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zero.numr.glif b/src/Cantarell-Bold.ufo/glyphs/zero.numr.glif
index 223dcb4c..2513c0d5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zero.numr.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zero.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.numr" format="2">
-  <advance width="493"/>
+  <advance width="464"/>
   <outline>
     <component base="zero.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zero.osf.glif b/src/Cantarell-Bold.ufo/glyphs/zero.osf.glif
index fffab001..457aea07 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zero.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zero.osf.glif
@@ -1,35 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.osf" format="2">
-  <advance width="635"/>
-  <anchor x="320" y="295" name="slash"/>
+  <advance width="641"/>
+  <anchor x="323" y="295" name="slash"/>
   <outline>
     <contour>
-      <point x="316" y="-8" type="curve" smooth="yes"/>
-      <point x="489" y="-8"/>
-      <point x="608" y="117"/>
-      <point x="608" y="301" type="curve" smooth="yes"/>
-      <point x="608" y="482"/>
-      <point x="491" y="604"/>
-      <point x="321" y="604" type="curve" smooth="yes"/>
-      <point x="146" y="604"/>
-      <point x="27" y="479"/>
-      <point x="27" y="296" type="curve" smooth="yes"/>
-      <point x="27" y="115"/>
-      <point x="144" y="-8"/>
+      <point x="319" y="-8" type="curve" smooth="yes"/>
+      <point x="492" y="-8"/>
+      <point x="611" y="117"/>
+      <point x="611" y="301" type="curve" smooth="yes"/>
+      <point x="611" y="482"/>
+      <point x="494" y="604"/>
+      <point x="324" y="604" type="curve" smooth="yes"/>
+      <point x="149" y="604"/>
+      <point x="30" y="479"/>
+      <point x="30" y="296" type="curve" smooth="yes"/>
+      <point x="30" y="115"/>
+      <point x="147" y="-8"/>
     </contour>
     <contour>
-      <point x="320" y="134" type="curve" smooth="yes"/>
-      <point x="246" y="134"/>
-      <point x="200" y="205"/>
-      <point x="200" y="300" type="curve" smooth="yes"/>
-      <point x="200" y="393"/>
-      <point x="246" y="461"/>
-      <point x="317" y="461" type="curve" smooth="yes"/>
-      <point x="388" y="461"/>
-      <point x="435" y="392"/>
-      <point x="435" y="294" type="curve" smooth="yes"/>
-      <point x="435" y="203"/>
-      <point x="389" y="134"/>
+      <point x="323" y="134" type="curve" smooth="yes"/>
+      <point x="249" y="134"/>
+      <point x="203" y="205"/>
+      <point x="203" y="300" type="curve" smooth="yes"/>
+      <point x="203" y="393"/>
+      <point x="249" y="461"/>
+      <point x="320" y="461" type="curve" smooth="yes"/>
+      <point x="391" y="461"/>
+      <point x="438" y="392"/>
+      <point x="438" y="294" type="curve" smooth="yes"/>
+      <point x="438" y="203"/>
+      <point x="392" y="134"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>zero</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>zero</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zero.osf.zero.glif 
b/src/Cantarell-Bold.ufo/glyphs/zero.osf.zero.glif
index 4e570b7b..8805008c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zero.osf.zero.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zero.osf.zero.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.osf.zero" format="2">
-  <advance width="635"/>
+  <advance width="641"/>
   <outline>
     <component base="zero.osf"/>
-    <component base="_slash.zero.osf" xOffset="101" yOffset="54"/>
+    <component base="_slash.zero.osf" xOffset="104" yOffset="54"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zero.tf.glif b/src/Cantarell-Bold.ufo/glyphs/zero.tf.glif
index ac86fef2..0a5ee818 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zero.tf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zero.tf.glif
@@ -1,36 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.tf" format="2">
-  <advance width="580"/>
-  <anchor x="292" y="345" name="slash"/>
+  <advance width="600"/>
   <outline>
-    <contour>
-      <point x="288" y="-10" type="curve" smooth="yes"/>
-      <point x="454" y="-10"/>
-      <point x="565" y="136"/>
-      <point x="565" y="349" type="curve" smooth="yes"/>
-      <point x="565" y="562"/>
-      <point x="455" y="704"/>
-      <point x="292" y="704" type="curve" smooth="yes"/>
-      <point x="127" y="704"/>
-      <point x="15" y="560"/>
-      <point x="15" y="344" type="curve" smooth="yes"/>
-      <point x="15" y="133"/>
-      <point x="125" y="-10"/>
-    </contour>
-    <contour>
-      <point x="291" y="138" type="curve" smooth="yes"/>
-      <point x="230" y="138"/>
-      <point x="188" y="222"/>
-      <point x="188" y="349" type="curve" smooth="yes"/>
-      <point x="188" y="474"/>
-      <point x="229" y="556"/>
-      <point x="289" y="556" type="curve" smooth="yes"/>
-      <point x="350" y="556"/>
-      <point x="392" y="471"/>
-      <point x="392" y="343" type="curve" smooth="yes"/>
-      <point x="392" y="220"/>
-      <point x="351" y="138"/>
-    </contour>
+    <component base="zero" xOffset="-16"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zero.tf.zero.glif b/src/Cantarell-Bold.ufo/glyphs/zero.tf.zero.glif
index 76455fc2..b26f37f1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zero.tf.zero.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zero.tf.zero.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.tf.zero" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <outline>
     <component base="zero.tf"/>
-    <component base="_slash.zero" xOffset="69" yOffset="104"/>
+    <component base="_slash.zero" xOffset="86" yOffset="104"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zero.zero.glif b/src/Cantarell-Bold.ufo/glyphs/zero.zero.glif
index 7fa8c27e..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="640"/>
+  <advance width="646"/>
   <outline>
     <component base="zero"/>
-    <component base="_slash.zero" xOffset="99" yOffset="104"/>
+    <component base="_slash.zero" xOffset="102" yOffset="104"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zeroinferior.glif b/src/Cantarell-Bold.ufo/glyphs/zeroinferior.glif
index 34c57b97..ccbe2b56 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zeroinferior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zeroinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zeroinferior" format="2">
-  <advance width="493"/>
+  <advance width="464"/>
   <unicode hex="2080"/>
   <outline>
     <component base="zero.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zerosuperior.glif b/src/Cantarell-Bold.ufo/glyphs/zerosuperior.glif
index 20dfaccd..6194b749 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zerosuperior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zerosuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zerosuperior" format="2">
-  <advance width="493"/>
+  <advance width="464"/>
   <unicode hex="2070"/>
   <outline>
     <component base="zero.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zerothird.glif b/src/Cantarell-Bold.ufo/glyphs/zerothird.glif
index a5f34408..6c27faab 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zerothird.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zerothird.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zerothird" format="2">
-  <advance width="1266"/>
+  <advance width="1125"/>
   <unicode hex="2189"/>
   <outline>
     <component base="zero.numr"/>
-    <component base="fraction" xOffset="493"/>
-    <component base="three.dnom" xOffset="831"/>
+    <component base="fraction" xOffset="464"/>
+    <component base="three.dnom" xOffset="713"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zhe-cy.glif b/src/Cantarell-Bold.ufo/glyphs/zhe-cy.glif
index 287205a7..79f4779d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zhe-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zhe-cy.glif
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zhe-cy" format="2">
-  <advance width="822"/>
+  <advance width="841"/>
   <unicode hex="0436"/>
-  <anchor x="693" y="0" name="bottomright"/>
-  <anchor x="411" y="490" name="top"/>
+  <anchor x="694" y="0" name="bottomright"/>
+  <anchor x="422" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="654" y="0" type="line"/>
-      <point x="830" y="0" type="line"/>
-      <point x="671" y="270" type="line"/>
-      <point x="674" y="247" type="line"/>
-      <point x="825" y="490" type="line"/>
-      <point x="643" y="490" type="line"/>
-      <point x="510" y="249" type="line"/>
+      <point x="0" y="0" type="line"/>
+      <point x="174" y="0" type="line"/>
+      <point x="327" y="246" type="line"/>
+      <point x="196" y="490" type="line"/>
+      <point x="13" y="490" type="line"/>
+      <point x="166" y="220" type="line"/>
+      <point x="164" y="243" type="line"/>
     </contour>
     <contour>
-      <point x="-11" y="0" type="line"/>
-      <point x="163" y="0" type="line"/>
-      <point x="316" y="246" type="line"/>
-      <point x="185" y="490" type="line"/>
-      <point x="2" y="490" type="line"/>
-      <point x="155" y="220" type="line"/>
-      <point x="153" y="243" type="line"/>
+      <point x="347" y="0" type="line"/>
+      <point x="501" y="0" type="line"/>
+      <point x="501" y="490" type="line"/>
+      <point x="347" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="270" y="180" type="line"/>
-      <point x="555" y="180" type="line"/>
-      <point x="555" y="313" type="line"/>
-      <point x="270" y="313" type="line"/>
+      <point x="281" y="180" type="line"/>
+      <point x="566" y="180" type="line"/>
+      <point x="566" y="313" type="line"/>
+      <point x="281" y="313" type="line"/>
     </contour>
     <contour>
-      <point x="336" y="0" type="line"/>
-      <point x="490" y="0" type="line"/>
-      <point x="490" y="490" type="line"/>
-      <point x="336" y="490" type="line"/>
+      <point x="665" y="0" type="line"/>
+      <point x="841" y="0" type="line"/>
+      <point x="682" y="270" type="line"/>
+      <point x="685" y="247" type="line"/>
+      <point x="836" y="490" type="line"/>
+      <point x="654" y="490" type="line"/>
+      <point x="521" y="249" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -47,6 +47,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zhebreve-cy.glif b/src/Cantarell-Bold.ufo/glyphs/zhebreve-cy.glif
index ea288e05..040bd4e9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zhebreve-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zhebreve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zhebreve-cy" format="2">
-  <advance width="822"/>
+  <advance width="841"/>
   <unicode hex="04C2"/>
   <outline>
     <component base="zhe-cy"/>
-    <component base="brevecomb-cy" xOffset="178"/>
+    <component base="brevecomb-cy" xOffset="189"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zhedescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/zhedescender-cy.glif
index 10347fb6..ffe963c6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zhedescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zhedescender-cy.glif
@@ -1,20 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zhedescender-cy" format="2">
-  <advance width="855"/>
+  <advance width="841"/>
   <unicode hex="0497"/>
   <outline>
     <component base="zhe-cy"/>
-    <component base="descender-cy" xOffset="597"/>
+    <component base="descender-cy" xOffset="598"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>zhe-cy</string>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>0</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>zhe-cy</string>
+      <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
+      <string>=zhe-cy+10</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zhedieresis-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/zhedieresis-cy.glif
index ba7a3838..f26a9728 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zhedieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zhedieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zhedieresis-cy" format="2">
-  <advance width="822"/>
+  <advance width="841"/>
   <unicode hex="04DD"/>
   <outline>
     <component base="zhe-cy"/>
-    <component base="dieresiscomb" xOffset="142"/>
+    <component base="dieresiscomb" xOffset="153"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/layercontents.plist b/src/Cantarell-Bold.ufo/layercontents.plist
index b6bbd64d..46d3522c 100644
--- a/src/Cantarell-Bold.ufo/layercontents.plist
+++ b/src/Cantarell-Bold.ufo/layercontents.plist
@@ -10,5 +10,65 @@
       <string>Template</string>
       <string>glyphs.T_emplate</string>
     </array>
+    <array>
+      <string>Outline</string>
+      <string>glyphs.O_utline</string>
+    </array>
+    <array>
+      <string>Wavy</string>
+      <string>glyphs.W_avy</string>
+    </array>
+    <array>
+      <string>Final Bent</string>
+      <string>glyphs.F_inal B_ent</string>
+    </array>
+    <array>
+      <string>Steeper</string>
+      <string>glyphs.S_teeper</string>
+    </array>
+    <array>
+      <string>Slanted</string>
+      <string>glyphs.S_lanted</string>
+    </array>
+    <array>
+      <string>May 11 19, 20:12</string>
+      <string>glyphs.M_ay 11 19, 20_12</string>
+    </array>
+    <array>
+      <string>May 5 19, 13:08</string>
+      <string>glyphs.M_ay 5 19, 13_08</string>
+    </array>
+    <array>
+      <string>May 11 19, 20:11</string>
+      <string>glyphs.M_ay 11 19, 20_11</string>
+    </array>
+    <array>
+      <string>May 11 19, 20:04</string>
+      <string>glyphs.M_ay 11 19, 20_04</string>
+    </array>
+    <array>
+      <string>May 11 19, 20:10</string>
+      <string>glyphs.M_ay 11 19, 20_10</string>
+    </array>
+    <array>
+      <string>May 11 19, 19:57</string>
+      <string>glyphs.M_ay 11 19, 19_57</string>
+    </array>
+    <array>
+      <string>May 11 19, 19:56</string>
+      <string>glyphs.M_ay 11 19, 19_56</string>
+    </array>
+    <array>
+      <string>May 11 19, 20:09</string>
+      <string>glyphs.M_ay 11 19, 20_09</string>
+    </array>
+    <array>
+      <string>Jun 8 19, 20:55</string>
+      <string>glyphs.J_un 8 19, 20_55</string>
+    </array>
+    <array>
+      <string>Jun 8 19, 20:46</string>
+      <string>glyphs.J_un 8 19, 20_46</string>
+    </array>
   </array>
 </plist>
diff --git a/src/Cantarell-Bold.ufo/lib.plist b/src/Cantarell-Bold.ufo/lib.plist
index 93c61c31..df47acbe 100644
--- a/src/Cantarell-Bold.ufo/lib.plist
+++ b/src/Cantarell-Bold.ufo/lib.plist
@@ -360,7 +360,6 @@
           <string>acutecomb</string>
           <string>acutecomb.case</string>
           <string>acutecomb.loclVIET</string>
-          <string>acutecomb_dotaccentcomb</string>
           <string>adblgrave</string>
           <string>adieresis</string>
           <string>adieresis-cy</string>
@@ -385,14 +384,6 @@
           <string>brevecomb-cy.case</string>
           <string>brevecomb.case</string>
           <string>brevecomb.loclVIET</string>
-          <string>brevecomb_acutecomb</string>
-          <string>brevecomb_acutecomb.case</string>
-          <string>brevecomb_gravecomb</string>
-          <string>brevecomb_gravecomb.case</string>
-          <string>brevecomb_hookabovecomb</string>
-          <string>brevecomb_hookabovecomb.case</string>
-          <string>brevecomb_tildecomb</string>
-          <string>brevecomb_tildecomb.case</string>
           <string>breveinvertedcomb</string>
           <string>breveinvertedcomb.case</string>
           <string>c</string>
@@ -402,7 +393,6 @@
           <string>caroncomb.alt</string>
           <string>caroncomb.case</string>
           <string>caroncomb.loclVIET</string>
-          <string>caroncomb_dotaccentcomb</string>
           <string>ccaron</string>
           <string>ccedilla</string>
           <string>ccedillaacute</string>
@@ -418,14 +408,6 @@
           <string>circumflexcomb</string>
           <string>circumflexcomb.case</string>
           <string>circumflexcomb.loclVIET</string>
-          <string>circumflexcomb_acutecomb</string>
-          <string>circumflexcomb_acutecomb.case</string>
-          <string>circumflexcomb_gravecomb</string>
-          <string>circumflexcomb_gravecomb.case</string>
-          <string>circumflexcomb_hookabovecomb</string>
-          <string>circumflexcomb_hookabovecomb.case</string>
-          <string>circumflexcomb_tildecomb</string>
-          <string>circumflexcomb_tildecomb.case</string>
           <string>commaaccentcomb</string>
           <string>commaturnedabovecomb</string>
           <string>commaturnedmod</string>
@@ -443,16 +425,11 @@
           <string>dieresiscomb</string>
           <string>dieresiscomb.case</string>
           <string>dieresiscomb.loclVIET</string>
-          <string>dieresiscomb_acutecomb</string>
-          <string>dieresiscomb_caroncomb</string>
-          <string>dieresiscomb_gravecomb</string>
-          <string>dieresiscomb_macroncomb</string>
           <string>dje-cy</string>
           <string>dlinebelow</string>
           <string>dotaccentcomb</string>
           <string>dotaccentcomb.case</string>
           <string>dotaccentcomb.loclVIET</string>
-          <string>dotaccentcomb_macroncomb</string>
           <string>dotbelowcomb</string>
           <string>doubleprimemod</string>
           <string>dze-cy</string>
@@ -574,6 +551,7 @@
           <string>kgreenlandic</string>
           <string>kje-cy</string>
           <string>l</string>
+          <string>l.ss01</string>
           <string>lacute</string>
           <string>lcaron</string>
           <string>lcommaaccent</string>
@@ -589,9 +567,6 @@
           <string>macroncomb.loclVIET</string>
           <string>macroncomb.narrow</string>
           <string>macroncomb.narrow.case</string>
-          <string>macroncomb_acutecomb</string>
-          <string>macroncomb_dieresiscomb</string>
-          <string>macroncomb_gravecomb</string>
           <string>mdotbelow</string>
           <string>n</string>
           <string>nacute</string>
@@ -706,9 +681,6 @@
           <string>tildecomb</string>
           <string>tildecomb.case</string>
           <string>tildecomb.loclVIET</string>
-          <string>tildecomb_acutecomb</string>
-          <string>tildecomb_dieresiscomb</string>
-          <string>tildecomb_macroncomb</string>
           <string>tlinebelow</string>
           <string>tse-cy</string>
           <string>tshe-cy</string>
@@ -791,7 +763,7 @@
         <key>name</key>
         <string>propagateAnchors</string>
         <key>pre</key>
-        <true/>
+        <integer>1</integer>
       </dict>
     </array>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.Schwa</key>
@@ -874,14 +846,6 @@
         <string>eight.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.eight.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>eight.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.el-cy</key>
     <dict>
       <key>RMXScaler</key>
@@ -930,14 +894,6 @@
         <string>five.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.five.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>five.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.four.dnom</key>
     <dict>
       <key>RMXScaler</key>
@@ -954,14 +910,6 @@
         <string>four.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.four.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>four.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.ge-cy</key>
     <dict>
       <key>RMXScaler</key>
@@ -1058,20 +1006,12 @@
         <string>nine.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.nine.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>nine</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.one.dnom</key>
     <dict>
       <key>RMXScaler</key>
       <dict>
         <key>source</key>
-        <string>one.lf</string>
+        <string>one</string>
       </dict>
     </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.one.tf</key>
@@ -1082,14 +1022,6 @@
         <string>one.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.one.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>one.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.ordfeminine</key>
     <dict>
       <key>RMXScaler</key>
@@ -1130,14 +1062,6 @@
         <string>seven.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.seven.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>seven.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.sha-cy</key>
     <dict>
       <key>RMXScaler</key>
@@ -1170,14 +1094,6 @@
         <string>six.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.six.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>six</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.softsign-cy</key>
     <dict>
       <key>RMXScaler</key>
@@ -1210,14 +1126,6 @@
         <string>three.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.three.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>three.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.tildecomb.loclVIET</key>
     <dict>
       <key>RMXScaler</key>
@@ -1250,14 +1158,6 @@
         <string>two.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.two.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>two.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.ve-cy</key>
     <dict>
       <key>RMXScaler</key>
@@ -1306,14 +1206,6 @@
         <string>zero.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.zero.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>zero.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.zhe-cy</key>
     <dict>
       <key>RMXScaler</key>
@@ -1323,7 +1215,7 @@
       </dict>
     </dict>
     <key>com.schriftgestaltung.appVersion</key>
-    <string>1230</string>
+    <string>1271</string>
     <key>com.schriftgestaltung.customParameter.GSFont.Family Alignment Zones</key>
     <array>
       <string>{739, 10}</string>
@@ -1333,7 +1225,7 @@
       <string>{-217, -12}</string>
     </array>
     <key>com.schriftgestaltung.customParameter.GSFont.disablesAutomaticAlignment</key>
-    <true/>
+    <false/>
     <key>com.schriftgestaltung.customParameter.GSFont.disablesLastChange</key>
     <true/>
     <key>com.schriftgestaltung.customParameter.GSFont.useNiceNames</key>
@@ -1349,7 +1241,7 @@
     <key>com.schriftgestaltung.customParameter.GSFontMaster.iconName</key>
     <string></string>
     <key>com.schriftgestaltung.customParameter.GSFontMaster.paramArea</key>
-    <string>260</string>
+    <string>300</string>
     <key>com.schriftgestaltung.customParameter.GSFontMaster.paramDepth</key>
     <string>16</string>
     <key>com.schriftgestaltung.customParameter.GSFontMaster.paramOver</key>
@@ -1863,9 +1755,7 @@
       <string>zcaron</string>
       <string>zdotaccent</string>
       <string>zdotbelow</string>
-      <string>f_f</string>
-      <string>f_f_i</string>
-      <string>f_f_l</string>
+      <string>l.ss01</string>
       <string>fi</string>
       <string>fl</string>
       <string>ordfeminine</string>
@@ -2063,6 +1953,7 @@
       <string>seven</string>
       <string>eight</string>
       <string>nine</string>
+      <string>zero.zero</string>
       <string>zero.osf</string>
       <string>one.osf</string>
       <string>two.osf</string>
@@ -2085,18 +1976,6 @@
       <string>eight.tf</string>
       <string>nine.tf</string>
       <string>zero.tf.zero</string>
-      <string>zero.tosf</string>
-      <string>one.tosf</string>
-      <string>two.tosf</string>
-      <string>three.tosf</string>
-      <string>four.tosf</string>
-      <string>five.tosf</string>
-      <string>six.tosf</string>
-      <string>seven.tosf</string>
-      <string>eight.tosf</string>
-      <string>nine.tosf</string>
-      <string>zero.tosf.zero</string>
-      <string>zero.zero</string>
       <string>zeroinferior</string>
       <string>oneinferior</string>
       <string>twoinferior</string>
@@ -2182,13 +2061,9 @@
       <string>bracketleft</string>
       <string>bracketright</string>
       <string>hyphen</string>
-      <string>softhyphen</string>
       <string>endash</string>
       <string>emdash</string>
       <string>figuredash</string>
-      <string>horizontalbar</string>
-      <string>hyphentwo</string>
-      <string>nonbreakinghyphen</string>
       <string>underscore</string>
       <string>quotesinglbase</string>
       <string>quotedblbase</string>
@@ -2206,9 +2081,7 @@
       <string>quotesingle</string>
       <string>leftanglebracket-math</string>
       <string>rightanglebracket-math</string>
-      <string>emquad</string>
       <string>emspace</string>
-      <string>enquad</string>
       <string>enspace</string>
       <string>figurespace</string>
       <string>fourperemspace</string>
@@ -2216,7 +2089,6 @@
       <string>punctuationspace</string>
       <string>sixperemspace</string>
       <string>space</string>
-      <string>nbspace</string>
       <string>thinspace</string>
       <string>threeperemspace</string>
       <string>zerowidthspace</string>
@@ -2230,6 +2102,7 @@
       <string>florin</string>
       <string>franc</string>
       <string>guarani</string>
+      <string>hryvnia</string>
       <string>kip</string>
       <string>lira</string>
       <string>liraTurkish</string>
@@ -2240,11 +2113,10 @@
       <string>ruble</string>
       <string>rupeeIndian</string>
       <string>sterling</string>
-      <string>won</string>
-      <string>yen</string>
-      <string>hryvnia</string>
       <string>tenge</string>
       <string>tugrik</string>
+      <string>won</string>
+      <string>yen</string>
       <string>bulletoperator</string>
       <string>commercialMinusSign</string>
       <string>divisionslash</string>
@@ -2262,8 +2134,8 @@
       <string>lessequal</string>
       <string>plusminus</string>
       <string>approxequal</string>
-      <string>logicalnot</string>
       <string>asciitilde</string>
+      <string>logicalnot</string>
       <string>asciicircum</string>
       <string>emptyset</string>
       <string>infinity</string>
@@ -2278,24 +2150,6 @@
       <string>percent</string>
       <string>perthousand</string>
       <string>ratio</string>
-      <string>bulletoperator.tf</string>
-      <string>commercialMinusSign.tf</string>
-      <string>divisionslash.tf</string>
-      <string>equivalence.tf</string>
-      <string>notidentical.tf</string>
-      <string>plus.tf</string>
-      <string>minus.tf</string>
-      <string>multiply.tf</string>
-      <string>divide.tf</string>
-      <string>equal.tf</string>
-      <string>notequal.tf</string>
-      <string>greater.tf</string>
-      <string>less.tf</string>
-      <string>greaterequal.tf</string>
-      <string>lessequal.tf</string>
-      <string>plusminus.tf</string>
-      <string>approxequal.tf</string>
-      <string>logicalnot.tf</string>
       <string>upArrow</string>
       <string>rightArrow</string>
       <string>downArrow</string>
@@ -2333,31 +2187,18 @@
       <string>verticallinelowmod</string>
       <string>verticallinemod</string>
       <string>dieresiscomb</string>
-      <string>dieresiscomb_gravecomb</string>
-      <string>dieresiscomb_acutecomb</string>
-      <string>dieresiscomb_caroncomb</string>
-      <string>dieresiscomb_macroncomb</string>
       <string>dotaccentcomb</string>
-      <string>dotaccentcomb_macroncomb</string>
       <string>gravecomb</string>
       <string>acutecomb</string>
-      <string>acutecomb_dotaccentcomb</string>
       <string>hungarumlautcomb</string>
       <string>caroncomb.alt</string>
       <string>circumflexcomb</string>
       <string>caroncomb</string>
-      <string>caroncomb_dotaccentcomb</string>
       <string>brevecomb</string>
       <string>ringcomb</string>
       <string>ringcomb_acutecomb</string>
       <string>tildecomb</string>
-      <string>tildecomb_dieresiscomb</string>
-      <string>tildecomb_acutecomb</string>
-      <string>tildecomb_macroncomb</string>
       <string>macroncomb</string>
-      <string>macroncomb_dieresiscomb</string>
-      <string>macroncomb_gravecomb</string>
-      <string>macroncomb_acutecomb</string>
       <string>hookabovecomb</string>
       <string>verticallineabovecomb</string>
       <string>dblgravecomb</string>
@@ -2376,19 +2217,19 @@
       <string>strokelongcomb</string>
       <string>slashshortcomb</string>
       <string>slashlongcomb</string>
-      <string>acute</string>
-      <string>breve</string>
-      <string>caron</string>
-      <string>cedilla</string>
-      <string>circumflex</string>
       <string>dieresis</string>
       <string>dotaccent</string>
       <string>grave</string>
+      <string>acute</string>
       <string>hungarumlaut</string>
-      <string>macron</string>
-      <string>ogonek</string>
+      <string>circumflex</string>
+      <string>caron</string>
+      <string>breve</string>
       <string>ring</string>
       <string>tilde</string>
+      <string>macron</string>
+      <string>cedilla</string>
+      <string>ogonek</string>
       <string>dieresiscomb.case</string>
       <string>dotaccentcomb.case</string>
       <string>gravecomb.case</string>
@@ -2428,28 +2269,11 @@
       <string>brevecomb-cy.case</string>
       <string>descender-cy.case</string>
       <string>descender-cy.strait</string>
-      <string>brevecomb_acutecomb</string>
-      <string>brevecomb_gravecomb</string>
-      <string>brevecomb_hookabovecomb</string>
-      <string>brevecomb_tildecomb</string>
-      <string>circumflexcomb_acutecomb</string>
-      <string>circumflexcomb_gravecomb</string>
-      <string>circumflexcomb_hookabovecomb</string>
-      <string>circumflexcomb_tildecomb</string>
-      <string>brevecomb_acutecomb.case</string>
-      <string>brevecomb_gravecomb.case</string>
-      <string>brevecomb_hookabovecomb.case</string>
-      <string>brevecomb_tildecomb.case</string>
-      <string>circumflexcomb_acutecomb.case</string>
-      <string>circumflexcomb_gravecomb.case</string>
-      <string>circumflexcomb_hookabovecomb.case</string>
-      <string>circumflexcomb_tildecomb.case</string>
       <string>_descenderreversed-cy</string>
       <string>_bar-cy</string>
       <string>_descender-cy.case.straight</string>
       <string>_descenderreverse-cy.case</string>
       <string>_bottomhook</string>
-      <string>_o.numero</string>
       <string>_slash.zero</string>
       <string>_typoquote</string>
       <string>_commaaccent</string>
@@ -2918,8 +2742,6 @@
       <string>uni1EA9</string>
       <key>acircumflextilde</key>
       <string>uni1EAB</string>
-      <key>acutecomb_dotaccentcomb</key>
-      <string>uni03010307</string>
       <key>adblgrave</key>
       <string>uni0201</string>
       <key>adieresis-cy</key>
@@ -2952,29 +2774,11 @@
       <string>uni0306.case</string>
       <key>brevecomb.loclVIET</key>
       <string>uni0306.loclVIET</string>
-      <key>brevecomb_acutecomb</key>
-      <string>uni03060301</string>
-      <key>brevecomb_acutecomb.case</key>
-      <string>uni03060301.case</string>
-      <key>brevecomb_gravecomb</key>
-      <string>uni03060300</string>
-      <key>brevecomb_gravecomb.case</key>
-      <string>uni03060300.case</string>
-      <key>brevecomb_hookabovecomb</key>
-      <string>uni03060309</string>
-      <key>brevecomb_hookabovecomb.case</key>
-      <string>uni03060309.case</string>
-      <key>brevecomb_tildecomb</key>
-      <string>uni03060303</string>
-      <key>brevecomb_tildecomb.case</key>
-      <string>uni03060303.case</string>
       <key>breveinvertedcomb</key>
       <string>uni0311</string>
       <key>breveinvertedcomb.case</key>
       <string>uni0311.case</string>
       <key>bulletoperator</key>
-      <string>uni2219</string>
-      <key>bulletoperator.tf</key>
       <string>uni2219.tf</string>
       <key>caroncomb</key>
       <string>uni030C</string>
@@ -2984,8 +2788,6 @@
       <string>uni030C.case</string>
       <key>caroncomb.loclVIET</key>
       <string>uni030C.loclVIET</string>
-      <key>caroncomb_dotaccentcomb</key>
-      <string>uni030C0307</string>
       <key>ccedillaacute</key>
       <string>uni1E09</string>
       <key>cedi</key>
@@ -3008,22 +2810,6 @@
       <string>uni0302.case</string>
       <key>circumflexcomb.loclVIET</key>
       <string>uni0302.loclVIET</string>
-      <key>circumflexcomb_acutecomb</key>
-      <string>uni03020301</string>
-      <key>circumflexcomb_acutecomb.case</key>
-      <string>uni03020301.case</string>
-      <key>circumflexcomb_gravecomb</key>
-      <string>uni03020300</string>
-      <key>circumflexcomb_gravecomb.case</key>
-      <string>uni03020300.case</string>
-      <key>circumflexcomb_hookabovecomb</key>
-      <string>uni03020309</string>
-      <key>circumflexcomb_hookabovecomb.case</key>
-      <string>uni03020309.case</string>
-      <key>circumflexcomb_tildecomb</key>
-      <string>uni03020303</string>
-      <key>circumflexcomb_tildecomb.case</key>
-      <string>uni03020303.case</string>
       <key>colonsign</key>
       <string>colonmonetary</string>
       <key>commaaccentcomb</key>
@@ -3033,8 +2819,6 @@
       <key>commaturnedmod</key>
       <string>uni02BB</string>
       <key>commercialMinusSign</key>
-      <string>uni2052</string>
-      <key>commercialMinusSign.tf</key>
       <string>uni2052.tf</string>
       <key>dblgravecomb</key>
       <string>uni030F</string>
@@ -3058,17 +2842,7 @@
       <string>uni0308.case</string>
       <key>dieresiscomb.loclVIET</key>
       <string>uni0308.loclVIET</string>
-      <key>dieresiscomb_acutecomb</key>
-      <string>uni03080301</string>
-      <key>dieresiscomb_caroncomb</key>
-      <string>uni0308030C</string>
-      <key>dieresiscomb_gravecomb</key>
-      <string>uni03080300</string>
-      <key>dieresiscomb_macroncomb</key>
-      <string>uni03080304</string>
       <key>divisionslash</key>
-      <string>uni2215</string>
-      <key>divisionslash.tf</key>
       <string>uni2215.tf</string>
       <key>dje-cy</key>
       <string>uni0452</string>
@@ -3080,8 +2854,6 @@
       <string>uni0307.case</string>
       <key>dotaccentcomb.loclVIET</key>
       <string>uni0307.loclVIET</string>
-      <key>dotaccentcomb_macroncomb</key>
-      <string>uni03070304</string>
       <key>doubleprimemod</key>
       <string>uni02BA</string>
       <key>downArrow</key>
@@ -3128,8 +2900,6 @@
       <string>uni1E17</string>
       <key>emacrongrave</key>
       <string>uni1E15</string>
-      <key>emquad</key>
-      <string>uni2001</string>
       <key>emspace</key>
       <string>uni2003</string>
       <key>en-cy</key>
@@ -3138,8 +2908,6 @@
       <string>uni04A3</string>
       <key>enghe-cy</key>
       <string>uni04A5</string>
-      <key>enquad</key>
-      <string>uni2000</string>
       <key>enspace</key>
       <string>uni2002</string>
       <key>er-cy</key>
@@ -3210,8 +2978,6 @@
       <string>uni1E2B</string>
       <key>hdotbelow</key>
       <string>uni1E25</string>
-      <key>horizontalbar</key>
-      <string>uni2015</string>
       <key>horncomb</key>
       <string>uni031B</string>
       <key>hryvnia</key>
@@ -3220,8 +2986,6 @@
       <string>uni030B</string>
       <key>hungarumlautcomb.case</key>
       <string>uni030B.case</string>
-      <key>hyphentwo</key>
-      <string>uni2010</string>
       <key>i-cy</key>
       <string>uni0456</string>
       <key>ia-cy</key>
@@ -3320,12 +3084,6 @@
       <string>uni0304.narrow</string>
       <key>macroncomb.narrow.case</key>
       <string>uni0304.narrow.case</string>
-      <key>macroncomb_acutecomb</key>
-      <string>uni03040301</string>
-      <key>macroncomb_dieresiscomb</key>
-      <string>uni03040308</string>
-      <key>macroncomb_gravecomb</key>
-      <string>uni03040300</string>
       <key>manat</key>
       <string>uni20BC</string>
       <key>mdotbelow</key>
@@ -3334,8 +3092,6 @@
       <string>uni00B5</string>
       <key>naira</key>
       <string>uni20A6</string>
-      <key>nbspace</key>
-      <string>uni00A0</string>
       <key>ncommaaccent</key>
       <string>uni0146</string>
       <key>ndotaccent</key>
@@ -3352,11 +3108,7 @@
       <string>uni045A</string>
       <key>nlinebelow</key>
       <string>uni1E49</string>
-      <key>nonbreakinghyphen</key>
-      <string>uni2011</string>
       <key>notidentical</key>
-      <string>uni2262</string>
-      <key>notidentical.tf</key>
       <string>uni2262.tf</string>
       <key>numero</key>
       <string>uni2116</string>
@@ -3528,8 +3280,6 @@
       <string>uni0337</string>
       <key>slashshortcomb.case</key>
       <string>uni0337.case</string>
-      <key>softhyphen</key>
-      <string>uni00AD</string>
       <key>softsign-cy</key>
       <string>uni044C</string>
       <key>strokelongcomb</key>
@@ -3560,10 +3310,6 @@
       <string>uni2004</string>
       <key>threesuperior</key>
       <string>uni00B3</string>
-      <key>tildecomb_dieresiscomb</key>
-      <string>uni03030308</string>
-      <key>tildecomb_macroncomb</key>
-      <string>uni03030304</string>
       <key>tlinebelow</key>
       <string>uni1E6F</string>
       <key>tripleprime</key>
@@ -3700,13 +3446,9 @@
       <string>_descender-cy.case.straight</string>
       <string>_descenderreverse-cy.case</string>
       <string>_descenderreversed-cy</string>
-      <string>_o.numero</string>
       <string>_slash.zero</string>
       <string>_slash.zero.osf</string>
       <string>_typoquote</string>
-      <string>hryvnia</string>
-      <string>tenge</string>
-      <string>tugrik</string>
     </array>
   </dict>
 </plist>
diff --git a/src/Cantarell-Light.ufo/features.fea b/src/Cantarell-Light.ufo/features.fea
index 07a3eaaf..81c2a25c 100644
--- a/src/Cantarell-Light.ufo/features.fea
+++ b/src/Cantarell-Light.ufo/features.fea
@@ -4,25 +4,25 @@
 # Prefix: Languagesystems
 # automatic
 languagesystem DFLT dflt;
+
 languagesystem latn dflt;
-languagesystem cyrl dflt;
-languagesystem latn NLD;
-languagesystem latn CAT;
 languagesystem latn ROM;
 languagesystem latn MOL;
 languagesystem latn KAZ;
+languagesystem latn TAT;
 languagesystem latn TRK;
 languagesystem latn CRT;
 languagesystem latn AZE;
-languagesystem cyrl TAT;
+languagesystem latn NLD;
+languagesystem latn CAT;
 
 
 # Prefix: GDEF
 table GDEF {
   GlyphClassDef
-    [A Aacute Abreve Abreveacute Abrevedotbelow Abrevegrave Abrevehookabove Abrevetilde Acaron Acircumflex 
Acircumflexacute Acircumflexdotbelow Acircumflexgrave Acircumflexhookabove Acircumflextilde Adblgrave 
Adieresis Adotbelow Agrave Ahookabove Ainvertedbreve Amacron Aogonek Aring Aringacute Atilde AE AEacute B C 
Cacute Ccaron Ccedilla Ccedillaacute Ccircumflex Cdotaccent D Eth Dcaron Dcroat Ddotbelow Dlinebelow E Eacute 
Ebreve Ecaron Ecedillabreve Ecircumflex Ecircumflexacute Ecircumflexdotbelow Ecircumflexgrave 
Ecircumflexhookabove Ecircumflextilde Edblgrave Edieresis Edotaccent Edotbelow Egrave Ehookabove 
Einvertedbreve Emacron Emacronacute Emacrongrave Eogonek Etilde F G Gbreve Gcaron Gcircumflex Gcommaaccent 
Gdotaccent Gmacron H Hbar Hbrevebelow Hcircumflex Hdotbelow I Iacute Ibreve Icaron Icircumflex Idblgrave 
Idieresis Idieresisacute Idotaccent Idotbelow Igrave Ihookabove Iinvertedbreve Imacron Iogonek Itilde J 
Jacute Jcircumflex K Kacute Kcommaaccent L Lacute Lcaro
 n Lcomma
 accent Ldotbelow Llinebelow Lslash M Mdotbelow N Nacute Ncaron Ncommaaccent Ndotaccent Ndotbelow Nlinebelow 
Ntilde O Oacute Obreve Ocaron Ocircumflex Ocircumflexacute Ocircumflexdotbelow Ocircumflexgrave 
Ocircumflexhookabove Ocircumflextilde Odblgrave Odieresis Odieresismacron Odotaccentmacron Odotbelow Ograve 
Ohookabove Ohorn Ohornacute Ohorndotbelow Ohorngrave Ohornhookabove Ohorntilde Ohungarumlaut Oinvertedbreve 
Omacron Omacronacute Omacrongrave Oogonek Oslash Oslashacute Otilde Otildeacute Otildedieresis Otildemacron 
OE P Q R Racute Rcaron Rcommaaccent Rdblgrave Rdotbelow Rinvertedbreve Rlinebelow S Sacute Sacutedotaccent 
Scaron Scarondotaccent Scedilla Scircumflex Scommaaccent Sdotaccent Sdotbelow Sdotbelowdotaccent Schwa T Tbar 
Tcaron Tcedilla Tcommaaccent Tdotbelow Tlinebelow U Uacute Ubreve Ucaron Ucircumflex Udblgrave Udieresis 
Udieresisacute Udieresiscaron Udieresisgrave Udieresismacron Udotbelow Ugrave Uhookabove Uhorn Uhornacute 
Uhorndotbelow Uhorngrave Uhornhoo
 kabove U
 horntilde Uhungarumlaut Uinvertedbreve Umacron Umacrondieresis Uogonek Uring Utilde Utildeacute V W Wacute 
Wcircumflex Wdieresis Wgrave X Y Yacute Ycircumflex Ydieresis Ydotaccent Ydotbelow Ygrave Yhookabove Ymacron 
Ytilde Z Zacute Zcaron Zdotaccent Zdotbelow a aacute abreve abreveacute abrevedotbelow abrevegrave 
abrevehookabove abrevetilde acaron acircumflex acircumflexacute acircumflexdotbelow acircumflexgrave 
acircumflexhookabove acircumflextilde adblgrave adieresis adotbelow agrave ahookabove ainvertedbreve amacron 
aogonek aring aringacute atilde ae aeacute b c cacute ccaron ccedilla ccedillaacute ccircumflex cdotaccent d 
dcaron dcroat ddotbelow dlinebelow e eacute ebreve ecaron ecedillabreve ecircumflex ecircumflexacute 
ecircumflexdotbelow ecircumflexgrave ecircumflexhookabove ecircumflextilde edblgrave edieresis edotaccent 
edotbelow egrave ehookabove einvertedbreve emacron emacronacute emacrongrave eogonek etilde schwa f g gbreve 
gcaron gcircumflex gcommaaccent gdotacc
 ent gmac
 ron h hbar hbrevebelow hcircumflex hdotbelow i idotless iacute ibreve icaron icircumflex idblgrave idieresis 
idieresisacute idotaccent idotbelow igrave ihookabove iinvertedbreve imacron iogonek itilde j jdotless jacute 
jcircumflex k kacute kcommaaccent l lacute lcaron lcommaaccent ldotbelow llinebelow lslash m mdotbelow n 
nacute ncaron ncommaaccent ndotaccent ndotbelow nlinebelow ntilde o oacute obreve ocaron ocircumflex 
ocircumflexacute ocircumflexdotbelow ocircumflexgrave ocircumflexhookabove ocircumflextilde odblgrave 
odieresis odieresismacron odotaccentmacron odotbelow ograve ohookabove ohorn ohornacute ohorndotbelow 
ohorngrave ohornhookabove ohorntilde ohungarumlaut oinvertedbreve omacron omacronacute omacrongrave oogonek 
oslash oslashacute otilde otildeacute otildedieresis otildemacron oe p q r racute rcaron rcommaaccent 
rdblgrave rdotbelow rinvertedbreve rlinebelow s sacute sacutedotaccent scaron scarondotaccent scedilla 
scircumflex scommaaccent sdotaccent sdotbelow s
 dotbelow
 dotaccent t tbar tcaron tcedilla tcommaaccent tdieresis tdotbelow tlinebelow u uacute ubreve ucaron 
ucircumflex udblgrave udieresis udieresisacute udieresiscaron udieresisgrave udieresismacron udotbelow ugrave 
uhookabove uhorn uhornacute uhorndotbelow uhorngrave uhornhookabove uhorntilde uhungarumlaut uinvertedbreve 
umacron umacrondieresis uogonek uring utilde utildeacute v w wacute wcircumflex wdieresis wgrave x y yacute 
ycircumflex ydieresis ydotaccent ydotbelow ygrave yhookabove ymacron ytilde z zacute zcaron zdotaccent 
zdotbelow A-cy Ve-cy Ge-cy Gje-cy Ie-cy Iegrave-cy Io-cy Zhe-cy Ze-cy Ii-cy Iishort-cy Iigrave-cy Ka-cy 
Kje-cy Em-cy En-cy O-cy Pe-cy Er-cy Es-cy Te-cy U-cy Ushort-cy Ha-cy Che-cy Hardsign-cy Yeru-cy Dze-cy 
Ereversed-cy I-cy Yi-cy Je-cy Iu-cy Ia-cy Fita-cy Zhedescender-cy Zedescender-cy Kadescender-cy 
Endescender-cy Esdescender-cy Ustraight-cy Ustraightstroke-cy Hadescender-cy Chedescender-cy Palochka-cy 
Zhebreve-cy Chekhakassian-cy Abreve-cy Adieresis-cy 
 Aie-cy I
 ebreve-cy Schwa-cy Zhedieresis-cy Zedieresis-cy Imacron-cy Idieresis-cy Odieresis-cy Obarred-cy Umacron-cy 
Udieresis-cy Uhungarumlaut-cy Chedieresis-cy Gedescender-cy Yerudieresis-cy Qa-cy We-cy a-cy ge-cy gje-cy 
ie-cy iegrave-cy io-cy zhe-cy ze-cy ii-cy iishort-cy iigrave-cy ka-cy kje-cy en-cy o-cy pe-cy er-cy es-cy 
te-cy u-cy ushort-cy ha-cy che-cy yeru-cy dze-cy e-cy ereversed-cy i-cy yi-cy je-cy tshe-cy iu-cy ia-cy 
dje-cy fita-cy zhedescender-cy zedescender-cy kadescender-cy endescender-cy esdescender-cy ustraight-cy 
ustraightstroke-cy hadescender-cy chedescender-cy shha-cy palochka-cy zhebreve-cy chekhakassian-cy abreve-cy 
adieresis-cy aie-cy iebreve-cy schwa-cy zhedieresis-cy zedieresis-cy imacron-cy idieresis-cy odieresis-cy 
obarred-cy umacron-cy udieresis-cy uhungarumlaut-cy chedieresis-cy gedescender-cy yerudieresis-cy qa-cy 
we-cy], # Base
+    [A Aacute Abreve Abreveacute Abrevedotbelow Abrevegrave Abrevehookabove Abrevetilde Acaron Acircumflex 
Acircumflexacute Acircumflexdotbelow Acircumflexgrave Acircumflexhookabove Acircumflextilde Adblgrave 
Adieresis Adotbelow Agrave Ahookabove Ainvertedbreve Amacron Aogonek Aring Aringacute Atilde AE AEacute B C 
Cacute Ccaron Ccedilla Ccedillaacute Ccircumflex Cdotaccent D Eth Dcaron Dcroat Ddotbelow Dlinebelow E Eacute 
Ebreve Ecaron Ecedillabreve Ecircumflex Ecircumflexacute Ecircumflexdotbelow Ecircumflexgrave 
Ecircumflexhookabove Ecircumflextilde Edblgrave Edieresis Edotaccent Edotbelow Egrave Ehookabove 
Einvertedbreve Emacron Emacronacute Emacrongrave Eogonek Etilde F G Gbreve Gcaron Gcircumflex Gcommaaccent 
Gdotaccent Gmacron H Hbar Hbrevebelow Hcircumflex Hdotbelow I Iacute Ibreve Icaron Icircumflex Idblgrave 
Idieresis Idieresisacute Idotaccent Idotbelow Igrave Ihookabove Iinvertedbreve Imacron Iogonek Itilde J 
Jacute Jcircumflex K Kacute Kcommaaccent L Lacute Lcaro
 n Lcomma
 accent Ldotbelow Llinebelow Lslash M Mdotbelow N Nacute Ncaron Ncommaaccent Ndotaccent Ndotbelow Nlinebelow 
Ntilde O Oacute Obreve Ocaron Ocircumflex Ocircumflexacute Ocircumflexdotbelow Ocircumflexgrave 
Ocircumflexhookabove Ocircumflextilde Odblgrave Odieresis Odieresismacron Odotaccentmacron Odotbelow Ograve 
Ohookabove Ohorn Ohornacute Ohorndotbelow Ohorngrave Ohornhookabove Ohorntilde Ohungarumlaut Oinvertedbreve 
Omacron Omacronacute Omacrongrave Oogonek Oslash Oslashacute Otilde Otildeacute Otildedieresis Otildemacron 
OE P Q R Racute Rcaron Rcommaaccent Rdblgrave Rdotbelow Rinvertedbreve Rlinebelow S Sacute Sacutedotaccent 
Scaron Scarondotaccent Scedilla Scircumflex Scommaaccent Sdotaccent Sdotbelow Sdotbelowdotaccent Schwa T Tbar 
Tcaron Tcedilla Tcommaaccent Tdotbelow Tlinebelow U Uacute Ubreve Ucaron Ucircumflex Udblgrave Udieresis 
Udieresisacute Udieresiscaron Udieresisgrave Udieresismacron Udotbelow Ugrave Uhookabove Uhorn Uhornacute 
Uhorndotbelow Uhorngrave Uhornhoo
 kabove U
 horntilde Uhungarumlaut Uinvertedbreve Umacron Umacrondieresis Uogonek Uring Utilde Utildeacute V W Wacute 
Wcircumflex Wdieresis Wgrave X Y Yacute Ycircumflex Ydieresis Ydotaccent Ydotbelow Ygrave Yhookabove Ymacron 
Ytilde Z Zacute Zcaron Zdotaccent Zdotbelow a aacute abreve abreveacute abrevedotbelow abrevegrave 
abrevehookabove abrevetilde acaron acircumflex acircumflexacute acircumflexdotbelow acircumflexgrave 
acircumflexhookabove acircumflextilde adblgrave adieresis adotbelow agrave ahookabove ainvertedbreve amacron 
aogonek aring aringacute atilde ae aeacute b c cacute ccaron ccedilla ccedillaacute ccircumflex cdotaccent d 
dcaron dcroat ddotbelow dlinebelow e eacute ebreve ecaron ecedillabreve ecircumflex ecircumflexacute 
ecircumflexdotbelow ecircumflexgrave ecircumflexhookabove ecircumflextilde edblgrave edieresis edotaccent 
edotbelow egrave ehookabove einvertedbreve emacron emacronacute emacrongrave eogonek etilde schwa f g gbreve 
gcaron gcircumflex gcommaaccent gdotacc
 ent gmac
 ron h hbar hbrevebelow hcircumflex hdotbelow i idotless iacute ibreve icaron icircumflex idblgrave idieresis 
idieresisacute idotaccent idotbelow igrave ihookabove iinvertedbreve imacron iogonek itilde j jdotless jacute 
jcircumflex k kacute kcommaaccent l lacute lcaron lcommaaccent ldotbelow llinebelow lslash m mdotbelow n 
nacute ncaron ncommaaccent ndotaccent ndotbelow nlinebelow ntilde o oacute obreve ocaron ocircumflex 
ocircumflexacute ocircumflexdotbelow ocircumflexgrave ocircumflexhookabove ocircumflextilde odblgrave 
odieresis odieresismacron odotaccentmacron odotbelow ograve ohookabove ohorn ohornacute ohorndotbelow 
ohorngrave ohornhookabove ohorntilde ohungarumlaut oinvertedbreve omacron omacronacute omacrongrave oogonek 
oslash oslashacute otilde otildeacute otildedieresis otildemacron oe p q r racute rcaron rcommaaccent 
rdblgrave rdotbelow rinvertedbreve rlinebelow s sacute sacutedotaccent scaron scarondotaccent scedilla 
scircumflex scommaaccent sdotaccent sdotbelow s
 dotbelow
 dotaccent t tbar tcaron tcedilla tcommaaccent tdieresis tdotbelow tlinebelow u uacute ubreve ucaron 
ucircumflex udblgrave udieresis udieresisacute udieresiscaron udieresisgrave udieresismacron udotbelow ugrave 
uhookabove uhorn uhornacute uhorndotbelow uhorngrave uhornhookabove uhorntilde uhungarumlaut uinvertedbreve 
umacron umacrondieresis uogonek uring utilde utildeacute v w wacute wcircumflex wdieresis wgrave x y yacute 
ycircumflex ydieresis ydotaccent ydotbelow ygrave yhookabove ymacron ytilde z zacute zcaron zdotaccent 
zdotbelow l.ss01 A-cy Ve-cy Ge-cy Gje-cy Ie-cy Iegrave-cy Io-cy Zhe-cy Ze-cy Ii-cy Iishort-cy Iigrave-cy 
Ka-cy Kje-cy Em-cy En-cy O-cy Pe-cy Er-cy Es-cy Te-cy U-cy Ushort-cy Ha-cy Che-cy Sha-cy Shcha-cy Hardsign-cy 
Yeru-cy Dze-cy Ereversed-cy I-cy Yi-cy Je-cy Iu-cy Ia-cy Fita-cy Zhedescender-cy Zedescender-cy 
Kadescender-cy Endescender-cy Esdescender-cy Ustraight-cy Ustraightstroke-cy Hadescender-cy Chedescender-cy 
Palochka-cy Zhebreve-cy Chekhakassian-cy 
 Abreve-c
 y Adieresis-cy Aie-cy Iebreve-cy Schwa-cy Zhedieresis-cy Zedieresis-cy Imacron-cy Idieresis-cy Odieresis-cy 
Obarred-cy Umacron-cy Udieresis-cy Uhungarumlaut-cy Chedieresis-cy Gedescender-cy Yerudieresis-cy Qa-cy We-cy 
a-cy ge-cy gje-cy ie-cy iegrave-cy io-cy zhe-cy ze-cy ii-cy iishort-cy iigrave-cy ka-cy kje-cy en-cy o-cy 
pe-cy er-cy es-cy u-cy ushort-cy ha-cy che-cy sha-cy shcha-cy yeru-cy dze-cy e-cy ereversed-cy i-cy yi-cy 
je-cy tshe-cy iu-cy ia-cy dje-cy fita-cy zhedescender-cy zedescender-cy kadescender-cy endescender-cy 
esdescender-cy ustraight-cy ustraightstroke-cy hadescender-cy chedescender-cy shha-cy palochka-cy zhebreve-cy 
chekhakassian-cy abreve-cy adieresis-cy aie-cy iebreve-cy schwa-cy zhedieresis-cy zedieresis-cy imacron-cy 
idieresis-cy odieresis-cy obarred-cy umacron-cy udieresis-cy uhungarumlaut-cy chedieresis-cy gedescender-cy 
yerudieresis-cy qa-cy we-cy], # Base
     , # Liga
-    [dieresiscomb dieresiscomb_gravecomb dieresiscomb_acutecomb dieresiscomb_caroncomb 
dieresiscomb_macroncomb dotaccentcomb dotaccentcomb_macroncomb gravecomb acutecomb acutecomb_dotaccentcomb 
hungarumlautcomb caroncomb.alt circumflexcomb caroncomb caroncomb_dotaccentcomb brevecomb ringcomb 
ringcomb_acutecomb tildecomb tildecomb_dieresiscomb tildecomb_acutecomb tildecomb_macroncomb macroncomb 
macroncomb_dieresiscomb macroncomb_gravecomb macroncomb_acutecomb hookabovecomb verticallineabovecomb 
dblgravecomb breveinvertedcomb commaturnedabovecomb horncomb dotbelowcomb dieresisbelowcomb commaaccentcomb 
cedillacomb ogonekcomb verticallinebelowcomb brevebelowcomb macronbelowcomb strokeshortcomb strokelongcomb 
slashshortcomb slashlongcomb dieresiscomb.case dotaccentcomb.case gravecomb.case acutecomb.case 
hungarumlautcomb.case circumflexcomb.case caroncomb.case brevecomb.case ringcomb.case ringcomb_acutecomb.case 
tildecomb.case macroncomb.case hookabovecomb.case dblgravecomb.case b
 reveinve
 rtedcomb.case strokeshortcomb.case slashshortcomb.case slashlongcomb.case macroncomb.narrow.case 
ogonekcomb.tall.case dieresiscomb.loclVIET dotaccentcomb.loclVIET gravecomb.loclVIET acutecomb.loclVIET 
circumflexcomb.loclVIET caroncomb.loclVIET brevecomb.loclVIET tildecomb.loclVIET macroncomb.loclVIET 
hookabovecomb.loclVIET macroncomb.narrow ogonekcomb.narrow macronbelowcomb.narrow ogonekcomb.tall 
brevecomb-cy descender-cy brevecomb-cy.case descender-cy.case descender-cy.strait brevecomb_acutecomb 
brevecomb_gravecomb brevecomb_hookabovecomb brevecomb_tildecomb circumflexcomb_acutecomb 
circumflexcomb_gravecomb circumflexcomb_hookabovecomb circumflexcomb_tildecomb brevecomb_acutecomb.case 
brevecomb_gravecomb.case brevecomb_hookabovecomb.case brevecomb_tildecomb.case circumflexcomb_acutecomb.case 
circumflexcomb_gravecomb.case circumflexcomb_hookabovecomb.case circumflexcomb_tildecomb.case], # Mark
+    [dieresiscomb dotaccentcomb gravecomb acutecomb hungarumlautcomb caroncomb.alt circumflexcomb caroncomb 
brevecomb ringcomb ringcomb_acutecomb tildecomb macroncomb hookabovecomb verticallineabovecomb dblgravecomb 
breveinvertedcomb commaturnedabovecomb horncomb dotbelowcomb dieresisbelowcomb commaaccentcomb cedillacomb 
ogonekcomb verticallinebelowcomb brevebelowcomb macronbelowcomb strokeshortcomb strokelongcomb slashshortcomb 
slashlongcomb dieresiscomb.case dotaccentcomb.case gravecomb.case acutecomb.case hungarumlautcomb.case 
circumflexcomb.case caroncomb.case brevecomb.case ringcomb.case ringcomb_acutecomb.case tildecomb.case 
macroncomb.case hookabovecomb.case dblgravecomb.case breveinvertedcomb.case strokeshortcomb.case 
slashshortcomb.case slashlongcomb.case macroncomb.narrow.case ogonekcomb.tall.case dieresiscomb.loclVIET 
dotaccentcomb.loclVIET gravecomb.loclVIET acutecomb.loclVIET circumflexcomb.loclVIET caroncomb.loclVIET 
brevecomb.loclVIET tildecomb.loclVIET macron
 comb.loc
 lVIET hookabovecomb.loclVIET macroncomb.narrow ogonekcomb.narrow macronbelowcomb.narrow ogonekcomb.tall 
brevecomb-cy descender-cy brevecomb-cy.case descender-cy.case descender-cy.strait], # Mark
     ;
 } GDEF;
 
@@ -43,6 +43,8 @@ feature tnum;
 feature onum;
 feature case;
 feature zero;
+feature salt;
+feature ss01;
 
 } aalt;
 
@@ -53,8 +55,8 @@ lookup ccmp_Other_1 {
        @CombiningNonTopAccents = [brevebelowcomb cedillacomb dieresisbelowcomb dotbelowcomb macronbelowcomb 
ogonekcomb verticallinebelowcomb horncomb slashlongcomb slashshortcomb strokelongcomb strokeshortcomb];
        sub [i j]' @CombiningTopAccents by [idotless jdotless];
        sub [i j]' @CombiningNonTopAccents @CombiningTopAccents by [idotless jdotless];
-       @Markscomb = [dieresiscomb dotaccentcomb gravecomb acutecomb hungarumlautcomb circumflexcomb 
caroncomb brevecomb ringcomb ringcomb_acutecomb tildecomb macroncomb hookabovecomb dblgravecomb 
breveinvertedcomb strokeshortcomb slashshortcomb slashlongcomb macroncomb.narrow ogonekcomb.tall brevecomb-cy 
descender-cy brevecomb_acutecomb brevecomb_gravecomb brevecomb_hookabovecomb brevecomb_tildecomb 
circumflexcomb_acutecomb circumflexcomb_gravecomb circumflexcomb_hookabovecomb circumflexcomb_tildecomb];
-       @MarkscombCase = [dieresiscomb.case dotaccentcomb.case gravecomb.case acutecomb.case 
hungarumlautcomb.case circumflexcomb.case caroncomb.case brevecomb.case ringcomb.case ringcomb_acutecomb.case 
tildecomb.case macroncomb.case hookabovecomb.case dblgravecomb.case breveinvertedcomb.case 
strokeshortcomb.case slashshortcomb.case slashlongcomb.case macroncomb.narrow.case ogonekcomb.tall.case 
brevecomb-cy.case descender-cy.case brevecomb_acutecomb.case brevecomb_gravecomb.case 
brevecomb_hookabovecomb.case brevecomb_tildecomb.case circumflexcomb_acutecomb.case 
circumflexcomb_gravecomb.case circumflexcomb_hookabovecomb.case circumflexcomb_tildecomb.case];
+       @Markscomb = [dieresiscomb dotaccentcomb gravecomb acutecomb hungarumlautcomb circumflexcomb 
caroncomb brevecomb ringcomb ringcomb_acutecomb tildecomb macroncomb hookabovecomb dblgravecomb 
breveinvertedcomb strokeshortcomb slashshortcomb slashlongcomb macroncomb.narrow ogonekcomb.tall brevecomb-cy 
descender-cy];
+       @MarkscombCase = [dieresiscomb.case dotaccentcomb.case gravecomb.case acutecomb.case 
hungarumlautcomb.case circumflexcomb.case caroncomb.case brevecomb.case ringcomb.case ringcomb_acutecomb.case 
tildecomb.case macroncomb.case hookabovecomb.case dblgravecomb.case breveinvertedcomb.case 
strokeshortcomb.case slashshortcomb.case slashlongcomb.case macroncomb.narrow.case ogonekcomb.tall.case 
brevecomb-cy.case descender-cy.case];
        sub @Markscomb @Markscomb' by @MarkscombCase;
        sub @Uppercase @Markscomb' by @MarkscombCase;
 } ccmp_Other_1;
@@ -66,79 +68,47 @@ lookup ccmp_Other_2 {
 
 lookup ccmp_Other_3 {
        lookupflag 0;
-       sub acutecomb dotaccentcomb by acutecomb_dotaccentcomb;
-       sub caroncomb dotaccentcomb by caroncomb_dotaccentcomb;
-       sub dieresiscomb acutecomb by dieresiscomb_acutecomb;
-       sub dieresiscomb caroncomb by dieresiscomb_caroncomb;
-       sub dieresiscomb gravecomb by dieresiscomb_gravecomb;
-       sub dieresiscomb macroncomb by dieresiscomb_macroncomb;
-       sub dotaccentcomb macroncomb by dotaccentcomb_macroncomb;
-       sub macroncomb acutecomb by macroncomb_acutecomb;
-       sub macroncomb dieresiscomb by macroncomb_dieresiscomb;
-       sub macroncomb gravecomb by macroncomb_gravecomb;
        sub ringcomb acutecomb by ringcomb_acutecomb;
        sub ringcomb.case acutecomb.case by ringcomb_acutecomb.case;
-       sub tildecomb acutecomb by tildecomb_acutecomb;
-       sub tildecomb dieresiscomb by tildecomb_dieresiscomb;
-       sub tildecomb macroncomb by tildecomb_macroncomb;
 } ccmp_Other_3;
 
-lookup ccmp_latn_1 {
-       lookupflag 0;
-       sub brevecomb acutecomb by brevecomb_acutecomb;
-       sub brevecomb.case acutecomb.case by brevecomb_acutecomb.case;
-       sub brevecomb gravecomb by brevecomb_gravecomb;
-       sub brevecomb.case gravecomb.case by brevecomb_gravecomb.case;
-       sub brevecomb hookabovecomb by brevecomb_hookabovecomb;
-       sub brevecomb.case hookabovecomb.case by brevecomb_hookabovecomb.case;
-       sub brevecomb tildecomb by brevecomb_tildecomb;
-       sub brevecomb.case tildecomb.case by brevecomb_tildecomb.case;
-       sub circumflexcomb acutecomb by circumflexcomb_acutecomb;
-       sub circumflexcomb.case acutecomb.case by circumflexcomb_acutecomb.case;
-       sub circumflexcomb gravecomb by circumflexcomb_gravecomb;
-       sub circumflexcomb.case gravecomb.case by circumflexcomb_gravecomb.case;
-       sub circumflexcomb hookabovecomb by circumflexcomb_hookabovecomb;
-       sub circumflexcomb.case hookabovecomb.case by circumflexcomb_hookabovecomb.case;
-       sub circumflexcomb tildecomb by circumflexcomb_tildecomb;
-       sub circumflexcomb.case tildecomb.case by circumflexcomb_tildecomb.case;
-} ccmp_latn_1;
-
-script latn;
-lookup ccmp_latn_1;
-
 } ccmp;
 
 feature locl {
 # automatic
-script latn;
-language NLD;
-sub iacute j' by jacute;
-sub Iacute J' by Jacute;
-language CAT;
-sub l periodcentered' l by periodcentered.loclCAT;
-sub L periodcentered' L by periodcentered.loclCAT.case;
-language ROM;
-sub Scedilla by Scommaaccent;
-sub scedilla by scommaaccent;
-sub Tcedilla by Tcommaaccent;
-sub tcedilla by tcommaaccent;
-language MOL;
-sub Scedilla by Scommaaccent;
-sub scedilla by scommaaccent;
-sub Tcedilla by Tcommaaccent;
-sub tcedilla by tcommaaccent;
-language KAZ;
-sub i by idotaccent;
-language TRK;
-sub i by idotaccent;
-language CRT;
-sub i by idotaccent;
-language AZE;
-sub i by idotaccent;
-
-script cyrl;
-language TAT;
-sub i by idotaccent;
+lookup locl_latn_0 {
+       script latn;
+       language ROM;
+       sub Scedilla by Scommaaccent;
+       sub scedilla by scommaaccent;
+       sub Tcedilla by Tcommaaccent;
+       sub tcedilla by tcommaaccent;
+       language MOL;
+       sub Scedilla by Scommaaccent;
+       sub scedilla by scommaaccent;
+       sub Tcedilla by Tcommaaccent;
+       sub tcedilla by tcommaaccent;
+       language KAZ;
+       sub i by idotaccent;
+       language TAT;
+       sub i by idotaccent;
+       language TRK;
+       sub i by idotaccent;
+       language CRT;
+       sub i by idotaccent;
+       language AZE;
+       sub i by idotaccent;
+} locl_latn_0;
+
+lookup locl_latn_1 {
+       script latn;
+       language NLD;
+       sub iacute j' by jacute;
+       sub Iacute J' by Jacute;
+       language CAT;
+       sub l periodcentered' l by periodcentered.loclCAT;
+       sub L periodcentered' L by periodcentered.loclCAT.case;
+} locl_latn_1;
 
 } locl;
 
@@ -267,34 +237,6 @@ sub six.tf by six;
 sub seven.tf by seven;
 sub eight.tf by eight;
 sub nine.tf by nine;
-sub bulletoperator.tf by bulletoperator;
-sub commercialMinusSign.tf by commercialMinusSign;
-sub divisionslash.tf by divisionslash;
-sub equivalence.tf by equivalence;
-sub notidentical.tf by notidentical;
-sub plus.tf by plus;
-sub minus.tf by minus;
-sub multiply.tf by multiply;
-sub divide.tf by divide;
-sub equal.tf by equal;
-sub notequal.tf by notequal;
-sub greater.tf by greater;
-sub less.tf by less;
-sub greaterequal.tf by greaterequal;
-sub lessequal.tf by lessequal;
-sub plusminus.tf by plusminus;
-sub approxequal.tf by approxequal;
-sub logicalnot.tf by logicalnot;
-sub zero.tosf by zero.osf;
-sub one.tosf by one.osf;
-sub two.tosf by two.osf;
-sub three.tosf by three.osf;
-sub four.tosf by four.osf;
-sub five.tosf by five.osf;
-sub six.tosf by six.osf;
-sub seven.tosf by seven.osf;
-sub eight.tosf by eight.osf;
-sub nine.tosf by nine.osf;
 
 } pnum;
 
@@ -310,49 +252,11 @@ sub six by six.tf;
 sub seven by seven.tf;
 sub eight by eight.tf;
 sub nine by nine.tf;
-sub bulletoperator by bulletoperator.tf;
-sub commercialMinusSign by commercialMinusSign.tf;
-sub divisionslash by divisionslash.tf;
-sub equivalence by equivalence.tf;
-sub notidentical by notidentical.tf;
-sub plus by plus.tf;
-sub minus by minus.tf;
-sub multiply by multiply.tf;
-sub divide by divide.tf;
-sub equal by equal.tf;
-sub notequal by notequal.tf;
-sub greater by greater.tf;
-sub less by less.tf;
-sub greaterequal by greaterequal.tf;
-sub lessequal by lessequal.tf;
-sub plusminus by plusminus.tf;
-sub approxequal by approxequal.tf;
-sub logicalnot by logicalnot.tf;
-sub zero.osf by zero.tosf;
-sub one.osf by one.tosf;
-sub two.osf by two.tosf;
-sub three.osf by three.tosf;
-sub four.osf by four.tosf;
-sub five.osf by five.tosf;
-sub six.osf by six.tosf;
-sub seven.osf by seven.tosf;
-sub eight.osf by eight.tosf;
-sub nine.osf by nine.tosf;
 
 } tnum;
 
 feature onum {
 # automatic
-sub zero.tf by zero.tosf;
-sub one.tf by one.tosf;
-sub two.tf by two.tosf;
-sub three.tf by three.tosf;
-sub four.tf by four.tosf;
-sub five.tf by five.tosf;
-sub six.tf by six.tosf;
-sub seven.tf by seven.tosf;
-sub eight.tf by eight.tosf;
-sub nine.tf by nine.tosf;
 sub zero by zero.osf;
 sub one by one.osf;
 sub two by two.osf;
@@ -391,22 +295,12 @@ sub macroncomb.narrow by macroncomb.narrow.case;
 sub ogonekcomb.tall by ogonekcomb.tall.case;
 sub brevecomb-cy by brevecomb-cy.case;
 sub descender-cy by descender-cy.case;
-sub brevecomb_acutecomb by brevecomb_acutecomb.case;
-sub brevecomb_gravecomb by brevecomb_gravecomb.case;
-sub brevecomb_hookabovecomb by brevecomb_hookabovecomb.case;
-sub brevecomb_tildecomb by brevecomb_tildecomb.case;
-sub circumflexcomb_acutecomb by circumflexcomb_acutecomb.case;
-sub circumflexcomb_gravecomb by circumflexcomb_gravecomb.case;
-sub circumflexcomb_hookabovecomb by circumflexcomb_hookabovecomb.case;
-sub circumflexcomb_tildecomb by circumflexcomb_tildecomb.case;
 
 } case;
 
 feature liga {
 # automatic
-sub f f i by f_f_i;
-sub f f l by f_f_l;
-sub f f by f_f;
+lookupflag IgnoreMarks;
 sub f i by fi;
 sub f l by fl;
 
@@ -414,9 +308,20 @@ sub f l by fl;
 
 feature zero {
 # automatic
+sub zero by zero.zero;
 sub zero.osf by zero.osf.zero;
 sub zero.tf by zero.tf.zero;
-sub zero.tosf by zero.tosf.zero;
-sub zero by zero.zero;
 
 } zero;
+
+feature salt {
+# automatic
+sub l by l.ss01;
+
+} salt;
+
+feature ss01 {
+# automatic
+sub l by l.ss01;
+
+} ss01;
diff --git a/src/Cantarell-Light.ufo/fontinfo.plist b/src/Cantarell-Light.ufo/fontinfo.plist
index 2d0c33da..67cf364c 100644
--- a/src/Cantarell-Light.ufo/fontinfo.plist
+++ b/src/Cantarell-Light.ufo/fontinfo.plist
@@ -12,8 +12,6 @@
     <integer>-217</integer>
     <key>familyName</key>
     <string>Cantarell</string>
-    <key>guidelines</key>
-    <array/>
     <key>italicAngle</key>
     <integer>0</integer>
     <key>openTypeHeadCreated</key>
@@ -39,6 +37,8 @@
     </array>
     <key>openTypeOS2VendorID</key>
     <string>ABAT</string>
+    <key>postscriptBlueFuzz</key>
+    <integer>1</integer>
     <key>postscriptBlueScale</key>
     <real>0.0625</real>
     <key>postscriptBlueValues</key>
@@ -52,10 +52,6 @@
       <integer>739</integer>
       <integer>749</integer>
     </array>
-    <key>postscriptFamilyBlues</key>
-    <array/>
-    <key>postscriptFamilyOtherBlues</key>
-    <array/>
     <key>postscriptOtherBlues</key>
     <array>
       <integer>-227</integer>
@@ -80,7 +76,7 @@
     <key>versionMajor</key>
     <integer>0</integer>
     <key>versionMinor</key>
-    <integer>111</integer>
+    <integer>200</integer>
     <key>xHeight</key>
     <integer>480</integer>
   </dict>
diff --git a/src/Cantarell-Light.ufo/glyphs.F_inal B_ent/be-cy.glif b/src/Cantarell-Light.ufo/glyphs.F_inal 
B_ent/be-cy.glif
new file mode 100644
index 00000000..84a01103
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.F_inal B_ent/be-cy.glif    
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="be-cy" format="2">
+  <advance width="515"/>
+  <unicode hex="0431"/>
+  <outline>
+    <contour>
+      <point x="265" y="-10" type="curve" smooth="yes"/>
+      <point x="384" y="-10"/>
+      <point x="460" y="83"/>
+      <point x="460" y="222" type="curve" smooth="yes"/>
+      <point x="460" y="363"/>
+      <point x="390" y="446"/>
+      <point x="273" y="446" type="curve" smooth="yes"/>
+      <point x="183" y="446"/>
+      <point x="112" y="400"/>
+      <point x="81" y="322" type="curve"/>
+      <point x="81" y="292" type="line"/>
+      <point x="115" y="381"/>
+      <point x="180" y="428"/>
+      <point x="265" y="428" type="curve" smooth="yes"/>
+      <point x="374" y="428"/>
+      <point x="439" y="353"/>
+      <point x="439" y="220" type="curve" smooth="yes"/>
+      <point x="439" y="91"/>
+      <point x="372" y="8"/>
+      <point x="266" y="8" type="curve" smooth="yes"/>
+      <point x="149" y="8"/>
+      <point x="89" y="115"/>
+      <point x="89" y="322" type="curve" smooth="yes"/>
+      <point x="89" y="551"/>
+      <point x="136" y="634"/>
+      <point x="290" y="678" type="curve" smooth="yes"/>
+      <point x="330" y="689"/>
+      <point x="369" y="691"/>
+      <point x="409" y="712" type="curve"/>
+      <point x="404" y="730" type="line"/>
+      <point x="364" y="709"/>
+      <point x="324" y="707"/>
+      <point x="284" y="696" type="curve" smooth="yes"/>
+      <point x="124" y="651"/>
+      <point x="69" y="554"/>
+      <point x="69" y="316" type="curve" smooth="yes"/>
+      <point x="69" y="101"/>
+      <point x="135" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.F_inal B_ent/contents.plist 
b/src/Cantarell-Light.ufo/glyphs.F_inal B_ent/contents.plist
new file mode 100644
index 00000000..1ae1e5b4
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.F_inal B_ent/contents.plist        
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>be-cy</key>
+    <string>be-cy.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs.F_inal B_ent/layerinfo.plist 
b/src/Cantarell-Light.ufo/glyphs.F_inal B_ent/layerinfo.plist
new file mode 100644
index 00000000..b9131788
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.F_inal B_ent/layerinfo.plist       
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>E1025333-A66D-4B0A-A6E2-8A9D70D97302</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.be-cy</key>
+      <integer>3</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/contents.plist 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/contents.plist
new file mode 100644
index 00000000..8b006235
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/contents.plist    
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>eight.tf</key>
+    <string>eight.tf.glif</string>
+    <key>five.tf</key>
+    <string>five.tf.glif</string>
+    <key>four.tf</key>
+    <string>four.tf.glif</string>
+    <key>nine.tf</key>
+    <string>nine.tf.glif</string>
+    <key>seven.tf</key>
+    <string>seven.tf.glif</string>
+    <key>six.tf</key>
+    <string>six.tf.glif</string>
+    <key>three.tf</key>
+    <string>three.tf.glif</string>
+    <key>two.tf</key>
+    <string>two.tf.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs/eight.tosf.glif b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 
20_47/eight.tf.glif
similarity index 98%
rename from src/Cantarell-Light.ufo/glyphs/eight.tosf.glif
rename to src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/eight.tf.glif
index f0447f8e..611a5391 100644
--- a/src/Cantarell-Light.ufo/glyphs/eight.tosf.glif
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/eight.tf.glif     
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<glyph name="eight.tosf" format="2">
+<glyph name="eight.tf" format="2">
   <advance width="580"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/five.tf.glif 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/five.tf.glif
new file mode 100644
index 00000000..2cd9df74
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/five.tf.glif      
@@ -0,0 +1,48 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="five.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="269" y="-10" type="curve" smooth="yes"/>
+      <point x="415" y="-10"/>
+      <point x="506" y="80"/>
+      <point x="506" y="203" type="curve" smooth="yes"/>
+      <point x="506" y="326"/>
+      <point x="413" y="403"/>
+      <point x="260" y="403" type="curve" smooth="yes"/>
+      <point x="222" y="403"/>
+      <point x="168" y="398"/>
+      <point x="115" y="388" type="curve"/>
+      <point x="127" y="384" type="line"/>
+      <point x="141" y="677" type="line"/>
+      <point x="475" y="677" type="line"/>
+      <point x="475" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
+      <point x="106" y="369" type="line"/>
+      <point x="155" y="379"/>
+      <point x="211" y="385"/>
+      <point x="254" y="385" type="curve" smooth="yes"/>
+      <point x="406" y="385"/>
+      <point x="485" y="310"/>
+      <point x="485" y="201" type="curve" smooth="yes"/>
+      <point x="485" y="88"/>
+      <point x="401" y="9"/>
+      <point x="274" y="9" type="curve" smooth="yes"/>
+      <point x="209" y="9"/>
+      <point x="134" y="28"/>
+      <point x="84" y="58" type="curve"/>
+      <point x="78" y="41" type="line"/>
+      <point x="131" y="9"/>
+      <point x="201" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/four.tf.glif 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/four.tf.glif
new file mode 100644
index 00000000..886b4189
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/four.tf.glif      
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="four.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="400" y="-10" type="line"/>
+      <point x="418" y="-10" type="line"/>
+      <point x="418" y="694" type="line"/>
+      <point x="401" y="694" type="line"/>
+      <point x="39" y="200" type="line"/>
+      <point x="39" y="190" type="line"/>
+      <point x="542" y="190" type="line"/>
+      <point x="542" y="207" type="line"/>
+      <point x="61" y="207" type="line"/>
+      <point x="61" y="202" type="line"/>
+      <point x="400" y="667" type="line"/>
+      <point x="400" y="665" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/layerinfo.plist 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/layerinfo.plist
new file mode 100644
index 00000000..a1972184
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/layerinfo.plist   
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>CD8E05C2-2F6B-43AC-8E64-00DE41B06201</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.eight.tf</key>
+      <integer>5</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.five.tf</key>
+      <integer>5</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.four.tf</key>
+      <integer>5</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.nine.tf</key>
+      <integer>5</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.seven.tf</key>
+      <integer>5</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.six.tf</key>
+      <integer>5</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.three.tf</key>
+      <integer>5</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.two.tf</key>
+      <integer>5</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs/nine.tosf.glif b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 
20_47/nine.tf.glif
similarity index 97%
rename from src/Cantarell-Light.ufo/glyphs/nine.tosf.glif
rename to src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/nine.tf.glif
index 64591d5c..89afc181 100644
--- a/src/Cantarell-Light.ufo/glyphs/nine.tosf.glif
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/nine.tf.glif      
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<glyph name="nine.tosf" format="2">
+<glyph name="nine.tf" format="2">
   <advance width="580"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/seven.tf.glif 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/seven.tf.glif
new file mode 100644
index 00000000..aa8809de
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/seven.tf.glif     
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="seven.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="178" y="0" type="line"/>
+      <point x="201" y="0" type="line"/>
+      <point x="517" y="682" type="line"/>
+      <point x="517" y="694" type="line"/>
+      <point x="55" y="694" type="line"/>
+      <point x="55" y="676" type="line"/>
+      <point x="500" y="676" type="line"/>
+      <point x="498" y="685" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/six.tosf.glif b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 
20_47/six.tf.glif
similarity index 98%
rename from src/Cantarell-Light.ufo/glyphs/six.tosf.glif
rename to src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/six.tf.glif
index 755888cf..1b662bd9 100644
--- a/src/Cantarell-Light.ufo/glyphs/six.tosf.glif
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/six.tf.glif       
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<glyph name="six.tosf" format="2">
+<glyph name="six.tf" format="2">
   <advance width="580"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/three.tf.glif 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/three.tf.glif
new file mode 100644
index 00000000..bff0c828
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/three.tf.glif     
@@ -0,0 +1,57 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="three.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="275" y="-10" type="curve" smooth="yes"/>
+      <point x="416" y="-10"/>
+      <point x="507" y="60"/>
+      <point x="507" y="170" type="curve" smooth="yes"/>
+      <point x="507" y="274"/>
+      <point x="426" y="340"/>
+      <point x="274" y="356" type="curve"/>
+      <point x="274" y="352" type="line"/>
+      <point x="391" y="359"/>
+      <point x="469" y="429"/>
+      <point x="469" y="528" type="curve" smooth="yes"/>
+      <point x="469" y="632"/>
+      <point x="385" y="704"/>
+      <point x="264" y="704" type="curve" smooth="yes"/>
+      <point x="198" y="704"/>
+      <point x="130" y="683"/>
+      <point x="75" y="645" type="curve"/>
+      <point x="80" y="629" type="line"/>
+      <point x="144" y="668"/>
+      <point x="201" y="686"/>
+      <point x="260" y="686" type="curve" smooth="yes"/>
+      <point x="372" y="686"/>
+      <point x="448" y="624"/>
+      <point x="448" y="524" type="curve" smooth="yes"/>
+      <point x="448" y="416"/>
+      <point x="362" y="361"/>
+      <point x="194" y="361" type="curve"/>
+      <point x="194" y="344" type="line"/>
+      <point x="382" y="344"/>
+      <point x="487" y="281"/>
+      <point x="487" y="168" type="curve" smooth="yes"/>
+      <point x="487" y="69"/>
+      <point x="406" y="9"/>
+      <point x="276" y="9" type="curve" smooth="yes"/>
+      <point x="202" y="9"/>
+      <point x="123" y="29"/>
+      <point x="61" y="63" type="curve"/>
+      <point x="56" y="45" type="line"/>
+      <point x="116" y="11"/>
+      <point x="199" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/two.tf.glif 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/two.tf.glif
new file mode 100644
index 00000000..8fd0b2ff
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/two.tf.glif       
@@ -0,0 +1,41 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="two.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="67" y="0" type="line"/>
+      <point x="506" y="0" type="line"/>
+      <point x="506" y="17" type="line"/>
+      <point x="87" y="17" type="line"/>
+      <point x="91" y="10" type="line"/>
+      <point x="416" y="310"/>
+      <point x="477" y="407"/>
+      <point x="477" y="509" type="curve" smooth="yes"/>
+      <point x="477" y="630"/>
+      <point x="394" y="704"/>
+      <point x="263" y="704" type="curve" smooth="yes"/>
+      <point x="185" y="704"/>
+      <point x="117" y="678"/>
+      <point x="67" y="629" type="curve"/>
+      <point x="77" y="616" type="line"/>
+      <point x="131" y="663"/>
+      <point x="191" y="686"/>
+      <point x="259" y="686" type="curve" smooth="yes"/>
+      <point x="379" y="686"/>
+      <point x="456" y="617"/>
+      <point x="456" y="507" type="curve" smooth="yes"/>
+      <point x="456" y="408"/>
+      <point x="394" y="311"/>
+      <point x="67" y="8" type="curve"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_55/contents.plist 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_55/contents.plist
new file mode 100644
index 00000000..7b74aabe
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_55/contents.plist    
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>zero.tf</key>
+    <string>zero.tf.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_55/layerinfo.plist 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_55/layerinfo.plist
new file mode 100644
index 00000000..c969e48b
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_55/layerinfo.plist   
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>411A308B-627F-44DA-B639-BF9140D58A87</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.zero.tf</key>
+      <integer>4</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_55/zero.tf.glif 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_55/zero.tf.glif
new file mode 100644
index 00000000..8d3a203c
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_55/zero.tf.glif      
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="zero.tf" format="2">
+  <advance width="580"/>
+  <anchor x="298" y="350" name="slash"/>
+  <outline>
+    <contour>
+      <point x="290" y="-10" type="curve" smooth="yes"/>
+      <point x="417" y="-10"/>
+      <point x="501" y="132"/>
+      <point x="501" y="343" type="curve" smooth="yes"/>
+      <point x="501" y="555"/>
+      <point x="418" y="699"/>
+      <point x="294" y="699" type="curve" smooth="yes"/>
+      <point x="164" y="699"/>
+      <point x="79" y="554"/>
+      <point x="79" y="340" type="curve" smooth="yes"/>
+      <point x="79" y="130"/>
+      <point x="164" y="-10"/>
+    </contour>
+    <contour>
+      <point x="293" y="8" type="curve" smooth="yes"/>
+      <point x="177" y="8"/>
+      <point x="100" y="143"/>
+      <point x="100" y="343" type="curve" smooth="yes"/>
+      <point x="100" y="545"/>
+      <point x="176" y="681"/>
+      <point x="291" y="681" type="curve" smooth="yes"/>
+      <point x="405" y="681"/>
+      <point x="480" y="543"/>
+      <point x="480" y="340" type="curve" smooth="yes"/>
+      <point x="480" y="142"/>
+      <point x="405" y="8"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/contents.plist 
b/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/contents.plist
new file mode 100644
index 00000000..679c3008
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/contents.plist    
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>eight</key>
+    <string>eight.glif</string>
+    <key>five</key>
+    <string>five.glif</string>
+    <key>four</key>
+    <string>four.glif</string>
+    <key>nine</key>
+    <string>nine.glif</string>
+    <key>one</key>
+    <string>one.glif</string>
+    <key>seven</key>
+    <string>seven.glif</string>
+    <key>six</key>
+    <string>six.glif</string>
+    <key>three</key>
+    <string>three.glif</string>
+    <key>two</key>
+    <string>two.glif</string>
+    <key>zero</key>
+    <string>zero.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/eight.glif b/src/Cantarell-Light.ufo/glyphs.M_ay 
5 19, 13_08/eight.glif
new file mode 100644
index 00000000..59fc7f67
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/eight.glif        
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="eight" format="2">
+  <advance width="582"/>
+  <unicode hex="0038"/>
+  <outline>
+    <contour>
+      <point x="296" y="-10" type="curve" smooth="yes"/>
+      <point x="426" y="-10"/>
+      <point x="513" y="57"/>
+      <point x="513" y="163" type="curve" smooth="yes"/>
+      <point x="513" y="389"/>
+      <point x="118" y="324"/>
+      <point x="118" y="540" type="curve" smooth="yes"/>
+      <point x="118" y="629"/>
+      <point x="185" y="687"/>
+      <point x="283" y="687" type="curve" smooth="yes"/>
+      <point x="381" y="687"/>
+      <point x="456" y="628"/>
+      <point x="456" y="543" type="curve" smooth="yes"/>
+      <point x="456" y="460"/>
+      <point x="384" y="397"/>
+      <point x="275" y="369" type="curve"/>
+      <point x="291" y="358" type="line"/>
+      <point x="404" y="385"/>
+      <point x="475" y="454"/>
+      <point x="475" y="543" type="curve" smooth="yes"/>
+      <point x="475" y="639"/>
+      <point x="394" y="704"/>
+      <point x="285" y="704" type="curve" smooth="yes"/>
+      <point x="175" y="704"/>
+      <point x="99" y="639"/>
+      <point x="99" y="538" type="curve" smooth="yes"/>
+      <point x="99" y="307"/>
+      <point x="493" y="372"/>
+      <point x="493" y="161" type="curve" smooth="yes"/>
+      <point x="493" y="67"/>
+      <point x="416" y="7"/>
+      <point x="298" y="7" type="curve" smooth="yes"/>
+      <point x="177" y="7"/>
+      <point x="94" y="71"/>
+      <point x="94" y="166" type="curve" smooth="yes"/>
+      <point x="94" y="254"/>
+      <point x="166" y="325"/>
+      <point x="275" y="352" type="curve"/>
+      <point x="259" y="363" type="line"/>
+      <point x="148" y="338"/>
+      <point x="74" y="260"/>
+      <point x="74" y="164" type="curve" smooth="yes"/>
+      <point x="74" y="60"/>
+      <point x="163" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/five.glif b/src/Cantarell-Light.ufo/glyphs.M_ay 
5 19, 13_08/five.glif
new file mode 100644
index 00000000..23cb4f36
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/five.glif 
@@ -0,0 +1,40 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="five" format="2">
+  <advance width="542"/>
+  <unicode hex="0035"/>
+  <outline>
+    <contour>
+      <point x="251" y="-10" type="curve" smooth="yes"/>
+      <point x="389" y="-10"/>
+      <point x="475" y="80"/>
+      <point x="475" y="203" type="curve" smooth="yes"/>
+      <point x="475" y="326"/>
+      <point x="388" y="403"/>
+      <point x="243" y="403" type="curve" smooth="yes"/>
+      <point x="206" y="403"/>
+      <point x="156" y="398"/>
+      <point x="106" y="388" type="curve"/>
+      <point x="118" y="384" type="line"/>
+      <point x="131" y="677" type="line"/>
+      <point x="446" y="677" type="line"/>
+      <point x="446" y="694" type="line"/>
+      <point x="113" y="694" type="line"/>
+      <point x="97" y="369" type="line"/>
+      <point x="143" y="379"/>
+      <point x="195" y="385"/>
+      <point x="236" y="385" type="curve" smooth="yes"/>
+      <point x="380" y="385"/>
+      <point x="454" y="310"/>
+      <point x="454" y="201" type="curve" smooth="yes"/>
+      <point x="454" y="88"/>
+      <point x="376" y="9"/>
+      <point x="255" y="9" type="curve" smooth="yes"/>
+      <point x="193" y="9"/>
+      <point x="121" y="29"/>
+      <point x="76" y="58" type="curve"/>
+      <point x="70" y="41" type="line"/>
+      <point x="120" y="9"/>
+      <point x="187" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/four.glif b/src/Cantarell-Light.ufo/glyphs.M_ay 
5 19, 13_08/four.glif
new file mode 100644
index 00000000..75c060f7
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/four.glif 
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="four" format="2">
+  <advance width="568"/>
+  <unicode hex="0034"/>
+  <outline>
+    <contour>
+      <point x="393" y="-10" type="line"/>
+      <point x="411" y="-10" type="line"/>
+      <point x="411" y="694" type="line"/>
+      <point x="394" y="694" type="line"/>
+      <point x="37" y="200" type="line"/>
+      <point x="37" y="190" type="line"/>
+      <point x="533" y="190" type="line"/>
+      <point x="533" y="207" type="line"/>
+      <point x="59" y="207" type="line"/>
+      <point x="59" y="202" type="line"/>
+      <point x="393" y="667" type="line"/>
+      <point x="393" y="665" type="line"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist 
b/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist
new file mode 100644
index 00000000..684ad0a1
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist   
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>FA142D69-41FD-40D6-A95D-F41463B6E55E</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.eight</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.five</key>
+      <integer>2</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.four</key>
+      <integer>2</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.nine</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.one</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.seven</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.six</key>
+      <integer>1</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.three</key>
+      <integer>2</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.two</key>
+      <integer>2</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.zero</key>
+      <integer>2</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs/f_f_i.glif b/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 
13_08/nine.glif
similarity index 53%
rename from src/Cantarell-Bold.ufo/glyphs/f_f_i.glif
rename to src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/nine.glif
index 25fe7103..166722b8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/f_f_i.glif
+++ b/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/nine.glif 
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<glyph name="f_f_i" format="2">
-  <advance width="1053"/>
+<glyph name="nine" format="2">
+  <advance width="585"/>
+  <unicode hex="0039"/>
   <outline>
-    <component base="f_f"/>
-    <component base="i" xOffset="766"/>
+    <component base="six" xScale="-1" yScale="-1" xOffset="598" yOffset="694"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>f</string>
+      <string>=|six</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
-      <string>i</string>
+      <string>=|six</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/one.glif b/src/Cantarell-Light.ufo/glyphs.M_ay 5 
19, 13_08/one.glif
new file mode 100644
index 00000000..a945596f
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/one.glif  
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="one" format="2">
+  <advance width="379"/>
+  <unicode hex="0031"/>
+  <outline>
+    <contour>
+      <point x="187" y="7" type="line"/>
+      <point x="207" y="7" type="line"/>
+      <point x="207" y="694" type="line"/>
+      <point x="195" y="694" type="line"/>
+      <point x="44" y="581" type="line"/>
+      <point x="52" y="569" type="line"/>
+      <point x="195" y="672" type="line"/>
+      <point x="187" y="677" type="line"/>
+    </contour>
+    <contour>
+      <point x="45" y="0" type="line"/>
+      <point x="344" y="0" type="line"/>
+      <point x="344" y="17" type="line"/>
+      <point x="45" y="17" type="line"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/seven.glif b/src/Cantarell-Light.ufo/glyphs.M_ay 
5 19, 13_08/seven.glif
new file mode 100644
index 00000000..efd890a0
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/seven.glif        
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="seven" format="2">
+  <advance width="521"/>
+  <unicode hex="0037"/>
+  <outline>
+    <contour>
+      <point x="157" y="0" type="line"/>
+      <point x="180" y="0" type="line"/>
+      <point x="471" y="682" type="line"/>
+      <point x="471" y="694" type="line"/>
+      <point x="44" y="694" type="line"/>
+      <point x="44" y="676" type="line"/>
+      <point x="454" y="676" type="line"/>
+      <point x="451" y="685" type="line"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/six.glif b/src/Cantarell-Light.ufo/glyphs.M_ay 5 
19, 13_08/six.glif
new file mode 100644
index 00000000..b897efbb
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/six.glif  
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="six" format="2">
+  <advance width="586"/>
+  <unicode hex="0036"/>
+  <outline>
+    <contour>
+      <point x="312" y="-10" type="curve" smooth="yes"/>
+      <point x="432" y="-10"/>
+      <point x="514" y="77"/>
+      <point x="514" y="206" type="curve" smooth="yes"/>
+      <point x="514" y="333"/>
+      <point x="434" y="410"/>
+      <point x="315" y="410" type="curve" smooth="yes"/>
+      <point x="218" y="410"/>
+      <point x="142" y="361"/>
+      <point x="96" y="270" type="curve"/>
+      <point x="96" y="239" type="line"/>
+      <point x="140" y="337"/>
+      <point x="217" y="392"/>
+      <point x="313" y="392" type="curve" smooth="yes"/>
+      <point x="419" y="392"/>
+      <point x="493" y="322"/>
+      <point x="493" y="203" type="curve" smooth="yes"/>
+      <point x="493" y="86"/>
+      <point x="421" y="8"/>
+      <point x="313" y="8" type="curve" smooth="yes"/>
+      <point x="181" y="8"/>
+      <point x="105" y="125"/>
+      <point x="105" y="322" type="curve" smooth="yes"/>
+      <point x="105" y="560"/>
+      <point x="192" y="686"/>
+      <point x="356" y="686" type="curve" smooth="yes"/>
+      <point x="407" y="686"/>
+      <point x="457" y="673"/>
+      <point x="495" y="650" type="curve"/>
+      <point x="502" y="667" type="line"/>
+      <point x="461" y="691"/>
+      <point x="412" y="704"/>
+      <point x="358" y="704" type="curve" smooth="yes"/>
+      <point x="179" y="704"/>
+      <point x="84" y="570"/>
+      <point x="84" y="319" type="curve" smooth="yes"/>
+      <point x="84" y="113"/>
+      <point x="168" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/three.glif b/src/Cantarell-Light.ufo/glyphs.M_ay 
5 19, 13_08/three.glif
new file mode 100644
index 00000000..0d0e22a0
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/three.glif        
@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="three" format="2">
+  <advance width="566"/>
+  <unicode hex="0033"/>
+  <outline>
+    <contour>
+      <point x="268" y="-10" type="curve" smooth="yes"/>
+      <point x="407" y="-10"/>
+      <point x="496" y="60"/>
+      <point x="496" y="170" type="curve" smooth="yes"/>
+      <point x="496" y="280"/>
+      <point x="411" y="350"/>
+      <point x="267" y="360" type="curve"/>
+      <point x="267" y="352" type="line"/>
+      <point x="382" y="359"/>
+      <point x="458" y="429"/>
+      <point x="458" y="528" type="curve" smooth="yes"/>
+      <point x="458" y="632"/>
+      <point x="376" y="704"/>
+      <point x="257" y="704" type="curve" smooth="yes"/>
+      <point x="191" y="704"/>
+      <point x="126" y="683"/>
+      <point x="72" y="645" type="curve"/>
+      <point x="77" y="629" type="line"/>
+      <point x="139" y="668"/>
+      <point x="195" y="686"/>
+      <point x="253" y="686" type="curve" smooth="yes"/>
+      <point x="363" y="686"/>
+      <point x="437" y="624"/>
+      <point x="437" y="524" type="curve" smooth="yes"/>
+      <point x="437" y="418"/>
+      <point x="356" y="361"/>
+      <point x="207" y="361" type="curve" smooth="yes"/>
+      <point x="188" y="361" type="line"/>
+      <point x="188" y="344" type="line"/>
+      <point x="207" y="344" type="line" smooth="yes"/>
+      <point x="378" y="344"/>
+      <point x="476" y="280"/>
+      <point x="476" y="168" type="curve" smooth="yes"/>
+      <point x="476" y="69"/>
+      <point x="397" y="9"/>
+      <point x="269" y="9" type="curve" smooth="yes"/>
+      <point x="197" y="9"/>
+      <point x="119" y="29"/>
+      <point x="58" y="63" type="curve"/>
+      <point x="53" y="45" type="line"/>
+      <point x="112" y="11"/>
+      <point x="193" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/two.glif b/src/Cantarell-Light.ufo/glyphs.M_ay 5 
19, 13_08/two.glif
new file mode 100644
index 00000000..ee7f0fd8
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/two.glif  
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="two" format="2">
+  <advance width="508"/>
+  <unicode hex="0032"/>
+  <outline>
+    <contour>
+      <point x="53" y="0" type="line"/>
+      <point x="449" y="0" type="line"/>
+      <point x="449" y="17" type="line"/>
+      <point x="73" y="17" type="line"/>
+      <point x="77" y="10" type="line"/>
+      <point x="367" y="310"/>
+      <point x="423" y="406"/>
+      <point x="423" y="509" type="curve" smooth="yes"/>
+      <point x="423" y="630"/>
+      <point x="348" y="704"/>
+      <point x="230" y="704" type="curve" smooth="yes"/>
+      <point x="159" y="704"/>
+      <point x="98" y="678"/>
+      <point x="53" y="629" type="curve"/>
+      <point x="62" y="616" type="line"/>
+      <point x="111" y="663"/>
+      <point x="164" y="686"/>
+      <point x="226" y="686" type="curve" smooth="yes"/>
+      <point x="333" y="686"/>
+      <point x="402" y="617"/>
+      <point x="402" y="507" type="curve" smooth="yes"/>
+      <point x="402" y="407"/>
+      <point x="345" y="311"/>
+      <point x="53" y="8" type="curve"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/zero.glif b/src/Cantarell-Light.ufo/glyphs.M_ay 
5 19, 13_08/zero.glif
new file mode 100644
index 00000000..b1381db0
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/zero.glif 
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="zero" format="2">
+  <advance width="601"/>
+  <unicode hex="0030"/>
+  <anchor x="309" y="350" name="slash"/>
+  <outline>
+    <contour>
+      <point x="300" y="-10" type="curve" smooth="yes"/>
+      <point x="431" y="-10"/>
+      <point x="518" y="131"/>
+      <point x="518" y="343" type="curve" smooth="yes"/>
+      <point x="518" y="556"/>
+      <point x="432" y="699"/>
+      <point x="304" y="699" type="curve" smooth="yes"/>
+      <point x="171" y="699"/>
+      <point x="83" y="555"/>
+      <point x="83" y="340" type="curve" smooth="yes"/>
+      <point x="83" y="130"/>
+      <point x="170" y="-10"/>
+    </contour>
+    <contour>
+      <point x="303" y="8" type="curve" smooth="yes"/>
+      <point x="184" y="8"/>
+      <point x="104" y="142"/>
+      <point x="104" y="343" type="curve" smooth="yes"/>
+      <point x="104" y="546"/>
+      <point x="183" y="681"/>
+      <point x="301" y="681" type="curve" smooth="yes"/>
+      <point x="419" y="681"/>
+      <point x="497" y="544"/>
+      <point x="497" y="340" type="curve" smooth="yes"/>
+      <point x="497" y="141"/>
+      <point x="419" y="8"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.O_utline/S_hcha-cy.glif 
b/src/Cantarell-Light.ufo/glyphs.O_utline/S_hcha-cy.glif
new file mode 100644
index 00000000..249b1807
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.O_utline/S_hcha-cy.glif
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="Shcha-cy" format="2">
+  <advance width="945"/>
+  <unicode hex="0429"/>
+  <outline>
+    <contour>
+      <point x="893" y="-175" type="line"/>
+      <point x="914" y="-175" type="line"/>
+      <point x="914" y="19" type="line"/>
+      <point x="126" y="19" type="line"/>
+      <point x="126" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
+      <point x="104" y="0" type="line"/>
+      <point x="893" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="468" y="10" type="line"/>
+      <point x="490" y="10" type="line"/>
+      <point x="490" y="694" type="line"/>
+      <point x="468" y="694" type="line"/>
+    </contour>
+    <contour>
+      <point x="816" y="10" type="line"/>
+      <point x="838" y="10" type="line"/>
+      <point x="838" y="694" type="line"/>
+      <point x="816" y="694" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Tse-cy</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.O_utline/contents.plist 
b/src/Cantarell-Light.ufo/glyphs.O_utline/contents.plist
new file mode 100644
index 00000000..99caaef1
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.O_utline/contents.plist
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>Shcha-cy</key>
+    <string>S_hcha-cy.glif</string>
+    <key>shcha-cy</key>
+    <string>shcha-cy.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs.O_utline/layerinfo.plist 
b/src/Cantarell-Light.ufo/glyphs.O_utline/layerinfo.plist
new file mode 100644
index 00000000..f0504dd3
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.O_utline/layerinfo.plist
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>DEF37A5E-EF3C-457A-9F90-2A9B95CC11C6</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.Shcha-cy</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.shcha-cy</key>
+      <integer>5</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs.O_utline/shcha-cy.glif 
b/src/Cantarell-Light.ufo/glyphs.O_utline/shcha-cy.glif
new file mode 100644
index 00000000..17c969d1
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.O_utline/shcha-cy.glif
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="shcha-cy" format="2">
+  <advance width="751"/>
+  <unicode hex="0449"/>
+  <outline>
+    <contour>
+      <point x="695" y="-121" type="line"/>
+      <point x="714" y="-121" type="line"/>
+      <point x="714" y="17" type="line"/>
+      <point x="109" y="17" type="line"/>
+      <point x="109" y="480" type="line"/>
+      <point x="88" y="480" type="line"/>
+      <point x="88" y="0" type="line"/>
+      <point x="695" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="365" y="9" type="line"/>
+      <point x="386" y="9" type="line"/>
+      <point x="386" y="480" type="line"/>
+      <point x="365" y="480" type="line"/>
+    </contour>
+    <contour>
+      <point x="631" y="9" type="line"/>
+      <point x="652" y="9" type="line"/>
+      <point x="652" y="480" type="line"/>
+      <point x="631" y="480" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>height</key>
+        <integer>70</integer>
+        <key>width</key>
+        <integer>80</integer>
+      </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>tse-cy</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.S_lanted/contents.plist 
b/src/Cantarell-Light.ufo/glyphs.S_lanted/contents.plist
new file mode 100644
index 00000000..71cd4196
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.S_lanted/contents.plist
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>el-cy</key>
+    <string>el-cy.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs.S_lanted/el-cy.glif 
b/src/Cantarell-Light.ufo/glyphs.S_lanted/el-cy.glif
new file mode 100644
index 00000000..18552bde
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.S_lanted/el-cy.glif
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="el-cy" format="2">
+  <advance width="552"/>
+  <unicode hex="043B"/>
+  <outline>
+    <contour>
+      <point x="69" y="-7" type="curve" smooth="yes"/>
+      <point x="115" y="-7"/>
+      <point x="136" y="29"/>
+      <point x="150" y="115" type="curve" smooth="yes"/>
+      <point x="207" y="463" type="line"/>
+      <point x="425" y="463" type="line"/>
+      <point x="425" y="0" type="line"/>
+      <point x="445" y="0" type="line"/>
+      <point x="445" y="480" type="line"/>
+      <point x="190" y="480" type="line"/>
+      <point x="134" y="122" type="line" smooth="yes"/>
+      <point x="122" y="47"/>
+      <point x="103" y="10"/>
+      <point x="66" y="10" type="curve" smooth="yes"/>
+      <point x="51" y="10"/>
+      <point x="35" y="16"/>
+      <point x="19" y="27" type="curve"/>
+      <point x="12" y="13" type="line"/>
+      <point x="25" y="1"/>
+      <point x="46" y="-7"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>height</key>
+        <integer>70</integer>
+        <key>weight</key>
+        <integer>-2</integer>
+        <key>width</key>
+        <integer>80</integer>
+      </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.S_lanted/layerinfo.plist 
b/src/Cantarell-Light.ufo/glyphs.S_lanted/layerinfo.plist
new file mode 100644
index 00000000..afb8f0ca
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.S_lanted/layerinfo.plist
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>1F83EC96-3622-449C-A91A-96D65254A2B1</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.el-cy</key>
+      <integer>4</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs.S_teeper/be-cy.glif 
b/src/Cantarell-Light.ufo/glyphs.S_teeper/be-cy.glif
new file mode 100644
index 00000000..51dc811a
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.S_teeper/be-cy.glif
@@ -0,0 +1,43 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="be-cy" format="2">
+  <advance width="515"/>
+  <unicode hex="0431"/>
+  <outline>
+    <contour>
+      <point x="265" y="-10" type="curve" smooth="yes"/>
+      <point x="384" y="-10"/>
+      <point x="460" y="83"/>
+      <point x="460" y="222" type="curve" smooth="yes"/>
+      <point x="460" y="363"/>
+      <point x="390" y="446"/>
+      <point x="273" y="446" type="curve" smooth="yes"/>
+      <point x="183" y="446"/>
+      <point x="112" y="400"/>
+      <point x="81" y="322" type="curve"/>
+      <point x="81" y="292" type="line"/>
+      <point x="115" y="381"/>
+      <point x="180" y="428"/>
+      <point x="265" y="428" type="curve" smooth="yes"/>
+      <point x="374" y="428"/>
+      <point x="439" y="353"/>
+      <point x="439" y="220" type="curve" smooth="yes"/>
+      <point x="439" y="91"/>
+      <point x="372" y="8"/>
+      <point x="266" y="8" type="curve" smooth="yes"/>
+      <point x="149" y="8"/>
+      <point x="89" y="115"/>
+      <point x="89" y="322" type="curve" smooth="yes"/>
+      <point x="89" y="552"/>
+      <point x="137" y="634"/>
+      <point x="299" y="681" type="curve" smooth="yes"/>
+      <point x="409" y="712" type="line"/>
+      <point x="404" y="730" type="line"/>
+      <point x="293" y="699" type="line" smooth="yes"/>
+      <point x="125" y="651"/>
+      <point x="69" y="555"/>
+      <point x="69" y="316" type="curve" smooth="yes"/>
+      <point x="69" y="101"/>
+      <point x="135" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.S_teeper/contents.plist 
b/src/Cantarell-Light.ufo/glyphs.S_teeper/contents.plist
new file mode 100644
index 00000000..1ae1e5b4
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.S_teeper/contents.plist
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>be-cy</key>
+    <string>be-cy.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs.S_teeper/layerinfo.plist 
b/src/Cantarell-Light.ufo/glyphs.S_teeper/layerinfo.plist
new file mode 100644
index 00000000..ecc9b944
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.S_teeper/layerinfo.plist
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>A3CE2618-B7B9-4EFA-A6FD-5883A4EDFA17</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.be-cy</key>
+      <integer>10</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs.T_emplate/florin.glif 
b/src/Cantarell-Light.ufo/glyphs.T_emplate/florin.glif
index 6ca515c5..cbd23436 100644
--- a/src/Cantarell-Light.ufo/glyphs.T_emplate/florin.glif
+++ b/src/Cantarell-Light.ufo/glyphs.T_emplate/florin.glif
@@ -8,6 +8,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>0</integer>
diff --git a/src/Cantarell-Light.ufo/glyphs.W_avy/be-cy.glif b/src/Cantarell-Light.ufo/glyphs.W_avy/be-cy.glif
new file mode 100644
index 00000000..2e22cf33
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.W_avy/be-cy.glif
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="be-cy" format="2">
+  <advance width="515"/>
+  <unicode hex="0431"/>
+  <outline>
+    <contour>
+      <point x="265" y="-10" type="curve" smooth="yes"/>
+      <point x="384" y="-10"/>
+      <point x="460" y="83"/>
+      <point x="460" y="222" type="curve" smooth="yes"/>
+      <point x="460" y="363"/>
+      <point x="390" y="446"/>
+      <point x="273" y="446" type="curve" smooth="yes"/>
+      <point x="183" y="446"/>
+      <point x="112" y="400"/>
+      <point x="81" y="322" type="curve"/>
+      <point x="81" y="292" type="line"/>
+      <point x="115" y="381"/>
+      <point x="180" y="428"/>
+      <point x="265" y="428" type="curve" smooth="yes"/>
+      <point x="374" y="428"/>
+      <point x="439" y="353"/>
+      <point x="439" y="220" type="curve" smooth="yes"/>
+      <point x="439" y="91"/>
+      <point x="372" y="8"/>
+      <point x="266" y="8" type="curve" smooth="yes"/>
+      <point x="149" y="8"/>
+      <point x="89" y="115"/>
+      <point x="89" y="322" type="curve" smooth="yes"/>
+      <point x="89" y="560"/>
+      <point x="146" y="654"/>
+      <point x="303" y="677" type="curve" smooth="yes"/>
+      <point x="357" y="685"/>
+      <point x="402" y="701"/>
+      <point x="427" y="722" type="curve"/>
+      <point x="418" y="740" type="line"/>
+      <point x="393" y="719"/>
+      <point x="344" y="702"/>
+      <point x="291" y="695" type="curve" smooth="yes"/>
+      <point x="132" y="674"/>
+      <point x="69" y="566"/>
+      <point x="69" y="316" type="curve" smooth="yes"/>
+      <point x="69" y="101"/>
+      <point x="135" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.W_avy/contents.plist 
b/src/Cantarell-Light.ufo/glyphs.W_avy/contents.plist
new file mode 100644
index 00000000..1ae1e5b4
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.W_avy/contents.plist
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>be-cy</key>
+    <string>be-cy.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs.W_avy/layerinfo.plist 
b/src/Cantarell-Light.ufo/glyphs.W_avy/layerinfo.plist
new file mode 100644
index 00000000..fc012bf1
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.W_avy/layerinfo.plist
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>C9D34AE2-2F48-44D6-9E3A-72B0149EC596</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.be-cy</key>
+      <integer>2</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_-cy.glif b/src/Cantarell-Light.ufo/glyphs/A_-cy.glif
index aeca432b..a1269a56 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="A-cy" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="0410"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_.glif b/src/Cantarell-Light.ufo/glyphs/A_.glif
index e92433dc..de9db1f7 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_.glif
@@ -1,29 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="A" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="0041"/>
-  <note>
-A
-</note>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
+  <anchor x="320" y="0" name="bottom"/>
+  <anchor x="582" y="10" name="ogonek"/>
+  <anchor x="323" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="44" y="0" type="line"/>
-      <point x="66" y="0" type="line"/>
-      <point x="326" y="676" type="line"/>
-      <point x="322" y="676" type="line"/>
-      <point x="565" y="0" type="line"/>
-      <point x="589" y="0" type="line"/>
-      <point x="337" y="694" type="line"/>
-      <point x="314" y="694" type="line"/>
+      <point x="38" y="0" type="line"/>
+      <point x="60" y="0" type="line"/>
+      <point x="323" y="676" type="line"/>
+      <point x="319" y="676" type="line"/>
+      <point x="564" y="0" type="line"/>
+      <point x="588" y="0" type="line"/>
+      <point x="334" y="694" type="line"/>
+      <point x="311" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="152" y="249" type="line"/>
-      <point x="489" y="249" type="line"/>
-      <point x="483" y="268" type="line"/>
-      <point x="157" y="268" type="line"/>
+      <point x="147" y="249" type="line"/>
+      <point x="487" y="249" type="line"/>
+      <point x="481" y="268" type="line"/>
+      <point x="152" y="268" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_E_.glif b/src/Cantarell-Light.ufo/glyphs/A_E_.glif
index 9e3a95b5..7da954bf 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_E_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_E_.glif
@@ -1,45 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="AE" format="2">
-  <advance width="914"/>
+  <advance width="876"/>
   <unicode hex="00C6"/>
-  <anchor x="500" y="0" name="bottom"/>
-  <anchor x="500" y="694" name="top"/>
+  <anchor x="449" y="0" name="bottom"/>
+  <anchor x="449" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="51" y="0" type="line"/>
-      <point x="74" y="0" type="line"/>
-      <point x="493" y="694" type="line"/>
-      <point x="474" y="694" type="line"/>
+      <point x="0" y="0" type="line"/>
+      <point x="23" y="0" type="line"/>
+      <point x="442" y="694" type="line"/>
+      <point x="423" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="210" y="243" type="line"/>
-      <point x="488" y="243" type="line"/>
-      <point x="489" y="262" type="line"/>
-      <point x="219" y="262" type="line"/>
+      <point x="159" y="243" type="line"/>
+      <point x="437" y="243" type="line"/>
+      <point x="438" y="262" type="line"/>
+      <point x="168" y="262" type="line"/>
     </contour>
     <contour>
-      <point x="478" y="0" type="line"/>
-      <point x="499" y="0" type="line"/>
-      <point x="499" y="694" type="line"/>
-      <point x="478" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="487" y="0" type="line"/>
-      <point x="865" y="0" type="line"/>
-      <point x="865" y="18" type="line"/>
-      <point x="487" y="18" type="line"/>
-    </contour>
-    <contour>
-      <point x="487" y="351" type="line"/>
-      <point x="840" y="351" type="line"/>
-      <point x="840" y="369" type="line"/>
-      <point x="487" y="369" type="line"/>
-    </contour>
-    <contour>
-      <point x="487" y="676" type="line"/>
-      <point x="865" y="676" type="line"/>
-      <point x="865" y="694" type="line"/>
-      <point x="487" y="694" type="line"/>
+      <point x="427" y="0" type="line"/>
+      <point x="814" y="0" type="line"/>
+      <point x="814" y="18" type="line"/>
+      <point x="448" y="18" type="line"/>
+      <point x="448" y="351" type="line"/>
+      <point x="789" y="351" type="line"/>
+      <point x="789" y="369" type="line"/>
+      <point x="448" y="369" type="line"/>
+      <point x="448" y="676" type="line"/>
+      <point x="814" y="676" type="line"/>
+      <point x="814" y="694" type="line"/>
+      <point x="427" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_E_acute.glif b/src/Cantarell-Light.ufo/glyphs/A_E_acute.glif
index 5fb23bd9..3de86eb7 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_E_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_E_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="AEacute" format="2">
-  <advance width="914"/>
+  <advance width="876"/>
   <unicode hex="01FC"/>
   <outline>
     <component base="AE"/>
-    <component base="acutecomb.case" xOffset="442"/>
+    <component base="acutecomb.case" xOffset="391"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_acute.glif b/src/Cantarell-Light.ufo/glyphs/A_acute.glif
index b3787921..70f59fc2 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aacute" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="00C1"/>
   <outline>
     <component base="A"/>
-    <component base="acutecomb.case" xOffset="268"/>
+    <component base="acutecomb.case" xOffset="265"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_breve-cy.glif b/src/Cantarell-Light.ufo/glyphs/A_breve-cy.glif
index 2fa1fde8..35b6931e 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_breve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_breve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreve-cy" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="04D0"/>
   <outline>
     <component base="A-cy"/>
-    <component base="brevecomb-cy.case" xOffset="133"/>
+    <component base="brevecomb-cy.case" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_breve.glif b/src/Cantarell-Light.ufo/glyphs/A_breve.glif
index daa93b58..8da23835 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreve" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="0102"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.case" xOffset="123"/>
+    <component base="brevecomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_breveacute.glif 
b/src/Cantarell-Light.ufo/glyphs/A_breveacute.glif
index ba76237a..bc2c8be0 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_breveacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_breveacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreveacute" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1EAE"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_acutecomb.case" xOffset="146" yOffset="14"/>
+    <component base="brevecomb.loclVIET" xOffset="115" yOffset="214"/>
+    <component base="acutecomb.loclVIET" xOffset="248" yOffset="294"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_brevedotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/A_brevedotbelow.glif
index 1aec1e16..b5b2e31b 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_brevedotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_brevedotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevedotbelow" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1EB6"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="203"/>
-    <component base="brevecomb.case" xOffset="123"/>
+    <component base="dotbelowcomb" xOffset="200"/>
+    <component base="brevecomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_brevegrave.glif 
b/src/Cantarell-Light.ufo/glyphs/A_brevegrave.glif
index 23b3473b..d324cf3b 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_brevegrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_brevegrave.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevegrave" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1EB0"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_gravecomb.case" xOffset="135" yOffset="14"/>
+    <component base="brevecomb.loclVIET" xOffset="115" yOffset="214"/>
+    <component base="gravecomb.loclVIET" xOffset="144" yOffset="294"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_brevehookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/A_brevehookabove.glif
index 6e7c9609..41360c2a 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_brevehookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_brevehookabove.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevehookabove" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1EB2"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_hookabovecomb.case" xOffset="140" yOffset="14"/>
+    <component base="brevecomb.loclVIET" xOffset="115" yOffset="214"/>
+    <component base="hookabovecomb.loclVIET" xOffset="175" yOffset="294"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_brevetilde.glif 
b/src/Cantarell-Light.ufo/glyphs/A_brevetilde.glif
index 2f824d6a..cbeb8e22 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_brevetilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_brevetilde.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevetilde" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1EB4"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_tildecomb.case" xOffset="107" yOffset="14"/>
+    <component base="brevecomb.loclVIET" xOffset="115" yOffset="214"/>
+    <component base="tildecomb.loclVIET" xOffset="86" yOffset="294"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_caron.glif b/src/Cantarell-Light.ufo/glyphs/A_caron.glif
index 532c1e6d..e8c2f1df 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acaron" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="01CD"/>
   <outline>
     <component base="A"/>
-    <component base="caroncomb.case" xOffset="151"/>
+    <component base="caroncomb.case" xOffset="148"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflex.glif
index b5f2e46f..772a598e 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflex" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="00C2"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.case" xOffset="149"/>
+    <component base="circumflexcomb.case" xOffset="146"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflexacute.glif
index b280e2dd..90bb9f25 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflexacute.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexacute" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1EA4"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="169" yOffset="14"/>
+    <component base="circumflexcomb.loclVIET" xOffset="147" yOffset="214"/>
+    <component base="acutecomb.loclVIET" xOffset="366" yOffset="288"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflexdotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflexdotbelow.glif
index d3f78220..2ff56055 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflexdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexdotbelow" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1EAC"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="203"/>
-    <component base="circumflexcomb.case" xOffset="149"/>
+    <component base="dotbelowcomb" xOffset="200"/>
+    <component base="circumflexcomb.case" xOffset="146"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflexgrave.glif
index 68f7ee30..ea8eac35 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflexgrave.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexgrave" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1EA6"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="169" yOffset="14"/>
+    <component base="circumflexcomb.loclVIET" xOffset="147" yOffset="214"/>
+    <component base="gravecomb.loclVIET" xOffset="262" yOffset="288"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflexhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflexhookabove.glif
index febe5411..c70f5188 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflexhookabove.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexhookabove" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1EA8"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="169" yOffset="14"/>
+    <component base="circumflexcomb.loclVIET" xOffset="147" yOffset="214"/>
+    <component base="hookabovecomb.loclVIET" xOffset="293" yOffset="288"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflextilde.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflextilde.glif
index 6d0d4a2f..83b8dbc5 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflextilde.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflextilde" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1EAA"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="127" yOffset="14"/>
+    <component base="circumflexcomb.loclVIET" xOffset="147" yOffset="214"/>
+    <component base="tildecomb.loclVIET" xOffset="96" yOffset="294"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/A_dblgrave.glif
index f7f18920..c0dd4472 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_dblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adblgrave" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="0200"/>
   <outline>
     <component base="A"/>
-    <component base="dblgravecomb.case" xOffset="83"/>
+    <component base="dblgravecomb.case" xOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_dieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/A_dieresis-cy.glif
index e4113791..e9dffb5e 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_dieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_dieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adieresis-cy" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="04D2"/>
   <outline>
     <component base="A-cy"/>
-    <component base="dieresiscomb.case" xOffset="106"/>
+    <component base="dieresiscomb.case" xOffset="103"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/A_dieresis.glif
index 4857292a..18766701 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adieresis" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="00C4"/>
   <outline>
     <component base="A"/>
-    <component base="dieresiscomb.case" xOffset="106"/>
+    <component base="dieresiscomb.case" xOffset="103"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/A_dotbelow.glif
index 81b14647..15aed9b5 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adotbelow" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1EA0"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="203"/>
+    <component base="dotbelowcomb" xOffset="200"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_grave.glif b/src/Cantarell-Light.ufo/glyphs/A_grave.glif
index d4e7360d..22c161a5 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Agrave" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="00C0"/>
   <outline>
     <component base="A"/>
-    <component base="gravecomb.case" xOffset="129"/>
+    <component base="gravecomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/A_hookabove.glif
index 98a1f4cb..d8464dbd 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_hookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ahookabove" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1EA2"/>
   <outline>
     <component base="A"/>
-    <component base="hookabovecomb.case" xOffset="171"/>
+    <component base="hookabovecomb.case" xOffset="168"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_ie-cy.glif b/src/Cantarell-Light.ufo/glyphs/A_ie-cy.glif
index 893acd57..18d42151 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_ie-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_ie-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aie-cy" format="2">
-  <advance width="914"/>
+  <advance width="876"/>
   <unicode hex="04D4"/>
   <outline>
     <component base="AE"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/A_invertedbreve.glif
index d4e9e986..eea7eb08 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_invertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ainvertedbreve" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="0202"/>
   <outline>
     <component base="A"/>
-    <component base="breveinvertedcomb.case" xOffset="120"/>
+    <component base="breveinvertedcomb.case" xOffset="117"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_macron.glif b/src/Cantarell-Light.ufo/glyphs/A_macron.glif
index 66f70954..fa9f71e0 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Amacron" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="0100"/>
   <outline>
     <component base="A"/>
-    <component base="macroncomb.case" xOffset="88"/>
+    <component base="macroncomb.case" xOffset="85"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_ogonek.glif b/src/Cantarell-Light.ufo/glyphs/A_ogonek.glif
index 43d5baa3..365bbce6 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_ogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aogonek" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="0104"/>
   <outline>
     <component base="A"/>
-    <component base="ogonekcomb" xOffset="182"/>
+    <component base="ogonekcomb" xOffset="181"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_ring.glif b/src/Cantarell-Light.ufo/glyphs/A_ring.glif
index 508acc83..01270ebb 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_ring.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_ring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aring" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="00C5"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb.case" xOffset="152"/>
+    <component base="ringcomb.case" xOffset="149"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_ringacute.glif b/src/Cantarell-Light.ufo/glyphs/A_ringacute.glif
index 83267fb7..81a8d332 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_ringacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_ringacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aringacute" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="01FA"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb_acutecomb.case" xOffset="167"/>
+    <component base="ringcomb_acutecomb.case" xOffset="164"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_tilde.glif b/src/Cantarell-Light.ufo/glyphs/A_tilde.glif
index 7f22ebb3..0bc89671 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Atilde" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="00C3"/>
   <outline>
     <component base="A"/>
-    <component base="tildecomb.case" xOffset="82"/>
+    <component base="tildecomb.case" xOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/B_.glif b/src/Cantarell-Light.ufo/glyphs/B_.glif
index 09eeafbd..b5a236da 100644
--- a/src/Cantarell-Light.ufo/glyphs/B_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/B_.glif
@@ -1,48 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="B" format="2">
-  <advance width="619"/>
+  <advance width="633"/>
   <unicode hex="0042"/>
-  <note>
-B
-</note>
-  <anchor x="267" y="0" name="bottom"/>
-  <anchor x="267" y="694" name="top"/>
+  <anchor x="280" y="0" name="bottom"/>
+  <anchor x="280" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="319" y="0" type="line" smooth="yes"/>
-      <point x="473" y="0"/>
-      <point x="557" y="68"/>
-      <point x="557" y="185" type="curve" smooth="yes"/>
-      <point x="557" y="300"/>
-      <point x="475" y="373"/>
-      <point x="353" y="373" type="curve" smooth="yes"/>
-      <point x="124" y="373" type="line"/>
-      <point x="124" y="356" type="line"/>
-      <point x="343" y="356" type="line" smooth="yes"/>
-      <point x="462" y="356"/>
-      <point x="535" y="288"/>
-      <point x="535" y="181" type="curve" smooth="yes"/>
-      <point x="535" y="75"/>
-      <point x="464" y="18"/>
-      <point x="330" y="18" type="curve" smooth="yes"/>
-      <point x="130" y="18" type="line"/>
-      <point x="130" y="676" type="line"/>
-      <point x="286" y="676" type="line" smooth="yes"/>
-      <point x="414" y="676"/>
-      <point x="484" y="622"/>
-      <point x="484" y="521" type="curve" smooth="yes"/>
-      <point x="484" y="442"/>
-      <point x="441" y="388"/>
-      <point x="357" y="369" type="curve"/>
-      <point x="383" y="365" type="line"/>
-      <point x="457" y="379"/>
-      <point x="506" y="444"/>
-      <point x="506" y="528" type="curve" smooth="yes"/>
-      <point x="506" y="635"/>
-      <point x="427" y="694"/>
-      <point x="286" y="694" type="curve" smooth="yes"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="332" y="0" type="line" smooth="yes"/>
+      <point x="486" y="0"/>
+      <point x="570" y="68"/>
+      <point x="570" y="185" type="curve" smooth="yes"/>
+      <point x="570" y="300"/>
+      <point x="488" y="373"/>
+      <point x="366" y="373" type="curve" smooth="yes"/>
+      <point x="137" y="373" type="line"/>
+      <point x="137" y="356" type="line"/>
+      <point x="356" y="356" type="line" smooth="yes"/>
+      <point x="475" y="356"/>
+      <point x="548" y="288"/>
+      <point x="548" y="181" type="curve" smooth="yes"/>
+      <point x="548" y="75"/>
+      <point x="477" y="18"/>
+      <point x="343" y="18" type="curve" smooth="yes"/>
+      <point x="143" y="18" type="line"/>
+      <point x="143" y="676" type="line"/>
+      <point x="299" y="676" type="line" smooth="yes"/>
+      <point x="427" y="676"/>
+      <point x="497" y="622"/>
+      <point x="497" y="521" type="curve" smooth="yes"/>
+      <point x="497" y="442"/>
+      <point x="454" y="388"/>
+      <point x="370" y="369" type="curve"/>
+      <point x="396" y="365" type="line"/>
+      <point x="470" y="379"/>
+      <point x="519" y="444"/>
+      <point x="519" y="528" type="curve" smooth="yes"/>
+      <point x="519" y="635"/>
+      <point x="440" y="694"/>
+      <point x="299" y="694" type="curve" smooth="yes"/>
+      <point x="123" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/B_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/B_e-cy.glif
index d9a72447..4928b3cf 100644
--- a/src/Cantarell-Light.ufo/glyphs/B_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/B_e-cy.glif
@@ -1,31 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Be-cy" format="2">
-  <advance width="605"/>
+  <advance width="622"/>
   <unicode hex="0411"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="318" y="0" type="line" smooth="yes"/>
-      <point x="463" y="0"/>
-      <point x="546" y="71"/>
-      <point x="546" y="195" type="curve" smooth="yes"/>
-      <point x="546" y="317"/>
-      <point x="471" y="393"/>
-      <point x="352" y="393" type="curve" smooth="yes"/>
-      <point x="124" y="393" type="line"/>
-      <point x="124" y="376" type="line"/>
-      <point x="342" y="376" type="line" smooth="yes"/>
-      <point x="454" y="376"/>
-      <point x="524" y="305"/>
-      <point x="524" y="191" type="curve" smooth="yes"/>
-      <point x="524" y="78"/>
-      <point x="456" y="18"/>
-      <point x="329" y="18" type="curve" smooth="yes"/>
-      <point x="132" y="18" type="line"/>
-      <point x="132" y="676" type="line"/>
-      <point x="476" y="676" type="line"/>
-      <point x="476" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="331" y="0" type="line" smooth="yes"/>
+      <point x="476" y="0"/>
+      <point x="559" y="71"/>
+      <point x="559" y="195" type="curve" smooth="yes"/>
+      <point x="559" y="317"/>
+      <point x="484" y="393"/>
+      <point x="365" y="393" type="curve" smooth="yes"/>
+      <point x="137" y="393" type="line"/>
+      <point x="137" y="376" type="line"/>
+      <point x="355" y="376" type="line" smooth="yes"/>
+      <point x="467" y="376"/>
+      <point x="537" y="305"/>
+      <point x="537" y="191" type="curve" smooth="yes"/>
+      <point x="537" y="78"/>
+      <point x="469" y="18"/>
+      <point x="342" y="18" type="curve" smooth="yes"/>
+      <point x="145" y="18" type="line"/>
+      <point x="145" y="676" type="line"/>
+      <point x="489" y="676" type="line"/>
+      <point x="489" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Softsign-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_.glif b/src/Cantarell-Light.ufo/glyphs/C_.glif
index c446232b..f3588fdc 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_.glif
@@ -1,40 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="C" format="2">
-  <advance width="646"/>
+  <advance width="655"/>
   <unicode hex="0043"/>
-  <note>
-C
-</note>
-  <anchor x="359" y="0" name="bottom"/>
-  <anchor x="359" y="694" name="top"/>
+  <anchor x="361" y="0" name="bottom"/>
+  <anchor x="361" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="395" y="-10" type="curve" smooth="yes"/>
-      <point x="461" y="-10"/>
-      <point x="535" y="6"/>
-      <point x="596" y="33" type="curve"/>
-      <point x="591" y="49" type="line"/>
-      <point x="531" y="24"/>
-      <point x="459" y="9"/>
-      <point x="399" y="9" type="curve" smooth="yes"/>
-      <point x="216" y="9"/>
-      <point x="92" y="145"/>
-      <point x="92" y="348" type="curve" smooth="yes"/>
-      <point x="92" y="549"/>
-      <point x="219" y="683"/>
-      <point x="409" y="683" type="curve" smooth="yes"/>
-      <point x="469" y="683"/>
-      <point x="532" y="670"/>
-      <point x="590" y="645" type="curve"/>
-      <point x="597" y="662" type="line"/>
-      <point x="539" y="689"/>
-      <point x="476" y="702"/>
-      <point x="412" y="702" type="curve" smooth="yes"/>
-      <point x="207" y="702"/>
-      <point x="70" y="556"/>
-      <point x="70" y="338" type="curve" smooth="yes"/>
-      <point x="70" y="129"/>
-      <point x="201" y="-10"/>
+      <point x="397" y="-10" type="curve" smooth="yes"/>
+      <point x="463" y="-10"/>
+      <point x="537" y="6"/>
+      <point x="598" y="33" type="curve"/>
+      <point x="593" y="49" type="line"/>
+      <point x="533" y="24"/>
+      <point x="461" y="9"/>
+      <point x="401" y="9" type="curve" smooth="yes"/>
+      <point x="218" y="9"/>
+      <point x="94" y="145"/>
+      <point x="94" y="348" type="curve" smooth="yes"/>
+      <point x="94" y="549"/>
+      <point x="221" y="683"/>
+      <point x="411" y="683" type="curve" smooth="yes"/>
+      <point x="471" y="683"/>
+      <point x="534" y="670"/>
+      <point x="592" y="645" type="curve"/>
+      <point x="599" y="662" type="line"/>
+      <point x="541" y="689"/>
+      <point x="478" y="702"/>
+      <point x="414" y="702" type="curve" smooth="yes"/>
+      <point x="209" y="702"/>
+      <point x="72" y="556"/>
+      <point x="72" y="338" type="curve" smooth="yes"/>
+      <point x="72" y="129"/>
+      <point x="203" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_acute.glif b/src/Cantarell-Light.ufo/glyphs/C_acute.glif
index f61122ff..163d092f 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cacute" format="2">
-  <advance width="646"/>
+  <advance width="655"/>
   <unicode hex="0106"/>
   <outline>
     <component base="C"/>
-    <component base="acutecomb.case" xOffset="301"/>
+    <component base="acutecomb.case" xOffset="303"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_caron.glif b/src/Cantarell-Light.ufo/glyphs/C_caron.glif
index c22b3cfe..c021d34c 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccaron" format="2">
-  <advance width="646"/>
+  <advance width="655"/>
   <unicode hex="010C"/>
   <outline>
     <component base="C"/>
-    <component base="caroncomb.case" xOffset="184"/>
+    <component base="caroncomb.case" xOffset="186"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_cedilla.glif b/src/Cantarell-Light.ufo/glyphs/C_cedilla.glif
index 7a918c63..b3db892c 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_cedilla.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedilla" format="2">
-  <advance width="646"/>
+  <advance width="655"/>
   <unicode hex="00C7"/>
   <outline>
     <component base="C"/>
-    <component base="cedillacomb" xOffset="234"/>
+    <component base="cedillacomb" xOffset="236"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_cedillaacute.glif 
b/src/Cantarell-Light.ufo/glyphs/C_cedillaacute.glif
index 5630b756..896f509a 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_cedillaacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_cedillaacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedillaacute" format="2">
-  <advance width="646"/>
+  <advance width="655"/>
   <unicode hex="1E08"/>
   <outline>
     <component base="C"/>
-    <component base="cedillacomb" xOffset="234"/>
-    <component base="acutecomb.case" xOffset="301"/>
+    <component base="cedillacomb" xOffset="236"/>
+    <component base="acutecomb.case" xOffset="303"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/C_circumflex.glif
index c3d3d6d5..f86a06c9 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccircumflex" format="2">
-  <advance width="646"/>
+  <advance width="655"/>
   <unicode hex="0108"/>
   <outline>
     <component base="C"/>
-    <component base="circumflexcomb.case" xOffset="182"/>
+    <component base="circumflexcomb.case" xOffset="184"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/C_dotaccent.glif
index 3a620b09..0020aa59 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cdotaccent" format="2">
-  <advance width="646"/>
+  <advance width="655"/>
   <unicode hex="010A"/>
   <outline>
     <component base="C"/>
-    <component base="dotaccentcomb.case" xOffset="240"/>
+    <component base="dotaccentcomb.case" xOffset="242"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_he-cy.glif b/src/Cantarell-Light.ufo/glyphs/C_he-cy.glif
index 46e52ac4..f20a4e23 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_he-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_he-cy.glif
@@ -1,33 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Che-cy" format="2">
-  <advance width="616"/>
+  <advance width="638"/>
   <unicode hex="0427"/>
-  <anchor x="532" y="0" name="bottomright"/>
-  <anchor x="309" y="694" name="top"/>
+  <anchor x="535" y="0" name="bottomright"/>
+  <anchor x="318" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="276" y="263" type="curve" smooth="yes"/>
-      <point x="365" y="263"/>
-      <point x="453" y="292"/>
-      <point x="503" y="329" type="curve"/>
-      <point x="493" y="340" type="line"/>
-      <point x="449" y="309"/>
-      <point x="362" y="281"/>
-      <point x="278" y="281" type="curve" smooth="yes"/>
-      <point x="162" y="281"/>
-      <point x="94" y="338"/>
-      <point x="94" y="435" type="curve" smooth="yes"/>
-      <point x="94" y="694" type="line"/>
-      <point x="73" y="694" type="line"/>
-      <point x="73" y="435" type="line" smooth="yes"/>
-      <point x="73" y="328"/>
-      <point x="146" y="263"/>
+      <point x="285" y="263" type="curve" smooth="yes"/>
+      <point x="374" y="263"/>
+      <point x="462" y="292"/>
+      <point x="512" y="329" type="curve"/>
+      <point x="502" y="340" type="line"/>
+      <point x="458" y="309"/>
+      <point x="371" y="281"/>
+      <point x="287" y="281" type="curve" smooth="yes"/>
+      <point x="171" y="281"/>
+      <point x="103" y="338"/>
+      <point x="103" y="435" type="curve" smooth="yes"/>
+      <point x="103" y="694" type="line"/>
+      <point x="82" y="694" type="line"/>
+      <point x="82" y="435" type="line" smooth="yes"/>
+      <point x="82" y="328"/>
+      <point x="155" y="263"/>
     </contour>
     <contour>
-      <point x="485" y="0" type="line"/>
-      <point x="506" y="0" type="line"/>
-      <point x="506" y="694" type="line"/>
-      <point x="485" y="694" type="line"/>
+      <point x="494" y="0" type="line"/>
+      <point x="515" y="0" type="line"/>
+      <point x="515" y="694" type="line"/>
+      <point x="494" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_hedescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/C_hedescender-cy.glif
index 0649274a..4aca1120 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_hedescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_hedescender-cy.glif
@@ -1,18 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chedescender-cy" format="2">
-  <advance width="627"/>
+  <advance width="638"/>
   <unicode hex="04B6"/>
   <outline>
     <component base="Che-cy"/>
-    <component base="descender-cy.case" xOffset="436"/>
+    <component base="descender-cy.case" xOffset="439"/>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>0</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Che-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Tse-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_hedieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/C_hedieresis-cy.glif
index 101258ef..4ed977c4 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_hedieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_hedieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chedieresis-cy" format="2">
-  <advance width="616"/>
+  <advance width="638"/>
   <unicode hex="04F4"/>
   <outline>
     <component base="Che-cy"/>
-    <component base="dieresiscomb.case" xOffset="89"/>
+    <component base="dieresiscomb.case" xOffset="98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_hekhakassian-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/C_hekhakassian-cy.glif
index fddb81a2..0ed252ed 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_hekhakassian-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_hekhakassian-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chekhakassian-cy" format="2">
-  <advance width="616"/>
+  <advance width="638"/>
   <unicode hex="04CB"/>
   <outline>
     <component base="Che-cy"/>
-    <component base="_descenderreverse-cy.case" xOffset="418"/>
+    <component base="_descenderreverse-cy.case" xOffset="408"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_heverticalstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/C_heverticalstroke-cy.glif
index 8ebc2c27..1c095466 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_heverticalstroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_heverticalstroke-cy.glif
@@ -1,37 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cheverticalstroke-cy" format="2">
-  <advance width="636"/>
+  <advance width="658"/>
   <unicode hex="04B8"/>
   <outline>
     <contour>
-      <point x="287" y="263" type="curve" smooth="yes"/>
-      <point x="375" y="263"/>
-      <point x="468" y="290"/>
-      <point x="523" y="329" type="curve"/>
-      <point x="513" y="340" type="line"/>
-      <point x="464" y="307"/>
-      <point x="372" y="281"/>
-      <point x="289" y="281" type="curve" smooth="yes"/>
-      <point x="164" y="281"/>
-      <point x="94" y="338"/>
-      <point x="94" y="435" type="curve" smooth="yes"/>
-      <point x="94" y="694" type="line"/>
-      <point x="73" y="694" type="line"/>
-      <point x="73" y="435" type="line" smooth="yes"/>
-      <point x="73" y="328"/>
-      <point x="148" y="263"/>
+      <point x="296" y="263" type="curve" smooth="yes"/>
+      <point x="384" y="263"/>
+      <point x="477" y="290"/>
+      <point x="532" y="329" type="curve"/>
+      <point x="522" y="340" type="line"/>
+      <point x="473" y="307"/>
+      <point x="381" y="281"/>
+      <point x="298" y="281" type="curve" smooth="yes"/>
+      <point x="173" y="281"/>
+      <point x="103" y="338"/>
+      <point x="103" y="435" type="curve" smooth="yes"/>
+      <point x="103" y="694" type="line"/>
+      <point x="82" y="694" type="line"/>
+      <point x="82" y="435" type="line" smooth="yes"/>
+      <point x="82" y="328"/>
+      <point x="157" y="263"/>
     </contour>
     <contour>
-      <point x="289" y="96" type="line"/>
-      <point x="309" y="96" type="line"/>
-      <point x="309" y="456" type="line"/>
-      <point x="289" y="456" type="line"/>
+      <point x="298" y="96" type="line"/>
+      <point x="318" y="96" type="line"/>
+      <point x="318" y="456" type="line"/>
+      <point x="298" y="456" type="line"/>
     </contour>
     <contour>
-      <point x="505" y="0" type="line"/>
-      <point x="526" y="0" type="line"/>
-      <point x="526" y="694" type="line"/>
-      <point x="505" y="694" type="line"/>
+      <point x="514" y="0" type="line"/>
+      <point x="535" y="0" type="line"/>
+      <point x="535" y="694" type="line"/>
+      <point x="514" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Che-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_.glif b/src/Cantarell-Light.ufo/glyphs/D_.glif
index 1261f1d2..9f9e6e56 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_.glif
@@ -1,35 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="D" format="2">
-  <advance width="692"/>
+  <advance width="706"/>
   <unicode hex="0044"/>
-  <note>
-D
-</note>
-  <anchor x="340" y="0" name="bottom"/>
-  <anchor x="173" y="364" name="center"/>
-  <anchor x="330" y="694" name="top"/>
+  <anchor x="353" y="0" name="bottom"/>
+  <anchor x="186" y="364" name="center"/>
+  <anchor x="343" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="273" y="0" type="line" smooth="yes"/>
-      <point x="491" y="0"/>
-      <point x="621" y="131"/>
-      <point x="621" y="353" type="curve" smooth="yes"/>
-      <point x="621" y="573"/>
-      <point x="500" y="694"/>
-      <point x="279" y="694" type="curve" smooth="yes"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="286" y="0" type="line" smooth="yes"/>
+      <point x="504" y="0"/>
+      <point x="634" y="131"/>
+      <point x="634" y="353" type="curve" smooth="yes"/>
+      <point x="634" y="573"/>
+      <point x="513" y="694"/>
+      <point x="292" y="694" type="curve" smooth="yes"/>
+      <point x="123" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="132" y="18" type="line"/>
-      <point x="132" y="676" type="line"/>
-      <point x="273" y="676" type="line" smooth="yes"/>
-      <point x="487" y="676"/>
-      <point x="599" y="564"/>
-      <point x="599" y="348" type="curve" smooth="yes"/>
-      <point x="599" y="138"/>
-      <point x="483" y="18"/>
-      <point x="279" y="18" type="curve" smooth="yes"/>
+      <point x="145" y="18" type="line"/>
+      <point x="145" y="676" type="line"/>
+      <point x="286" y="676" type="line" smooth="yes"/>
+      <point x="500" y="676"/>
+      <point x="612" y="564"/>
+      <point x="612" y="348" type="curve" smooth="yes"/>
+      <point x="612" y="138"/>
+      <point x="496" y="18"/>
+      <point x="292" y="18" type="curve" smooth="yes"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_Z_caron.glif b/src/Cantarell-Light.ufo/glyphs/D_Z_caron.glif
index 060b1c9b..15d970d8 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_Z_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_Z_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="DZcaron" format="2">
-  <advance width="1308"/>
+  <advance width="1322"/>
   <unicode hex="01C4"/>
   <outline>
     <component base="D"/>
-    <component base="Zcaron" xOffset="692"/>
+    <component base="Zcaron" xOffset="706"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_caron.glif b/src/Cantarell-Light.ufo/glyphs/D_caron.glif
index b2afcf8a..311f3604 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dcaron" format="2">
-  <advance width="692"/>
+  <advance width="706"/>
   <unicode hex="010E"/>
   <outline>
     <component base="D"/>
-    <component base="caroncomb.case" xOffset="155"/>
+    <component base="caroncomb.case" xOffset="168"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_croat.glif b/src/Cantarell-Light.ufo/glyphs/D_croat.glif
index f4728bba..42afd576 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_croat.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_croat.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dcroat" format="2">
-  <advance width="692"/>
+  <advance width="706"/>
   <unicode hex="0110"/>
   <outline>
     <component base="Eth"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/D_dotbelow.glif
index 99943dd1..a56c25de 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ddotbelow" format="2">
-  <advance width="692"/>
+  <advance width="706"/>
   <unicode hex="1E0C"/>
   <outline>
     <component base="D"/>
-    <component base="dotbelowcomb" xOffset="220"/>
+    <component base="dotbelowcomb" xOffset="233"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/D_e-cy.glif
index a95e5162..7e2a80b5 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_e-cy.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="De-cy" format="2">
-  <advance width="702"/>
+  <advance width="694"/>
   <unicode hex="0414"/>
   <outline>
     <contour>
-      <point x="74" y="2" type="line"/>
-      <point x="184" y="2"/>
-      <point x="235" y="129"/>
-      <point x="235" y="407" type="curve" smooth="yes"/>
-      <point x="235" y="675" type="line"/>
-      <point x="553" y="675" type="line"/>
-      <point x="553" y="6" type="line"/>
-      <point x="575" y="6" type="line"/>
-      <point x="575" y="694" type="line"/>
-      <point x="213" y="694" type="line"/>
-      <point x="213" y="409" type="line" smooth="yes"/>
-      <point x="213" y="142"/>
-      <point x="169" y="19"/>
-      <point x="72" y="19" type="curve"/>
+      <point x="64" y="2" type="line"/>
+      <point x="170" y="2"/>
+      <point x="225" y="141"/>
+      <point x="225" y="407" type="curve" smooth="yes"/>
+      <point x="225" y="675" type="line"/>
+      <point x="543" y="675" type="line"/>
+      <point x="543" y="6" type="line"/>
+      <point x="565" y="6" type="line"/>
+      <point x="565" y="694" type="line"/>
+      <point x="203" y="694" type="line"/>
+      <point x="203" y="409" type="line" smooth="yes"/>
+      <point x="203" y="153"/>
+      <point x="155" y="19"/>
+      <point x="62" y="19" type="curve"/>
     </contour>
     <contour>
-      <point x="39" y="-175" type="line"/>
-      <point x="60" y="-175" type="line"/>
-      <point x="60" y="0" type="line"/>
-      <point x="642" y="0" type="line"/>
-      <point x="642" y="-175" type="line"/>
-      <point x="663" y="-175" type="line"/>
-      <point x="663" y="19" type="line"/>
-      <point x="39" y="19" type="line"/>
+      <point x="36" y="-175" type="line"/>
+      <point x="57" y="-175" type="line"/>
+      <point x="57" y="0" type="line"/>
+      <point x="620" y="0" type="line"/>
+      <point x="620" y="-175" type="line"/>
+      <point x="641" y="-175" type="line"/>
+      <point x="641" y="19" type="line"/>
+      <point x="36" y="19" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_je-cy.glif b/src/Cantarell-Light.ufo/glyphs/D_je-cy.glif
index 8854419f..16f2080f 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_je-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_je-cy.glif
@@ -1,41 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dje-cy" format="2">
-  <advance width="766"/>
+  <advance width="768"/>
   <unicode hex="0402"/>
   <outline>
     <contour>
-      <point x="461" y="0" type="line"/>
-      <point x="614" y="7"/>
-      <point x="706" y="91"/>
-      <point x="706" y="223" type="curve" smooth="yes"/>
-      <point x="706" y="349"/>
-      <point x="623" y="431"/>
-      <point x="495" y="431" type="curve" smooth="yes"/>
-      <point x="409" y="431"/>
-      <point x="315" y="395"/>
-      <point x="272" y="345" type="curve"/>
-      <point x="282" y="334" type="line"/>
-      <point x="322" y="379"/>
-      <point x="413" y="413"/>
-      <point x="492" y="413" type="curve" smooth="yes"/>
-      <point x="609" y="413"/>
-      <point x="685" y="338"/>
-      <point x="685" y="223" type="curve" smooth="yes"/>
-      <point x="685" y="102"/>
-      <point x="600" y="25"/>
-      <point x="459" y="18" type="curve"/>
+      <point x="457" y="0" type="line"/>
+      <point x="610" y="7"/>
+      <point x="702" y="91"/>
+      <point x="702" y="223" type="curve" smooth="yes"/>
+      <point x="702" y="349"/>
+      <point x="619" y="431"/>
+      <point x="491" y="431" type="curve" smooth="yes"/>
+      <point x="405" y="431"/>
+      <point x="311" y="395"/>
+      <point x="268" y="345" type="curve"/>
+      <point x="278" y="334" type="line"/>
+      <point x="318" y="379"/>
+      <point x="409" y="413"/>
+      <point x="488" y="413" type="curve" smooth="yes"/>
+      <point x="605" y="413"/>
+      <point x="681" y="338"/>
+      <point x="681" y="223" type="curve" smooth="yes"/>
+      <point x="681" y="102"/>
+      <point x="596" y="25"/>
+      <point x="455" y="18" type="curve"/>
     </contour>
     <contour>
-      <point x="270" y="0" type="line"/>
-      <point x="291" y="0" type="line"/>
-      <point x="291" y="694" type="line"/>
-      <point x="270" y="694" type="line"/>
+      <point x="266" y="0" type="line"/>
+      <point x="287" y="0" type="line"/>
+      <point x="287" y="694" type="line"/>
+      <point x="266" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="39" y="676" type="line"/>
-      <point x="543" y="676" type="line"/>
-      <point x="543" y="694" type="line"/>
-      <point x="39" y="694" type="line"/>
+      <point x="35" y="676" type="line"/>
+      <point x="539" y="676" type="line"/>
+      <point x="539" y="694" type="line"/>
+      <point x="35" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|Ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_linebelow.glif b/src/Cantarell-Light.ufo/glyphs/D_linebelow.glif
index 4446287d..d0a068d3 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_linebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dlinebelow" format="2">
-  <advance width="692"/>
+  <advance width="706"/>
   <unicode hex="1E0E"/>
   <outline>
     <component base="D"/>
-    <component base="macronbelowcomb" xOffset="90"/>
+    <component base="macronbelowcomb" xOffset="103"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_zcaron.glif b/src/Cantarell-Light.ufo/glyphs/D_zcaron.glif
index 0b48913e..4d2b44e2 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_zcaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_zcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dzcaron" format="2">
-  <advance width="1106"/>
+  <advance width="1157"/>
   <unicode hex="01C5"/>
   <outline>
     <component base="D"/>
-    <component base="zcaron" xOffset="692"/>
+    <component base="zcaron" xOffset="706"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_ze-cy.glif b/src/Cantarell-Light.ufo/glyphs/D_ze-cy.glif
index 0554b26b..d828d477 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_ze-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_ze-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dze-cy" format="2">
-  <advance width="569"/>
+  <advance width="586"/>
   <unicode hex="0405"/>
   <outline>
     <component base="S"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_zhe-cy.glif b/src/Cantarell-Light.ufo/glyphs/D_zhe-cy.glif
index 06ad4841..535f1b9b 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_zhe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_zhe-cy.glif
@@ -1,21 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dzhe-cy" format="2">
-  <advance width="700"/>
+  <advance width="726"/>
   <unicode hex="040F"/>
   <outline>
     <contour>
-      <point x="345" y="-175" type="line"/>
-      <point x="366" y="-175" type="line"/>
-      <point x="366" y="0" type="line"/>
-      <point x="590" y="0" type="line"/>
-      <point x="590" y="694" type="line"/>
-      <point x="569" y="694" type="line"/>
-      <point x="569" y="19" type="line"/>
-      <point x="132" y="19" type="line"/>
-      <point x="132" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
-      <point x="110" y="0" type="line"/>
-      <point x="345" y="0" type="line"/>
+      <point x="358" y="-175" type="line"/>
+      <point x="379" y="-175" type="line"/>
+      <point x="379" y="0" type="line"/>
+      <point x="603" y="0" type="line"/>
+      <point x="603" y="694" type="line"/>
+      <point x="582" y="694" type="line"/>
+      <point x="582" y="19" type="line"/>
+      <point x="145" y="19" type="line"/>
+      <point x="145" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="358" y="0" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_-cy.glif
index 5debf83e..73f689e7 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_-cy.glif
@@ -1,41 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="E-cy" format="2">
-  <advance width="664"/>
+  <advance width="673"/>
   <unicode hex="0404"/>
   <outline>
     <contour>
-      <point x="75" y="349" type="line"/>
-      <point x="546" y="349" type="line"/>
-      <point x="546" y="367" type="line"/>
-      <point x="75" y="367" type="line"/>
+      <point x="408" y="-10" type="curve" smooth="yes"/>
+      <point x="476" y="-10"/>
+      <point x="553" y="6"/>
+      <point x="616" y="33" type="curve"/>
+      <point x="611" y="49" type="line"/>
+      <point x="549" y="24"/>
+      <point x="474" y="9"/>
+      <point x="412" y="9" type="curve" smooth="yes"/>
+      <point x="223" y="9"/>
+      <point x="94" y="146"/>
+      <point x="94" y="348" type="curve" smooth="yes"/>
+      <point x="94" y="549"/>
+      <point x="227" y="683"/>
+      <point x="422" y="683" type="curve" smooth="yes"/>
+      <point x="485" y="683"/>
+      <point x="550" y="670"/>
+      <point x="610" y="645" type="curve"/>
+      <point x="617" y="662" type="line"/>
+      <point x="557" y="689"/>
+      <point x="491" y="702"/>
+      <point x="425" y="702" type="curve" smooth="yes"/>
+      <point x="215" y="702"/>
+      <point x="72" y="556"/>
+      <point x="72" y="338" type="curve" smooth="yes"/>
+      <point x="72" y="129"/>
+      <point x="208" y="-10"/>
     </contour>
     <contour>
-      <point x="406" y="-10" type="curve" smooth="yes"/>
-      <point x="474" y="-10"/>
-      <point x="551" y="6"/>
-      <point x="614" y="33" type="curve"/>
-      <point x="609" y="49" type="line"/>
-      <point x="547" y="24"/>
-      <point x="472" y="9"/>
-      <point x="410" y="9" type="curve" smooth="yes"/>
-      <point x="221" y="9"/>
-      <point x="92" y="146"/>
-      <point x="92" y="348" type="curve" smooth="yes"/>
-      <point x="92" y="549"/>
-      <point x="225" y="683"/>
-      <point x="420" y="683" type="curve" smooth="yes"/>
-      <point x="483" y="683"/>
-      <point x="548" y="670"/>
-      <point x="608" y="645" type="curve"/>
-      <point x="615" y="662" type="line"/>
-      <point x="555" y="689"/>
-      <point x="489" y="702"/>
-      <point x="423" y="702" type="curve" smooth="yes"/>
-      <point x="213" y="702"/>
-      <point x="70" y="556"/>
-      <point x="70" y="338" type="curve" smooth="yes"/>
-      <point x="70" y="129"/>
-      <point x="206" y="-10"/>
+      <point x="77" y="349" type="line"/>
+      <point x="548" y="349" type="line"/>
+      <point x="548" y="367" type="line"/>
+      <point x="77" y="367" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Es-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Es-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_.glif b/src/Cantarell-Light.ufo/glyphs/E_.glif
index ca883f78..ee32ccc2 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_.glif
@@ -1,38 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="E" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="0045"/>
-  <note>
-E
-</note>
-  <anchor x="304" y="0" name="bottom"/>
-  <anchor x="498" y="10" name="ogonek"/>
-  <anchor x="303" y="694" name="top"/>
-  <anchor x="-7" y="694" name="topleft"/>
+  <anchor x="317" y="0" name="bottom"/>
+  <anchor x="511" y="10" name="ogonek"/>
+  <anchor x="326" y="694" name="top"/>
+  <anchor x="6" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="131" y="0" type="line"/>
-      <point x="131" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="119" y="0" type="line"/>
-      <point x="504" y="0" type="line"/>
-      <point x="504" y="18" type="line"/>
-      <point x="119" y="18" type="line"/>
-    </contour>
-    <contour>
-      <point x="119" y="355" type="line"/>
-      <point x="477" y="355" type="line"/>
-      <point x="477" y="373" type="line"/>
-      <point x="119" y="373" type="line"/>
-    </contour>
-    <contour>
-      <point x="119" y="676" type="line"/>
-      <point x="504" y="676" type="line"/>
-      <point x="504" y="694" type="line"/>
-      <point x="119" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="517" y="0" type="line"/>
+      <point x="517" y="18" type="line"/>
+      <point x="144" y="18" type="line"/>
+      <point x="144" y="355" type="line"/>
+      <point x="490" y="355" type="line"/>
+      <point x="490" y="373" type="line"/>
+      <point x="144" y="373" type="line"/>
+      <point x="144" y="676" type="line"/>
+      <point x="517" y="676" type="line"/>
+      <point x="517" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_acute.glif b/src/Cantarell-Light.ufo/glyphs/E_acute.glif
index a00c4f27..fbf7b564 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eacute" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="00C9"/>
   <outline>
     <component base="E"/>
-    <component base="acutecomb.case" xOffset="245"/>
+    <component base="acutecomb.case" xOffset="268"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_breve.glif b/src/Cantarell-Light.ufo/glyphs/E_breve.glif
index 9926182d..206add31 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ebreve" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="0114"/>
   <outline>
     <component base="E"/>
-    <component base="brevecomb.case" xOffset="100"/>
+    <component base="brevecomb.case" xOffset="123"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_caron.glif b/src/Cantarell-Light.ufo/glyphs/E_caron.glif
index 78af5e57..a734a6df 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecaron" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="011A"/>
   <outline>
     <component base="E"/>
-    <component base="caroncomb.case" xOffset="128"/>
+    <component base="caroncomb.case" xOffset="151"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif 
b/src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif
index 82276a84..b53d4e5f 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecedillabreve" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="1E1C"/>
   <outline>
     <component base="E"/>
-    <component base="cedillacomb" xOffset="179"/>
-    <component base="brevecomb.case" xOffset="100"/>
+    <component base="cedillacomb" xOffset="192"/>
+    <component base="brevecomb.case" xOffset="123"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflex.glif
index 1b8b3ea5..fd4d6abe 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflex" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="00CA"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.case" xOffset="126"/>
+    <component base="circumflexcomb.case" xOffset="149"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif
index 157b43de..caceaaaa 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexacute" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="1EBE"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="146" yOffset="14"/>
+    <component base="circumflexcomb.loclVIET" xOffset="150" yOffset="214"/>
+    <component base="acutecomb.loclVIET" xOffset="369" yOffset="288"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexdotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexdotbelow.glif
index 5a042efd..f7d61a3d 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflexdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexdotbelow" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="1EC6"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="184"/>
-    <component base="circumflexcomb.case" xOffset="126"/>
+    <component base="dotbelowcomb" xOffset="197"/>
+    <component base="circumflexcomb.case" xOffset="149"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif
index 3117d542..95969d02 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexgrave" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="1EC0"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="146" yOffset="14"/>
+    <component base="circumflexcomb.loclVIET" xOffset="150" yOffset="214"/>
+    <component base="gravecomb.loclVIET" xOffset="265" yOffset="288"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexhookabove.glif
index e4a62966..f1d54fd4 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflexhookabove.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexhookabove" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="1EC2"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="146" yOffset="14"/>
+    <component base="circumflexcomb.loclVIET" xOffset="150" yOffset="214"/>
+    <component base="hookabovecomb.loclVIET" xOffset="296" yOffset="288"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflextilde.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflextilde.glif
index 11d2c9b6..40bb2225 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflextilde.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflextilde" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="1EC4"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="104" yOffset="14"/>
+    <component base="circumflexcomb.loclVIET" xOffset="150" yOffset="214"/>
+    <component base="tildecomb.loclVIET" xOffset="99" yOffset="294"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/E_dblgrave.glif
index f706b20c..7f66f4bc 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_dblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edblgrave" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="0204"/>
   <outline>
     <component base="E"/>
-    <component base="dblgravecomb.case" xOffset="60"/>
+    <component base="dblgravecomb.case" xOffset="83"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/E_dieresis.glif
index 884ea099..dbb5707d 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edieresis" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="00CB"/>
   <outline>
     <component base="E"/>
-    <component base="dieresiscomb.case" xOffset="83"/>
+    <component base="dieresiscomb.case" xOffset="106"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif
index c018ba6a..d3a62194 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotaccent" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="0116"/>
   <outline>
     <component base="E"/>
-    <component base="dotaccentcomb.case" xOffset="184"/>
+    <component base="dotaccentcomb.case" xOffset="207"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif
index f952513b..4e1809f9 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotbelow" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="1EB8"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="184"/>
+    <component base="dotbelowcomb" xOffset="197"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_f-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_f-cy.glif
index 20c51b4c..035b0046 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_f-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_f-cy.glif
@@ -1,41 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ef-cy" format="2">
-  <advance width="796"/>
+  <advance width="798"/>
   <unicode hex="0424"/>
   <outline>
     <contour>
-      <point x="397" y="86" type="curve" smooth="yes"/>
-      <point x="609" y="86"/>
-      <point x="734" y="184"/>
-      <point x="734" y="351" type="curve" smooth="yes"/>
-      <point x="734" y="517"/>
-      <point x="610" y="625"/>
-      <point x="399" y="625" type="curve" smooth="yes"/>
-      <point x="187" y="625"/>
-      <point x="62" y="516"/>
-      <point x="62" y="349" type="curve" smooth="yes"/>
-      <point x="62" y="184"/>
-      <point x="186" y="86"/>
+      <point x="387" y="-20" type="line"/>
+      <point x="408" y="-20" type="line"/>
+      <point x="408" y="714" type="line"/>
+      <point x="387" y="714" type="line"/>
     </contour>
     <contour>
-      <point x="400" y="105" type="curve" smooth="yes"/>
-      <point x="201" y="105"/>
-      <point x="84" y="196"/>
-      <point x="84" y="351" type="curve" smooth="yes"/>
-      <point x="84" y="505"/>
-      <point x="200" y="606"/>
-      <point x="397" y="606" type="curve" smooth="yes"/>
-      <point x="595" y="606"/>
-      <point x="712" y="504"/>
-      <point x="712" y="349" type="curve" smooth="yes"/>
-      <point x="712" y="196"/>
-      <point x="596" y="105"/>
+      <point x="398" y="86" type="curve" smooth="yes"/>
+      <point x="610" y="86"/>
+      <point x="735" y="184"/>
+      <point x="735" y="351" type="curve" smooth="yes"/>
+      <point x="735" y="517"/>
+      <point x="611" y="625"/>
+      <point x="400" y="625" type="curve" smooth="yes"/>
+      <point x="188" y="625"/>
+      <point x="63" y="516"/>
+      <point x="63" y="349" type="curve" smooth="yes"/>
+      <point x="63" y="184"/>
+      <point x="187" y="86"/>
     </contour>
     <contour>
-      <point x="386" y="-20" type="line"/>
-      <point x="407" y="-20" type="line"/>
-      <point x="407" y="714" type="line"/>
-      <point x="386" y="714" type="line"/>
+      <point x="401" y="105" type="curve" smooth="yes"/>
+      <point x="202" y="105"/>
+      <point x="85" y="196"/>
+      <point x="85" y="351" type="curve" smooth="yes"/>
+      <point x="85" y="505"/>
+      <point x="201" y="606"/>
+      <point x="398" y="606" type="curve" smooth="yes"/>
+      <point x="596" y="606"/>
+      <point x="713" y="504"/>
+      <point x="713" y="349" type="curve" smooth="yes"/>
+      <point x="713" y="196"/>
+      <point x="597" y="105"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_grave.glif b/src/Cantarell-Light.ufo/glyphs/E_grave.glif
index 13ca2dc4..2e0a9935 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Egrave" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="00C8"/>
   <outline>
     <component base="E"/>
-    <component base="gravecomb.case" xOffset="106"/>
+    <component base="gravecomb.case" xOffset="129"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/E_hookabove.glif
index 57024a3e..4cd51198 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_hookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ehookabove" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="1EBA"/>
   <outline>
     <component base="E"/>
-    <component base="hookabovecomb.case" xOffset="148"/>
+    <component base="hookabovecomb.case" xOffset="171"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/E_invertedbreve.glif
index 1d72cffd..525b2be2 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_invertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Einvertedbreve" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="0206"/>
   <outline>
     <component base="E"/>
-    <component base="breveinvertedcomb.case" xOffset="97"/>
+    <component base="breveinvertedcomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_l-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_l-cy.glif
index 4d437337..1bbdf82a 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_l-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_l-cy.glif
@@ -1,29 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="El-cy" format="2">
-  <advance width="685"/>
+  <advance width="694"/>
   <unicode hex="041B"/>
   <outline>
     <contour>
-      <point x="110" y="-6" type="curve" smooth="yes"/>
-      <point x="198" y="-6"/>
-      <point x="229" y="89"/>
-      <point x="229" y="362" type="curve" smooth="yes"/>
-      <point x="229" y="675" type="line"/>
-      <point x="553" y="675" type="line"/>
-      <point x="553" y="0" type="line"/>
-      <point x="575" y="0" type="line"/>
-      <point x="575" y="694" type="line"/>
-      <point x="207" y="694" type="line"/>
-      <point x="207" y="369" type="line" smooth="yes"/>
-      <point x="207" y="89"/>
-      <point x="185" y="14"/>
-      <point x="106" y="14" type="curve" smooth="yes"/>
-      <point x="84" y="14"/>
-      <point x="64" y="20"/>
-      <point x="47" y="31" type="curve"/>
-      <point x="40" y="13" type="line"/>
-      <point x="57" y="2"/>
-      <point x="85" y="-6"/>
+      <point x="106" y="-6" type="curve" smooth="yes"/>
+      <point x="194" y="-6"/>
+      <point x="225" y="89"/>
+      <point x="225" y="362" type="curve" smooth="yes"/>
+      <point x="225" y="675" type="line"/>
+      <point x="549" y="675" type="line"/>
+      <point x="549" y="0" type="line"/>
+      <point x="571" y="0" type="line"/>
+      <point x="571" y="694" type="line"/>
+      <point x="203" y="694" type="line"/>
+      <point x="203" y="369" type="line" smooth="yes"/>
+      <point x="203" y="89"/>
+      <point x="181" y="14"/>
+      <point x="102" y="14" type="curve" smooth="yes"/>
+      <point x="80" y="14"/>
+      <point x="60" y="20"/>
+      <point x="43" y="31" type="curve"/>
+      <point x="36" y="13" type="line"/>
+      <point x="53" y="2"/>
+      <point x="81" y="-6"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_m-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_m-cy.glif
index 0281c222..65335cb5 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_m-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_m-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Em-cy" format="2">
-  <advance width="835"/>
+  <advance width="861"/>
   <unicode hex="041C"/>
   <outline>
     <component base="M"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_macron.glif b/src/Cantarell-Light.ufo/glyphs/E_macron.glif
index ceabb84a..3f3ab223 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacron" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="0112"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="65"/>
+    <component base="macroncomb.case" xOffset="88"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_macronacute.glif 
b/src/Cantarell-Light.ufo/glyphs/E_macronacute.glif
index 1ec4979c..a56ccefd 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_macronacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_macronacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacronacute" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="1E16"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="65"/>
-    <component base="acutecomb.case" xOffset="245" yOffset="128"/>
+    <component base="macroncomb.case" xOffset="88"/>
+    <component base="acutecomb.case" xOffset="268" yOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_macrongrave.glif 
b/src/Cantarell-Light.ufo/glyphs/E_macrongrave.glif
index 8834ef86..8fe9c5dd 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_macrongrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_macrongrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacrongrave" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="1E14"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="65"/>
-    <component base="gravecomb.case" xOffset="106" yOffset="128"/>
+    <component base="macroncomb.case" xOffset="88"/>
+    <component base="gravecomb.case" xOffset="129" yOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_n-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_n-cy.glif
index 1925d8f0..af1eba19 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_n-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_n-cy.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="En-cy" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="041D"/>
-  <anchor x="619" y="0" name="bottomright"/>
+  <anchor x="625" y="0" name="bottomright"/>
   <outline>
     <component base="H"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_ndescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/E_ndescender-cy.glif
index 47107132..c5c34342 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_ndescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_ndescender-cy.glif
@@ -1,18 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Endescender-cy" format="2">
-  <advance width="714"/>
+  <advance width="728"/>
   <unicode hex="04A2"/>
   <outline>
     <component base="En-cy"/>
-    <component base="descender-cy.case" xOffset="523"/>
+    <component base="descender-cy.case" xOffset="529"/>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>0</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Tse-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_ng.glif b/src/Cantarell-Light.ufo/glyphs/E_ng.glif
index 9deeb7b1..c9d9fea1 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_ng.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_ng.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eng" format="2">
-  <advance width="729"/>
+  <advance width="755"/>
   <unicode hex="014A"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="130" y="0" type="line"/>
-      <point x="130" y="674" type="line"/>
-      <point x="128" y="674" type="line"/>
-      <point x="599" y="-10" type="line"/>
-      <point x="619" y="0" type="line"/>
-      <point x="619" y="694" type="line"/>
-      <point x="599" y="694" type="line"/>
-      <point x="599" y="20" type="line"/>
-      <point x="603" y="20" type="line"/>
-      <point x="139" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="612" y="-10" type="line"/>
+      <point x="632" y="0" type="line"/>
+      <point x="632" y="694" type="line"/>
+      <point x="612" y="694" type="line"/>
+      <point x="612" y="20" type="line"/>
+      <point x="616" y="20" type="line"/>
+      <point x="152" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="143" y="0" type="line"/>
+      <point x="143" y="674" type="line"/>
+      <point x="141" y="674" type="line"/>
     </contour>
     <contour>
-      <point x="513" y="-230" type="line"/>
-      <point x="577" y="-200"/>
-      <point x="619" y="-117"/>
-      <point x="619" y="-23" type="curve" smooth="yes"/>
-      <point x="619" y="0" type="line"/>
-      <point x="598" y="0" type="line"/>
-      <point x="598" y="-35" type="line" smooth="yes"/>
-      <point x="598" y="-112"/>
-      <point x="562" y="-186"/>
-      <point x="508" y="-220" type="curve"/>
+      <point x="526" y="-230" type="line"/>
+      <point x="590" y="-200"/>
+      <point x="632" y="-117"/>
+      <point x="632" y="-23" type="curve" smooth="yes"/>
+      <point x="632" y="0" type="line"/>
+      <point x="611" y="0" type="line"/>
+      <point x="611" y="-35" type="line" smooth="yes"/>
+      <point x="611" y="-112"/>
+      <point x="575" y="-186"/>
+      <point x="521" y="-220" type="curve"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_nghe-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_nghe-cy.glif
index d89c7929..63aa0fb3 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_nghe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_nghe-cy.glif
@@ -1,31 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Enghe-cy" format="2">
-  <advance width="885"/>
+  <advance width="902"/>
   <unicode hex="04A4"/>
   <outline>
     <contour>
-      <point x="570" y="0" type="line"/>
-      <point x="592" y="0" type="line"/>
-      <point x="592" y="694" type="line"/>
-      <point x="570" y="694" type="line"/>
+      <point x="583" y="0" type="line"/>
+      <point x="605" y="0" type="line"/>
+      <point x="605" y="676" type="line"/>
+      <point x="867" y="676" type="line"/>
+      <point x="867" y="694" type="line"/>
+      <point x="583" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="132" y="0" type="line"/>
-      <point x="132" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="145" y="0" type="line"/>
+      <point x="145" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="125" y="352" type="line"/>
-      <point x="576" y="352" type="line"/>
-      <point x="576" y="371" type="line"/>
-      <point x="125" y="371" type="line"/>
-    </contour>
-    <contour>
-      <point x="570" y="676" type="line"/>
-      <point x="854" y="676" type="line"/>
-      <point x="854" y="694" type="line"/>
-      <point x="570" y="694" type="line"/>
+      <point x="138" y="352" type="line"/>
+      <point x="589" y="352" type="line"/>
+      <point x="589" y="371" type="line"/>
+      <point x="138" y="371" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_ogonek.glif b/src/Cantarell-Light.ufo/glyphs/E_ogonek.glif
index b2347d75..9896f90b 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_ogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_ogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eogonek" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="0118"/>
   <anchor x="285" y="694" name="top"/>
   <outline>
     <component base="E"/>
-    <component base="ogonekcomb" xOffset="97"/>
+    <component base="ogonekcomb" xOffset="110"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_r-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_r-cy.glif
index 8caa7f02..1a1a6346 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_r-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_r-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Er-cy" format="2">
-  <advance width="572"/>
+  <advance width="584"/>
   <unicode hex="0420"/>
   <outline>
     <component base="P"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_reversed-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/E_reversed-cy.glif
index 70cec149..fb53c407 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_reversed-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_reversed-cy.glif
@@ -1,42 +1,50 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ereversed-cy" format="2">
-  <advance width="664"/>
+  <advance width="670"/>
   <unicode hex="042D"/>
-  <anchor x="332" y="694" name="top"/>
+  <anchor x="337" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="248" y="-10" type="curve" smooth="yes"/>
-      <point x="459" y="-10"/>
-      <point x="593" y="133"/>
-      <point x="593" y="352" type="curve" smooth="yes"/>
-      <point x="593" y="566"/>
-      <point x="466" y="702"/>
-      <point x="269" y="702" type="curve" smooth="yes"/>
-      <point x="199" y="702"/>
-      <point x="113" y="685"/>
-      <point x="52" y="659" type="curve"/>
-      <point x="57" y="643" type="line"/>
-      <point x="116" y="667"/>
-      <point x="199" y="683"/>
-      <point x="265" y="683" type="curve" smooth="yes"/>
-      <point x="455" y="683"/>
-      <point x="571" y="545"/>
-      <point x="571" y="346" type="curve" smooth="yes"/>
-      <point x="571" y="140"/>
-      <point x="447" y="9"/>
-      <point x="254" y="9" type="curve" smooth="yes"/>
-      <point x="187" y="9"/>
-      <point x="114" y="23"/>
-      <point x="58" y="47" type="curve"/>
-      <point x="51" y="30" type="line"/>
-      <point x="107" y="5"/>
-      <point x="180" y="-10"/>
+      <point x="253" y="-10" type="curve" smooth="yes"/>
+      <point x="464" y="-10"/>
+      <point x="598" y="133"/>
+      <point x="598" y="352" type="curve" smooth="yes"/>
+      <point x="598" y="566"/>
+      <point x="471" y="702"/>
+      <point x="274" y="702" type="curve" smooth="yes"/>
+      <point x="204" y="702"/>
+      <point x="118" y="685"/>
+      <point x="57" y="659" type="curve"/>
+      <point x="62" y="643" type="line"/>
+      <point x="121" y="667"/>
+      <point x="204" y="683"/>
+      <point x="270" y="683" type="curve" smooth="yes"/>
+      <point x="460" y="683"/>
+      <point x="576" y="545"/>
+      <point x="576" y="346" type="curve" smooth="yes"/>
+      <point x="576" y="140"/>
+      <point x="452" y="9"/>
+      <point x="259" y="9" type="curve" smooth="yes"/>
+      <point x="192" y="9"/>
+      <point x="119" y="23"/>
+      <point x="63" y="47" type="curve"/>
+      <point x="56" y="30" type="line"/>
+      <point x="112" y="5"/>
+      <point x="185" y="-10"/>
     </contour>
     <contour>
-      <point x="102" y="352" type="line"/>
-      <point x="577" y="352" type="line"/>
-      <point x="577" y="370" type="line"/>
-      <point x="102" y="370" type="line"/>
+      <point x="107" y="352" type="line"/>
+      <point x="582" y="352" type="line"/>
+      <point x="582" y="370" type="line"/>
+      <point x="107" y="370" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|Es-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|Es-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_s-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_s-cy.glif
index 1c027d47..facb7103 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_s-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_s-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Es-cy" format="2">
-  <advance width="646"/>
+  <advance width="655"/>
   <unicode hex="0421"/>
   <anchor x="371" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_sdescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/E_sdescender-cy.glif
index 134deaf5..178f759b 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_sdescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_sdescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Esdescender-cy" format="2">
-  <advance width="646"/>
+  <advance width="655"/>
   <unicode hex="04AA"/>
   <outline>
     <component base="Es-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_th.glif b/src/Cantarell-Light.ufo/glyphs/E_th.glif
index 7972198f..0a6527c2 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_th.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_th.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eth" format="2">
-  <advance width="692"/>
+  <advance width="706"/>
   <unicode hex="00D0"/>
   <outline>
     <component base="D"/>
-    <component base="strokeshortcomb.case" xOffset="-68" yOffset="65"/>
+    <component base="strokeshortcomb.case" xOffset="-55" yOffset="65"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tilde.glif b/src/Cantarell-Light.ufo/glyphs/E_tilde.glif
index 35b1235c..5ffda4d1 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etilde" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="1EBC"/>
   <outline>
     <component base="E"/>
-    <component base="tildecomb.case" xOffset="59"/>
+    <component base="tildecomb.case" xOffset="82"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/F_.glif b/src/Cantarell-Light.ufo/glyphs/F_.glif
index 1c7e9589..08b0893b 100644
--- a/src/Cantarell-Light.ufo/glyphs/F_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/F_.glif
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="F" format="2">
-  <advance width="541"/>
+  <advance width="554"/>
   <unicode hex="0046"/>
-  <note>
-F
-</note>
-  <anchor x="270" y="0" name="bottom"/>
-  <anchor x="270" y="694" name="top"/>
+  <anchor x="283" y="0" name="bottom"/>
+  <anchor x="283" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="132" y="0" type="line"/>
-      <point x="132" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="119" y="366" type="line"/>
-      <point x="473" y="366" type="line"/>
-      <point x="473" y="384" type="line"/>
-      <point x="119" y="384" type="line"/>
-    </contour>
-    <contour>
-      <point x="119" y="676" type="line"/>
-      <point x="497" y="676" type="line"/>
-      <point x="497" y="694" type="line"/>
-      <point x="119" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="145" y="0" type="line"/>
+      <point x="145" y="366" type="line"/>
+      <point x="486" y="366" type="line"/>
+      <point x="486" y="384" type="line"/>
+      <point x="145" y="384" type="line"/>
+      <point x="145" y="676" type="line"/>
+      <point x="510" y="676" type="line"/>
+      <point x="510" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/F_ita-cy.glif b/src/Cantarell-Light.ufo/glyphs/F_ita-cy.glif
index 094183da..cc234fc1 100644
--- a/src/Cantarell-Light.ufo/glyphs/F_ita-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/F_ita-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Fita-cy" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="0472"/>
   <outline>
     <component base="Obarred-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_.glif b/src/Cantarell-Light.ufo/glyphs/G_.glif
index 068c7243..d3e6074b 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_.glif
@@ -1,45 +1,48 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="G" format="2">
-  <advance width="716"/>
+  <advance width="727"/>
   <unicode hex="0047"/>
-  <note>
-G
-</note>
-  <anchor x="351" y="0" name="bottom"/>
-  <anchor x="369" y="694" name="top"/>
+  <anchor x="352" y="0" name="bottom"/>
+  <anchor x="370" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="397" y="-10" type="curve" smooth="yes"/>
-      <point x="486" y="-10"/>
-      <point x="583" y="19"/>
-      <point x="640" y="60" type="curve"/>
-      <point x="640" y="338" type="line"/>
-      <point x="383" y="338" type="line"/>
-      <point x="383" y="319" type="line"/>
-      <point x="618" y="319" type="line"/>
-      <point x="618" y="57" type="line"/>
-      <point x="623" y="69" type="line"/>
-      <point x="560" y="32"/>
-      <point x="473" y="9"/>
-      <point x="400" y="9" type="curve" smooth="yes"/>
-      <point x="215" y="9"/>
-      <point x="94" y="143"/>
-      <point x="94" y="348" type="curve" smooth="yes"/>
-      <point x="94" y="554"/>
-      <point x="216" y="680"/>
-      <point x="413" y="680" type="curve" smooth="yes"/>
-      <point x="482" y="680"/>
-      <point x="555" y="664"/>
-      <point x="605" y="634" type="curve"/>
-      <point x="612" y="651" type="line"/>
-      <point x="558" y="683"/>
-      <point x="489" y="699"/>
-      <point x="416" y="699" type="curve" smooth="yes"/>
-      <point x="203" y="699"/>
-      <point x="71" y="564"/>
-      <point x="71" y="345" type="curve" smooth="yes"/>
-      <point x="71" y="130"/>
-      <point x="200" y="-10"/>
+      <point x="398" y="-10" type="curve" smooth="yes"/>
+      <point x="487" y="-10"/>
+      <point x="584" y="19"/>
+      <point x="641" y="60" type="curve"/>
+      <point x="641" y="338" type="line"/>
+      <point x="384" y="338" type="line"/>
+      <point x="384" y="319" type="line"/>
+      <point x="619" y="319" type="line"/>
+      <point x="619" y="57" type="line"/>
+      <point x="624" y="69" type="line"/>
+      <point x="561" y="32"/>
+      <point x="474" y="9"/>
+      <point x="401" y="9" type="curve" smooth="yes"/>
+      <point x="216" y="9"/>
+      <point x="95" y="143"/>
+      <point x="95" y="348" type="curve" smooth="yes"/>
+      <point x="95" y="554"/>
+      <point x="217" y="680"/>
+      <point x="414" y="680" type="curve" smooth="yes"/>
+      <point x="483" y="680"/>
+      <point x="556" y="664"/>
+      <point x="606" y="634" type="curve"/>
+      <point x="613" y="651" type="line"/>
+      <point x="559" y="683"/>
+      <point x="490" y="699"/>
+      <point x="417" y="699" type="curve" smooth="yes"/>
+      <point x="204" y="699"/>
+      <point x="72" y="564"/>
+      <point x="72" y="345" type="curve" smooth="yes"/>
+      <point x="72" y="130"/>
+      <point x="201" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_breve.glif b/src/Cantarell-Light.ufo/glyphs/G_breve.glif
index 3a23ade9..686946b0 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gbreve" format="2">
-  <advance width="716"/>
+  <advance width="727"/>
   <unicode hex="011E"/>
   <outline>
     <component base="G"/>
-    <component base="brevecomb.case" xOffset="166"/>
+    <component base="brevecomb.case" xOffset="167"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_caron.glif b/src/Cantarell-Light.ufo/glyphs/G_caron.glif
index 45b5c965..0aa5a5d0 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcaron" format="2">
-  <advance width="716"/>
+  <advance width="727"/>
   <unicode hex="01E6"/>
   <outline>
     <component base="G"/>
-    <component base="caroncomb.case" xOffset="194"/>
+    <component base="caroncomb.case" xOffset="195"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/G_circumflex.glif
index b258e67a..9b110155 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcircumflex" format="2">
-  <advance width="716"/>
+  <advance width="727"/>
   <unicode hex="011C"/>
   <outline>
     <component base="G"/>
-    <component base="circumflexcomb.case" xOffset="192"/>
+    <component base="circumflexcomb.case" xOffset="193"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/G_commaaccent.glif
index 6d2c967a..17bf744d 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcommaaccent" format="2">
-  <advance width="716"/>
+  <advance width="727"/>
   <unicode hex="0122"/>
   <outline>
     <component base="G"/>
-    <component base="commaaccentcomb" xOffset="222"/>
+    <component base="commaaccentcomb" xOffset="223"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/G_dotaccent.glif
index 9d7c0c0c..3e1dc758 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gdotaccent" format="2">
-  <advance width="716"/>
+  <advance width="727"/>
   <unicode hex="0120"/>
   <outline>
     <component base="G"/>
-    <component base="dotaccentcomb.case" xOffset="250"/>
+    <component base="dotaccentcomb.case" xOffset="251"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/G_e-cy.glif
index 46e4f514..83964110 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_e-cy.glif
@@ -1,17 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ge-cy" format="2">
-  <advance width="509"/>
+  <advance width="535"/>
   <unicode hex="0413"/>
-  <anchor x="169" y="0" name="bottomright"/>
-  <anchor x="265" y="694" name="top"/>
+  <anchor x="165" y="0" name="bottomright"/>
+  <anchor x="278" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="132" y="0" type="line"/>
-      <point x="132" y="676" type="line"/>
-      <point x="487" y="676" type="line"/>
-      <point x="487" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="145" y="0" type="line"/>
+      <point x="145" y="676" type="line"/>
+      <point x="500" y="676" type="line"/>
+      <point x="500" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_edescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/G_edescender-cy.glif
index 7ada80e9..5973f712 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_edescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_edescender-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gedescender-cy" format="2">
-  <advance width="509"/>
+  <advance width="535"/>
   <unicode hex="04F6"/>
   <outline>
     <component base="Ge-cy"/>
-    <component base="descender-cy.case" xOffset="73"/>
+    <component base="descender-cy.case" xOffset="69"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_ermandbls.glif b/src/Cantarell-Light.ufo/glyphs/G_ermandbls.glif
index 2013142d..0bb58611 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_ermandbls.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_ermandbls.glif
@@ -1,46 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Germandbls" format="2">
-  <advance width="711"/>
+  <advance width="682"/>
   <unicode hex="1E9E"/>
   <outline>
     <contour>
-      <point x="434" y="-10" type="curve" smooth="yes"/>
-      <point x="554" y="-10"/>
-      <point x="632" y="59"/>
-      <point x="632" y="164" type="curve" smooth="yes"/>
-      <point x="632" y="273"/>
-      <point x="566" y="341"/>
-      <point x="433" y="370" type="curve"/>
-      <point x="434" y="360" type="line"/>
-      <point x="581" y="599" type="line"/>
-      <point x="557" y="659"/>
-      <point x="467" y="702"/>
-      <point x="364" y="702" type="curve" smooth="yes"/>
-      <point x="217" y="702"/>
-      <point x="117" y="614"/>
-      <point x="117" y="482" type="curve" smooth="yes"/>
-      <point x="117" y="0" type="line"/>
-      <point x="138" y="0" type="line"/>
-      <point x="138" y="482" type="line" smooth="yes"/>
-      <point x="138" y="603"/>
-      <point x="228" y="683"/>
-      <point x="362" y="683" type="curve" smooth="yes"/>
-      <point x="452" y="683"/>
-      <point x="533" y="648"/>
-      <point x="557" y="599" type="curve"/>
-      <point x="409" y="355" type="line"/>
-      <point x="546" y="328"/>
-      <point x="611" y="266"/>
-      <point x="611" y="163" type="curve" smooth="yes"/>
-      <point x="611" y="70"/>
-      <point x="542" y="8"/>
-      <point x="439" y="8" type="curve" smooth="yes"/>
-      <point x="395" y="8"/>
-      <point x="347" y="19"/>
-      <point x="303" y="39" type="curve"/>
-      <point x="296" y="21" type="line"/>
-      <point x="337" y="1"/>
-      <point x="386" y="-10"/>
+      <point x="429" y="-10" type="curve" smooth="yes"/>
+      <point x="549" y="-10"/>
+      <point x="627" y="59"/>
+      <point x="627" y="164" type="curve" smooth="yes"/>
+      <point x="627" y="273"/>
+      <point x="561" y="341"/>
+      <point x="428" y="370" type="curve"/>
+      <point x="429" y="360" type="line"/>
+      <point x="576" y="599" type="line"/>
+      <point x="552" y="659"/>
+      <point x="462" y="702"/>
+      <point x="359" y="702" type="curve" smooth="yes"/>
+      <point x="212" y="702"/>
+      <point x="112" y="614"/>
+      <point x="112" y="482" type="curve" smooth="yes"/>
+      <point x="112" y="0" type="line"/>
+      <point x="133" y="0" type="line"/>
+      <point x="133" y="482" type="line" smooth="yes"/>
+      <point x="133" y="603"/>
+      <point x="223" y="683"/>
+      <point x="357" y="683" type="curve" smooth="yes"/>
+      <point x="447" y="683"/>
+      <point x="528" y="648"/>
+      <point x="552" y="599" type="curve"/>
+      <point x="404" y="355" type="line"/>
+      <point x="541" y="328"/>
+      <point x="606" y="266"/>
+      <point x="606" y="163" type="curve" smooth="yes"/>
+      <point x="606" y="70"/>
+      <point x="537" y="8"/>
+      <point x="434" y="8" type="curve" smooth="yes"/>
+      <point x="390" y="8"/>
+      <point x="342" y="19"/>
+      <point x="298" y="39" type="curve"/>
+      <point x="291" y="21" type="line"/>
+      <point x="332" y="1"/>
+      <point x="381" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_hemiddlehook-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/G_hemiddlehook-cy.glif
index 3900d864..7ce3233d 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_hemiddlehook-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_hemiddlehook-cy.glif
@@ -1,37 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ghemiddlehook-cy" format="2">
-  <advance width="633"/>
+  <advance width="649"/>
   <unicode hex="0494"/>
   <outline>
     <contour>
-      <point x="253" y="-231" type="line"/>
-      <point x="444" y="-214"/>
-      <point x="571" y="-77"/>
-      <point x="571" y="111" type="curve" smooth="yes"/>
-      <point x="571" y="286"/>
-      <point x="481" y="391"/>
-      <point x="332" y="391" type="curve" smooth="yes"/>
-      <point x="249" y="391"/>
-      <point x="163" y="357"/>
-      <point x="117" y="305" type="curve"/>
-      <point x="127" y="294" type="line"/>
-      <point x="170" y="341"/>
-      <point x="251" y="373"/>
-      <point x="328" y="373" type="curve" smooth="yes"/>
-      <point x="467" y="373"/>
-      <point x="550" y="274"/>
-      <point x="550" y="110" type="curve" smooth="yes"/>
-      <point x="550" y="-68"/>
-      <point x="431" y="-200"/>
-      <point x="252" y="-219" type="curve"/>
+      <point x="266" y="-231" type="line"/>
+      <point x="457" y="-214"/>
+      <point x="584" y="-77"/>
+      <point x="584" y="111" type="curve" smooth="yes"/>
+      <point x="584" y="286"/>
+      <point x="494" y="391"/>
+      <point x="345" y="391" type="curve" smooth="yes"/>
+      <point x="262" y="391"/>
+      <point x="176" y="357"/>
+      <point x="130" y="305" type="curve"/>
+      <point x="140" y="294" type="line"/>
+      <point x="183" y="341"/>
+      <point x="264" y="373"/>
+      <point x="341" y="373" type="curve" smooth="yes"/>
+      <point x="480" y="373"/>
+      <point x="563" y="274"/>
+      <point x="563" y="110" type="curve" smooth="yes"/>
+      <point x="563" y="-68"/>
+      <point x="444" y="-200"/>
+      <point x="265" y="-219" type="curve"/>
     </contour>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="131" y="0" type="line"/>
-      <point x="131" y="676" type="line"/>
-      <point x="476" y="676" type="line"/>
-      <point x="476" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="144" y="0" type="line"/>
+      <point x="144" y="676" type="line"/>
+      <point x="489" y="676" type="line"/>
+      <point x="489" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_hestroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/G_hestroke-cy.glif
index 70cc0294..249a9106 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_hestroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_hestroke-cy.glif
@@ -1,21 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ghestroke-cy" format="2">
-  <advance width="506"/>
+  <advance width="545"/>
   <unicode hex="0492"/>
   <outline>
     <contour>
-      <point x="122" y="0" type="line"/>
-      <point x="144" y="0" type="line"/>
-      <point x="144" y="676" type="line"/>
-      <point x="484" y="676" type="line"/>
-      <point x="484" y="694" type="line"/>
-      <point x="122" y="694" type="line"/>
+      <point x="148" y="0" type="line"/>
+      <point x="170" y="0" type="line"/>
+      <point x="170" y="676" type="line"/>
+      <point x="510" y="676" type="line"/>
+      <point x="510" y="694" type="line"/>
+      <point x="148" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="40" y="318" type="line"/>
-      <point x="319" y="318" type="line"/>
-      <point x="319" y="335" type="line"/>
-      <point x="40" y="335" type="line"/>
+      <point x="66" y="318" type="line"/>
+      <point x="345" y="318" type="line"/>
+      <point x="345" y="335" type="line"/>
+      <point x="66" y="335" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Eth</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_heupturn-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/G_heupturn-cy.glif
index c8422e92..c52a71e9 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_heupturn-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_heupturn-cy.glif
@@ -1,17 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gheupturn-cy" format="2">
-  <advance width="504"/>
+  <advance width="530"/>
   <unicode hex="0490"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="132" y="0" type="line"/>
-      <point x="132" y="676" type="line"/>
-      <point x="482" y="676" type="line"/>
-      <point x="482" y="850" type="line"/>
-      <point x="463" y="850" type="line"/>
-      <point x="463" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="145" y="0" type="line"/>
+      <point x="145" y="676" type="line"/>
+      <point x="495" y="676" type="line"/>
+      <point x="495" y="850" type="line"/>
+      <point x="476" y="850" type="line"/>
+      <point x="476" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_je-cy.glif b/src/Cantarell-Light.ufo/glyphs/G_je-cy.glif
index 511365bf..6c9f1d8c 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_je-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_je-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gje-cy" format="2">
-  <advance width="509"/>
+  <advance width="535"/>
   <unicode hex="0403"/>
   <outline>
     <component base="Ge-cy"/>
-    <component base="acutecomb.case" xOffset="207"/>
+    <component base="acutecomb.case" xOffset="220"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_macron.glif b/src/Cantarell-Light.ufo/glyphs/G_macron.glif
index 2768883d..0d43f7b8 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gmacron" format="2">
-  <advance width="716"/>
+  <advance width="727"/>
   <unicode hex="1E20"/>
   <outline>
     <component base="G"/>
-    <component base="macroncomb.case" xOffset="131"/>
+    <component base="macroncomb.case" xOffset="132"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_.glif b/src/Cantarell-Light.ufo/glyphs/H_.glif
index 0abec0e4..76046719 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_.glif
@@ -1,32 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="H" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="0048"/>
-  <note>
-H
-</note>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="2" y="694" name="topleft"/>
+  <anchor x="366" y="0" name="bottom"/>
+  <anchor x="366" y="534" name="center"/>
+  <anchor x="366" y="694" name="top"/>
+  <anchor x="15" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="570" y="0" type="line"/>
-      <point x="592" y="0" type="line"/>
-      <point x="592" y="694" type="line"/>
-      <point x="570" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="132" y="0" type="line"/>
-      <point x="132" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="125" y="352" type="line"/>
-      <point x="576" y="352" type="line"/>
-      <point x="576" y="371" type="line"/>
-      <point x="125" y="371" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="145" y="0" type="line"/>
+      <point x="145" y="352" type="line"/>
+      <point x="583" y="352" type="line"/>
+      <point x="583" y="0" type="line"/>
+      <point x="605" y="0" type="line"/>
+      <point x="605" y="694" type="line"/>
+      <point x="583" y="694" type="line"/>
+      <point x="583" y="371" type="line"/>
+      <point x="145" y="371" type="line"/>
+      <point x="145" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_a-cy.glif b/src/Cantarell-Light.ufo/glyphs/H_a-cy.glif
index d6273b27..6bcefdd3 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_a-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_a-cy.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ha-cy" format="2">
-  <advance width="594"/>
+  <advance width="598"/>
   <unicode hex="0425"/>
-  <anchor x="560" y="0" name="bottomright"/>
+  <anchor x="537" y="0" name="bottomright"/>
   <outline>
     <component base="X"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_adescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/H_adescender-cy.glif
index 6ab06bd4..75495862 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_adescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_adescender-cy.glif
@@ -1,18 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hadescender-cy" format="2">
-  <advance width="662"/>
+  <advance width="598"/>
   <unicode hex="04B2"/>
   <outline>
-    <component base="Ha-cy" xOffset="7"/>
-    <component base="descender-cy.case" xOffset="471"/>
+    <component base="Ha-cy"/>
+    <component base="descender-cy.case" xOffset="441"/>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>0</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Ha-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Tse-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_ardsign-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/H_ardsign-cy.glif
index a6a52cf5..f5d3acff 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_ardsign-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_ardsign-cy.glif
@@ -1,32 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hardsign-cy" format="2">
-  <advance width="709"/>
+  <advance width="708"/>
   <unicode hex="042A"/>
-  <anchor x="355" y="694" name="top"/>
+  <anchor x="351" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="231" y="0" type="line"/>
-      <point x="428" y="0" type="line" smooth="yes"/>
-      <point x="567" y="0"/>
-      <point x="649" y="74"/>
-      <point x="649" y="200" type="curve" smooth="yes"/>
-      <point x="649" y="322"/>
-      <point x="574" y="403"/>
-      <point x="461" y="403" type="curve" smooth="yes"/>
-      <point x="245" y="403" type="line"/>
-      <point x="245" y="386" type="line"/>
-      <point x="451" y="386" type="line" smooth="yes"/>
-      <point x="557" y="386"/>
-      <point x="627" y="310"/>
-      <point x="627" y="195" type="curve" smooth="yes"/>
-      <point x="627" y="84"/>
-      <point x="557" y="18"/>
-      <point x="439" y="18" type="curve" smooth="yes"/>
-      <point x="253" y="18" type="line"/>
-      <point x="253" y="694" type="line"/>
-      <point x="39" y="694" type="line"/>
-      <point x="39" y="676" type="line"/>
-      <point x="231" y="676" type="line"/>
+      <point x="227" y="0" type="line"/>
+      <point x="424" y="0" type="line" smooth="yes"/>
+      <point x="563" y="0"/>
+      <point x="645" y="74"/>
+      <point x="645" y="200" type="curve" smooth="yes"/>
+      <point x="645" y="322"/>
+      <point x="570" y="403"/>
+      <point x="457" y="403" type="curve" smooth="yes"/>
+      <point x="241" y="403" type="line"/>
+      <point x="241" y="386" type="line"/>
+      <point x="447" y="386" type="line" smooth="yes"/>
+      <point x="553" y="386"/>
+      <point x="623" y="310"/>
+      <point x="623" y="195" type="curve" smooth="yes"/>
+      <point x="623" y="84"/>
+      <point x="553" y="18"/>
+      <point x="435" y="18" type="curve" smooth="yes"/>
+      <point x="249" y="18" type="line"/>
+      <point x="249" y="694" type="line"/>
+      <point x="35" y="694" type="line"/>
+      <point x="35" y="676" type="line"/>
+      <point x="227" y="676" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|Ge-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Softsign-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_bar.glif b/src/Cantarell-Light.ufo/glyphs/H_bar.glif
index cd003bc0..de03d83a 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_bar.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_bar.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hbar" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="0126"/>
   <outline>
     <component base="H"/>
-    <component base="strokelongcomb" xOffset="-107" yOffset="192"/>
+    <component base="strokelongcomb" xOffset="-94" yOffset="192"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_brevebelow.glif 
b/src/Cantarell-Light.ufo/glyphs/H_brevebelow.glif
index 55ffe824..a635ae56 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_brevebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_brevebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hbrevebelow" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1E2A"/>
   <outline>
     <component base="H"/>
-    <component base="brevebelowcomb" xOffset="147"/>
+    <component base="brevebelowcomb" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/H_circumflex.glif
index 1d2c1f51..c98685de 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hcircumflex" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="0124"/>
   <outline>
     <component base="H"/>
-    <component base="circumflexcomb.case" xOffset="176"/>
+    <component base="circumflexcomb.case" xOffset="189"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/H_dotbelow.glif
index a7ad186e..c9cf243e 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hdotbelow" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1E24"/>
   <outline>
     <component base="H"/>
-    <component base="dotbelowcomb" xOffset="233"/>
+    <component base="dotbelowcomb" xOffset="246"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_-cy.glif
index d9128c2a..67023ea0 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="I-cy" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="0406"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_.glif b/src/Cantarell-Light.ufo/glyphs/I_.glif
index bc44bb70..e20da27c 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_.glif
@@ -1,20 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="I" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="0049"/>
-  <note>
-I
-</note>
-  <anchor x="121" y="0" name="bottom"/>
-  <anchor x="125" y="10" name="ogonek"/>
-  <anchor x="121" y="694" name="top"/>
-  <anchor x="-6" y="694" name="topleft"/>
+  <anchor x="134" y="0" name="bottom"/>
+  <anchor x="138" y="10" name="ogonek"/>
+  <anchor x="134" y="694" name="top"/>
+  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="131" y="0" type="line"/>
-      <point x="131" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="144" y="0" type="line"/>
+      <point x="144" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_a-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_a-cy.glif
index 5bc5c90c..463d152c 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_a-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_a-cy.glif
@@ -1,40 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ia-cy" format="2">
-  <advance width="605"/>
+  <advance width="611"/>
   <unicode hex="042F"/>
-  <anchor x="300" y="694" name="top"/>
+  <anchor x="293" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="285" y="288" type="curve" smooth="yes"/>
-      <point x="484" y="288" type="line"/>
-      <point x="484" y="306" type="line"/>
-      <point x="290" y="306" type="line" smooth="yes"/>
-      <point x="163" y="306"/>
-      <point x="87" y="377"/>
-      <point x="87" y="495" type="curve" smooth="yes"/>
-      <point x="87" y="610"/>
-      <point x="160" y="676"/>
-      <point x="283" y="676" type="curve" smooth="yes"/>
-      <point x="484" y="676" type="line"/>
-      <point x="484" y="694" type="line"/>
-      <point x="290" y="694" type="line" smooth="yes"/>
-      <point x="150" y="694"/>
-      <point x="65" y="618"/>
-      <point x="65" y="489" type="curve" smooth="yes"/>
-      <point x="65" y="365"/>
-      <point x="149" y="288"/>
+      <point x="467" y="0" type="line"/>
+      <point x="488" y="0" type="line"/>
+      <point x="488" y="694" type="line"/>
+      <point x="283" y="694" type="line" smooth="yes"/>
+      <point x="143" y="694"/>
+      <point x="58" y="618"/>
+      <point x="58" y="489" type="curve" smooth="yes"/>
+      <point x="58" y="365"/>
+      <point x="142" y="288"/>
+      <point x="278" y="288" type="curve" smooth="yes"/>
+      <point x="477" y="288" type="line"/>
+      <point x="477" y="306" type="line"/>
+      <point x="283" y="306" type="line" smooth="yes"/>
+      <point x="156" y="306"/>
+      <point x="80" y="377"/>
+      <point x="80" y="495" type="curve" smooth="yes"/>
+      <point x="80" y="610"/>
+      <point x="153" y="676"/>
+      <point x="276" y="676" type="curve" smooth="yes"/>
+      <point x="467" y="676" type="line"/>
     </contour>
     <contour>
-      <point x="61" y="0" type="line"/>
-      <point x="86" y="0" type="line"/>
-      <point x="265" y="302" type="line"/>
-      <point x="243" y="302" type="line"/>
-    </contour>
-    <contour>
-      <point x="474" y="0" type="line"/>
-      <point x="495" y="0" type="line"/>
-      <point x="495" y="694" type="line"/>
-      <point x="474" y="694" type="line"/>
+      <point x="54" y="0" type="line"/>
+      <point x="79" y="0" type="line"/>
+      <point x="258" y="302" type="line"/>
+      <point x="236" y="302" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|R</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_acute.glif b/src/Cantarell-Light.ufo/glyphs/I_acute.glif
index 50340365..4645ed97 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iacute" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="00CD"/>
   <outline>
     <component base="I"/>
-    <component base="acutecomb.case" xOffset="63"/>
+    <component base="acutecomb.case" xOffset="76"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_breve.glif b/src/Cantarell-Light.ufo/glyphs/I_breve.glif
index 27e3aa3b..cc7f72ad 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ibreve" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="012C"/>
   <outline>
     <component base="I"/>
-    <component base="brevecomb.case" xOffset="-82"/>
+    <component base="brevecomb.case" xOffset="-69"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_caron.glif b/src/Cantarell-Light.ufo/glyphs/I_caron.glif
index 983a3558..977e9881 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Icaron" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="01CF"/>
   <outline>
     <component base="I"/>
-    <component base="caroncomb.case" xOffset="-54"/>
+    <component base="caroncomb.case" xOffset="-41"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/I_circumflex.glif
index 057d863d..6920a1de 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Icircumflex" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="00CE"/>
   <outline>
     <component base="I"/>
-    <component base="circumflexcomb.case" xOffset="-56"/>
+    <component base="circumflexcomb.case" xOffset="-43"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/I_dblgrave.glif
index 188a0e4f..1e1645d9 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_dblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idblgrave" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="0208"/>
   <outline>
     <component base="I"/>
-    <component base="dblgravecomb.case" xOffset="-122"/>
+    <component base="dblgravecomb.case" xOffset="-109"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_dieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/I_dieresis-cy.glif
index c2ed84e7..25aabe54 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_dieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_dieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idieresis-cy" format="2">
-  <advance width="722"/>
+  <advance width="748"/>
   <unicode hex="04E4"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="dieresiscomb.case" xOffset="141"/>
+    <component base="dieresiscomb.case" xOffset="154"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/I_dieresis.glif
index c195d1a3..3b004d2d 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idieresis" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="00CF"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-99"/>
+    <component base="dieresiscomb.case" xOffset="-86"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_dieresisacute.glif 
b/src/Cantarell-Light.ufo/glyphs/I_dieresisacute.glif
index f3f377d9..f4777b13 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_dieresisacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_dieresisacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idieresisacute" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="1E2E"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-99"/>
-    <component base="acutecomb.case" xOffset="63" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="-86"/>
+    <component base="acutecomb.case" xOffset="76" yOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/I_dotaccent.glif
index 2d7840f5..07b60d91 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idotaccent" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="0130"/>
   <outline>
     <component base="I"/>
-    <component base="dotaccentcomb.case" xOffset="2"/>
+    <component base="dotaccentcomb.case" xOffset="15"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/I_dotbelow.glif
index 8677535c..84901026 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idotbelow" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="1ECA"/>
   <outline>
     <component base="I"/>
-    <component base="dotbelowcomb" xOffset="1"/>
+    <component base="dotbelowcomb" xOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_e-cy.glif
index 405bcbb1..be5fa588 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_e-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ie-cy" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="0415"/>
-  <anchor x="277" y="694" name="top"/>
   <outline>
     <component base="E"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif
index 1b3ac075..cf42a148 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iebreve-cy" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="04D6"/>
   <outline>
     <component base="Ie-cy"/>
-    <component base="brevecomb-cy.case" xOffset="84"/>
+    <component base="brevecomb-cy.case" xOffset="133"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif
index 8fe78829..561c7001 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iegrave-cy" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="0400"/>
   <outline>
     <component base="Ie-cy"/>
-    <component base="gravecomb.case" xOffset="80"/>
+    <component base="gravecomb.case" xOffset="129"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_grave.glif b/src/Cantarell-Light.ufo/glyphs/I_grave.glif
index 5ad8361a..985bec86 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Igrave" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="00CC"/>
   <outline>
     <component base="I"/>
-    <component base="gravecomb.case" xOffset="-76"/>
+    <component base="gravecomb.case" xOffset="-63"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/I_hookabove.glif
index 8151242c..db161aec 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_hookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ihookabove" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="1EC8"/>
   <outline>
     <component base="I"/>
-    <component base="hookabovecomb.case" xOffset="-34"/>
+    <component base="hookabovecomb.case" xOffset="-21"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_i-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_i-cy.glif
index 916d7cd4..f67654c3 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_i-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_i-cy.glif
@@ -1,23 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ii-cy" format="2">
-  <advance width="722"/>
+  <advance width="748"/>
   <unicode hex="0418"/>
-  <anchor x="702" y="0" name="bottomright"/>
-  <anchor x="361" y="694" name="top"/>
+  <anchor x="715" y="0" name="bottomright"/>
+  <anchor x="374" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="137" y="0" type="line"/>
-      <point x="593" y="674" type="line"/>
-      <point x="592" y="674" type="line"/>
-      <point x="592" y="0" type="line"/>
-      <point x="612" y="0" type="line"/>
-      <point x="612" y="694" type="line"/>
-      <point x="585" y="694" type="line"/>
-      <point x="128" y="20" type="line"/>
-      <point x="130" y="20" type="line"/>
-      <point x="130" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="150" y="0" type="line"/>
+      <point x="606" y="674" type="line"/>
+      <point x="605" y="674" type="line"/>
+      <point x="605" y="0" type="line"/>
+      <point x="625" y="0" type="line"/>
+      <point x="625" y="694" type="line"/>
+      <point x="598" y="694" type="line"/>
+      <point x="141" y="20" type="line"/>
+      <point x="143" y="20" type="line"/>
+      <point x="143" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_igrave-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_igrave-cy.glif
index adf43d18..2b58c015 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_igrave-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_igrave-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iigrave-cy" format="2">
-  <advance width="722"/>
+  <advance width="748"/>
   <unicode hex="040D"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="gravecomb.case" xOffset="164"/>
+    <component base="gravecomb.case" xOffset="177"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/I_invertedbreve.glif
index 1ba13fbb..2c44f5b9 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_invertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iinvertedbreve" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="020A"/>
   <outline>
     <component base="I"/>
-    <component base="breveinvertedcomb.case" xOffset="-85"/>
+    <component base="breveinvertedcomb.case" xOffset="-72"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_ishort-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_ishort-cy.glif
index 861eafe0..c2050d98 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_ishort-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_ishort-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iishort-cy" format="2">
-  <advance width="722"/>
+  <advance width="748"/>
   <unicode hex="0419"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="brevecomb-cy.case" xOffset="168"/>
+    <component base="brevecomb-cy.case" xOffset="181"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_macron-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_macron-cy.glif
index 761b3951..6c0e44c9 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_macron-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_macron-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Imacron-cy" format="2">
-  <advance width="722"/>
+  <advance width="748"/>
   <unicode hex="04E2"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="macroncomb.case" xOffset="123"/>
+    <component base="macroncomb.case" xOffset="136"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_macron.glif b/src/Cantarell-Light.ufo/glyphs/I_macron.glif
index 367eec7c..fc1d9627 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Imacron" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="012A"/>
   <outline>
     <component base="I"/>
-    <component base="macroncomb.narrow.case" xOffset="-91"/>
+    <component base="macroncomb.narrow.case" xOffset="-78"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_o-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_o-cy.glif
index ed380e35..a469f8b6 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_o-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_o-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Io-cy" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="0401"/>
   <outline>
     <component base="Ie-cy"/>
-    <component base="dieresiscomb.case" xOffset="57"/>
+    <component base="dieresiscomb.case" xOffset="106"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_ogonek.glif b/src/Cantarell-Light.ufo/glyphs/I_ogonek.glif
index 0e1dc81d..47b31f02 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_ogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iogonek" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="012E"/>
   <outline>
     <component base="I"/>
-    <component base="ogonekcomb.narrow" xOffset="-251"/>
+    <component base="ogonekcomb.narrow" xOffset="-238"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_tilde.glif b/src/Cantarell-Light.ufo/glyphs/I_tilde.glif
index e1cac42d..9d7a3ff1 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Itilde" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="0128"/>
   <outline>
     <component base="I"/>
-    <component base="tildecomb.case" xOffset="-123"/>
+    <component base="tildecomb.case" xOffset="-110"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_u-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_u-cy.glif
index afa8a1fd..56c710b8 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_u-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_u-cy.glif
@@ -1,48 +1,56 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iu-cy" format="2">
-  <advance width="959"/>
+  <advance width="972"/>
   <unicode hex="042E"/>
-  <anchor x="480" y="694" name="top"/>
+  <anchor x="493" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="581" y="-10" type="curve" smooth="yes"/>
-      <point x="763" y="-10"/>
-      <point x="887" y="134"/>
-      <point x="887" y="347" type="curve" smooth="yes"/>
-      <point x="887" y="558"/>
-      <point x="766" y="699"/>
-      <point x="585" y="699" type="curve" smooth="yes"/>
-      <point x="407" y="699"/>
-      <point x="296" y="562"/>
-      <point x="296" y="343" type="curve" smooth="yes"/>
-      <point x="296" y="125"/>
-      <point x="405" y="-10"/>
+      <point x="594" y="-10" type="curve" smooth="yes"/>
+      <point x="776" y="-10"/>
+      <point x="900" y="134"/>
+      <point x="900" y="347" type="curve" smooth="yes"/>
+      <point x="900" y="558"/>
+      <point x="779" y="699"/>
+      <point x="598" y="699" type="curve" smooth="yes"/>
+      <point x="420" y="699"/>
+      <point x="309" y="562"/>
+      <point x="309" y="343" type="curve" smooth="yes"/>
+      <point x="309" y="125"/>
+      <point x="418" y="-10"/>
     </contour>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="132" y="0" type="line"/>
-      <point x="132" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="145" y="0" type="line"/>
+      <point x="145" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="125" y="352" type="line"/>
-      <point x="309" y="352" type="line"/>
-      <point x="309" y="371" type="line"/>
-      <point x="125" y="371" type="line"/>
+      <point x="138" y="352" type="line"/>
+      <point x="322" y="352" type="line"/>
+      <point x="322" y="371" type="line"/>
+      <point x="138" y="371" type="line"/>
     </contour>
     <contour>
-      <point x="584" y="9" type="curve" smooth="yes"/>
-      <point x="419" y="9"/>
-      <point x="317" y="137"/>
-      <point x="317" y="346" type="curve" smooth="yes"/>
-      <point x="317" y="556"/>
-      <point x="415" y="680"/>
-      <point x="581" y="680" type="curve" smooth="yes"/>
-      <point x="750" y="680"/>
-      <point x="865" y="543"/>
-      <point x="865" y="342" type="curve" smooth="yes"/>
-      <point x="865" y="142"/>
-      <point x="752" y="9"/>
+      <point x="597" y="9" type="curve" smooth="yes"/>
+      <point x="432" y="9"/>
+      <point x="330" y="137"/>
+      <point x="330" y="346" type="curve" smooth="yes"/>
+      <point x="330" y="556"/>
+      <point x="428" y="680"/>
+      <point x="594" y="680" type="curve" smooth="yes"/>
+      <point x="763" y="680"/>
+      <point x="878" y="543"/>
+      <point x="878" y="342" type="curve" smooth="yes"/>
+      <point x="878" y="142"/>
+      <point x="765" y="9"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_zhitsa-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_zhitsa-cy.glif
index 8c4c970c..c180bd23 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_zhitsa-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_zhitsa-cy.glif
@@ -1,23 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Izhitsa-cy" format="2">
-  <advance width="691"/>
+  <advance width="657"/>
   <unicode hex="0474"/>
   <outline>
     <contour>
+      <point x="293" y="0" type="line"/>
       <point x="304" y="0" type="line"/>
-      <point x="315" y="0" type="line"/>
-      <point x="502" y="532" type="line" smooth="yes"/>
-      <point x="539" y="638"/>
-      <point x="587" y="687"/>
-      <point x="653" y="687" type="curve"/>
-      <point x="652" y="707" type="line"/>
-      <point x="579" y="707"/>
-      <point x="521" y="648"/>
-      <point x="481" y="533" type="curve" smooth="yes"/>
-      <point x="306" y="30" type="line"/>
-      <point x="315" y="30" type="line"/>
-      <point x="68" y="694" type="line"/>
-      <point x="45" y="694" type="line"/>
+      <point x="491" y="532" type="line" smooth="yes"/>
+      <point x="528" y="638"/>
+      <point x="576" y="687"/>
+      <point x="642" y="687" type="curve"/>
+      <point x="641" y="707" type="line"/>
+      <point x="568" y="707"/>
+      <point x="510" y="648"/>
+      <point x="470" y="533" type="curve" smooth="yes"/>
+      <point x="295" y="30" type="line"/>
+      <point x="304" y="30" type="line"/>
+      <point x="57" y="694" type="line"/>
+      <point x="34" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>V</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/J_.glif b/src/Cantarell-Light.ufo/glyphs/J_.glif
index 2eb87669..d49a44c6 100644
--- a/src/Cantarell-Light.ufo/glyphs/J_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/J_.glif
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="J" format="2">
-  <advance width="398"/>
+  <advance width="391"/>
   <unicode hex="004A"/>
-  <note>
-J
-</note>
-  <anchor x="257" y="0" name="bottom"/>
-  <anchor x="282" y="694" name="top"/>
+  <anchor x="242" y="0" name="bottom"/>
+  <anchor x="267" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="146" y="-10" type="curve" smooth="yes"/>
-      <point x="237" y="-10"/>
-      <point x="293" y="54"/>
-      <point x="293" y="158" type="curve" smooth="yes"/>
-      <point x="293" y="694" type="line"/>
-      <point x="272" y="694" type="line"/>
-      <point x="272" y="154" type="line" smooth="yes"/>
-      <point x="272" y="63"/>
-      <point x="226" y="9"/>
-      <point x="149" y="9" type="curve" smooth="yes"/>
-      <point x="116" y="9"/>
-      <point x="78" y="19"/>
-      <point x="48" y="36" type="curve"/>
-      <point x="40" y="19" type="line"/>
-      <point x="69" y="1"/>
-      <point x="108" y="-10"/>
+      <point x="131" y="-10" type="curve" smooth="yes"/>
+      <point x="222" y="-10"/>
+      <point x="278" y="54"/>
+      <point x="278" y="158" type="curve" smooth="yes"/>
+      <point x="278" y="694" type="line"/>
+      <point x="257" y="694" type="line"/>
+      <point x="257" y="154" type="line" smooth="yes"/>
+      <point x="257" y="63"/>
+      <point x="211" y="9"/>
+      <point x="134" y="9" type="curve" smooth="yes"/>
+      <point x="101" y="9"/>
+      <point x="63" y="19"/>
+      <point x="33" y="36" type="curve"/>
+      <point x="25" y="19" type="line"/>
+      <point x="54" y="1"/>
+      <point x="93" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/J_acute.glif b/src/Cantarell-Light.ufo/glyphs/J_acute.glif
index 010ff26b..53c9408a 100644
--- a/src/Cantarell-Light.ufo/glyphs/J_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/J_acute.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Jacute" format="2">
-  <advance width="398"/>
+  <advance width="391"/>
   <outline>
     <component base="J"/>
-    <component base="acutecomb.case" xOffset="224"/>
+    <component base="acutecomb.case" xOffset="209"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/J_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/J_circumflex.glif
index 08e8e120..e71f6116 100644
--- a/src/Cantarell-Light.ufo/glyphs/J_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/J_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Jcircumflex" format="2">
-  <advance width="398"/>
+  <advance width="391"/>
   <unicode hex="0134"/>
   <outline>
     <component base="J"/>
-    <component base="circumflexcomb.case" xOffset="105"/>
+    <component base="circumflexcomb.case" xOffset="90"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/J_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/J_e-cy.glif
index 1b397dca..b7e45928 100644
--- a/src/Cantarell-Light.ufo/glyphs/J_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/J_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Je-cy" format="2">
-  <advance width="398"/>
+  <advance width="391"/>
   <unicode hex="0408"/>
   <outline>
     <component base="J"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_.glif b/src/Cantarell-Light.ufo/glyphs/K_.glif
index 3b2b45fa..909f3663 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_.glif
@@ -1,27 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="K" format="2">
-  <advance width="552"/>
+  <advance width="578"/>
   <unicode hex="004B"/>
-  <note>
-K
-</note>
-  <anchor x="283" y="0" name="bottom"/>
-  <anchor x="283" y="694" name="top"/>
+  <anchor x="296" y="0" name="bottom"/>
+  <anchor x="296" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="497" y="0" type="line"/>
-      <point x="527" y="0" type="line"/>
-      <point x="151" y="366" type="line"/>
-      <point x="151" y="356" type="line"/>
-      <point x="513" y="694" type="line"/>
-      <point x="484" y="694" type="line"/>
-      <point x="132" y="360" type="line"/>
+      <point x="510" y="0" type="line"/>
+      <point x="540" y="0" type="line"/>
+      <point x="164" y="366" type="line"/>
+      <point x="164" y="356" type="line"/>
+      <point x="526" y="694" type="line"/>
+      <point x="497" y="694" type="line"/>
+      <point x="145" y="360" type="line"/>
     </contour>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="130" y="0" type="line"/>
-      <point x="130" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="143" y="0" type="line"/>
+      <point x="143" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_a-cy.glif b/src/Cantarell-Light.ufo/glyphs/K_a-cy.glif
index 961add26..2c19ffc4 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_a-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_a-cy.glif
@@ -1,30 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ka-cy" format="2">
-  <advance width="608"/>
+  <advance width="625"/>
   <unicode hex="041A"/>
-  <anchor x="589" y="0" name="bottomright"/>
-  <anchor x="309" y="694" name="top"/>
+  <anchor x="588" y="0" name="bottomright"/>
+  <anchor x="322" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="555" y="0" type="line"/>
-      <point x="580" y="0" type="line"/>
-      <point x="285" y="364" type="line"/>
-      <point x="285" y="353" type="line"/>
-      <point x="565" y="694" type="line"/>
-      <point x="541" y="694" type="line"/>
-      <point x="266" y="357" type="line"/>
+      <point x="568" y="0" type="line"/>
+      <point x="593" y="0" type="line"/>
+      <point x="298" y="364" type="line"/>
+      <point x="298" y="353" type="line"/>
+      <point x="578" y="694" type="line"/>
+      <point x="554" y="694" type="line"/>
+      <point x="279" y="357" type="line"/>
     </contour>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="130" y="0" type="line"/>
-      <point x="130" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="143" y="0" type="line"/>
+      <point x="143" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="119" y="348" type="line"/>
-      <point x="280" y="348" type="line"/>
-      <point x="280" y="366" type="line"/>
-      <point x="119" y="366" type="line"/>
+      <point x="132" y="348" type="line"/>
+      <point x="293" y="348" type="line"/>
+      <point x="293" y="366" type="line"/>
+      <point x="132" y="366" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif
index ac547226..60a01735 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif
@@ -1,38 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kabashkir-cy" format="2">
-  <advance width="714"/>
+  <advance width="731"/>
   <unicode hex="04A0"/>
   <outline>
     <contour>
-      <point x="22" y="676" type="line"/>
-      <point x="236" y="676" type="line"/>
-      <point x="236" y="694" type="line"/>
-      <point x="22" y="694" type="line"/>
+      <point x="674" y="0" type="line"/>
+      <point x="699" y="0" type="line"/>
+      <point x="404" y="364" type="line"/>
+      <point x="404" y="353" type="line"/>
+      <point x="684" y="694" type="line"/>
+      <point x="660" y="694" type="line"/>
+      <point x="385" y="357" type="line"/>
     </contour>
     <contour>
-      <point x="661" y="0" type="line"/>
-      <point x="686" y="0" type="line"/>
-      <point x="391" y="364" type="line"/>
-      <point x="391" y="353" type="line"/>
-      <point x="671" y="694" type="line"/>
-      <point x="647" y="694" type="line"/>
-      <point x="372" y="357" type="line"/>
+      <point x="229" y="0" type="line"/>
+      <point x="249" y="0" type="line"/>
+      <point x="249" y="694" type="line"/>
+      <point x="35" y="694" type="line"/>
+      <point x="35" y="676" type="line"/>
+      <point x="229" y="676" type="line"/>
     </contour>
     <contour>
-      <point x="216" y="0" type="line"/>
-      <point x="236" y="0" type="line"/>
-      <point x="236" y="694" type="line"/>
-      <point x="216" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="225" y="348" type="line"/>
-      <point x="386" y="348" type="line"/>
-      <point x="386" y="366" type="line"/>
-      <point x="225" y="366" type="line"/>
+      <point x="238" y="348" type="line"/>
+      <point x="399" y="348" type="line"/>
+      <point x="399" y="366" type="line"/>
+      <point x="238" y="366" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|Ge-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>Ka-cy</string>
     </dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_acute.glif b/src/Cantarell-Light.ufo/glyphs/K_acute.glif
index edf5f080..47709b67 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kacute" format="2">
-  <advance width="552"/>
+  <advance width="578"/>
   <unicode hex="1E30"/>
   <outline>
     <component base="K"/>
-    <component base="acutecomb.case" xOffset="225"/>
+    <component base="acutecomb.case" xOffset="238"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_adescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/K_adescender-cy.glif
index 3f90c9f3..1e865385 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_adescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_adescender-cy.glif
@@ -1,18 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kadescender-cy" format="2">
-  <advance width="684"/>
+  <advance width="625"/>
   <unicode hex="049A"/>
   <outline>
     <component base="Ka-cy"/>
-    <component base="descender-cy.case" xOffset="493"/>
+    <component base="descender-cy.case" xOffset="492"/>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>0</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Ka-cy</string>
+      <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
+      <string>=Ka-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_averticalstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/K_averticalstroke-cy.glif
index 7b190300..e24a1055 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_averticalstroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_averticalstroke-cy.glif
@@ -1,34 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kaverticalstroke-cy" format="2">
-  <advance width="605"/>
+  <advance width="621"/>
   <unicode hex="049C"/>
   <outline>
     <contour>
-      <point x="551" y="0" type="line"/>
-      <point x="576" y="0" type="line"/>
-      <point x="301" y="364" type="line"/>
-      <point x="301" y="353" type="line"/>
-      <point x="561" y="694" type="line"/>
-      <point x="537" y="694" type="line"/>
-      <point x="282" y="357" type="line"/>
+      <point x="564" y="0" type="line"/>
+      <point x="589" y="0" type="line"/>
+      <point x="314" y="364" type="line"/>
+      <point x="314" y="353" type="line"/>
+      <point x="574" y="694" type="line"/>
+      <point x="550" y="694" type="line"/>
+      <point x="295" y="357" type="line"/>
     </contour>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="130" y="0" type="line"/>
-      <point x="130" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="143" y="0" type="line"/>
+      <point x="143" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="119" y="348" type="line"/>
-      <point x="296" y="348" type="line"/>
-      <point x="296" y="366" type="line"/>
-      <point x="119" y="366" type="line"/>
+      <point x="132" y="348" type="line"/>
+      <point x="309" y="348" type="line"/>
+      <point x="309" y="366" type="line"/>
+      <point x="132" y="366" type="line"/>
     </contour>
     <contour>
-      <point x="223" y="178" type="line"/>
-      <point x="243" y="178" type="line"/>
-      <point x="243" y="538" type="line"/>
-      <point x="223" y="538" type="line"/>
+      <point x="236" y="178" type="line"/>
+      <point x="256" y="178" type="line"/>
+      <point x="256" y="538" type="line"/>
+      <point x="236" y="538" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Ka-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/K_commaaccent.glif
index 7264f0f6..d4e463b9 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kcommaaccent" format="2">
-  <advance width="552"/>
+  <advance width="578"/>
   <unicode hex="0136"/>
   <outline>
     <component base="K"/>
-    <component base="commaaccentcomb" xOffset="154"/>
+    <component base="commaaccentcomb" xOffset="167"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_je-cy.glif b/src/Cantarell-Light.ufo/glyphs/K_je-cy.glif
index 3b3fe377..3b38659e 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_je-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_je-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kje-cy" format="2">
-  <advance width="608"/>
+  <advance width="625"/>
   <unicode hex="040C"/>
   <outline>
     <component base="Ka-cy"/>
-    <component base="acutecomb.case" xOffset="251"/>
+    <component base="acutecomb.case" xOffset="264"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_.glif b/src/Cantarell-Light.ufo/glyphs/L_.glif
index 2244dc3f..5ee545ef 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_.glif
@@ -1,23 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="L" format="2">
-  <advance width="495"/>
+  <advance width="513"/>
   <unicode hex="004C"/>
-  <note>
-L
-</note>
-  <anchor x="286" y="0" name="bottom"/>
-  <anchor x="162" y="367" name="center"/>
-  <anchor x="502" y="352" name="periodcentered"/>
-  <anchor x="122" y="694" name="top"/>
-  <anchor x="251" y="480" name="topright"/>
+  <anchor x="299" y="0" name="bottom"/>
+  <anchor x="175" y="367" name="center"/>
+  <anchor x="515" y="352" name="periodcentered"/>
+  <anchor x="135" y="694" name="top"/>
+  <anchor x="264" y="480" name="topright"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="456" y="0" type="line"/>
-      <point x="456" y="19" type="line"/>
-      <point x="131" y="19" type="line"/>
-      <point x="131" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="469" y="0" type="line"/>
+      <point x="469" y="19" type="line"/>
+      <point x="144" y="19" type="line"/>
+      <point x="144" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_J_.glif b/src/Cantarell-Light.ufo/glyphs/L_J_.glif
index 95e758ea..5e40583a 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_J_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_J_.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="LJ" format="2">
-  <advance width="893"/>
+  <advance width="904"/>
   <unicode hex="01C7"/>
   <outline>
     <component base="L"/>
-    <component base="J" xOffset="495"/>
+    <component base="J" xOffset="513"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_acute.glif b/src/Cantarell-Light.ufo/glyphs/L_acute.glif
index 58a394a4..8a9a8a4e 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lacute" format="2">
-  <advance width="495"/>
+  <advance width="513"/>
   <unicode hex="0139"/>
   <outline>
     <component base="L"/>
-    <component base="acutecomb.case" xOffset="64"/>
+    <component base="acutecomb.case" xOffset="77"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_caron.glif b/src/Cantarell-Light.ufo/glyphs/L_caron.glif
index 2cac9d1f..2d2c3f12 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcaron" format="2">
-  <advance width="495"/>
+  <advance width="513"/>
   <unicode hex="013D"/>
   <outline>
     <component base="L"/>
-    <component base="caroncomb.alt" xOffset="139"/>
+    <component base="caroncomb.alt" xOffset="152"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/L_commaaccent.glif
index 7a34cea7..e04b204d 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcommaaccent" format="2">
-  <advance width="495"/>
+  <advance width="513"/>
   <unicode hex="013B"/>
   <outline>
     <component base="L"/>
-    <component base="commaaccentcomb" xOffset="157"/>
+    <component base="commaaccentcomb" xOffset="170"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_dot.glif b/src/Cantarell-Light.ufo/glyphs/L_dot.glif
index 9c25d0f6..201b0414 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_dot.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_dot.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldot" format="2">
-  <advance width="495"/>
+  <advance width="513"/>
   <unicode hex="013F"/>
   <outline>
     <component base="L"/>
-    <component base="periodcentered.loclCAT.case" xOffset="502"/>
+    <component base="periodcentered.loclCAT.case" xOffset="515"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/L_dotbelow.glif
index b7c784e1..2ddeb18e 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldotbelow" format="2">
-  <advance width="495"/>
+  <advance width="513"/>
   <unicode hex="1E36"/>
   <outline>
     <component base="L"/>
-    <component base="dotbelowcomb" xOffset="166"/>
+    <component base="dotbelowcomb" xOffset="179"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_j.glif b/src/Cantarell-Light.ufo/glyphs/L_j.glif
index 99c51e41..a656c3fa 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_j.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_j.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lj" format="2">
-  <advance width="697"/>
+  <advance width="748"/>
   <unicode hex="01C8"/>
   <outline>
     <component base="L"/>
-    <component base="j" xOffset="495"/>
+    <component base="j" xOffset="513"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_je-cy.glif b/src/Cantarell-Light.ufo/glyphs/L_je-cy.glif
index 76fbf9d1..da4833ab 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_je-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_je-cy.glif
@@ -4,52 +4,54 @@
   <unicode hex="0409"/>
   <outline>
     <contour>
-      <point x="567" y="0" type="line"/>
-      <point x="762" y="0" type="line" smooth="yes"/>
-      <point x="905" y="0"/>
-      <point x="990" y="73"/>
-      <point x="990" y="200" type="curve" smooth="yes"/>
-      <point x="990" y="322"/>
-      <point x="912" y="403"/>
-      <point x="796" y="403" type="curve" smooth="yes"/>
-      <point x="572" y="403" type="line"/>
-      <point x="572" y="386" type="line"/>
-      <point x="786" y="386" type="line" smooth="yes"/>
-      <point x="893" y="386"/>
-      <point x="968" y="312"/>
-      <point x="968" y="195" type="curve" smooth="yes"/>
-      <point x="968" y="82"/>
-      <point x="898" y="18"/>
-      <point x="773" y="18" type="curve" smooth="yes"/>
-      <point x="567" y="18" type="line"/>
+      <point x="106" y="-6" type="curve" smooth="yes"/>
+      <point x="194" y="-6"/>
+      <point x="225" y="89"/>
+      <point x="225" y="362" type="curve" smooth="yes"/>
+      <point x="225" y="675" type="line"/>
+      <point x="549" y="675" type="line"/>
+      <point x="549" y="0" type="line"/>
+      <point x="571" y="0" type="line"/>
+      <point x="571" y="694" type="line"/>
+      <point x="203" y="694" type="line"/>
+      <point x="203" y="369" type="line" smooth="yes"/>
+      <point x="203" y="89"/>
+      <point x="181" y="14"/>
+      <point x="102" y="14" type="curve" smooth="yes"/>
+      <point x="80" y="14"/>
+      <point x="60" y="20"/>
+      <point x="43" y="31" type="curve"/>
+      <point x="36" y="13" type="line"/>
+      <point x="53" y="2"/>
+      <point x="81" y="-6"/>
     </contour>
     <contour>
-      <point x="110" y="-6" type="curve" smooth="yes"/>
-      <point x="198" y="-6"/>
-      <point x="229" y="89"/>
-      <point x="229" y="362" type="curve" smooth="yes"/>
-      <point x="229" y="675" type="line"/>
-      <point x="553" y="675" type="line"/>
-      <point x="553" y="0" type="line"/>
-      <point x="575" y="0" type="line"/>
-      <point x="575" y="694" type="line"/>
-      <point x="207" y="694" type="line"/>
-      <point x="207" y="369" type="line" smooth="yes"/>
-      <point x="207" y="89"/>
-      <point x="185" y="14"/>
-      <point x="106" y="14" type="curve" smooth="yes"/>
-      <point x="84" y="14"/>
-      <point x="64" y="20"/>
-      <point x="47" y="31" type="curve"/>
-      <point x="40" y="13" type="line"/>
-      <point x="57" y="2"/>
-      <point x="85" y="-6"/>
+      <point x="563" y="0" type="line"/>
+      <point x="758" y="0" type="line" smooth="yes"/>
+      <point x="901" y="0"/>
+      <point x="986" y="73"/>
+      <point x="986" y="200" type="curve" smooth="yes"/>
+      <point x="986" y="322"/>
+      <point x="908" y="403"/>
+      <point x="792" y="403" type="curve" smooth="yes"/>
+      <point x="568" y="403" type="line"/>
+      <point x="568" y="386" type="line"/>
+      <point x="782" y="386" type="line" smooth="yes"/>
+      <point x="889" y="386"/>
+      <point x="964" y="312"/>
+      <point x="964" y="195" type="curve" smooth="yes"/>
+      <point x="964" y="82"/>
+      <point x="894" y="18"/>
+      <point x="769" y="18" type="curve" smooth="yes"/>
+      <point x="563" y="18" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>El-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Softsign-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_linebelow.glif b/src/Cantarell-Light.ufo/glyphs/L_linebelow.glif
index 6033a396..b58b53f0 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_linebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Llinebelow" format="2">
-  <advance width="495"/>
+  <advance width="513"/>
   <unicode hex="1E3A"/>
   <outline>
     <component base="L"/>
-    <component base="macronbelowcomb" xOffset="36"/>
+    <component base="macronbelowcomb" xOffset="49"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_slash.glif b/src/Cantarell-Light.ufo/glyphs/L_slash.glif
index 99c43bf3..194655e1 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_slash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_slash.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lslash" format="2">
-  <advance width="495"/>
+  <advance width="513"/>
   <unicode hex="0141"/>
   <outline>
     <component base="L"/>
-    <component base="slashshortcomb.case" xOffset="-14" yOffset="61"/>
+    <component base="slashshortcomb.case" xOffset="-1" yOffset="61"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/M_.glif b/src/Cantarell-Light.ufo/glyphs/M_.glif
index 23a0d1fd..fe973010 100644
--- a/src/Cantarell-Light.ufo/glyphs/M_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/M_.glif
@@ -1,30 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="M" format="2">
-  <advance width="835"/>
+  <advance width="861"/>
   <unicode hex="004D"/>
-  <note>
-M
-</note>
-  <anchor x="432" y="0" name="bottom"/>
-  <anchor x="432" y="694" name="top"/>
+  <anchor x="445" y="0" name="bottom"/>
+  <anchor x="445" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="131" y="0" type="line"/>
-      <point x="131" y="677" type="line"/>
-      <point x="124" y="677" type="line"/>
-      <point x="404" y="108" type="line"/>
-      <point x="424" y="108" type="line"/>
-      <point x="711" y="676" type="line"/>
-      <point x="704" y="676" type="line"/>
-      <point x="704" y="0" type="line"/>
-      <point x="725" y="0" type="line"/>
-      <point x="725" y="694" type="line"/>
-      <point x="699" y="694" type="line"/>
-      <point x="410" y="118" type="line"/>
-      <point x="421" y="118" type="line"/>
-      <point x="138" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="144" y="0" type="line"/>
+      <point x="144" y="677" type="line"/>
+      <point x="137" y="677" type="line"/>
+      <point x="417" y="108" type="line"/>
+      <point x="437" y="108" type="line"/>
+      <point x="724" y="676" type="line"/>
+      <point x="717" y="676" type="line"/>
+      <point x="717" y="0" type="line"/>
+      <point x="738" y="0" type="line"/>
+      <point x="738" y="694" type="line"/>
+      <point x="712" y="694" type="line"/>
+      <point x="423" y="118" type="line"/>
+      <point x="434" y="118" type="line"/>
+      <point x="151" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/M_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/M_dotbelow.glif
index efa9f400..18ff2c83 100644
--- a/src/Cantarell-Light.ufo/glyphs/M_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/M_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Mdotbelow" format="2">
-  <advance width="835"/>
+  <advance width="861"/>
   <unicode hex="1E42"/>
   <outline>
     <component base="M"/>
-    <component base="dotbelowcomb" xOffset="312"/>
+    <component base="dotbelowcomb" xOffset="325"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_.glif b/src/Cantarell-Light.ufo/glyphs/N_.glif
index 2ba8f6f8..c1de3491 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_.glif
@@ -1,26 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="N" format="2">
-  <advance width="732"/>
+  <advance width="758"/>
   <unicode hex="004E"/>
-  <note>
-N
-</note>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
+  <anchor x="390" y="0" name="bottom"/>
+  <anchor x="390" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="130" y="0" type="line"/>
-      <point x="130" y="674" type="line"/>
-      <point x="129" y="674" type="line"/>
-      <point x="595" y="0" type="line"/>
-      <point x="622" y="0" type="line"/>
-      <point x="622" y="694" type="line"/>
-      <point x="602" y="694" type="line"/>
-      <point x="602" y="20" type="line"/>
-      <point x="605" y="20" type="line"/>
-      <point x="139" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="143" y="0" type="line"/>
+      <point x="143" y="674" type="line"/>
+      <point x="142" y="674" type="line"/>
+      <point x="608" y="0" type="line"/>
+      <point x="635" y="0" type="line"/>
+      <point x="635" y="694" type="line"/>
+      <point x="615" y="694" type="line"/>
+      <point x="615" y="20" type="line"/>
+      <point x="618" y="20" type="line"/>
+      <point x="152" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_J_.glif b/src/Cantarell-Light.ufo/glyphs/N_J_.glif
index 95737588..f07e2923 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_J_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_J_.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="NJ" format="2">
-  <advance width="1130"/>
+  <advance width="1149"/>
   <unicode hex="01CA"/>
   <outline>
     <component base="N"/>
-    <component base="J" xOffset="732"/>
+    <component base="J" xOffset="758"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_acute.glif b/src/Cantarell-Light.ufo/glyphs/N_acute.glif
index d488256d..4435b35a 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nacute" format="2">
-  <advance width="732"/>
+  <advance width="758"/>
   <unicode hex="0143"/>
   <outline>
     <component base="N"/>
-    <component base="acutecomb.case" xOffset="319"/>
+    <component base="acutecomb.case" xOffset="332"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_caron.glif b/src/Cantarell-Light.ufo/glyphs/N_caron.glif
index f38b2988..c4ff1729 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ncaron" format="2">
-  <advance width="732"/>
+  <advance width="758"/>
   <unicode hex="0147"/>
   <outline>
     <component base="N"/>
-    <component base="caroncomb.case" xOffset="202"/>
+    <component base="caroncomb.case" xOffset="215"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/N_commaaccent.glif
index f5c04c3f..a5427211 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ncommaaccent" format="2">
-  <advance width="732"/>
+  <advance width="758"/>
   <unicode hex="0145"/>
   <outline>
     <component base="N"/>
-    <component base="commaaccentcomb" xOffset="248"/>
+    <component base="commaaccentcomb" xOffset="261"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/N_dotaccent.glif
index 882a00fc..c98cb20f 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ndotaccent" format="2">
-  <advance width="732"/>
+  <advance width="758"/>
   <unicode hex="1E44"/>
   <outline>
     <component base="N"/>
-    <component base="dotaccentcomb.case" xOffset="258"/>
+    <component base="dotaccentcomb.case" xOffset="271"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/N_dotbelow.glif
index 8a80caec..a35f13c9 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ndotbelow" format="2">
-  <advance width="732"/>
+  <advance width="758"/>
   <unicode hex="1E46"/>
   <outline>
     <component base="N"/>
-    <component base="dotbelowcomb" xOffset="257"/>
+    <component base="dotbelowcomb" xOffset="270"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_j.glif b/src/Cantarell-Light.ufo/glyphs/N_j.glif
index 6c228c1c..c729744a 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_j.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_j.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nj" format="2">
-  <advance width="934"/>
+  <advance width="993"/>
   <unicode hex="01CB"/>
   <outline>
     <component base="N"/>
-    <component base="j" xOffset="732"/>
+    <component base="j" xOffset="758"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_je-cy.glif b/src/Cantarell-Light.ufo/glyphs/N_je-cy.glif
index be52699c..25e4aa84 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_je-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_je-cy.glif
@@ -1,45 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nje-cy" format="2">
-  <advance width="1064"/>
+  <advance width="1081"/>
   <unicode hex="040A"/>
   <outline>
     <contour>
-      <point x="582" y="0" type="line"/>
-      <point x="777" y="0" type="line" smooth="yes"/>
-      <point x="920" y="0"/>
-      <point x="1005" y="73"/>
-      <point x="1005" y="200" type="curve" smooth="yes"/>
-      <point x="1005" y="322"/>
-      <point x="927" y="403"/>
-      <point x="811" y="403" type="curve" smooth="yes"/>
-      <point x="587" y="403" type="line"/>
-      <point x="587" y="386" type="line"/>
-      <point x="801" y="386" type="line" smooth="yes"/>
-      <point x="908" y="386"/>
-      <point x="983" y="312"/>
-      <point x="983" y="195" type="curve" smooth="yes"/>
-      <point x="983" y="82"/>
-      <point x="913" y="18"/>
-      <point x="788" y="18" type="curve" smooth="yes"/>
-      <point x="582" y="18" type="line"/>
+      <point x="595" y="0" type="line"/>
+      <point x="790" y="0" type="line" smooth="yes"/>
+      <point x="938" y="0"/>
+      <point x="1018" y="67"/>
+      <point x="1018" y="190" type="curve" smooth="yes"/>
+      <point x="1018" y="305"/>
+      <point x="948" y="371"/>
+      <point x="824" y="371" type="curve" smooth="yes"/>
+      <point x="600" y="371" type="line"/>
+      <point x="600" y="353" type="line"/>
+      <point x="814" y="353" type="line" smooth="yes"/>
+      <point x="931" y="353"/>
+      <point x="996" y="293"/>
+      <point x="996" y="185" type="curve" smooth="yes"/>
+      <point x="996" y="75"/>
+      <point x="929" y="18"/>
+      <point x="801" y="18" type="curve" smooth="yes"/>
+      <point x="595" y="18" type="line"/>
     </contour>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="132" y="0" type="line"/>
-      <point x="132" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="145" y="0" type="line"/>
+      <point x="145" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="125" y="352" type="line"/>
-      <point x="576" y="352" type="line"/>
-      <point x="576" y="371" type="line"/>
-      <point x="125" y="371" type="line"/>
+      <point x="138" y="352" type="line"/>
+      <point x="589" y="352" type="line"/>
+      <point x="589" y="371" type="line"/>
+      <point x="138" y="371" type="line"/>
     </contour>
     <contour>
-      <point x="570" y="0" type="line"/>
-      <point x="592" y="0" type="line"/>
-      <point x="592" y="694" type="line"/>
-      <point x="570" y="694" type="line"/>
+      <point x="583" y="0" type="line"/>
+      <point x="605" y="0" type="line"/>
+      <point x="605" y="694" type="line"/>
+      <point x="583" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Softsign-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_linebelow.glif b/src/Cantarell-Light.ufo/glyphs/N_linebelow.glif
index 5bbadf54..a2b3253d 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_linebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nlinebelow" format="2">
-  <advance width="732"/>
+  <advance width="758"/>
   <unicode hex="1E48"/>
   <outline>
     <component base="N"/>
-    <component base="macronbelowcomb" xOffset="127"/>
+    <component base="macronbelowcomb" xOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_tilde.glif b/src/Cantarell-Light.ufo/glyphs/N_tilde.glif
index bebbf8b1..53355cda 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ntilde" format="2">
-  <advance width="732"/>
+  <advance width="758"/>
   <unicode hex="00D1"/>
   <outline>
     <component base="N"/>
-    <component base="tildecomb.case" xOffset="133"/>
+    <component base="tildecomb.case" xOffset="146"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_-cy.glif b/src/Cantarell-Light.ufo/glyphs/O_-cy.glif
index dc36687a..e0332f26 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="O-cy" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="041E"/>
-  <anchor x="377" y="694" name="top"/>
   <outline>
     <component base="O"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_.glif b/src/Cantarell-Light.ufo/glyphs/O_.glif
index 0540c611..657fa3be 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_.glif
@@ -1,45 +1,48 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="O" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="004F"/>
-  <note>
-O
-</note>
-  <anchor x="598" y="94" name="Qtail"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="379" y="345" name="center"/>
-  <anchor x="459" y="10" name="ogonek"/>
-  <anchor x="378" y="694" name="top"/>
-  <anchor x="-3" y="694" name="topleft"/>
-  <anchor x="653" y="694" name="topright"/>
+  <anchor x="599" y="94" name="Qtail"/>
+  <anchor x="379" y="0" name="bottom"/>
+  <anchor x="380" y="345" name="center"/>
+  <anchor x="460" y="10" name="ogonek"/>
+  <anchor x="379" y="694" name="top"/>
+  <anchor x="-2" y="694" name="topleft"/>
+  <anchor x="654" y="694" name="topright"/>
   <outline>
     <contour>
-      <point x="376" y="-10" type="curve" smooth="yes"/>
-      <point x="559" y="-10"/>
-      <point x="682" y="135"/>
-      <point x="682" y="346" type="curve" smooth="yes"/>
-      <point x="682" y="558"/>
-      <point x="561" y="699"/>
-      <point x="379" y="699" type="curve" smooth="yes"/>
-      <point x="194" y="699"/>
-      <point x="71" y="553"/>
-      <point x="71" y="343" type="curve" smooth="yes"/>
-      <point x="71" y="133"/>
-      <point x="193" y="-10"/>
+      <point x="377" y="-10" type="curve" smooth="yes"/>
+      <point x="560" y="-10"/>
+      <point x="683" y="135"/>
+      <point x="683" y="346" type="curve" smooth="yes"/>
+      <point x="683" y="558"/>
+      <point x="562" y="699"/>
+      <point x="380" y="699" type="curve" smooth="yes"/>
+      <point x="195" y="699"/>
+      <point x="72" y="553"/>
+      <point x="72" y="343" type="curve" smooth="yes"/>
+      <point x="72" y="133"/>
+      <point x="194" y="-10"/>
     </contour>
     <contour>
-      <point x="378" y="9" type="curve" smooth="yes"/>
-      <point x="207" y="9"/>
-      <point x="93" y="147"/>
-      <point x="93" y="346" type="curve" smooth="yes"/>
-      <point x="93" y="545"/>
-      <point x="206" y="680"/>
-      <point x="376" y="680" type="curve" smooth="yes"/>
-      <point x="546" y="680"/>
-      <point x="660" y="542"/>
-      <point x="660" y="343" type="curve" smooth="yes"/>
-      <point x="660" y="143"/>
-      <point x="548" y="9"/>
+      <point x="379" y="9" type="curve" smooth="yes"/>
+      <point x="208" y="9"/>
+      <point x="94" y="147"/>
+      <point x="94" y="346" type="curve" smooth="yes"/>
+      <point x="94" y="545"/>
+      <point x="207" y="680"/>
+      <point x="377" y="680" type="curve" smooth="yes"/>
+      <point x="547" y="680"/>
+      <point x="661" y="542"/>
+      <point x="661" y="343" type="curve" smooth="yes"/>
+      <point x="661" y="143"/>
+      <point x="549" y="9"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_E_.glif b/src/Cantarell-Light.ufo/glyphs/O_E_.glif
index 74c7d665..c756a134 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_E_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_E_.glif
@@ -1,61 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="OE" format="2">
-  <advance width="952"/>
+  <advance width="966"/>
   <unicode hex="0152"/>
-  <anchor x="533" y="0" name="bottom"/>
-  <anchor x="533" y="694" name="top"/>
+  <anchor x="534" y="0" name="bottom"/>
+  <anchor x="534" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="426" y="-10" type="curve" smooth="yes"/>
-      <point x="458" y="-10"/>
-      <point x="507" y="-6"/>
-      <point x="538" y="0" type="curve"/>
-      <point x="533" y="18" type="line"/>
-      <point x="506" y="12"/>
-      <point x="458" y="9"/>
-      <point x="428" y="9" type="curve" smooth="yes"/>
-      <point x="227" y="9"/>
-      <point x="93" y="145"/>
-      <point x="93" y="346" type="curve" smooth="yes"/>
-      <point x="93" y="547"/>
-      <point x="227" y="680"/>
-      <point x="426" y="680" type="curve" smooth="yes"/>
-      <point x="454" y="680"/>
-      <point x="501" y="677"/>
-      <point x="528" y="672" type="curve"/>
-      <point x="532" y="691" type="line"/>
-      <point x="504" y="696"/>
-      <point x="458" y="699"/>
-      <point x="430" y="699" type="curve" smooth="yes"/>
-      <point x="215" y="699"/>
-      <point x="71" y="555"/>
-      <point x="71" y="343" type="curve" smooth="yes"/>
-      <point x="71" y="131"/>
-      <point x="214" y="-10"/>
+      <point x="427" y="-10" type="curve" smooth="yes"/>
+      <point x="459" y="-10"/>
+      <point x="508" y="-6"/>
+      <point x="539" y="0" type="curve"/>
+      <point x="534" y="18" type="line"/>
+      <point x="507" y="12"/>
+      <point x="459" y="9"/>
+      <point x="429" y="9" type="curve" smooth="yes"/>
+      <point x="228" y="9"/>
+      <point x="94" y="145"/>
+      <point x="94" y="346" type="curve" smooth="yes"/>
+      <point x="94" y="547"/>
+      <point x="228" y="680"/>
+      <point x="427" y="680" type="curve" smooth="yes"/>
+      <point x="455" y="680"/>
+      <point x="502" y="677"/>
+      <point x="529" y="672" type="curve"/>
+      <point x="533" y="691" type="line"/>
+      <point x="505" y="696"/>
+      <point x="459" y="699"/>
+      <point x="431" y="699" type="curve" smooth="yes"/>
+      <point x="216" y="699"/>
+      <point x="72" y="555"/>
+      <point x="72" y="343" type="curve" smooth="yes"/>
+      <point x="72" y="131"/>
+      <point x="215" y="-10"/>
     </contour>
     <contour>
-      <point x="509" y="0" type="line"/>
-      <point x="530" y="0" type="line"/>
-      <point x="530" y="694" type="line"/>
-      <point x="509" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="518" y="0" type="line"/>
-      <point x="903" y="0" type="line"/>
-      <point x="903" y="18" type="line"/>
-      <point x="518" y="18" type="line"/>
-    </contour>
-    <contour>
-      <point x="518" y="351" type="line"/>
-      <point x="878" y="351" type="line"/>
-      <point x="878" y="369" type="line"/>
-      <point x="518" y="369" type="line"/>
-    </contour>
-    <contour>
-      <point x="518" y="676" type="line"/>
-      <point x="903" y="676" type="line"/>
-      <point x="903" y="694" type="line"/>
-      <point x="518" y="694" type="line"/>
+      <point x="510" y="0" type="line"/>
+      <point x="904" y="0" type="line"/>
+      <point x="904" y="18" type="line"/>
+      <point x="531" y="18" type="line"/>
+      <point x="531" y="351" type="line"/>
+      <point x="879" y="351" type="line"/>
+      <point x="879" y="369" type="line"/>
+      <point x="531" y="369" type="line"/>
+      <point x="531" y="676" type="line"/>
+      <point x="904" y="676" type="line"/>
+      <point x="904" y="694" type="line"/>
+      <point x="510" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_acute.glif b/src/Cantarell-Light.ufo/glyphs/O_acute.glif
index c6c5e9af..58ec962b 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oacute" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="00D3"/>
   <outline>
     <component base="O"/>
-    <component base="acutecomb.case" xOffset="320"/>
+    <component base="acutecomb.case" xOffset="321"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_barred-cy.glif b/src/Cantarell-Light.ufo/glyphs/O_barred-cy.glif
index 9faecdb4..923845b2 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_barred-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_barred-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Obarred-cy" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="04E8"/>
   <outline>
     <component base="O"/>
-    <component base="_bar-cy" xOffset="-81" yOffset="3"/>
+    <component base="_bar-cy" xOffset="-80" yOffset="3"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_breve.glif b/src/Cantarell-Light.ufo/glyphs/O_breve.glif
index a5d0de18..27f919db 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Obreve" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="014E"/>
   <outline>
     <component base="O"/>
-    <component base="brevecomb.case" xOffset="175"/>
+    <component base="brevecomb.case" xOffset="176"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_caron.glif b/src/Cantarell-Light.ufo/glyphs/O_caron.glif
index 1db587b5..3afd11a3 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocaron" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="01D1"/>
   <outline>
     <component base="O"/>
-    <component base="caroncomb.case" xOffset="203"/>
+    <component base="caroncomb.case" xOffset="204"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/O_circumflex.glif
index 81b07e20..fd211582 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflex" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="00D4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb.case" xOffset="201"/>
+    <component base="circumflexcomb.case" xOffset="202"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_circumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/O_circumflexacute.glif
index c2231d0f..72c3ca24 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflexacute.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexacute" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="1ED0"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="221" yOffset="14"/>
+    <component base="circumflexcomb.loclVIET" xOffset="203" yOffset="214"/>
+    <component base="acutecomb.loclVIET" xOffset="422" yOffset="288"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_circumflexdotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/O_circumflexdotbelow.glif
index 3046c1f7..e8d39f3f 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflexdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexdotbelow" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="1ED8"/>
   <outline>
     <component base="O"/>
-    <component base="dotbelowcomb" xOffset="258"/>
-    <component base="circumflexcomb.case" xOffset="201"/>
+    <component base="dotbelowcomb" xOffset="259"/>
+    <component base="circumflexcomb.case" xOffset="202"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_circumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/O_circumflexgrave.glif
index 62676cd4..157197a5 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflexgrave.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexgrave" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="1ED2"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="221" yOffset="14"/>
+    <component base="circumflexcomb.loclVIET" xOffset="203" yOffset="214"/>
+    <component base="gravecomb.loclVIET" xOffset="318" yOffset="288"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_circumflexhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/O_circumflexhookabove.glif
index 86727080..fbc633be 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflexhookabove.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexhookabove" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="1ED4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="221" yOffset="14"/>
+    <component base="circumflexcomb.loclVIET" xOffset="203" yOffset="214"/>
+    <component base="hookabovecomb.loclVIET" xOffset="349" yOffset="288"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_circumflextilde.glif 
b/src/Cantarell-Light.ufo/glyphs/O_circumflextilde.glif
index 1eb65b20..0b209efb 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflextilde.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflextilde" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="1ED6"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="179" yOffset="14"/>
+    <component base="circumflexcomb.loclVIET" xOffset="203" yOffset="214"/>
+    <component base="tildecomb.loclVIET" xOffset="152" yOffset="294"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/O_dblgrave.glif
index 6394d7fc..a938e9ea 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_dblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odblgrave" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="020C"/>
   <outline>
     <component base="O"/>
-    <component base="dblgravecomb.case" xOffset="135"/>
+    <component base="dblgravecomb.case" xOffset="136"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_dieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/O_dieresis-cy.glif
index 52d45fae..40ef260e 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_dieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_dieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odieresis-cy" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="04E6"/>
   <outline>
     <component base="O-cy"/>
-    <component base="dieresiscomb.case" xOffset="157"/>
+    <component base="dieresiscomb.case" xOffset="159"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/O_dieresis.glif
index b65291e2..2ae25498 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odieresis" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="00D6"/>
   <outline>
     <component base="O"/>
-    <component base="dieresiscomb.case" xOffset="158"/>
+    <component base="dieresiscomb.case" xOffset="159"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_dieresismacron.glif 
b/src/Cantarell-Light.ufo/glyphs/O_dieresismacron.glif
index 35f3bde8..441ca04a 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_dieresismacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_dieresismacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odieresismacron" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="022A"/>
   <outline>
     <component base="O"/>
-    <component base="dieresiscomb.case" xOffset="158"/>
-    <component base="macroncomb.case" xOffset="140" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="159"/>
+    <component base="macroncomb.case" xOffset="141" yOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_dotaccentmacron.glif 
b/src/Cantarell-Light.ufo/glyphs/O_dotaccentmacron.glif
index b8c716c0..b5bdb9ee 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_dotaccentmacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_dotaccentmacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odotaccentmacron" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="0230"/>
   <outline>
     <component base="O"/>
-    <component base="dotaccentcomb.case" xOffset="259"/>
-    <component base="macroncomb.case" xOffset="140" yOffset="143"/>
+    <component base="dotaccentcomb.case" xOffset="260"/>
+    <component base="macroncomb.case" xOffset="141" yOffset="143"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/O_dotbelow.glif
index 4e27c1e1..e430fc77 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odotbelow" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="1ECC"/>
   <outline>
     <component base="O"/>
-    <component base="dotbelowcomb" xOffset="258"/>
+    <component base="dotbelowcomb" xOffset="259"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_grave.glif b/src/Cantarell-Light.ufo/glyphs/O_grave.glif
index 8f325a20..a139dfa6 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ograve" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="00D2"/>
   <outline>
     <component base="O"/>
-    <component base="gravecomb.case" xOffset="181"/>
+    <component base="gravecomb.case" xOffset="182"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_hm.glif b/src/Cantarell-Light.ufo/glyphs/O_hm.glif
index d5a39abb..e3e81810 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_hm.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_hm.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohm" format="2">
-  <advance width="807"/>
+  <advance width="793"/>
   <unicode hex="2126"/>
   <outline>
     <contour>
-      <point x="102" y="0" type="line"/>
-      <point x="328" y="0" type="line"/>
-      <point x="328" y="13" type="line"/>
-      <point x="212" y="98"/>
-      <point x="135" y="249"/>
-      <point x="135" y="391" type="curve" smooth="yes"/>
-      <point x="135" y="567"/>
-      <point x="241" y="685"/>
-      <point x="400" y="685" type="curve" smooth="yes"/>
-      <point x="564" y="685"/>
-      <point x="674" y="567"/>
-      <point x="674" y="391" type="curve" smooth="yes"/>
-      <point x="674" y="260"/>
-      <point x="596" y="108"/>
-      <point x="479" y="13" type="curve"/>
-      <point x="479" y="0" type="line"/>
-      <point x="705" y="0" type="line"/>
-      <point x="705" y="18" type="line"/>
-      <point x="512" y="18" type="line"/>
-      <point x="622" y="115"/>
-      <point x="696" y="266"/>
-      <point x="696" y="394" type="curve" smooth="yes"/>
-      <point x="696" y="580"/>
-      <point x="579" y="704"/>
-      <point x="403" y="704" type="curve" smooth="yes"/>
-      <point x="229" y="704"/>
-      <point x="113" y="578"/>
-      <point x="113" y="388" type="curve" smooth="yes"/>
-      <point x="113" y="245"/>
-      <point x="186" y="97"/>
-      <point x="295" y="18" type="curve"/>
-      <point x="102" y="18" type="line"/>
+      <point x="95" y="0" type="line"/>
+      <point x="321" y="0" type="line"/>
+      <point x="321" y="13" type="line"/>
+      <point x="205" y="98"/>
+      <point x="128" y="249"/>
+      <point x="128" y="391" type="curve" smooth="yes"/>
+      <point x="128" y="567"/>
+      <point x="234" y="685"/>
+      <point x="393" y="685" type="curve" smooth="yes"/>
+      <point x="557" y="685"/>
+      <point x="667" y="567"/>
+      <point x="667" y="391" type="curve" smooth="yes"/>
+      <point x="667" y="260"/>
+      <point x="589" y="108"/>
+      <point x="472" y="13" type="curve"/>
+      <point x="472" y="0" type="line"/>
+      <point x="698" y="0" type="line"/>
+      <point x="698" y="18" type="line"/>
+      <point x="505" y="18" type="line"/>
+      <point x="615" y="115"/>
+      <point x="689" y="266"/>
+      <point x="689" y="394" type="curve" smooth="yes"/>
+      <point x="689" y="580"/>
+      <point x="572" y="704"/>
+      <point x="396" y="704" type="curve" smooth="yes"/>
+      <point x="222" y="704"/>
+      <point x="106" y="578"/>
+      <point x="106" y="388" type="curve" smooth="yes"/>
+      <point x="106" y="245"/>
+      <point x="179" y="97"/>
+      <point x="288" y="18" type="curve"/>
+      <point x="95" y="18" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/O_hookabove.glif
index 0091752c..05e55882 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_hookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohookabove" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="1ECE"/>
   <outline>
     <component base="O"/>
-    <component base="hookabovecomb.case" xOffset="223"/>
+    <component base="hookabovecomb.case" xOffset="224"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_horn.glif b/src/Cantarell-Light.ufo/glyphs/O_horn.glif
index 9cc328b5..48604c25 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_horn.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_horn.glif
@@ -1,13 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorn" format="2">
-  <advance width="776"/>
+  <advance width="777"/>
   <unicode hex="01A0"/>
   <outline>
     <component base="O"/>
-    <component base="horncomb" xOffset="521" yOffset="212"/>
+    <component base="horncomb" xOffset="522" yOffset="212"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
       <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
       <string>=+22</string>
     </dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_hornacute.glif b/src/Cantarell-Light.ufo/glyphs/O_hornacute.glif
index b25bf249..d1c9f9f6 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_hornacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_hornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohornacute" format="2">
-  <advance width="776"/>
+  <advance width="777"/>
   <unicode hex="1EDA"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="acutecomb.case" xOffset="320"/>
+    <component base="acutecomb.case" xOffset="321"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_horndotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/O_horndotbelow.glif
index 28c58f5c..f78bf4bd 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_horndotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_horndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorndotbelow" format="2">
-  <advance width="776"/>
+  <advance width="777"/>
   <unicode hex="1EE2"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="dotbelowcomb" xOffset="258"/>
+    <component base="dotbelowcomb" xOffset="259"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_horngrave.glif b/src/Cantarell-Light.ufo/glyphs/O_horngrave.glif
index b4de557b..e3cf0864 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_horngrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_horngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorngrave" format="2">
-  <advance width="776"/>
+  <advance width="777"/>
   <unicode hex="1EDC"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="gravecomb.case" xOffset="181"/>
+    <component base="gravecomb.case" xOffset="182"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_hornhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/O_hornhookabove.glif
index be340ffc..29844474 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_hornhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_hornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohornhookabove" format="2">
-  <advance width="776"/>
+  <advance width="777"/>
   <unicode hex="1EDE"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="hookabovecomb.case" xOffset="223"/>
+    <component base="hookabovecomb.case" xOffset="224"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_horntilde.glif b/src/Cantarell-Light.ufo/glyphs/O_horntilde.glif
index e447d7ba..826c99b2 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_horntilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_horntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorntilde" format="2">
-  <advance width="776"/>
+  <advance width="777"/>
   <unicode hex="1EE0"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="tildecomb.case" xOffset="134"/>
+    <component base="tildecomb.case" xOffset="135"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_hungarumlaut.glif 
b/src/Cantarell-Light.ufo/glyphs/O_hungarumlaut.glif
index 4c1e3f1f..cc9a165d 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_hungarumlaut.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_hungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohungarumlaut" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="0150"/>
   <outline>
     <component base="O"/>
-    <component base="hungarumlautcomb.case" xOffset="206"/>
+    <component base="hungarumlautcomb.case" xOffset="207"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/O_invertedbreve.glif
index c67b2044..30e05046 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_invertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oinvertedbreve" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="020E"/>
   <outline>
     <component base="O"/>
-    <component base="breveinvertedcomb.case" xOffset="172"/>
+    <component base="breveinvertedcomb.case" xOffset="173"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_macron.glif b/src/Cantarell-Light.ufo/glyphs/O_macron.glif
index bbe572bb..e4132da3 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacron" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="014C"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="140"/>
+    <component base="macroncomb.case" xOffset="141"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_macronacute.glif 
b/src/Cantarell-Light.ufo/glyphs/O_macronacute.glif
index 993c0607..3c6ba629 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_macronacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_macronacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacronacute" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="1E52"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="140"/>
-    <component base="acutecomb.case" xOffset="320" yOffset="128"/>
+    <component base="macroncomb.case" xOffset="141"/>
+    <component base="acutecomb.case" xOffset="321" yOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_macrongrave.glif 
b/src/Cantarell-Light.ufo/glyphs/O_macrongrave.glif
index be12b7b9..4bcea63c 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_macrongrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_macrongrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacrongrave" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="1E50"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="140"/>
-    <component base="gravecomb.case" xOffset="181" yOffset="128"/>
+    <component base="macroncomb.case" xOffset="141"/>
+    <component base="gravecomb.case" xOffset="182" yOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_ogonek.glif b/src/Cantarell-Light.ufo/glyphs/O_ogonek.glif
index 3c2edd1d..0e4563dd 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_ogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oogonek" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="01EA"/>
   <outline>
     <component base="O"/>
-    <component base="ogonekcomb.tall.case" xOffset="58"/>
+    <component base="ogonekcomb.tall.case" xOffset="59"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_slash.glif b/src/Cantarell-Light.ufo/glyphs/O_slash.glif
index 4ff2f646..204bf208 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_slash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_slash.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oslash" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="00D8"/>
   <outline>
     <component base="O"/>
-    <component base="slashlongcomb.case" xOffset="90" yOffset="-21"/>
+    <component base="slashlongcomb.case" xOffset="91" yOffset="-21"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_slashacute.glif 
b/src/Cantarell-Light.ufo/glyphs/O_slashacute.glif
index 08ed08dd..b78c7add 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_slashacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_slashacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oslashacute" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="01FE"/>
   <outline>
     <component base="Oslash"/>
-    <component base="acutecomb.case" xOffset="320"/>
+    <component base="acutecomb.case" xOffset="321"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_tilde.glif b/src/Cantarell-Light.ufo/glyphs/O_tilde.glif
index 100d9eb2..e285cf36 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otilde" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="00D5"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="134"/>
+    <component base="tildecomb.case" xOffset="135"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_tildeacute.glif 
b/src/Cantarell-Light.ufo/glyphs/O_tildeacute.glif
index ad662792..34e06384 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_tildeacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_tildeacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildeacute" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="1E4C"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="134"/>
-    <component base="acutecomb.case" xOffset="320" yOffset="142"/>
+    <component base="tildecomb.case" xOffset="135"/>
+    <component base="acutecomb.case" xOffset="321" yOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_tildedieresis.glif 
b/src/Cantarell-Light.ufo/glyphs/O_tildedieresis.glif
index b5e93d00..938f3dc6 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_tildedieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_tildedieresis.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildedieresis" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="1E4E"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="134"/>
-    <component base="dieresiscomb.case" xOffset="158" yOffset="142"/>
+    <component base="tildecomb.case" xOffset="135"/>
+    <component base="dieresiscomb.case" xOffset="159" yOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_tildemacron.glif 
b/src/Cantarell-Light.ufo/glyphs/O_tildemacron.glif
index 066686d7..035d5fe5 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_tildemacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_tildemacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildemacron" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="022C"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="134"/>
-    <component base="macroncomb.case" xOffset="140" yOffset="142"/>
+    <component base="tildecomb.case" xOffset="135"/>
+    <component base="macroncomb.case" xOffset="141" yOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/P_.glif b/src/Cantarell-Light.ufo/glyphs/P_.glif
index 67ba99b2..17984c30 100644
--- a/src/Cantarell-Light.ufo/glyphs/P_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/P_.glif
@@ -1,38 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="P" format="2">
-  <advance width="572"/>
+  <advance width="584"/>
   <unicode hex="0050"/>
-  <note>
-P
-</note>
-  <anchor x="318" y="0" name="bottom"/>
-  <anchor x="318" y="694" name="top"/>
+  <anchor x="331" y="0" name="bottom"/>
+  <anchor x="331" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="131" y="0" type="line"/>
-      <point x="131" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="125" y="268" type="line"/>
-      <point x="286" y="268" type="line" smooth="yes"/>
-      <point x="422" y="268"/>
-      <point x="512" y="353"/>
-      <point x="512" y="480" type="curve" smooth="yes"/>
-      <point x="512" y="608"/>
-      <point x="424" y="694"/>
-      <point x="292" y="694" type="curve" smooth="yes"/>
-      <point x="125" y="694" type="line"/>
-      <point x="125" y="676" type="line"/>
-      <point x="286" y="676" type="line" smooth="yes"/>
-      <point x="408" y="676"/>
-      <point x="490" y="597"/>
-      <point x="490" y="475" type="curve" smooth="yes"/>
-      <point x="490" y="358"/>
-      <point x="416" y="286"/>
-      <point x="292" y="286" type="curve" smooth="yes"/>
-      <point x="125" y="286" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="144" y="0" type="line"/>
+      <point x="144" y="676" type="line"/>
+      <point x="299" y="676" type="line" smooth="yes"/>
+      <point x="421" y="676"/>
+      <point x="503" y="597"/>
+      <point x="503" y="475" type="curve" smooth="yes"/>
+      <point x="503" y="358"/>
+      <point x="429" y="286"/>
+      <point x="305" y="286" type="curve" smooth="yes"/>
+      <point x="138" y="286" type="line"/>
+      <point x="138" y="268" type="line"/>
+      <point x="299" y="268" type="line" smooth="yes"/>
+      <point x="435" y="268"/>
+      <point x="525" y="353"/>
+      <point x="525" y="480" type="curve" smooth="yes"/>
+      <point x="525" y="608"/>
+      <point x="437" y="694"/>
+      <point x="305" y="694" type="curve" smooth="yes"/>
+      <point x="123" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/P_alochka-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/P_alochka-cy.glif
index 507c7e0c..f4cd7fcb 100644
--- a/src/Cantarell-Light.ufo/glyphs/P_alochka-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/P_alochka-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Palochka-cy" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="04C0"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/P_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/P_e-cy.glif
index 7c985862..83d0c176 100644
--- a/src/Cantarell-Light.ufo/glyphs/P_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/P_e-cy.glif
@@ -1,18 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Pe-cy" format="2">
-  <advance width="671"/>
+  <advance width="697"/>
   <unicode hex="041F"/>
-  <anchor x="651" y="0" name="bottomright"/>
+  <anchor x="664" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="131" y="0" type="line"/>
-      <point x="131" y="676" type="line"/>
-      <point x="540" y="676" type="line"/>
-      <point x="540" y="0" type="line"/>
-      <point x="561" y="0" type="line"/>
-      <point x="561" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="144" y="0" type="line"/>
+      <point x="144" y="676" type="line"/>
+      <point x="553" y="676" type="line"/>
+      <point x="553" y="0" type="line"/>
+      <point x="574" y="0" type="line"/>
+      <point x="574" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Q_.glif b/src/Cantarell-Light.ufo/glyphs/Q_.glif
index db626580..c44e749b 100644
--- a/src/Cantarell-Light.ufo/glyphs/Q_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Q_.glif
@@ -1,46 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Q" format="2">
-  <advance width="754"/>
+  <advance width="776"/>
   <unicode hex="0051"/>
-  <note>
-Q
-</note>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
+  <anchor x="378" y="0" name="bottom"/>
+  <anchor x="378" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="376" y="-10" type="curve" smooth="yes"/>
-      <point x="559" y="-10"/>
-      <point x="682" y="135"/>
-      <point x="682" y="346" type="curve" smooth="yes"/>
-      <point x="682" y="558"/>
-      <point x="561" y="699"/>
-      <point x="379" y="699" type="curve" smooth="yes"/>
-      <point x="194" y="699"/>
-      <point x="71" y="553"/>
-      <point x="71" y="343" type="curve" smooth="yes"/>
-      <point x="71" y="133"/>
-      <point x="193" y="-10"/>
+      <point x="377" y="-10" type="curve" smooth="yes"/>
+      <point x="560" y="-10"/>
+      <point x="683" y="135"/>
+      <point x="683" y="346" type="curve" smooth="yes"/>
+      <point x="683" y="558"/>
+      <point x="562" y="699"/>
+      <point x="380" y="699" type="curve" smooth="yes"/>
+      <point x="195" y="699"/>
+      <point x="72" y="553"/>
+      <point x="72" y="343" type="curve" smooth="yes"/>
+      <point x="72" y="133"/>
+      <point x="194" y="-10"/>
     </contour>
     <contour>
-      <point x="378" y="9" type="curve" smooth="yes"/>
-      <point x="207" y="9"/>
-      <point x="93" y="147"/>
-      <point x="93" y="346" type="curve" smooth="yes"/>
-      <point x="93" y="545"/>
-      <point x="206" y="680"/>
-      <point x="376" y="680" type="curve" smooth="yes"/>
-      <point x="546" y="680"/>
-      <point x="660" y="542"/>
-      <point x="660" y="343" type="curve" smooth="yes"/>
-      <point x="660" y="143"/>
-      <point x="548" y="9"/>
+      <point x="692" y="-13" type="line"/>
+      <point x="705" y="1" type="line"/>
+      <point x="415" y="287" type="line"/>
+      <point x="404" y="274" type="line"/>
     </contour>
     <contour>
-      <point x="691" y="-13" type="line"/>
-      <point x="704" y="1" type="line"/>
-      <point x="414" y="287" type="line"/>
-      <point x="403" y="274" type="line"/>
+      <point x="379" y="9" type="curve" smooth="yes"/>
+      <point x="208" y="9"/>
+      <point x="94" y="147"/>
+      <point x="94" y="346" type="curve" smooth="yes"/>
+      <point x="94" y="545"/>
+      <point x="207" y="680"/>
+      <point x="377" y="680" type="curve" smooth="yes"/>
+      <point x="547" y="680"/>
+      <point x="661" y="542"/>
+      <point x="661" y="343" type="curve" smooth="yes"/>
+      <point x="661" y="143"/>
+      <point x="549" y="9"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Q_a-cy.glif b/src/Cantarell-Light.ufo/glyphs/Q_a-cy.glif
index 59f59ccf..db416042 100644
--- a/src/Cantarell-Light.ufo/glyphs/Q_a-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Q_a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Qa-cy" format="2">
-  <advance width="754"/>
+  <advance width="776"/>
   <unicode hex="051A"/>
   <outline>
     <component base="Q"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_.glif b/src/Cantarell-Light.ufo/glyphs/R_.glif
index 18d7b47e..4083b2ed 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_.glif
@@ -1,44 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="R" format="2">
-  <advance width="606"/>
+  <advance width="624"/>
   <unicode hex="0052"/>
-  <note>
-R
-</note>
-  <anchor x="304" y="0" name="bottom"/>
-  <anchor x="276" y="694" name="top"/>
+  <anchor x="317" y="0" name="bottom"/>
+  <anchor x="289" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="131" y="0" type="line"/>
-      <point x="131" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="144" y="0" type="line"/>
+      <point x="144" y="676" type="line"/>
+      <point x="296" y="676" type="line" smooth="yes"/>
+      <point x="432" y="676"/>
+      <point x="506" y="616"/>
+      <point x="506" y="500" type="curve" smooth="yes"/>
+      <point x="506" y="389"/>
+      <point x="436" y="329"/>
+      <point x="303" y="329" type="curve" smooth="yes"/>
+      <point x="134" y="329" type="line"/>
+      <point x="134" y="311" type="line"/>
+      <point x="296" y="311" type="line" smooth="yes"/>
+      <point x="446" y="311"/>
+      <point x="528" y="381"/>
+      <point x="528" y="506" type="curve" smooth="yes"/>
+      <point x="528" y="628"/>
+      <point x="446" y="694"/>
+      <point x="301" y="694" type="curve" smooth="yes"/>
+      <point x="123" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="121" y="311" type="line"/>
-      <point x="283" y="311" type="line" smooth="yes"/>
-      <point x="433" y="311"/>
-      <point x="515" y="381"/>
-      <point x="515" y="506" type="curve" smooth="yes"/>
-      <point x="515" y="628"/>
-      <point x="433" y="694"/>
-      <point x="288" y="694" type="curve" smooth="yes"/>
-      <point x="121" y="694" type="line"/>
-      <point x="121" y="676" type="line"/>
-      <point x="283" y="676" type="line" smooth="yes"/>
-      <point x="419" y="676"/>
-      <point x="493" y="616"/>
-      <point x="493" y="500" type="curve" smooth="yes"/>
-      <point x="493" y="389"/>
-      <point x="423" y="329"/>
-      <point x="290" y="329" type="curve" smooth="yes"/>
-      <point x="121" y="329" type="line"/>
-    </contour>
-    <contour>
-      <point x="531" y="0" type="line"/>
-      <point x="557" y="0" type="line"/>
-      <point x="372" y="325" type="line"/>
-      <point x="349" y="325" type="line"/>
+      <point x="544" y="0" type="line"/>
+      <point x="570" y="0" type="line"/>
+      <point x="385" y="325" type="line"/>
+      <point x="362" y="325" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_acute.glif b/src/Cantarell-Light.ufo/glyphs/R_acute.glif
index 8eca6caf..1e86917e 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Racute" format="2">
-  <advance width="606"/>
+  <advance width="624"/>
   <unicode hex="0154"/>
   <outline>
     <component base="R"/>
-    <component base="acutecomb.case" xOffset="218"/>
+    <component base="acutecomb.case" xOffset="231"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_caron.glif b/src/Cantarell-Light.ufo/glyphs/R_caron.glif
index 2d522456..1187914f 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcaron" format="2">
-  <advance width="606"/>
+  <advance width="624"/>
   <unicode hex="0158"/>
   <outline>
     <component base="R"/>
-    <component base="caroncomb.case" xOffset="101"/>
+    <component base="caroncomb.case" xOffset="114"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/R_commaaccent.glif
index 8f162c88..67ed0fc9 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcommaaccent" format="2">
-  <advance width="606"/>
+  <advance width="624"/>
   <unicode hex="0156"/>
   <outline>
     <component base="R"/>
-    <component base="commaaccentcomb" xOffset="175"/>
+    <component base="commaaccentcomb" xOffset="188"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/R_dblgrave.glif
index 7bc8839d..67174ec0 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_dblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdblgrave" format="2">
-  <advance width="606"/>
+  <advance width="624"/>
   <unicode hex="0210"/>
   <outline>
     <component base="R"/>
-    <component base="dblgravecomb.case" xOffset="33"/>
+    <component base="dblgravecomb.case" xOffset="46"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/R_dotbelow.glif
index 17c23bab..17ea1b7e 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdotbelow" format="2">
-  <advance width="606"/>
+  <advance width="624"/>
   <unicode hex="1E5A"/>
   <outline>
     <component base="R"/>
-    <component base="dotbelowcomb" xOffset="184"/>
+    <component base="dotbelowcomb" xOffset="197"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/R_invertedbreve.glif
index 3ca8d33e..578fe499 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_invertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rinvertedbreve" format="2">
-  <advance width="606"/>
+  <advance width="624"/>
   <unicode hex="0212"/>
   <outline>
     <component base="R"/>
-    <component base="breveinvertedcomb.case" xOffset="70"/>
+    <component base="breveinvertedcomb.case" xOffset="83"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_linebelow.glif b/src/Cantarell-Light.ufo/glyphs/R_linebelow.glif
index e09e4375..4cc98641 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_linebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rlinebelow" format="2">
-  <advance width="606"/>
+  <advance width="624"/>
   <unicode hex="1E5E"/>
   <outline>
     <component base="R"/>
-    <component base="macronbelowcomb" xOffset="54"/>
+    <component base="macronbelowcomb" xOffset="67"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_.glif b/src/Cantarell-Light.ufo/glyphs/S_.glif
index 0fbee642..94e18e82 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_.glif
@@ -1,46 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="S" format="2">
-  <advance width="569"/>
+  <advance width="586"/>
   <unicode hex="0053"/>
-  <note>
-S
-</note>
-  <anchor x="277" y="0" name="bottom"/>
-  <anchor x="282" y="694" name="top"/>
+  <anchor x="286" y="0" name="bottom"/>
+  <anchor x="291" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="277" y="-10" type="curve" smooth="yes"/>
-      <point x="420" y="-10"/>
-      <point x="510" y="66"/>
-      <point x="510" y="177" type="curve" smooth="yes"/>
-      <point x="510" y="416"/>
-      <point x="91" y="307"/>
-      <point x="91" y="531" type="curve" smooth="yes"/>
-      <point x="91" y="627"/>
-      <point x="167" y="683"/>
-      <point x="297" y="683" type="curve" smooth="yes"/>
-      <point x="357" y="683"/>
-      <point x="418" y="671"/>
-      <point x="471" y="645" type="curve"/>
-      <point x="478" y="663" type="line"/>
-      <point x="425" y="691"/>
-      <point x="362" y="702"/>
-      <point x="303" y="702" type="curve" smooth="yes"/>
-      <point x="157" y="702"/>
-      <point x="69" y="636"/>
-      <point x="69" y="527" type="curve" smooth="yes"/>
-      <point x="69" y="290"/>
-      <point x="488" y="394"/>
-      <point x="488" y="172" type="curve" smooth="yes"/>
-      <point x="488" y="75"/>
-      <point x="409" y="9"/>
-      <point x="282" y="9" type="curve" smooth="yes"/>
-      <point x="215" y="9"/>
-      <point x="140" y="27"/>
-      <point x="68" y="60" type="curve"/>
-      <point x="61" y="41" type="line"/>
-      <point x="130" y="8"/>
-      <point x="208" y="-10"/>
+      <point x="286" y="-10" type="curve" smooth="yes"/>
+      <point x="429" y="-10"/>
+      <point x="519" y="66"/>
+      <point x="519" y="177" type="curve" smooth="yes"/>
+      <point x="519" y="416"/>
+      <point x="100" y="307"/>
+      <point x="100" y="531" type="curve" smooth="yes"/>
+      <point x="100" y="627"/>
+      <point x="176" y="683"/>
+      <point x="306" y="683" type="curve" smooth="yes"/>
+      <point x="366" y="683"/>
+      <point x="427" y="671"/>
+      <point x="480" y="645" type="curve"/>
+      <point x="487" y="663" type="line"/>
+      <point x="434" y="691"/>
+      <point x="371" y="702"/>
+      <point x="312" y="702" type="curve" smooth="yes"/>
+      <point x="166" y="702"/>
+      <point x="78" y="636"/>
+      <point x="78" y="527" type="curve" smooth="yes"/>
+      <point x="78" y="290"/>
+      <point x="497" y="394"/>
+      <point x="497" y="172" type="curve" smooth="yes"/>
+      <point x="497" y="75"/>
+      <point x="418" y="9"/>
+      <point x="291" y="9" type="curve" smooth="yes"/>
+      <point x="224" y="9"/>
+      <point x="149" y="27"/>
+      <point x="77" y="60" type="curve"/>
+      <point x="70" y="41" type="line"/>
+      <point x="139" y="8"/>
+      <point x="217" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_acute.glif b/src/Cantarell-Light.ufo/glyphs/S_acute.glif
index f1c6adeb..4d2869bb 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sacute" format="2">
-  <advance width="569"/>
+  <advance width="586"/>
   <unicode hex="015A"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="224"/>
+    <component base="acutecomb.case" xOffset="233"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_acutedotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/S_acutedotaccent.glif
index 3312e1a6..3decf925 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_acutedotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_acutedotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sacutedotaccent" format="2">
-  <advance width="569"/>
+  <advance width="586"/>
   <unicode hex="1E64"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="224"/>
-    <component base="dotaccentcomb.case" xOffset="158" yOffset="70"/>
+    <component base="acutecomb.case" xOffset="233"/>
+    <component base="dotaccentcomb.case" xOffset="167" yOffset="70"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_altillo.glif b/src/Cantarell-Light.ufo/glyphs/S_altillo.glif
index 8f233e47..634ff15b 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_altillo.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_altillo.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Saltillo" format="2">
-  <advance width="236"/>
+  <advance width="271"/>
   <unicode hex="A78B"/>
   <outline>
-    <component base="quotesingle" xScale="1.04" yScale="2.16474" xOffset="3" yOffset="-808"/>
+    <component base="quotesingle" xScale="1.04" yScale="2.16474" xOffset="14" yOffset="-808"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_caron.glif b/src/Cantarell-Light.ufo/glyphs/S_caron.glif
index 9da2da4d..b7c678cc 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scaron" format="2">
-  <advance width="569"/>
+  <advance width="586"/>
   <unicode hex="0160"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="107"/>
+    <component base="caroncomb.case" xOffset="116"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_carondotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/S_carondotaccent.glif
index b772566e..3190a27a 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_carondotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_carondotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scarondotaccent" format="2">
-  <advance width="569"/>
+  <advance width="586"/>
   <unicode hex="1E66"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="107"/>
-    <component base="dotaccentcomb.case" xOffset="163" yOffset="109"/>
+    <component base="caroncomb.case" xOffset="116"/>
+    <component base="dotaccentcomb.case" xOffset="172" yOffset="109"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_cedilla.glif b/src/Cantarell-Light.ufo/glyphs/S_cedilla.glif
index 163ebf90..d36b1204 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_cedilla.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scedilla" format="2">
-  <advance width="569"/>
+  <advance width="586"/>
   <unicode hex="015E"/>
   <outline>
     <component base="S"/>
-    <component base="cedillacomb" xOffset="152"/>
+    <component base="cedillacomb" xOffset="161"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_chwa-cy.glif b/src/Cantarell-Light.ufo/glyphs/S_chwa-cy.glif
index ad748805..54af034c 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_chwa-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_chwa-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Schwa-cy" format="2">
-  <advance width="755"/>
+  <advance width="728"/>
   <unicode hex="04D8"/>
   <outline>
     <component base="Schwa"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_chwa.glif b/src/Cantarell-Light.ufo/glyphs/S_chwa.glif
index a8dddeee..4e8681b8 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_chwa.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_chwa.glif
@@ -1,42 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Schwa" format="2">
-  <advance width="755"/>
+  <advance width="728"/>
   <unicode hex="018F"/>
-  <anchor x="369" y="0" name="bottom"/>
-  <anchor x="369" y="694" name="top"/>
+  <anchor x="360" y="0" name="bottom"/>
+  <anchor x="360" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="328" y="704" type="curve" smooth="yes"/>
-      <point x="245" y="704"/>
-      <point x="174" y="681"/>
-      <point x="106" y="633" type="curve"/>
-      <point x="111" y="617" type="line"/>
-      <point x="180" y="663"/>
-      <point x="249" y="685"/>
-      <point x="326" y="685" type="curve" smooth="yes"/>
-      <point x="521" y="685"/>
-      <point x="642" y="558"/>
-      <point x="642" y="342" type="curve" smooth="yes"/>
-      <point x="642" y="140"/>
-      <point x="537" y="9"/>
-      <point x="366" y="9" type="curve" smooth="yes"/>
-      <point x="202" y="9"/>
-      <point x="105" y="130"/>
-      <point x="105" y="321" type="curve"/>
-      <point x="660" y="321" type="line"/>
-      <point x="660" y="340" type="line"/>
-      <point x="83" y="340" type="line"/>
-      <point x="82" y="332"/>
-      <point x="82" y="328"/>
-      <point x="82" y="318" type="curve" smooth="yes"/>
-      <point x="82" y="123"/>
-      <point x="191" y="-10"/>
-      <point x="364" y="-10" type="curve" smooth="yes"/>
-      <point x="540" y="-10"/>
-      <point x="665" y="130"/>
-      <point x="665" y="342" type="curve" smooth="yes"/>
-      <point x="665" y="562"/>
-      <point x="532" y="704"/>
+      <point x="355" y="-10" type="curve" smooth="yes"/>
+      <point x="531" y="-10"/>
+      <point x="656" y="130"/>
+      <point x="656" y="342" type="curve" smooth="yes"/>
+      <point x="656" y="562"/>
+      <point x="523" y="704"/>
+      <point x="319" y="704" type="curve" smooth="yes"/>
+      <point x="236" y="704"/>
+      <point x="165" y="681"/>
+      <point x="97" y="633" type="curve"/>
+      <point x="102" y="617" type="line"/>
+      <point x="171" y="663"/>
+      <point x="240" y="685"/>
+      <point x="317" y="685" type="curve" smooth="yes"/>
+      <point x="512" y="685"/>
+      <point x="633" y="558"/>
+      <point x="633" y="342" type="curve" smooth="yes"/>
+      <point x="633" y="140"/>
+      <point x="528" y="9"/>
+      <point x="357" y="9" type="curve" smooth="yes"/>
+      <point x="193" y="9"/>
+      <point x="96" y="130"/>
+      <point x="96" y="321" type="curve"/>
+      <point x="651" y="321" type="line"/>
+      <point x="651" y="340" type="line"/>
+      <point x="74" y="340" type="line"/>
+      <point x="73" y="332"/>
+      <point x="73" y="328"/>
+      <point x="73" y="318" type="curve" smooth="yes"/>
+      <point x="73" y="123"/>
+      <point x="182" y="-10"/>
     </contour>
   </outline>
   <lib>
@@ -48,6 +48,8 @@
         <key>width</key>
         <integer>150</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>O</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/S_circumflex.glif
index 73d5c01f..cd4a831c 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scircumflex" format="2">
-  <advance width="569"/>
+  <advance width="586"/>
   <unicode hex="015C"/>
   <outline>
     <component base="S"/>
-    <component base="circumflexcomb.case" xOffset="105"/>
+    <component base="circumflexcomb.case" xOffset="114"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/S_commaaccent.glif
index ac6c29b0..437890f8 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scommaaccent" format="2">
-  <advance width="569"/>
+  <advance width="586"/>
   <unicode hex="0218"/>
   <outline>
     <component base="S"/>
-    <component base="commaaccentcomb" xOffset="148"/>
+    <component base="commaaccentcomb" xOffset="157"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/S_dotaccent.glif
index 3349b24d..21bb426d 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotaccent" format="2">
-  <advance width="569"/>
+  <advance width="586"/>
   <unicode hex="1E60"/>
   <outline>
     <component base="S"/>
-    <component base="dotaccentcomb.case" xOffset="163"/>
+    <component base="dotaccentcomb.case" xOffset="172"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/S_dotbelow.glif
index fe9fbd57..199746ac 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotbelow" format="2">
-  <advance width="569"/>
+  <advance width="586"/>
   <unicode hex="1E62"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="157"/>
+    <component base="dotbelowcomb" xOffset="166"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_dotbelowdotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/S_dotbelowdotaccent.glif
index 8b5a58f2..a2c6ef19 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_dotbelowdotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_dotbelowdotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotbelowdotaccent" format="2">
-  <advance width="569"/>
+  <advance width="586"/>
   <unicode hex="1E68"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="157"/>
-    <component base="dotaccentcomb.case" xOffset="163"/>
+    <component base="dotbelowcomb" xOffset="166"/>
+    <component base="dotaccentcomb.case" xOffset="172"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_ha-cy.glif b/src/Cantarell-Light.ufo/glyphs/S_ha-cy.glif
index 57bd335c..ea18c534 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_ha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_ha-cy.glif
@@ -1,23 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sha-cy" format="2">
-  <advance width="954"/>
+  <advance width="980"/>
   <unicode hex="0428"/>
+  <anchor x="877" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="844" y="0" type="line"/>
-      <point x="844" y="694" type="line"/>
-      <point x="822" y="694" type="line"/>
-      <point x="822" y="19" type="line"/>
-      <point x="132" y="19" type="line"/>
-      <point x="132" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="857" y="0" type="line"/>
+      <point x="857" y="694" type="line"/>
+      <point x="835" y="694" type="line"/>
+      <point x="835" y="19" type="line"/>
+      <point x="145" y="19" type="line"/>
+      <point x="145" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="474" y="10" type="line"/>
-      <point x="496" y="10" type="line"/>
-      <point x="496" y="694" type="line"/>
-      <point x="474" y="694" type="line"/>
+      <point x="487" y="10" type="line"/>
+      <point x="509" y="10" type="line"/>
+      <point x="509" y="694" type="line"/>
+      <point x="487" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif b/src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif
index 4b217556..3e0d272b 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif
@@ -1,29 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Shcha-cy" format="2">
-  <advance width="976"/>
+  <advance width="986"/>
   <unicode hex="0429"/>
   <outline>
-    <contour>
-      <point x="911" y="-175" type="line"/>
-      <point x="932" y="-175" type="line"/>
-      <point x="932" y="19" type="line"/>
-      <point x="132" y="19" type="line"/>
-      <point x="132" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
-      <point x="110" y="0" type="line"/>
-      <point x="911" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="474" y="10" type="line"/>
-      <point x="496" y="10" type="line"/>
-      <point x="496" y="694" type="line"/>
-      <point x="474" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="822" y="10" type="line"/>
-      <point x="844" y="10" type="line"/>
-      <point x="844" y="694" type="line"/>
-      <point x="822" y="694" type="line"/>
-    </contour>
+    <component base="Sha-cy"/>
+    <component base="descender-cy.case" xOffset="781"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Tse-cy</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>-1</integer>
+        <integer>0</integer>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_hha-cy.glif b/src/Cantarell-Light.ufo/glyphs/S_hha-cy.glif
index fcecdf1b..32ce6653 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_hha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_hha-cy.glif
@@ -1,31 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Shha-cy" format="2">
-  <advance width="617"/>
+  <advance width="638"/>
   <unicode hex="04BA"/>
   <outline>
     <contour>
-      <point x="525" y="0" type="line"/>
-      <point x="546" y="0" type="line"/>
-      <point x="546" y="239" type="line" smooth="yes"/>
-      <point x="546" y="346"/>
-      <point x="473" y="411"/>
-      <point x="339" y="411" type="curve" smooth="yes"/>
-      <point x="252" y="411"/>
-      <point x="163" y="384"/>
-      <point x="109" y="345" type="curve"/>
-      <point x="119" y="334" type="line"/>
-      <point x="167" y="367"/>
-      <point x="255" y="393"/>
-      <point x="336" y="393" type="curve" smooth="yes"/>
-      <point x="457" y="393"/>
-      <point x="525" y="336"/>
-      <point x="525" y="239" type="curve" smooth="yes"/>
+      <point x="539" y="0" type="line"/>
+      <point x="560" y="0" type="line"/>
+      <point x="560" y="239" type="line" smooth="yes"/>
+      <point x="560" y="346"/>
+      <point x="487" y="411"/>
+      <point x="353" y="411" type="curve" smooth="yes"/>
+      <point x="266" y="411"/>
+      <point x="177" y="384"/>
+      <point x="123" y="345" type="curve"/>
+      <point x="133" y="334" type="line"/>
+      <point x="181" y="367"/>
+      <point x="269" y="393"/>
+      <point x="350" y="393" type="curve" smooth="yes"/>
+      <point x="471" y="393"/>
+      <point x="539" y="336"/>
+      <point x="539" y="239" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="131" y="0" type="line"/>
-      <point x="131" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="124" y="0" type="line"/>
+      <point x="145" y="0" type="line"/>
+      <point x="145" y="694" type="line"/>
+      <point x="124" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_oftsign-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/S_oftsign-cy.glif
index adac69fb..d4c352a5 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_oftsign-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_oftsign-cy.glif
@@ -1,29 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Softsign-cy" format="2">
-  <advance width="597"/>
+  <advance width="613"/>
   <unicode hex="042C"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="312" y="0" type="line" smooth="yes"/>
-      <point x="453" y="0"/>
-      <point x="537" y="74"/>
-      <point x="537" y="200" type="curve" smooth="yes"/>
-      <point x="537" y="322"/>
-      <point x="460" y="403"/>
-      <point x="345" y="403" type="curve" smooth="yes"/>
-      <point x="124" y="403" type="line"/>
-      <point x="124" y="386" type="line"/>
-      <point x="335" y="386" type="line" smooth="yes"/>
-      <point x="443" y="386"/>
-      <point x="515" y="310"/>
-      <point x="515" y="195" type="curve" smooth="yes"/>
-      <point x="515" y="84"/>
-      <point x="444" y="18"/>
-      <point x="323" y="18" type="curve" smooth="yes"/>
-      <point x="132" y="18" type="line"/>
-      <point x="132" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="325" y="0" type="line" smooth="yes"/>
+      <point x="466" y="0"/>
+      <point x="550" y="74"/>
+      <point x="550" y="200" type="curve" smooth="yes"/>
+      <point x="550" y="322"/>
+      <point x="473" y="403"/>
+      <point x="358" y="403" type="curve" smooth="yes"/>
+      <point x="137" y="403" type="line"/>
+      <point x="137" y="386" type="line"/>
+      <point x="348" y="386" type="line" smooth="yes"/>
+      <point x="456" y="386"/>
+      <point x="528" y="310"/>
+      <point x="528" y="195" type="curve" smooth="yes"/>
+      <point x="528" y="84"/>
+      <point x="457" y="18"/>
+      <point x="336" y="18" type="curve" smooth="yes"/>
+      <point x="145" y="18" type="line"/>
+      <point x="145" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_.glif b/src/Cantarell-Light.ufo/glyphs/T_.glif
index 34ee39e7..ac77e0ca 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_.glif
@@ -1,25 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="T" format="2">
-  <advance width="589"/>
+  <advance width="535"/>
   <unicode hex="0054"/>
-  <note>
-T
-</note>
-  <anchor x="292" y="0" name="bottom"/>
-  <anchor x="295" y="357" name="center"/>
-  <anchor x="295" y="694" name="top"/>
+  <anchor x="265" y="0" name="bottom"/>
+  <anchor x="268" y="357" name="center"/>
+  <anchor x="268" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="284" y="0" type="line"/>
-      <point x="305" y="0" type="line"/>
-      <point x="305" y="694" type="line"/>
-      <point x="284" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="39" y="676" type="line"/>
-      <point x="550" y="676" type="line"/>
-      <point x="550" y="694" type="line"/>
-      <point x="39" y="694" type="line"/>
+      <point x="257" y="0" type="line"/>
+      <point x="278" y="0" type="line"/>
+      <point x="278" y="676" type="line"/>
+      <point x="523" y="676" type="line"/>
+      <point x="523" y="694" type="line"/>
+      <point x="12" y="694" type="line"/>
+      <point x="12" y="676" type="line"/>
+      <point x="257" y="676" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_bar.glif b/src/Cantarell-Light.ufo/glyphs/T_bar.glif
index f247c3b0..1c2a327a 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_bar.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_bar.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tbar" format="2">
-  <advance width="589"/>
+  <advance width="535"/>
   <unicode hex="0166"/>
   <outline>
     <component base="T"/>
-    <component base="strokeshortcomb.case" xOffset="54" yOffset="58"/>
+    <component base="strokeshortcomb.case" xOffset="27" yOffset="58"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_caron.glif b/src/Cantarell-Light.ufo/glyphs/T_caron.glif
index 5b0f03a6..b09f9142 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcaron" format="2">
-  <advance width="589"/>
+  <advance width="535"/>
   <unicode hex="0164"/>
   <outline>
     <component base="T"/>
-    <component base="caroncomb.case" xOffset="120"/>
+    <component base="caroncomb.case" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_cedilla.glif b/src/Cantarell-Light.ufo/glyphs/T_cedilla.glif
index 41670fff..d63d9fae 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_cedilla.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcedilla" format="2">
-  <advance width="589"/>
+  <advance width="535"/>
   <unicode hex="0162"/>
   <outline>
     <component base="T"/>
-    <component base="cedillacomb" xOffset="167"/>
+    <component base="cedillacomb" xOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/T_commaaccent.glif
index 29204a36..c67199e9 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcommaaccent" format="2">
-  <advance width="589"/>
+  <advance width="535"/>
   <unicode hex="021A"/>
   <outline>
     <component base="T"/>
-    <component base="commaaccentcomb" xOffset="163"/>
+    <component base="commaaccentcomb" xOffset="136"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/T_dotbelow.glif
index a13b2c25..4252aaac 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tdotbelow" format="2">
-  <advance width="589"/>
+  <advance width="535"/>
   <unicode hex="1E6C"/>
   <outline>
     <component base="T"/>
-    <component base="dotbelowcomb" xOffset="172"/>
+    <component base="dotbelowcomb" xOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/T_e-cy.glif
index 96ab8c3e..aa57abf5 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_e-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Te-cy" format="2">
-  <advance width="589"/>
+  <advance width="535"/>
   <unicode hex="0422"/>
-  <anchor x="569" y="0" name="bottomright"/>
   <outline>
     <component base="T"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_horn.glif b/src/Cantarell-Light.ufo/glyphs/T_horn.glif
index 4b919001..4caedbe1 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_horn.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_horn.glif
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Thorn" format="2">
-  <advance width="572"/>
+  <advance width="584"/>
   <unicode hex="00DE"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="131" y="0" type="line"/>
-      <point x="131" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="138" y="148" type="line"/>
+      <point x="299" y="148" type="line" smooth="yes"/>
+      <point x="441" y="148"/>
+      <point x="525" y="228"/>
+      <point x="525" y="357" type="curve" smooth="yes"/>
+      <point x="525" y="489"/>
+      <point x="437" y="574"/>
+      <point x="305" y="574" type="curve" smooth="yes"/>
+      <point x="138" y="574" type="line"/>
+      <point x="138" y="556" type="line"/>
+      <point x="299" y="556" type="line" smooth="yes"/>
+      <point x="421" y="556"/>
+      <point x="503" y="477"/>
+      <point x="503" y="355" type="curve" smooth="yes"/>
+      <point x="503" y="238"/>
+      <point x="429" y="166"/>
+      <point x="305" y="166" type="curve" smooth="yes"/>
+      <point x="138" y="166" type="line"/>
     </contour>
     <contour>
-      <point x="125" y="148" type="line"/>
-      <point x="286" y="148" type="line" smooth="yes"/>
-      <point x="428" y="148"/>
-      <point x="512" y="228"/>
-      <point x="512" y="357" type="curve" smooth="yes"/>
-      <point x="512" y="489"/>
-      <point x="424" y="574"/>
-      <point x="292" y="574" type="curve" smooth="yes"/>
-      <point x="125" y="574" type="line"/>
-      <point x="125" y="556" type="line"/>
-      <point x="286" y="556" type="line" smooth="yes"/>
-      <point x="408" y="556"/>
-      <point x="490" y="477"/>
-      <point x="490" y="355" type="curve" smooth="yes"/>
-      <point x="490" y="238"/>
-      <point x="416" y="166"/>
-      <point x="292" y="166" type="curve" smooth="yes"/>
-      <point x="125" y="166" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="144" y="0" type="line"/>
+      <point x="144" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>P</string>
+      <string>I</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>P</string>
     </dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_linebelow.glif b/src/Cantarell-Light.ufo/glyphs/T_linebelow.glif
index 8c2d37f1..52d85145 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_linebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tlinebelow" format="2">
-  <advance width="589"/>
+  <advance width="535"/>
   <unicode hex="1E6E"/>
   <outline>
     <component base="T"/>
-    <component base="macronbelowcomb" xOffset="42"/>
+    <component base="macronbelowcomb" xOffset="15"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_se-cy.glif b/src/Cantarell-Light.ufo/glyphs/T_se-cy.glif
index 16e4c1f6..2a5b9a6c 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_se-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_se-cy.glif
@@ -1,23 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tse-cy" format="2">
-  <advance width="687"/>
+  <advance width="702"/>
   <unicode hex="0426"/>
   <outline>
     <contour>
-      <point x="627" y="-175" type="line"/>
-      <point x="648" y="-175" type="line"/>
-      <point x="648" y="19" type="line"/>
-      <point x="132" y="19" type="line"/>
-      <point x="132" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
-      <point x="110" y="0" type="line"/>
-      <point x="627" y="0" type="line"/>
+      <point x="628" y="-175" type="line"/>
+      <point x="649" y="-175" type="line"/>
+      <point x="649" y="19" type="line"/>
+      <point x="145" y="19" type="line"/>
+      <point x="145" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="628" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="539" y="10" type="line"/>
-      <point x="560" y="10" type="line"/>
-      <point x="560" y="694" type="line"/>
-      <point x="539" y="694" type="line"/>
+      <point x="552" y="10" type="line"/>
+      <point x="573" y="10" type="line"/>
+      <point x="573" y="694" type="line"/>
+      <point x="552" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>De-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_she-cy.glif b/src/Cantarell-Light.ufo/glyphs/T_she-cy.glif
index b0e171a9..59f073cd 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_she-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_she-cy.glif
@@ -1,37 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tshe-cy" format="2">
-  <advance width="779"/>
+  <advance width="782"/>
   <unicode hex="040B"/>
   <outline>
     <contour>
-      <point x="687" y="0" type="line"/>
-      <point x="708" y="0" type="line"/>
-      <point x="708" y="239" type="line" smooth="yes"/>
-      <point x="708" y="346"/>
-      <point x="635" y="411"/>
-      <point x="501" y="411" type="curve" smooth="yes"/>
-      <point x="414" y="411"/>
-      <point x="325" y="384"/>
-      <point x="271" y="345" type="curve"/>
-      <point x="281" y="334" type="line"/>
-      <point x="329" y="367"/>
-      <point x="417" y="393"/>
-      <point x="498" y="393" type="curve" smooth="yes"/>
-      <point x="619" y="393"/>
-      <point x="687" y="336"/>
-      <point x="687" y="239" type="curve" smooth="yes"/>
+      <point x="268" y="0" type="line"/>
+      <point x="289" y="0" type="line"/>
+      <point x="289" y="676" type="line"/>
+      <point x="542" y="676" type="line"/>
+      <point x="542" y="694" type="line"/>
+      <point x="35" y="694" type="line"/>
+      <point x="35" y="676" type="line"/>
+      <point x="268" y="676" type="line"/>
     </contour>
     <contour>
-      <point x="272" y="0" type="line"/>
-      <point x="293" y="0" type="line"/>
-      <point x="293" y="694" type="line"/>
-      <point x="272" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="39" y="676" type="line"/>
-      <point x="546" y="676" type="line"/>
-      <point x="546" y="694" type="line"/>
-      <point x="39" y="694" type="line"/>
+      <point x="683" y="0" type="line"/>
+      <point x="704" y="0" type="line"/>
+      <point x="704" y="239" type="line" smooth="yes"/>
+      <point x="704" y="346"/>
+      <point x="631" y="411"/>
+      <point x="497" y="411" type="curve" smooth="yes"/>
+      <point x="410" y="411"/>
+      <point x="321" y="384"/>
+      <point x="267" y="345" type="curve"/>
+      <point x="277" y="334" type="line"/>
+      <point x="325" y="367"/>
+      <point x="413" y="393"/>
+      <point x="494" y="393" type="curve" smooth="yes"/>
+      <point x="615" y="393"/>
+      <point x="683" y="336"/>
+      <point x="683" y="239" type="curve" smooth="yes"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|Ge-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Shha-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_-cy.glif b/src/Cantarell-Light.ufo/glyphs/U_-cy.glif
index 5424c849..93414033 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_-cy.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="U-cy" format="2">
-  <advance width="594"/>
+  <advance width="536"/>
   <unicode hex="0423"/>
-  <anchor x="297" y="694" name="top"/>
+  <anchor x="266" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="168" y="0" type="line"/>
-      <point x="190" y="0" type="line"/>
-      <point x="560" y="694" type="line"/>
-      <point x="537" y="694" type="line"/>
-      <point x="313" y="263" type="line"/>
-      <point x="306" y="253" type="line"/>
+      <point x="137" y="0" type="line"/>
+      <point x="161" y="0" type="line"/>
+      <point x="531" y="694" type="line"/>
+      <point x="506" y="694" type="line"/>
+      <point x="282" y="263" type="line"/>
+      <point x="275" y="253" type="line"/>
     </contour>
     <contour>
-      <point x="306" y="245" type="line"/>
-      <point x="317" y="263" type="line"/>
-      <point x="58" y="694" type="line"/>
-      <point x="33" y="694" type="line"/>
+      <point x="275" y="245" type="line"/>
+      <point x="286" y="263" type="line"/>
+      <point x="27" y="694" type="line"/>
+      <point x="2" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_.glif b/src/Cantarell-Light.ufo/glyphs/U_.glif
index 6bd0b9e3..bec59e85 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_.glif
@@ -1,34 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="U" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="0055"/>
-  <note>
-U
-</note>
-  <anchor x="338" y="0" name="bottom"/>
-  <anchor x="420" y="10" name="ogonek"/>
-  <anchor x="338" y="694" name="top"/>
-  <anchor x="635" y="694" name="topright"/>
+  <anchor x="347" y="0" name="bottom"/>
+  <anchor x="429" y="10" name="ogonek"/>
+  <anchor x="347" y="694" name="top"/>
+  <anchor x="644" y="694" name="topright"/>
   <outline>
     <contour>
-      <point x="337" y="-10" type="curve" smooth="yes"/>
-      <point x="486" y="-10"/>
-      <point x="574" y="85"/>
-      <point x="574" y="246" type="curve" smooth="yes"/>
-      <point x="574" y="694" type="line"/>
-      <point x="553" y="694" type="line"/>
-      <point x="553" y="246" type="line" smooth="yes"/>
-      <point x="553" y="97"/>
-      <point x="474" y="9"/>
-      <point x="340" y="9" type="curve" smooth="yes"/>
-      <point x="202" y="9"/>
-      <point x="121" y="97"/>
-      <point x="121" y="246" type="curve" smooth="yes"/>
-      <point x="121" y="694" type="line"/>
-      <point x="99" y="694" type="line"/>
-      <point x="99" y="246" type="line" smooth="yes"/>
-      <point x="99" y="85"/>
-      <point x="187" y="-10"/>
+      <point x="346" y="-10" type="curve" smooth="yes"/>
+      <point x="495" y="-10"/>
+      <point x="583" y="85"/>
+      <point x="583" y="246" type="curve" smooth="yes"/>
+      <point x="583" y="694" type="line"/>
+      <point x="562" y="694" type="line"/>
+      <point x="562" y="246" type="line" smooth="yes"/>
+      <point x="562" y="97"/>
+      <point x="483" y="9"/>
+      <point x="349" y="9" type="curve" smooth="yes"/>
+      <point x="211" y="9"/>
+      <point x="130" y="97"/>
+      <point x="130" y="246" type="curve" smooth="yes"/>
+      <point x="130" y="694" type="line"/>
+      <point x="108" y="694" type="line"/>
+      <point x="108" y="246" type="line" smooth="yes"/>
+      <point x="108" y="85"/>
+      <point x="196" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_acute.glif b/src/Cantarell-Light.ufo/glyphs/U_acute.glif
index 23d16358..4695c308 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uacute" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="00DA"/>
   <outline>
     <component base="U"/>
-    <component base="acutecomb.case" xOffset="280"/>
+    <component base="acutecomb.case" xOffset="289"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_breve.glif b/src/Cantarell-Light.ufo/glyphs/U_breve.glif
index 2391e4e9..74b90883 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ubreve" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="016C"/>
   <outline>
     <component base="U"/>
-    <component base="brevecomb.case" xOffset="135"/>
+    <component base="brevecomb.case" xOffset="144"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_caron.glif b/src/Cantarell-Light.ufo/glyphs/U_caron.glif
index 1b3ed7aa..cb06f98d 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ucaron" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="01D3"/>
   <outline>
     <component base="U"/>
-    <component base="caroncomb.case" xOffset="163"/>
+    <component base="caroncomb.case" xOffset="172"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/U_circumflex.glif
index 19a4d0ce..9f909e62 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ucircumflex" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="00DB"/>
   <outline>
     <component base="U"/>
-    <component base="circumflexcomb.case" xOffset="161"/>
+    <component base="circumflexcomb.case" xOffset="170"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/U_dblgrave.glif
index 675a3d13..d6f6b529 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_dblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udblgrave" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="0214"/>
   <outline>
     <component base="U"/>
-    <component base="dblgravecomb.case" xOffset="95"/>
+    <component base="dblgravecomb.case" xOffset="104"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/U_dieresis-cy.glif
index b6049222..1ae57736 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_dieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_dieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresis-cy" format="2">
-  <advance width="594"/>
+  <advance width="536"/>
   <unicode hex="04F0"/>
   <outline>
     <component base="U-cy"/>
-    <component base="dieresiscomb.case" xOffset="77"/>
+    <component base="dieresiscomb.case" xOffset="46"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/U_dieresis.glif
index daa37c37..254df11a 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresis" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="00DC"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="118"/>
+    <component base="dieresiscomb.case" xOffset="127"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dieresisacute.glif 
b/src/Cantarell-Light.ufo/glyphs/U_dieresisacute.glif
index f3920790..8722c755 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_dieresisacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_dieresisacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresisacute" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="01D7"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="118"/>
-    <component base="acutecomb.case" xOffset="280" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="127"/>
+    <component base="acutecomb.case" xOffset="289" yOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dieresiscaron.glif 
b/src/Cantarell-Light.ufo/glyphs/U_dieresiscaron.glif
index a65e923a..a2975bdf 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_dieresiscaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_dieresiscaron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresiscaron" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="01D9"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="118"/>
-    <component base="caroncomb.case" xOffset="163" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="127"/>
+    <component base="caroncomb.case" xOffset="172" yOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dieresisgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/U_dieresisgrave.glif
index f9724a2f..1787176b 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_dieresisgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_dieresisgrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresisgrave" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="01DB"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="118"/>
-    <component base="gravecomb.case" xOffset="141" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="127"/>
+    <component base="gravecomb.case" xOffset="150" yOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dieresismacron.glif 
b/src/Cantarell-Light.ufo/glyphs/U_dieresismacron.glif
index fb244bb7..65cd4c13 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_dieresismacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_dieresismacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresismacron" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="01D5"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="118"/>
-    <component base="macroncomb.case" xOffset="100" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="127"/>
+    <component base="macroncomb.case" xOffset="109" yOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/U_dotbelow.glif
index 15758b9c..830615d6 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udotbelow" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="1EE4"/>
   <outline>
     <component base="U"/>
-    <component base="dotbelowcomb" xOffset="218"/>
+    <component base="dotbelowcomb" xOffset="227"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_grave.glif b/src/Cantarell-Light.ufo/glyphs/U_grave.glif
index 6aee26e6..cee8c97d 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ugrave" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="00D9"/>
   <outline>
     <component base="U"/>
-    <component base="gravecomb.case" xOffset="141"/>
+    <component base="gravecomb.case" xOffset="150"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/U_hookabove.glif
index 3f2ad0e0..7cfe1573 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_hookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhookabove" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="1EE6"/>
   <outline>
     <component base="U"/>
-    <component base="hookabovecomb.case" xOffset="183"/>
+    <component base="hookabovecomb.case" xOffset="192"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_horn.glif b/src/Cantarell-Light.ufo/glyphs/U_horn.glif
index f3ff6a5f..59858b01 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_horn.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_horn.glif
@@ -1,13 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorn" format="2">
-  <advance width="745"/>
+  <advance width="763"/>
   <unicode hex="01AF"/>
   <outline>
     <component base="U"/>
-    <component base="horncomb" xOffset="503" yOffset="212"/>
+    <component base="horncomb" xOffset="512" yOffset="212"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>U</string>
       <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
       <string>=+72</string>
     </dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_hornacute.glif b/src/Cantarell-Light.ufo/glyphs/U_hornacute.glif
index 1e4be7dd..87b790dc 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_hornacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_hornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhornacute" format="2">
-  <advance width="745"/>
+  <advance width="763"/>
   <unicode hex="1EE8"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="acutecomb.case" xOffset="280"/>
+    <component base="acutecomb.case" xOffset="289"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_horndotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/U_horndotbelow.glif
index b37f2506..9d8950dc 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_horndotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_horndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorndotbelow" format="2">
-  <advance width="745"/>
+  <advance width="763"/>
   <unicode hex="1EF0"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="dotbelowcomb" xOffset="218"/>
+    <component base="dotbelowcomb" xOffset="227"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_horngrave.glif b/src/Cantarell-Light.ufo/glyphs/U_horngrave.glif
index 19bc7368..d58e3e01 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_horngrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_horngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorngrave" format="2">
-  <advance width="745"/>
+  <advance width="763"/>
   <unicode hex="1EEA"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="gravecomb.case" xOffset="141"/>
+    <component base="gravecomb.case" xOffset="150"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_hornhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/U_hornhookabove.glif
index 28eb4e1a..b1a5c145 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_hornhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_hornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhornhookabove" format="2">
-  <advance width="745"/>
+  <advance width="763"/>
   <unicode hex="1EEC"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="hookabovecomb.case" xOffset="183"/>
+    <component base="hookabovecomb.case" xOffset="192"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_horntilde.glif b/src/Cantarell-Light.ufo/glyphs/U_horntilde.glif
index 6d9d3b6c..81d2b858 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_horntilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_horntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorntilde" format="2">
-  <advance width="745"/>
+  <advance width="763"/>
   <unicode hex="1EEE"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="tildecomb.case" xOffset="94"/>
+    <component base="tildecomb.case" xOffset="103"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut-cy.glif
index 928b652c..2f49e842 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhungarumlaut-cy" format="2">
-  <advance width="594"/>
+  <advance width="536"/>
   <unicode hex="04F2"/>
   <outline>
     <component base="U-cy"/>
-    <component base="hungarumlautcomb.case" xOffset="125"/>
+    <component base="hungarumlautcomb.case" xOffset="94"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut.glif 
b/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut.glif
index 190387db..1668ffb9 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhungarumlaut" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="0170"/>
   <outline>
     <component base="U"/>
-    <component base="hungarumlautcomb.case" xOffset="166"/>
+    <component base="hungarumlautcomb.case" xOffset="175"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/U_invertedbreve.glif
index 9986ded1..49b47349 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_invertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uinvertedbreve" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="0216"/>
   <outline>
     <component base="U"/>
-    <component base="breveinvertedcomb.case" xOffset="132"/>
+    <component base="breveinvertedcomb.case" xOffset="141"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_macron-cy.glif b/src/Cantarell-Light.ufo/glyphs/U_macron-cy.glif
index 43af59f1..61439eb3 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_macron-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_macron-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacron-cy" format="2">
-  <advance width="594"/>
+  <advance width="536"/>
   <unicode hex="04EE"/>
   <outline>
     <component base="U-cy"/>
-    <component base="macroncomb.case" xOffset="59"/>
+    <component base="macroncomb.case" xOffset="28"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_macron.glif b/src/Cantarell-Light.ufo/glyphs/U_macron.glif
index 06eaa796..a49df8b2 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacron" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="016A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="100"/>
+    <component base="macroncomb.case" xOffset="109"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_macrondieresis.glif 
b/src/Cantarell-Light.ufo/glyphs/U_macrondieresis.glif
index 0be87762..be7bad60 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_macrondieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_macrondieresis.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacrondieresis" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="1E7A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="100"/>
-    <component base="dieresiscomb.case" xOffset="118" yOffset="128"/>
+    <component base="macroncomb.case" xOffset="109"/>
+    <component base="dieresiscomb.case" xOffset="127" yOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_ogonek.glif b/src/Cantarell-Light.ufo/glyphs/U_ogonek.glif
index 9e39cfa8..66d62481 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_ogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uogonek" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="0172"/>
   <outline>
     <component base="U"/>
-    <component base="ogonekcomb.tall.case" xOffset="19"/>
+    <component base="ogonekcomb.tall.case" xOffset="28"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_ring.glif b/src/Cantarell-Light.ufo/glyphs/U_ring.glif
index cde327e3..dbbad8f5 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_ring.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_ring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uring" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="016E"/>
   <outline>
     <component base="U"/>
-    <component base="ringcomb.case" xOffset="164"/>
+    <component base="ringcomb.case" xOffset="173"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_short-cy.glif b/src/Cantarell-Light.ufo/glyphs/U_short-cy.glif
index 94ad5806..3b990828 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_short-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_short-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ushort-cy" format="2">
-  <advance width="594"/>
+  <advance width="536"/>
   <unicode hex="040E"/>
   <outline>
     <component base="U-cy"/>
-    <component base="brevecomb-cy.case" xOffset="104"/>
+    <component base="brevecomb-cy.case" xOffset="73"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_straight-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/U_straight-cy.glif
index 3f70c6ec..0559d8f3 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_straight-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_straight-cy.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ustraight-cy" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="04AE"/>
-  <anchor x="264" y="326" name="center"/>
+  <anchor x="273" y="326" name="center"/>
   <outline>
     <component base="Y"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_straightstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/U_straightstroke-cy.glif
index 0bec3b75..2e27f549 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_straightstroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_straightstroke-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ustraightstroke-cy" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="04B0"/>
   <outline>
     <component base="Ustraight-cy"/>
-    <component base="strokeshortcomb.case" xScale="1.40103" xOffset="-74" yOffset="27"/>
+    <component base="strokeshortcomb.case" xScale="1.40103" xOffset="-65" yOffset="27"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_tilde.glif b/src/Cantarell-Light.ufo/glyphs/U_tilde.glif
index 7ea754bf..356f6b77 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Utilde" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="0168"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="94"/>
+    <component base="tildecomb.case" xOffset="103"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_tildeacute.glif 
b/src/Cantarell-Light.ufo/glyphs/U_tildeacute.glif
index ed491ab3..078ffd48 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_tildeacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_tildeacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Utildeacute" format="2">
-  <advance width="673"/>
+  <advance width="691"/>
   <unicode hex="1E78"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="94"/>
-    <component base="acutecomb.case" xOffset="280" yOffset="142"/>
+    <component base="tildecomb.case" xOffset="103"/>
+    <component base="acutecomb.case" xOffset="289" yOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/V_.glif b/src/Cantarell-Light.ufo/glyphs/V_.glif
index 3b3fac6b..f9f09e83 100644
--- a/src/Cantarell-Light.ufo/glyphs/V_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/V_.glif
@@ -1,22 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="V" format="2">
-  <advance width="603"/>
+  <advance width="600"/>
   <unicode hex="0056"/>
-  <note>
-V
-</note>
-  <anchor x="302" y="0" name="bottom"/>
-  <anchor x="302" y="694" name="top"/>
+  <anchor x="301" y="0" name="bottom"/>
+  <anchor x="301" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="297" y="0" type="line"/>
-      <point x="308" y="0" type="line"/>
-      <point x="565" y="694" type="line"/>
-      <point x="544" y="694" type="line"/>
-      <point x="299" y="30" type="line"/>
-      <point x="308" y="30" type="line"/>
-      <point x="61" y="694" type="line"/>
-      <point x="38" y="694" type="line"/>
+      <point x="296" y="0" type="line"/>
+      <point x="306" y="0" type="line"/>
+      <point x="566" y="694" type="line"/>
+      <point x="545" y="694" type="line"/>
+      <point x="298" y="30" type="line"/>
+      <point x="307" y="30" type="line"/>
+      <point x="57" y="694" type="line"/>
+      <point x="34" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/V_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/V_e-cy.glif
index 2c9181a3..a86bc85d 100644
--- a/src/Cantarell-Light.ufo/glyphs/V_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/V_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ve-cy" format="2">
-  <advance width="619"/>
+  <advance width="633"/>
   <unicode hex="0412"/>
   <outline>
     <component base="B"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_.glif b/src/Cantarell-Light.ufo/glyphs/W_.glif
index a4f97c6f..791c5f05 100644
--- a/src/Cantarell-Light.ufo/glyphs/W_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/W_.glif
@@ -1,30 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="W" format="2">
-  <advance width="986"/>
+  <advance width="975"/>
   <unicode hex="0057"/>
-  <note>
-W
-</note>
-  <anchor x="494" y="0" name="bottom"/>
-  <anchor x="494" y="694" name="top"/>
+  <anchor x="487" y="0" name="bottom"/>
+  <anchor x="487" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="266" y="0" type="line"/>
-      <point x="278" y="0" type="line"/>
-      <point x="502" y="666" type="line"/>
-      <point x="488" y="666" type="line"/>
+      <point x="247" y="0" type="line"/>
+      <point x="259" y="0" type="line"/>
+      <point x="495" y="666" type="line"/>
+      <point x="481" y="666" type="line"/>
       <point x="719" y="0" type="line"/>
       <point x="732" y="0" type="line"/>
-      <point x="944" y="694" type="line"/>
-      <point x="923" y="694" type="line"/>
+      <point x="939" y="694" type="line"/>
+      <point x="918" y="694" type="line"/>
       <point x="722" y="32" type="line"/>
       <point x="730" y="32" type="line"/>
-      <point x="502" y="688" type="line"/>
-      <point x="489" y="688" type="line"/>
-      <point x="269" y="32" type="line"/>
-      <point x="277" y="32" type="line"/>
-      <point x="64" y="694" type="line"/>
-      <point x="41" y="694" type="line"/>
+      <point x="495" y="688" type="line"/>
+      <point x="482" y="688" type="line"/>
+      <point x="250" y="32" type="line"/>
+      <point x="258" y="32" type="line"/>
+      <point x="59" y="694" type="line"/>
+      <point x="36" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_acute.glif b/src/Cantarell-Light.ufo/glyphs/W_acute.glif
index 7c5fa934..c83bb173 100644
--- a/src/Cantarell-Light.ufo/glyphs/W_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/W_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wacute" format="2">
-  <advance width="986"/>
+  <advance width="975"/>
   <unicode hex="1E82"/>
   <outline>
     <component base="W"/>
-    <component base="acutecomb.case" xOffset="436"/>
+    <component base="acutecomb.case" xOffset="429"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/W_circumflex.glif
index 15657702..3f5b0e00 100644
--- a/src/Cantarell-Light.ufo/glyphs/W_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/W_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wcircumflex" format="2">
-  <advance width="986"/>
+  <advance width="975"/>
   <unicode hex="0174"/>
   <outline>
     <component base="W"/>
-    <component base="circumflexcomb.case" xOffset="317"/>
+    <component base="circumflexcomb.case" xOffset="310"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/W_dieresis.glif
index 55d01f69..ceee0b67 100644
--- a/src/Cantarell-Light.ufo/glyphs/W_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/W_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wdieresis" format="2">
-  <advance width="986"/>
+  <advance width="975"/>
   <unicode hex="1E84"/>
   <outline>
     <component base="W"/>
-    <component base="dieresiscomb.case" xOffset="274"/>
+    <component base="dieresiscomb.case" xOffset="267"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/W_e-cy.glif
index 04735dec..563c4404 100644
--- a/src/Cantarell-Light.ufo/glyphs/W_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/W_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="We-cy" format="2">
-  <advance width="986"/>
+  <advance width="975"/>
   <unicode hex="051C"/>
   <outline>
     <component base="W"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_grave.glif b/src/Cantarell-Light.ufo/glyphs/W_grave.glif
index 7d93ebff..d75fc7f3 100644
--- a/src/Cantarell-Light.ufo/glyphs/W_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/W_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wgrave" format="2">
-  <advance width="986"/>
+  <advance width="975"/>
   <unicode hex="1E80"/>
   <outline>
     <component base="W"/>
-    <component base="gravecomb.case" xOffset="297"/>
+    <component base="gravecomb.case" xOffset="290"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/X_.glif b/src/Cantarell-Light.ufo/glyphs/X_.glif
index 871c59b9..519e4ea7 100644
--- a/src/Cantarell-Light.ufo/glyphs/X_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/X_.glif
@@ -1,32 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="X" format="2">
-  <advance width="594"/>
+  <advance width="598"/>
   <unicode hex="0058"/>
-  <note>
-X
-</note>
-  <anchor x="299" y="0" name="bottom"/>
-  <anchor x="299" y="694" name="top"/>
+  <anchor x="302" y="0" name="bottom"/>
+  <anchor x="302" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="531" y="0" type="line"/>
-      <point x="558" y="0" type="line"/>
-      <point x="291" y="385" type="line"/>
+      <point x="536" y="0" type="line"/>
+      <point x="563" y="0" type="line"/>
+      <point x="293" y="385" type="line"/>
       <point x="91" y="694" type="line"/>
       <point x="64" y="694" type="line"/>
-      <point x="278" y="369" type="line"/>
+      <point x="280" y="369" type="line"/>
     </contour>
     <contour>
       <point x="35" y="0" type="line"/>
       <point x="59" y="0" type="line"/>
-      <point x="296" y="351" type="line"/>
-      <point x="285" y="367" type="line"/>
+      <point x="298" y="351" type="line"/>
+      <point x="287" y="367" type="line"/>
     </contour>
     <contour>
-      <point x="304" y="358" type="line"/>
-      <point x="538" y="694" type="line"/>
-      <point x="514" y="694" type="line"/>
-      <point x="293" y="375" type="line"/>
+      <point x="306" y="358" type="line"/>
+      <point x="543" y="694" type="line"/>
+      <point x="519" y="694" type="line"/>
+      <point x="295" y="375" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_.glif b/src/Cantarell-Light.ufo/glyphs/Y_.glif
index 35e40140..0c37196a 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_.glif
@@ -1,25 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Y" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="0059"/>
-  <note>
-Y
-</note>
-  <anchor x="269" y="0" name="bottom"/>
-  <anchor x="269" y="694" name="top"/>
-  <anchor x="3" y="694" name="topleft"/>
+  <anchor x="283" y="0" name="bottom"/>
+  <anchor x="283" y="694" name="top"/>
+  <anchor x="11" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="254" y="0" type="line"/>
-      <point x="275" y="0" type="line"/>
-      <point x="275" y="333" type="line"/>
-      <point x="507" y="694" type="line"/>
-      <point x="484" y="694" type="line"/>
-      <point x="262" y="344" type="line"/>
-      <point x="270" y="344" type="line"/>
-      <point x="47" y="694" type="line"/>
-      <point x="21" y="694" type="line"/>
-      <point x="254" y="333" type="line"/>
+      <point x="268" y="0" type="line"/>
+      <point x="289" y="0" type="line"/>
+      <point x="289" y="333" type="line"/>
+      <point x="526" y="694" type="line"/>
+      <point x="503" y="694" type="line"/>
+      <point x="276" y="344" type="line"/>
+      <point x="284" y="344" type="line"/>
+      <point x="56" y="694" type="line"/>
+      <point x="30" y="694" type="line"/>
+      <point x="268" y="333" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_acute.glif b/src/Cantarell-Light.ufo/glyphs/Y_acute.glif
index 5cbb74d1..74bb070a 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yacute" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="00DD"/>
   <outline>
     <component base="Y"/>
-    <component base="acutecomb.case" xOffset="211"/>
+    <component base="acutecomb.case" xOffset="225"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif b/src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif
index 127f08b2..1d6d7073 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif
@@ -1,35 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yat-cy" format="2">
-  <advance width="688"/>
+  <advance width="715"/>
   <unicode hex="0462"/>
   <outline>
     <contour>
-      <point x="187" y="0" type="line"/>
-      <point x="401" y="0" type="line" smooth="yes"/>
-      <point x="544" y="0"/>
-      <point x="629" y="74"/>
-      <point x="629" y="200" type="curve" smooth="yes"/>
-      <point x="629" y="322"/>
-      <point x="551" y="403"/>
-      <point x="435" y="403" type="curve" smooth="yes"/>
-      <point x="201" y="403" type="line"/>
-      <point x="201" y="386" type="line"/>
-      <point x="425" y="386" type="line" smooth="yes"/>
-      <point x="532" y="386"/>
-      <point x="607" y="312"/>
-      <point x="607" y="195" type="curve" smooth="yes"/>
-      <point x="607" y="82"/>
-      <point x="537" y="18"/>
-      <point x="412" y="18" type="curve" smooth="yes"/>
-      <point x="209" y="18" type="line"/>
-      <point x="209" y="694" type="line"/>
-      <point x="187" y="694" type="line"/>
+      <point x="211" y="0" type="line"/>
+      <point x="424" y="0" type="line" smooth="yes"/>
+      <point x="567" y="0"/>
+      <point x="652" y="74"/>
+      <point x="652" y="200" type="curve" smooth="yes"/>
+      <point x="652" y="322"/>
+      <point x="574" y="403"/>
+      <point x="458" y="403" type="curve" smooth="yes"/>
+      <point x="224" y="403" type="line"/>
+      <point x="224" y="386" type="line"/>
+      <point x="448" y="386" type="line" smooth="yes"/>
+      <point x="555" y="386"/>
+      <point x="630" y="312"/>
+      <point x="630" y="195" type="curve" smooth="yes"/>
+      <point x="630" y="82"/>
+      <point x="560" y="18"/>
+      <point x="435" y="18" type="curve" smooth="yes"/>
+      <point x="232" y="18" type="line"/>
+      <point x="232" y="694" type="line"/>
+      <point x="211" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="43" y="545" type="line"/>
-      <point x="403" y="545" type="line"/>
-      <point x="403" y="564" type="line"/>
-      <point x="43" y="564" type="line"/>
+      <point x="66" y="545" type="line"/>
+      <point x="426" y="545" type="line"/>
+      <point x="426" y="564" type="line"/>
+      <point x="66" y="564" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Eth</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Softsign-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/Y_circumflex.glif
index 8d918466..4ad6a4d1 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ycircumflex" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="0176"/>
   <outline>
     <component base="Y"/>
-    <component base="circumflexcomb.case" xOffset="92"/>
+    <component base="circumflexcomb.case" xOffset="106"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/Y_dieresis.glif
index ed856b68..5a1e2d27 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydieresis" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="0178"/>
   <outline>
     <component base="Y"/>
-    <component base="dieresiscomb.case" xOffset="49"/>
+    <component base="dieresiscomb.case" xOffset="63"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/Y_dotaccent.glif
index 643b3a95..61f50ec0 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydotaccent" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="1E8E"/>
   <outline>
     <component base="Y"/>
-    <component base="dotaccentcomb.case" xOffset="150"/>
+    <component base="dotaccentcomb.case" xOffset="164"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/Y_dotbelow.glif
index ff90ac2a..1bf6817d 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydotbelow" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="1EF4"/>
   <outline>
     <component base="Y"/>
-    <component base="dotbelowcomb" xOffset="149"/>
+    <component base="dotbelowcomb" xOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_eru-cy.glif b/src/Cantarell-Light.ufo/glyphs/Y_eru-cy.glif
index 234199c3..f75e95b5 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_eru-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_eru-cy.glif
@@ -1,36 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yeru-cy" format="2">
-  <advance width="787"/>
+  <advance width="813"/>
   <unicode hex="042B"/>
-  <anchor x="399" y="694" name="top"/>
+  <anchor x="412" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="294" y="0" type="line" smooth="yes"/>
-      <point x="437" y="0"/>
-      <point x="522" y="74"/>
-      <point x="522" y="200" type="curve" smooth="yes"/>
-      <point x="522" y="322"/>
-      <point x="444" y="403"/>
-      <point x="328" y="403" type="curve" smooth="yes"/>
-      <point x="124" y="403" type="line"/>
-      <point x="124" y="386" type="line"/>
-      <point x="318" y="386" type="line" smooth="yes"/>
-      <point x="427" y="386"/>
-      <point x="500" y="310"/>
-      <point x="500" y="195" type="curve" smooth="yes"/>
-      <point x="500" y="84"/>
-      <point x="428" y="18"/>
-      <point x="305" y="18" type="curve" smooth="yes"/>
-      <point x="132" y="18" type="line"/>
-      <point x="132" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="307" y="0" type="line" smooth="yes"/>
+      <point x="450" y="0"/>
+      <point x="535" y="74"/>
+      <point x="535" y="200" type="curve" smooth="yes"/>
+      <point x="535" y="322"/>
+      <point x="457" y="403"/>
+      <point x="341" y="403" type="curve" smooth="yes"/>
+      <point x="137" y="403" type="line"/>
+      <point x="137" y="386" type="line"/>
+      <point x="331" y="386" type="line" smooth="yes"/>
+      <point x="440" y="386"/>
+      <point x="513" y="310"/>
+      <point x="513" y="195" type="curve" smooth="yes"/>
+      <point x="513" y="84"/>
+      <point x="441" y="18"/>
+      <point x="318" y="18" type="curve" smooth="yes"/>
+      <point x="145" y="18" type="line"/>
+      <point x="145" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="656" y="0" type="line"/>
-      <point x="677" y="0" type="line"/>
-      <point x="677" y="694" type="line"/>
-      <point x="656" y="694" type="line"/>
+      <point x="669" y="0" type="line"/>
+      <point x="690" y="0" type="line"/>
+      <point x="690" y="694" type="line"/>
+      <point x="669" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_erudieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/Y_erudieresis-cy.glif
index fc365687..1b8e4204 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_erudieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_erudieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yerudieresis-cy" format="2">
-  <advance width="787"/>
+  <advance width="813"/>
   <unicode hex="04F8"/>
   <outline>
     <component base="Yeru-cy"/>
-    <component base="dieresiscomb.case" xOffset="179"/>
+    <component base="dieresiscomb.case" xOffset="192"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_grave.glif b/src/Cantarell-Light.ufo/glyphs/Y_grave.glif
index cdd7cd5c..3bad702d 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ygrave" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="1EF2"/>
   <outline>
     <component base="Y"/>
-    <component base="gravecomb.case" xOffset="72"/>
+    <component base="gravecomb.case" xOffset="86"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/Y_hookabove.glif
index fe2ffdeb..c5ce0454 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_hookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yhookabove" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="1EF6"/>
   <outline>
     <component base="Y"/>
-    <component base="hookabovecomb.case" xOffset="114"/>
+    <component base="hookabovecomb.case" xOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_i-cy.glif b/src/Cantarell-Light.ufo/glyphs/Y_i-cy.glif
index 728199dd..203f017b 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_i-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_i-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yi-cy" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="0407"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-99"/>
+    <component base="dieresiscomb.case" xOffset="-86"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_macron.glif b/src/Cantarell-Light.ufo/glyphs/Y_macron.glif
index 8df39672..e7ddea7e 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ymacron" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="0232"/>
   <outline>
     <component base="Y"/>
-    <component base="macroncomb.case" xOffset="31"/>
+    <component base="macroncomb.case" xOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_tilde.glif b/src/Cantarell-Light.ufo/glyphs/Y_tilde.glif
index 99020eb5..341fa8b4 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ytilde" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="1EF8"/>
   <outline>
     <component base="Y"/>
-    <component base="tildecomb.case" xOffset="25"/>
+    <component base="tildecomb.case" xOffset="39"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif b/src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif
index eab99858..11674c51 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif
@@ -1,43 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yusbig-cy" format="2">
-  <advance width="754"/>
+  <advance width="766"/>
   <unicode hex="046A"/>
   <outline>
     <contour>
-      <point x="355" y="381" type="line"/>
-      <point x="375" y="381" type="line"/>
-      <point x="124" y="683" type="line"/>
-      <point x="122" y="677" type="line"/>
-      <point x="631" y="677" type="line"/>
-      <point x="629" y="683" type="line"/>
-      <point x="373" y="381" type="line"/>
-      <point x="393" y="381" type="line"/>
-      <point x="649" y="676" type="line"/>
-      <point x="649" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
-      <point x="104" y="676" type="line"/>
+      <point x="64" y="0" type="curve"/>
+      <point x="83" y="0" type="line"/>
+      <point x="83" y="250"/>
+      <point x="176" y="364"/>
+      <point x="379" y="364" type="curve" smooth="yes"/>
+      <point x="587" y="364"/>
+      <point x="683" y="250"/>
+      <point x="683" y="0" type="curve"/>
+      <point x="702" y="0" type="line"/>
+      <point x="702" y="262"/>
+      <point x="603" y="382"/>
+      <point x="386" y="382" type="curve" smooth="yes"/>
+      <point x="165" y="382"/>
+      <point x="64" y="262"/>
     </contour>
     <contour>
-      <point x="386" y="369" type="line"/>
-      <point x="366" y="369" type="line"/>
-      <point x="366" y="0" type="line"/>
-      <point x="386" y="0" type="line"/>
+      <point x="372" y="0" type="line"/>
+      <point x="392" y="0" type="line"/>
+      <point x="392" y="369" type="line"/>
+      <point x="372" y="369" type="line"/>
     </contour>
     <contour>
-      <point x="77" y="0" type="line"/>
-      <point x="77" y="250"/>
-      <point x="170" y="364"/>
-      <point x="373" y="364" type="curve" smooth="yes"/>
-      <point x="581" y="364"/>
-      <point x="677" y="250"/>
-      <point x="677" y="0" type="curve"/>
-      <point x="696" y="0" type="line"/>
-      <point x="696" y="262"/>
-      <point x="597" y="382"/>
-      <point x="380" y="382" type="curve" smooth="yes"/>
-      <point x="159" y="382"/>
-      <point x="58" y="262"/>
-      <point x="58" y="0" type="curve"/>
+      <point x="361" y="381" type="line"/>
+      <point x="381" y="381" type="line"/>
+      <point x="130" y="683" type="line"/>
+      <point x="128" y="677" type="line"/>
+      <point x="637" y="677" type="line"/>
+      <point x="635" y="683" type="line"/>
+      <point x="379" y="381" type="line"/>
+      <point x="399" y="381" type="line"/>
+      <point x="655" y="676" type="line"/>
+      <point x="655" y="694" type="line"/>
+      <point x="110" y="694" type="line"/>
+      <point x="110" y="676" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_.glif b/src/Cantarell-Light.ufo/glyphs/Z_.glif
index 651d51d2..122e8939 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_.glif
@@ -2,9 +2,6 @@
 <glyph name="Z" format="2">
   <advance width="616"/>
   <unicode hex="005A"/>
-  <note>
-Z
-</note>
   <anchor x="298" y="0" name="bottom"/>
   <anchor x="298" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/Z_e-cy.glif
index 373d2b8d..3d790789 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_e-cy.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ze-cy" format="2">
-  <advance width="582"/>
+  <advance width="579"/>
   <unicode hex="0417"/>
-  <anchor x="291" y="0" name="bottom"/>
-  <anchor x="291" y="694" name="top"/>
+  <anchor x="282" y="0" name="bottom"/>
+  <anchor x="282" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="272" y="-10" type="curve" smooth="yes"/>
-      <point x="418" y="-10"/>
-      <point x="507" y="61"/>
-      <point x="507" y="181" type="curve" smooth="yes"/>
-      <point x="507" y="293"/>
-      <point x="428" y="368"/>
-      <point x="309" y="369" type="curve"/>
-      <point x="319" y="364" type="line"/>
-      <point x="428" y="364"/>
-      <point x="492" y="424"/>
-      <point x="492" y="525" type="curve" smooth="yes"/>
-      <point x="492" y="637"/>
-      <point x="409" y="704"/>
-      <point x="269" y="704" type="curve" smooth="yes"/>
-      <point x="190" y="704"/>
-      <point x="123" y="683"/>
-      <point x="68" y="645" type="curve"/>
-      <point x="73" y="627" type="line"/>
-      <point x="137" y="666"/>
-      <point x="196" y="684"/>
-      <point x="264" y="684" type="curve" smooth="yes"/>
-      <point x="391" y="684"/>
-      <point x="469" y="622"/>
-      <point x="469" y="520" type="curve" smooth="yes"/>
-      <point x="469" y="428"/>
-      <point x="404" y="374"/>
-      <point x="292" y="374" type="curve" smooth="yes"/>
-      <point x="147" y="374" type="line"/>
-      <point x="147" y="355" type="line"/>
-      <point x="281" y="355" type="line" smooth="yes"/>
-      <point x="405" y="355"/>
-      <point x="485" y="286"/>
-      <point x="485" y="177" type="curve" smooth="yes"/>
-      <point x="485" y="72"/>
-      <point x="405" y="11"/>
-      <point x="274" y="11" type="curve" smooth="yes"/>
-      <point x="197" y="11"/>
-      <point x="117" y="31"/>
-      <point x="54" y="65" type="curve"/>
-      <point x="48" y="45" type="line"/>
-      <point x="110" y="11"/>
-      <point x="192" y="-10"/>
+      <point x="263" y="-10" type="curve" smooth="yes"/>
+      <point x="409" y="-10"/>
+      <point x="498" y="61"/>
+      <point x="498" y="181" type="curve" smooth="yes"/>
+      <point x="498" y="293"/>
+      <point x="419" y="368"/>
+      <point x="300" y="369" type="curve"/>
+      <point x="310" y="364" type="line"/>
+      <point x="419" y="364"/>
+      <point x="483" y="424"/>
+      <point x="483" y="525" type="curve" smooth="yes"/>
+      <point x="483" y="637"/>
+      <point x="400" y="704"/>
+      <point x="260" y="704" type="curve" smooth="yes"/>
+      <point x="181" y="704"/>
+      <point x="114" y="683"/>
+      <point x="59" y="645" type="curve"/>
+      <point x="64" y="627" type="line"/>
+      <point x="128" y="666"/>
+      <point x="187" y="684"/>
+      <point x="255" y="684" type="curve" smooth="yes"/>
+      <point x="382" y="684"/>
+      <point x="460" y="622"/>
+      <point x="460" y="520" type="curve" smooth="yes"/>
+      <point x="460" y="428"/>
+      <point x="395" y="374"/>
+      <point x="283" y="374" type="curve" smooth="yes"/>
+      <point x="138" y="374" type="line"/>
+      <point x="138" y="355" type="line"/>
+      <point x="272" y="355" type="line" smooth="yes"/>
+      <point x="396" y="355"/>
+      <point x="476" y="286"/>
+      <point x="476" y="177" type="curve" smooth="yes"/>
+      <point x="476" y="72"/>
+      <point x="396" y="11"/>
+      <point x="265" y="11" type="curve" smooth="yes"/>
+      <point x="188" y="11"/>
+      <point x="108" y="31"/>
+      <point x="45" y="65" type="curve"/>
+      <point x="39" y="45" type="line"/>
+      <point x="101" y="11"/>
+      <point x="183" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_edescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/Z_edescender-cy.glif
index be1ae800..33714fde 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_edescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_edescender-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zedescender-cy" format="2">
-  <advance width="582"/>
+  <advance width="579"/>
   <unicode hex="0498"/>
   <outline>
     <component base="Ze-cy"/>
-    <component base="cedillacomb" xOffset="166"/>
+    <component base="cedillacomb" xOffset="157"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_edieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/Z_edieresis-cy.glif
index 62a87def..61238d65 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_edieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_edieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zedieresis-cy" format="2">
-  <advance width="582"/>
+  <advance width="579"/>
   <unicode hex="04DE"/>
   <outline>
     <component base="Ze-cy"/>
-    <component base="dieresiscomb.case" xOffset="71"/>
+    <component base="dieresiscomb.case" xOffset="62"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_he-cy.glif b/src/Cantarell-Light.ufo/glyphs/Z_he-cy.glif
index b1772fc1..296418ba 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_he-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_he-cy.glif
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhe-cy" format="2">
-  <advance width="884"/>
+  <advance width="882"/>
   <unicode hex="0416"/>
-  <anchor x="852" y="0" name="bottomright"/>
-  <anchor x="442" y="694" name="top"/>
+  <anchor x="840" y="0" name="bottomright"/>
+  <anchor x="441" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="821" y="0" type="line"/>
-      <point x="847" y="0" type="line"/>
-      <point x="603" y="364" type="line"/>
-      <point x="603" y="354" type="line"/>
-      <point x="835" y="694" type="line"/>
-      <point x="808" y="694" type="line"/>
-      <point x="584" y="358" type="line"/>
+      <point x="820" y="0" type="line"/>
+      <point x="846" y="0" type="line"/>
+      <point x="602" y="364" type="line"/>
+      <point x="602" y="354" type="line"/>
+      <point x="834" y="694" type="line"/>
+      <point x="807" y="694" type="line"/>
+      <point x="583" y="358" type="line"/>
     </contour>
     <contour>
-      <point x="37" y="0" type="line"/>
-      <point x="63" y="0" type="line"/>
-      <point x="300" y="359" type="line"/>
-      <point x="77" y="694" type="line"/>
-      <point x="50" y="694" type="line"/>
-      <point x="281" y="354" type="line"/>
-      <point x="280" y="363" type="line"/>
+      <point x="36" y="0" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="299" y="359" type="line"/>
+      <point x="76" y="694" type="line"/>
+      <point x="49" y="694" type="line"/>
+      <point x="280" y="354" type="line"/>
+      <point x="279" y="363" type="line"/>
     </contour>
     <contour>
-      <point x="278" y="349" type="line"/>
-      <point x="598" y="349" type="line"/>
-      <point x="598" y="367" type="line"/>
-      <point x="278" y="367" type="line"/>
+      <point x="431" y="0" type="line"/>
+      <point x="451" y="0" type="line"/>
+      <point x="451" y="694" type="line"/>
+      <point x="431" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="432" y="0" type="line"/>
-      <point x="452" y="0" type="line"/>
-      <point x="452" y="694" type="line"/>
-      <point x="432" y="694" type="line"/>
+      <point x="277" y="349" type="line"/>
+      <point x="597" y="349" type="line"/>
+      <point x="597" y="367" type="line"/>
+      <point x="277" y="367" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_hebreve-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/Z_hebreve-cy.glif
index 9a0da145..a3c2dae8 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_hebreve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_hebreve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhebreve-cy" format="2">
-  <advance width="884"/>
+  <advance width="882"/>
   <unicode hex="04C1"/>
   <outline>
     <component base="Zhe-cy"/>
-    <component base="brevecomb-cy.case" xOffset="249"/>
+    <component base="brevecomb-cy.case" xOffset="248"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_hedescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/Z_hedescender-cy.glif
index 3c5f1696..37a233bd 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_hedescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_hedescender-cy.glif
@@ -1,18 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhedescender-cy" format="2">
-  <advance width="954"/>
+  <advance width="882"/>
   <unicode hex="0496"/>
   <outline>
-    <component base="Zhe-cy" xOffset="7"/>
-    <component base="descender-cy.case" xOffset="763"/>
+    <component base="Zhe-cy"/>
+    <component base="descender-cy.case" xOffset="744"/>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>0</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Zhe-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Zhe-cy</string>
+      <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
+      <string>=Zhe-cy+10</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_hedieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/Z_hedieresis-cy.glif
index b0392449..fe732f00 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_hedieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_hedieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhedieresis-cy" format="2">
-  <advance width="884"/>
+  <advance width="882"/>
   <unicode hex="04DC"/>
   <outline>
     <component base="Zhe-cy"/>
-    <component base="dieresiscomb.case" xOffset="222"/>
+    <component base="dieresiscomb.case" xOffset="221"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/_currencyvstem.glif 
b/src/Cantarell-Light.ufo/glyphs/_currencyvstem.glif
index 3a90ad4a..3fdd2303 100644
--- a/src/Cantarell-Light.ufo/glyphs/_currencyvstem.glif
+++ b/src/Cantarell-Light.ufo/glyphs/_currencyvstem.glif
@@ -3,10 +3,10 @@
   <advance width="600"/>
   <outline>
     <contour>
-      <point x="408" y="685" type="line"/>
-      <point x="426" y="685" type="line"/>
-      <point x="426" y="840" type="line"/>
-      <point x="408" y="840" type="line"/>
+      <point x="408" y="703" type="line"/>
+      <point x="426" y="703" type="line"/>
+      <point x="426" y="823" type="line"/>
+      <point x="408" y="823" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/_descenderreverse-cy.case.glif 
b/src/Cantarell-Light.ufo/glyphs/_descenderreverse-cy.case.glif
index e2135177..f97a8f36 100644
--- a/src/Cantarell-Light.ufo/glyphs/_descenderreverse-cy.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/_descenderreverse-cy.case.glif
@@ -1,14 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="_descenderreverse-cy.case" format="2">
   <advance width="241"/>
-  <anchor x="114" y="0" name="_bottomright"/>
+  <anchor x="127" y="0" name="_bottomright"/>
   <outline>
     <contour>
       <point x="10" y="-175" type="line"/>
       <point x="31" y="-175" type="line"/>
       <point x="31" y="0" type="line"/>
-      <point x="70" y="0" type="line"/>
-      <point x="70" y="19" type="line"/>
+      <point x="86" y="0" type="line"/>
+      <point x="86" y="19" type="line"/>
       <point x="10" y="19" type="line"/>
     </contour>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/_descenderreversed-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/_descenderreversed-cy.glif
index c07e0e5c..56dbb7be 100644
--- a/src/Cantarell-Light.ufo/glyphs/_descenderreversed-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/_descenderreversed-cy.glif
@@ -1,15 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="_descenderreversed-cy" format="2">
   <advance width="205"/>
-  <anchor x="150" y="0" name="_bottomright"/>
+  <anchor x="153" y="0" name="_bottomright"/>
   <outline>
     <contour>
       <point x="44" y="-119" type="line"/>
       <point x="64" y="-119" type="line"/>
       <point x="64" y="0" type="line"/>
-      <point x="117" y="0" type="line"/>
-      <point x="117" y="19" type="line"/>
-      <point x="44" y="19" type="line"/>
+      <point x="106" y="0" type="line"/>
+      <point x="106" y="17" type="line"/>
+      <point x="44" y="17" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/_typoquote.glif b/src/Cantarell-Light.ufo/glyphs/_typoquote.glif
index 5187e624..4a2fdd15 100644
--- a/src/Cantarell-Light.ufo/glyphs/_typoquote.glif
+++ b/src/Cantarell-Light.ufo/glyphs/_typoquote.glif
@@ -5,12 +5,12 @@
     <contour>
       <point x="89" y="-153" type="curve"/>
       <point x="106" y="-153" type="line"/>
-      <point x="139" y="-94"/>
-      <point x="164" y="17"/>
+      <point x="141" y="-91"/>
+      <point x="164" y="14"/>
       <point x="164" y="108" type="curve"/>
       <point x="144" y="108" type="line"/>
-      <point x="144" y="18"/>
-      <point x="120" y="-93"/>
+      <point x="144" y="15"/>
+      <point x="122" y="-89"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/a-cy.glif b/src/Cantarell-Light.ufo/glyphs/a-cy.glif
index fb36db8b..a7126bcb 100644
--- a/src/Cantarell-Light.ufo/glyphs/a-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/a-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="a-cy" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="0430"/>
-  <anchor x="233" y="480" name="top"/>
   <outline>
     <component base="a"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/a.glif b/src/Cantarell-Light.ufo/glyphs/a.glif
index c90a0b3e..f9a82a9d 100644
--- a/src/Cantarell-Light.ufo/glyphs/a.glif
+++ b/src/Cantarell-Light.ufo/glyphs/a.glif
@@ -1,54 +1,57 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="a" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="0061"/>
-  <note>
-a
-</note>
-  <anchor x="232" y="0" name="bottom"/>
-  <anchor x="379" y="10" name="ogonek"/>
-  <anchor x="213" y="480" name="top"/>
+  <anchor x="250" y="0" name="bottom"/>
+  <anchor x="397" y="10" name="ogonek"/>
+  <anchor x="231" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="368" y="0" type="line"/>
-      <point x="385" y="0" type="line"/>
-      <point x="385" y="327" type="line" smooth="yes"/>
-      <point x="385" y="428"/>
-      <point x="326" y="486"/>
-      <point x="228" y="486" type="curve" smooth="yes"/>
-      <point x="176" y="486"/>
-      <point x="116" y="470"/>
-      <point x="64" y="444" type="curve"/>
-      <point x="69" y="430" type="line"/>
-      <point x="116" y="453"/>
-      <point x="172" y="468"/>
-      <point x="222" y="468" type="curve" smooth="yes"/>
-      <point x="313" y="468"/>
-      <point x="364" y="419"/>
-      <point x="364" y="323" type="curve" smooth="yes"/>
-      <point x="364" y="71" type="line"/>
+      <point x="386" y="0" type="line"/>
+      <point x="403" y="0" type="line"/>
+      <point x="403" y="327" type="line" smooth="yes"/>
+      <point x="403" y="428"/>
+      <point x="344" y="486"/>
+      <point x="246" y="486" type="curve" smooth="yes"/>
+      <point x="194" y="486"/>
+      <point x="134" y="470"/>
+      <point x="82" y="444" type="curve"/>
+      <point x="87" y="430" type="line"/>
+      <point x="134" y="453"/>
+      <point x="190" y="468"/>
+      <point x="240" y="468" type="curve" smooth="yes"/>
+      <point x="331" y="468"/>
+      <point x="382" y="419"/>
+      <point x="382" y="323" type="curve" smooth="yes"/>
+      <point x="382" y="71" type="line"/>
     </contour>
     <contour>
-      <point x="197" y="-10" type="curve" smooth="yes"/>
-      <point x="264" y="-10"/>
-      <point x="324" y="17"/>
-      <point x="372" y="68" type="curve"/>
-      <point x="372" y="86" type="line"/>
-      <point x="315" y="32"/>
-      <point x="263" y="8"/>
-      <point x="203" y="8" type="curve" smooth="yes"/>
-      <point x="121" y="8"/>
-      <point x="67" y="53"/>
-      <point x="67" y="121" type="curve" smooth="yes"/>
-      <point x="67" y="209"/>
-      <point x="159" y="247"/>
-      <point x="372" y="247" type="curve"/>
-      <point x="372" y="263" type="line"/>
-      <point x="149" y="263"/>
-      <point x="46" y="217"/>
-      <point x="46" y="117" type="curve" smooth="yes"/>
-      <point x="46" y="41"/>
-      <point x="105" y="-10"/>
+      <point x="215" y="-10" type="curve" smooth="yes"/>
+      <point x="282" y="-10"/>
+      <point x="342" y="17"/>
+      <point x="390" y="68" type="curve"/>
+      <point x="390" y="86" type="line"/>
+      <point x="333" y="32"/>
+      <point x="281" y="8"/>
+      <point x="221" y="8" type="curve" smooth="yes"/>
+      <point x="139" y="8"/>
+      <point x="85" y="53"/>
+      <point x="85" y="121" type="curve" smooth="yes"/>
+      <point x="85" y="209"/>
+      <point x="177" y="247"/>
+      <point x="390" y="247" type="curve"/>
+      <point x="390" y="263" type="line"/>
+      <point x="167" y="263"/>
+      <point x="64" y="217"/>
+      <point x="64" y="117" type="curve" smooth="yes"/>
+      <point x="64" y="41"/>
+      <point x="123" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/aacute.glif b/src/Cantarell-Light.ufo/glyphs/aacute.glif
index 5efb99db..eb6b9138 100644
--- a/src/Cantarell-Light.ufo/glyphs/aacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/aacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aacute" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="00E1"/>
   <outline>
     <component base="a"/>
-    <component base="acutecomb" xOffset="146"/>
+    <component base="acutecomb" xOffset="164"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/abreve-cy.glif b/src/Cantarell-Light.ufo/glyphs/abreve-cy.glif
index 6cea9483..35f645fc 100644
--- a/src/Cantarell-Light.ufo/glyphs/abreve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abreve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abreve-cy" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="04D1"/>
   <outline>
     <component base="a-cy"/>
-    <component base="brevecomb-cy" xOffset="36"/>
+    <component base="brevecomb-cy" xOffset="34"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/abreve.glif b/src/Cantarell-Light.ufo/glyphs/abreve.glif
index 1386eeb2..0284b105 100644
--- a/src/Cantarell-Light.ufo/glyphs/abreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abreve" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="0103"/>
   <outline>
     <component base="a"/>
-    <component base="brevecomb" xOffset="27"/>
+    <component base="brevecomb" xOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/abreveacute.glif b/src/Cantarell-Light.ufo/glyphs/abreveacute.glif
index 500267a0..5a0eb0ff 100644
--- a/src/Cantarell-Light.ufo/glyphs/abreveacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abreveacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abreveacute" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="1EAF"/>
   <outline>
     <component base="a"/>
-    <component base="brevecomb_acutecomb" xOffset="26"/>
+    <component base="brevecomb.loclVIET" xOffset="23"/>
+    <component base="acutecomb.loclVIET" xOffset="156" yOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/abrevedotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/abrevedotbelow.glif
index 75852a56..dff8cb2d 100644
--- a/src/Cantarell-Light.ufo/glyphs/abrevedotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abrevedotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abrevedotbelow" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="1EB7"/>
   <outline>
     <component base="a"/>
-    <component base="dotbelowcomb" xOffset="112"/>
-    <component base="brevecomb" xOffset="27"/>
+    <component base="dotbelowcomb" xOffset="130"/>
+    <component base="brevecomb" xOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/abrevegrave.glif b/src/Cantarell-Light.ufo/glyphs/abrevegrave.glif
index c75020a4..b28d7b5b 100644
--- a/src/Cantarell-Light.ufo/glyphs/abrevegrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abrevegrave.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abrevegrave" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="1EB1"/>
   <outline>
     <component base="a"/>
-    <component base="brevecomb_gravecomb" xOffset="18"/>
+    <component base="brevecomb.loclVIET" xOffset="23"/>
+    <component base="gravecomb.loclVIET" xOffset="52" yOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/abrevehookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/abrevehookabove.glif
index 41c286f5..4a08b3c2 100644
--- a/src/Cantarell-Light.ufo/glyphs/abrevehookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abrevehookabove.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abrevehookabove" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="1EB3"/>
   <outline>
     <component base="a"/>
-    <component base="brevecomb_hookabovecomb" xOffset="22"/>
+    <component base="brevecomb.loclVIET" xOffset="23"/>
+    <component base="hookabovecomb.loclVIET" xOffset="83" yOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/abrevetilde.glif b/src/Cantarell-Light.ufo/glyphs/abrevetilde.glif
index 79452334..563fd21b 100644
--- a/src/Cantarell-Light.ufo/glyphs/abrevetilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abrevetilde.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abrevetilde" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="1EB5"/>
   <outline>
     <component base="a"/>
-    <component base="brevecomb_tildecomb" xOffset="-23"/>
+    <component base="brevecomb.loclVIET" xOffset="23"/>
+    <component base="tildecomb.loclVIET" xOffset="-6" yOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/acaron.glif b/src/Cantarell-Light.ufo/glyphs/acaron.glif
index cc364718..619e77e2 100644
--- a/src/Cantarell-Light.ufo/glyphs/acaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acaron" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="01CE"/>
   <outline>
     <component base="a"/>
-    <component base="caroncomb" xOffset="30"/>
+    <component base="caroncomb" xOffset="48"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/acircumflex.glif b/src/Cantarell-Light.ufo/glyphs/acircumflex.glif
index a575aa26..4dbab78d 100644
--- a/src/Cantarell-Light.ufo/glyphs/acircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflex" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="00E2"/>
   <outline>
     <component base="a"/>
-    <component base="circumflexcomb" xOffset="42"/>
+    <component base="circumflexcomb" xOffset="60"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/acircumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/acircumflexacute.glif
index ce31786d..9bb62b74 100644
--- a/src/Cantarell-Light.ufo/glyphs/acircumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acircumflexacute.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflexacute" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="1EA5"/>
   <outline>
     <component base="a"/>
-    <component base="circumflexcomb_acutecomb" xOffset="37"/>
+    <component base="circumflexcomb.loclVIET" xOffset="55"/>
+    <component base="acutecomb.loclVIET" xOffset="274" yOffset="74"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/acircumflexdotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/acircumflexdotbelow.glif
index 92e90c15..d563b2e8 100644
--- a/src/Cantarell-Light.ufo/glyphs/acircumflexdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acircumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflexdotbelow" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="1EAD"/>
   <outline>
     <component base="a"/>
-    <component base="dotbelowcomb" xOffset="112"/>
-    <component base="circumflexcomb" xOffset="42"/>
+    <component base="dotbelowcomb" xOffset="130"/>
+    <component base="circumflexcomb" xOffset="60"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/acircumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/acircumflexgrave.glif
index 0d1d59ac..4bb5ca73 100644
--- a/src/Cantarell-Light.ufo/glyphs/acircumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acircumflexgrave.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflexgrave" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="1EA7"/>
   <outline>
     <component base="a"/>
-    <component base="circumflexcomb_gravecomb" xOffset="37"/>
+    <component base="circumflexcomb.loclVIET" xOffset="55"/>
+    <component base="gravecomb.loclVIET" xOffset="170" yOffset="74"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/acircumflexhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/acircumflexhookabove.glif
index b3f01d26..f5fd8261 100644
--- a/src/Cantarell-Light.ufo/glyphs/acircumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acircumflexhookabove.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflexhookabove" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="1EA9"/>
   <outline>
     <component base="a"/>
-    <component base="circumflexcomb_hookabovecomb" xOffset="51"/>
+    <component base="circumflexcomb.loclVIET" xOffset="55"/>
+    <component base="hookabovecomb.loclVIET" xOffset="201" yOffset="74"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/acircumflextilde.glif 
b/src/Cantarell-Light.ufo/glyphs/acircumflextilde.glif
index 8264ce99..e494d3b1 100644
--- a/src/Cantarell-Light.ufo/glyphs/acircumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acircumflextilde.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflextilde" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="1EAB"/>
   <outline>
     <component base="a"/>
-    <component base="circumflexcomb_tildecomb" xOffset="-2"/>
+    <component base="circumflexcomb.loclVIET" xOffset="55"/>
+    <component base="tildecomb.loclVIET" xOffset="4" yOffset="80"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>tildecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/acute.glif b/src/Cantarell-Light.ufo/glyphs/acute.glif
index 44530a23..2ae18c78 100644
--- a/src/Cantarell-Light.ufo/glyphs/acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acute.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acute" format="2">
-  <advance width="242"/>
+  <advance width="500"/>
   <unicode hex="00B4"/>
   <outline>
-    <component base="acutecomb" xOffset="-17"/>
+    <component base="acutecomb" xOffset="138"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/adblgrave.glif b/src/Cantarell-Light.ufo/glyphs/adblgrave.glif
index 7710a91c..ea794b5e 100644
--- a/src/Cantarell-Light.ufo/glyphs/adblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/adblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="adblgrave" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="0201"/>
   <outline>
     <component base="a"/>
-    <component base="dblgravecomb" xOffset="-39"/>
+    <component base="dblgravecomb" xOffset="-21"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/adieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/adieresis-cy.glif
index 62cc1669..30973d19 100644
--- a/src/Cantarell-Light.ufo/glyphs/adieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/adieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="adieresis-cy" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="04D3"/>
   <outline>
     <component base="a-cy"/>
-    <component base="dieresiscomb" xOffset="14"/>
+    <component base="dieresiscomb" xOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/adieresis.glif b/src/Cantarell-Light.ufo/glyphs/adieresis.glif
index ed089aeb..88cfec1e 100644
--- a/src/Cantarell-Light.ufo/glyphs/adieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/adieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="adieresis" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="00E4"/>
   <outline>
     <component base="a"/>
-    <component base="dieresiscomb" xOffset="-6"/>
+    <component base="dieresiscomb" xOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/adotbelow.glif b/src/Cantarell-Light.ufo/glyphs/adotbelow.glif
index c006cb6f..842e9a06 100644
--- a/src/Cantarell-Light.ufo/glyphs/adotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/adotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="adotbelow" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="1EA1"/>
   <outline>
     <component base="a"/>
-    <component base="dotbelowcomb" xOffset="112"/>
+    <component base="dotbelowcomb" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ae.glif b/src/Cantarell-Light.ufo/glyphs/ae.glif
index 07d2e526..82787d48 100644
--- a/src/Cantarell-Light.ufo/glyphs/ae.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ae.glif
@@ -1,82 +1,82 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ae" format="2">
-  <advance width="812"/>
+  <advance width="846"/>
   <unicode hex="00E6"/>
-  <anchor x="406" y="0" name="bottom"/>
-  <anchor x="406" y="480" name="top"/>
+  <anchor x="424" y="0" name="bottom"/>
+  <anchor x="424" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="374" y="239" type="line"/>
-      <point x="389" y="239" type="line"/>
-      <point x="389" y="327" type="line" smooth="yes"/>
-      <point x="389" y="429"/>
-      <point x="332" y="486"/>
-      <point x="230" y="486" type="curve" smooth="yes"/>
-      <point x="164" y="486"/>
-      <point x="95" y="463"/>
-      <point x="49" y="426" type="curve"/>
-      <point x="54" y="412" type="line"/>
-      <point x="99" y="447"/>
-      <point x="162" y="468"/>
-      <point x="224" y="468" type="curve" smooth="yes"/>
-      <point x="321" y="468"/>
-      <point x="374" y="416"/>
-      <point x="374" y="322" type="curve" smooth="yes"/>
+      <point x="619" y="-10" type="curve" smooth="yes"/>
+      <point x="674" y="-10"/>
+      <point x="721" y="5"/>
+      <point x="762" y="37" type="curve"/>
+      <point x="757" y="51" type="line"/>
+      <point x="715" y="21"/>
+      <point x="671" y="6"/>
+      <point x="619" y="6" type="curve" smooth="yes"/>
+      <point x="494" y="6"/>
+      <point x="412" y="93"/>
+      <point x="412" y="241" type="curve" smooth="yes"/>
+      <point x="412" y="376"/>
+      <point x="481" y="468"/>
+      <point x="591" y="468" type="curve" smooth="yes"/>
+      <point x="699" y="468"/>
+      <point x="762" y="380"/>
+      <point x="762" y="261" type="curve"/>
+      <point x="401" y="261" type="line"/>
+      <point x="401" y="244" type="line"/>
+      <point x="782" y="244" type="line"/>
+      <point x="783" y="251"/>
+      <point x="783" y="256"/>
+      <point x="783" y="264" type="curve" smooth="yes"/>
+      <point x="783" y="388"/>
+      <point x="710" y="486"/>
+      <point x="593" y="486" type="curve" smooth="yes"/>
+      <point x="475" y="486"/>
+      <point x="392" y="386"/>
+      <point x="392" y="239" type="curve" smooth="yes"/>
+      <point x="392" y="87"/>
+      <point x="480" y="-10"/>
     </contour>
     <contour>
-      <point x="193" y="-10" type="curve" smooth="yes"/>
-      <point x="296" y="-10"/>
-      <point x="380" y="55"/>
-      <point x="397" y="154" type="curve"/>
-      <point x="386" y="162" type="line"/>
-      <point x="372" y="73"/>
-      <point x="297" y="8"/>
-      <point x="197" y="8" type="curve" smooth="yes"/>
-      <point x="119" y="8"/>
-      <point x="67" y="48"/>
-      <point x="67" y="112" type="curve" smooth="yes"/>
-      <point x="67" y="202"/>
-      <point x="170" y="244"/>
-      <point x="382" y="244" type="curve"/>
-      <point x="382" y="262" type="line"/>
-      <point x="166" y="262"/>
-      <point x="46" y="210"/>
-      <point x="46" y="109" type="curve" smooth="yes"/>
-      <point x="46" y="37"/>
-      <point x="106" y="-10"/>
+      <point x="211" y="-10" type="curve" smooth="yes"/>
+      <point x="314" y="-10"/>
+      <point x="398" y="55"/>
+      <point x="415" y="154" type="curve"/>
+      <point x="404" y="162" type="line"/>
+      <point x="390" y="73"/>
+      <point x="315" y="8"/>
+      <point x="215" y="8" type="curve" smooth="yes"/>
+      <point x="137" y="8"/>
+      <point x="85" y="48"/>
+      <point x="85" y="112" type="curve" smooth="yes"/>
+      <point x="85" y="202"/>
+      <point x="188" y="244"/>
+      <point x="400" y="244" type="curve"/>
+      <point x="400" y="262" type="line"/>
+      <point x="184" y="262"/>
+      <point x="64" y="210"/>
+      <point x="64" y="109" type="curve" smooth="yes"/>
+      <point x="64" y="37"/>
+      <point x="124" y="-10"/>
     </contour>
     <contour>
-      <point x="601" y="-10" type="curve" smooth="yes"/>
-      <point x="656" y="-10"/>
-      <point x="703" y="5"/>
-      <point x="744" y="37" type="curve"/>
-      <point x="739" y="51" type="line"/>
-      <point x="697" y="21"/>
-      <point x="653" y="6"/>
-      <point x="601" y="6" type="curve" smooth="yes"/>
-      <point x="476" y="6"/>
-      <point x="394" y="93"/>
-      <point x="394" y="241" type="curve" smooth="yes"/>
-      <point x="394" y="376"/>
-      <point x="463" y="468"/>
-      <point x="573" y="468" type="curve" smooth="yes"/>
-      <point x="681" y="468"/>
-      <point x="744" y="380"/>
-      <point x="744" y="261" type="curve"/>
-      <point x="383" y="261" type="line"/>
-      <point x="383" y="244" type="line"/>
-      <point x="764" y="244" type="line"/>
-      <point x="765" y="251"/>
-      <point x="765" y="256"/>
-      <point x="765" y="264" type="curve" smooth="yes"/>
-      <point x="765" y="388"/>
-      <point x="692" y="486"/>
-      <point x="575" y="486" type="curve" smooth="yes"/>
-      <point x="457" y="486"/>
-      <point x="374" y="386"/>
-      <point x="374" y="239" type="curve" smooth="yes"/>
-      <point x="374" y="87"/>
-      <point x="462" y="-10"/>
+      <point x="392" y="239" type="line"/>
+      <point x="407" y="239" type="line"/>
+      <point x="407" y="327" type="line" smooth="yes"/>
+      <point x="407" y="429"/>
+      <point x="350" y="486"/>
+      <point x="248" y="486" type="curve" smooth="yes"/>
+      <point x="182" y="486"/>
+      <point x="113" y="463"/>
+      <point x="67" y="426" type="curve"/>
+      <point x="72" y="412" type="line"/>
+      <point x="117" y="447"/>
+      <point x="180" y="468"/>
+      <point x="242" y="468" type="curve" smooth="yes"/>
+      <point x="339" y="468"/>
+      <point x="392" y="416"/>
+      <point x="392" y="322" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/aeacute.glif b/src/Cantarell-Light.ufo/glyphs/aeacute.glif
index cbdf02bb..f76a0288 100644
--- a/src/Cantarell-Light.ufo/glyphs/aeacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/aeacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aeacute" format="2">
-  <advance width="812"/>
+  <advance width="846"/>
   <unicode hex="01FD"/>
   <outline>
     <component base="ae"/>
-    <component base="acutecomb" xOffset="339"/>
+    <component base="acutecomb" xOffset="357"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/agrave.glif b/src/Cantarell-Light.ufo/glyphs/agrave.glif
index 35942bee..93c4ece7 100644
--- a/src/Cantarell-Light.ufo/glyphs/agrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/agrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="agrave" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="00E0"/>
   <outline>
     <component base="a"/>
-    <component base="gravecomb" xOffset="29"/>
+    <component base="gravecomb" xOffset="47"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ahookabove.glif b/src/Cantarell-Light.ufo/glyphs/ahookabove.glif
index d4ef0dfd..5c783bde 100644
--- a/src/Cantarell-Light.ufo/glyphs/ahookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ahookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ahookabove" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="1EA3"/>
   <outline>
     <component base="a"/>
-    <component base="hookabovecomb" xOffset="61"/>
+    <component base="hookabovecomb" xOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/aie-cy.glif b/src/Cantarell-Light.ufo/glyphs/aie-cy.glif
index 225308da..10f43b49 100644
--- a/src/Cantarell-Light.ufo/glyphs/aie-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/aie-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aie-cy" format="2">
-  <advance width="812"/>
+  <advance width="846"/>
   <unicode hex="04D5"/>
   <outline>
     <component base="ae"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ainvertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/ainvertedbreve.glif
index f8919c12..2e7ee9f2 100644
--- a/src/Cantarell-Light.ufo/glyphs/ainvertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ainvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ainvertedbreve" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="0203"/>
   <outline>
     <component base="a"/>
-    <component base="breveinvertedcomb" xOffset="12"/>
+    <component base="breveinvertedcomb" xOffset="30"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/amacron.glif b/src/Cantarell-Light.ufo/glyphs/amacron.glif
index 8aec4530..4d92777c 100644
--- a/src/Cantarell-Light.ufo/glyphs/amacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/amacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="amacron" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="0101"/>
   <outline>
     <component base="a"/>
-    <component base="macroncomb" xOffset="-30"/>
+    <component base="macroncomb" xOffset="-12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ampersand.glif b/src/Cantarell-Light.ufo/glyphs/ampersand.glif
index 2769cdaf..6c95b317 100644
--- a/src/Cantarell-Light.ufo/glyphs/ampersand.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ampersand.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ampersand" format="2">
-  <advance width="697"/>
+  <advance width="675"/>
   <unicode hex="0026"/>
   <outline>
     <contour>
-      <point x="584" y="-5" type="curve"/>
-      <point x="597" y="10" type="line"/>
-      <point x="290" y="295"/>
-      <point x="193" y="418"/>
-      <point x="193" y="538" type="curve" smooth="yes"/>
-      <point x="193" y="628"/>
-      <point x="243" y="686"/>
-      <point x="320" y="686" type="curve" smooth="yes"/>
-      <point x="391" y="686"/>
-      <point x="441" y="636"/>
-      <point x="441" y="567" type="curve" smooth="yes"/>
-      <point x="441" y="382"/>
-      <point x="91" y="412"/>
-      <point x="91" y="184" type="curve" smooth="yes"/>
-      <point x="91" y="65"/>
-      <point x="186" y="-12"/>
-      <point x="294" y="-12" type="curve" smooth="yes"/>
-      <point x="421" y="-12"/>
-      <point x="540" y="93"/>
-      <point x="613" y="271" type="curve"/>
-      <point x="597" y="279" type="line"/>
-      <point x="524" y="107"/>
-      <point x="413" y="6"/>
-      <point x="297" y="6" type="curve" smooth="yes"/>
-      <point x="198" y="6"/>
-      <point x="112" y="79"/>
-      <point x="112" y="186" type="curve" smooth="yes"/>
-      <point x="112" y="402"/>
-      <point x="461" y="367"/>
-      <point x="461" y="568" type="curve" smooth="yes"/>
-      <point x="461" y="649"/>
-      <point x="404" y="704"/>
-      <point x="322" y="704" type="curve" smooth="yes"/>
-      <point x="232" y="704"/>
-      <point x="172" y="637"/>
-      <point x="172" y="537" type="curve" smooth="yes"/>
-      <point x="172" y="411"/>
-      <point x="274" y="280"/>
+      <point x="283" y="-12" type="curve" smooth="yes"/>
+      <point x="410" y="-12"/>
+      <point x="529" y="93"/>
+      <point x="602" y="271" type="curve"/>
+      <point x="586" y="279" type="line"/>
+      <point x="513" y="107"/>
+      <point x="402" y="6"/>
+      <point x="286" y="6" type="curve" smooth="yes"/>
+      <point x="187" y="6"/>
+      <point x="101" y="79"/>
+      <point x="101" y="186" type="curve" smooth="yes"/>
+      <point x="101" y="402"/>
+      <point x="450" y="367"/>
+      <point x="450" y="568" type="curve" smooth="yes"/>
+      <point x="450" y="649"/>
+      <point x="393" y="704"/>
+      <point x="311" y="704" type="curve" smooth="yes"/>
+      <point x="221" y="704"/>
+      <point x="161" y="637"/>
+      <point x="161" y="537" type="curve" smooth="yes"/>
+      <point x="161" y="411"/>
+      <point x="263" y="280"/>
+      <point x="573" y="-5" type="curve"/>
+      <point x="586" y="10" type="line"/>
+      <point x="279" y="295"/>
+      <point x="182" y="418"/>
+      <point x="182" y="538" type="curve" smooth="yes"/>
+      <point x="182" y="628"/>
+      <point x="232" y="686"/>
+      <point x="309" y="686" type="curve" smooth="yes"/>
+      <point x="380" y="686"/>
+      <point x="430" y="636"/>
+      <point x="430" y="567" type="curve" smooth="yes"/>
+      <point x="430" y="382"/>
+      <point x="80" y="412"/>
+      <point x="80" y="184" type="curve" smooth="yes"/>
+      <point x="80" y="65"/>
+      <point x="175" y="-12"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/aogonek.glif b/src/Cantarell-Light.ufo/glyphs/aogonek.glif
index aa7c5852..281983ea 100644
--- a/src/Cantarell-Light.ufo/glyphs/aogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/aogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aogonek" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="0105"/>
   <outline>
     <component base="a"/>
-    <component base="ogonekcomb" xOffset="-22"/>
+    <component base="ogonekcomb" xOffset="-4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/apostrophemod.glif 
b/src/Cantarell-Light.ufo/glyphs/apostrophemod.glif
index c2751f0c..c14bd1ab 100644
--- a/src/Cantarell-Light.ufo/glyphs/apostrophemod.glif
+++ b/src/Cantarell-Light.ufo/glyphs/apostrophemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="apostrophemod" format="2">
-  <advance width="226"/>
+  <advance width="148"/>
   <unicode hex="02BC"/>
   <outline>
-    <component base="quoteright" xOffset="-21"/>
+    <component base="quoteright" xOffset="-42"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/approxequal.glif b/src/Cantarell-Light.ufo/glyphs/approxequal.glif
index 159fbf99..8a041f5b 100644
--- a/src/Cantarell-Light.ufo/glyphs/approxequal.glif
+++ b/src/Cantarell-Light.ufo/glyphs/approxequal.glif
@@ -1,51 +1,57 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="approxequal" format="2">
-  <advance width="632"/>
+  <advance width="580"/>
   <unicode hex="2248"/>
   <outline>
     <contour>
-      <point x="115" y="372" type="line"/>
-      <point x="130" y="415"/>
-      <point x="173" y="454"/>
-      <point x="222" y="454" type="curve" smooth="yes"/>
-      <point x="296" y="454"/>
-      <point x="320" y="368"/>
-      <point x="402" y="368" type="curve" smooth="yes"/>
-      <point x="461" y="368"/>
-      <point x="505" y="414"/>
-      <point x="518" y="461" type="curve"/>
-      <point x="506" y="466" type="line"/>
-      <point x="489" y="425"/>
-      <point x="449" y="387"/>
-      <point x="403" y="387" type="curve" smooth="yes"/>
-      <point x="333" y="387"/>
-      <point x="308" y="473"/>
-      <point x="225" y="473" type="curve" smooth="yes"/>
-      <point x="170" y="473"/>
-      <point x="117" y="433"/>
-      <point x="103" y="377" type="curve"/>
+      <point x="392" y="378" type="curve" smooth="yes"/>
+      <point x="457" y="378"/>
+      <point x="507" y="424"/>
+      <point x="522" y="471" type="curve"/>
+      <point x="510" y="476" type="line"/>
+      <point x="491" y="435"/>
+      <point x="445" y="397"/>
+      <point x="393" y="397" type="curve" smooth="yes"/>
+      <point x="315" y="397"/>
+      <point x="287" y="483"/>
+      <point x="196" y="483" type="curve" smooth="yes"/>
+      <point x="134" y="483"/>
+      <point x="73" y="443"/>
+      <point x="58" y="387" type="curve"/>
+      <point x="70" y="382" type="line"/>
+      <point x="87" y="425"/>
+      <point x="136" y="464"/>
+      <point x="192" y="464" type="curve" smooth="yes"/>
+      <point x="274" y="464"/>
+      <point x="303" y="378"/>
     </contour>
     <contour>
-      <point x="115" y="152" type="line"/>
-      <point x="130" y="195"/>
-      <point x="173" y="234"/>
-      <point x="222" y="234" type="curve" smooth="yes"/>
-      <point x="296" y="234"/>
-      <point x="320" y="148"/>
-      <point x="402" y="148" type="curve" smooth="yes"/>
-      <point x="461" y="148"/>
-      <point x="505" y="194"/>
-      <point x="518" y="241" type="curve"/>
-      <point x="506" y="246" type="line"/>
-      <point x="489" y="205"/>
-      <point x="449" y="167"/>
-      <point x="403" y="167" type="curve" smooth="yes"/>
-      <point x="333" y="167"/>
-      <point x="308" y="253"/>
-      <point x="225" y="253" type="curve" smooth="yes"/>
-      <point x="170" y="253"/>
-      <point x="117" y="213"/>
-      <point x="103" y="157" type="curve"/>
+      <point x="392" y="148" type="curve" smooth="yes"/>
+      <point x="457" y="148"/>
+      <point x="507" y="194"/>
+      <point x="522" y="241" type="curve"/>
+      <point x="510" y="246" type="line"/>
+      <point x="491" y="205"/>
+      <point x="445" y="167"/>
+      <point x="393" y="167" type="curve" smooth="yes"/>
+      <point x="315" y="167"/>
+      <point x="287" y="253"/>
+      <point x="196" y="253" type="curve" smooth="yes"/>
+      <point x="134" y="253"/>
+      <point x="73" y="213"/>
+      <point x="58" y="157" type="curve"/>
+      <point x="70" y="152" type="line"/>
+      <point x="87" y="195"/>
+      <point x="136" y="234"/>
+      <point x="192" y="234" type="curve" smooth="yes"/>
+      <point x="274" y="234"/>
+      <point x="303" y="148"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/aring.glif b/src/Cantarell-Light.ufo/glyphs/aring.glif
index 04e6faec..0d102ba6 100644
--- a/src/Cantarell-Light.ufo/glyphs/aring.glif
+++ b/src/Cantarell-Light.ufo/glyphs/aring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aring" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="00E5"/>
   <outline>
     <component base="a"/>
-    <component base="ringcomb" xOffset="39"/>
+    <component base="ringcomb" xOffset="57"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/aringacute.glif b/src/Cantarell-Light.ufo/glyphs/aringacute.glif
index fd744eb7..a4612a60 100644
--- a/src/Cantarell-Light.ufo/glyphs/aringacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/aringacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aringacute" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="01FB"/>
   <outline>
     <component base="a"/>
-    <component base="ringcomb_acutecomb" xOffset="63"/>
+    <component base="ringcomb_acutecomb" xOffset="81"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/asciicircum.glif b/src/Cantarell-Light.ufo/glyphs/asciicircum.glif
index 5939854e..8113a06a 100644
--- a/src/Cantarell-Light.ufo/glyphs/asciicircum.glif
+++ b/src/Cantarell-Light.ufo/glyphs/asciicircum.glif
@@ -1,17 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="asciicircum" format="2">
-  <advance width="582"/>
+  <advance width="580"/>
   <unicode hex="005E"/>
   <outline>
     <contour>
-      <point x="85" y="272" type="line"/>
+      <point x="91" y="313" type="line"/>
       <point x="293" y="696" type="line"/>
       <point x="284" y="696" type="line"/>
-      <point x="495" y="273" type="line"/>
-      <point x="511" y="281" type="line"/>
+      <point x="474" y="314" type="line"/>
+      <point x="490" y="322" type="line"/>
       <point x="303" y="701" type="line"/>
       <point x="275" y="701" type="line"/>
-      <point x="71" y="280" type="line"/>
+      <point x="77" y="321" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/asciitilde.glif b/src/Cantarell-Light.ufo/glyphs/asciitilde.glif
index 97a90164..e11e3759 100644
--- a/src/Cantarell-Light.ufo/glyphs/asciitilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/asciitilde.glif
@@ -1,29 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="asciitilde" format="2">
-  <advance width="653"/>
+  <advance width="580"/>
   <unicode hex="007E"/>
   <outline>
     <contour>
-      <point x="117" y="278" type="line"/>
-      <point x="136" y="326"/>
-      <point x="180" y="368"/>
-      <point x="229" y="368" type="curve" smooth="yes"/>
-      <point x="298" y="368"/>
-      <point x="341" y="273"/>
-      <point x="424" y="273" type="curve" smooth="yes"/>
-      <point x="479" y="273"/>
-      <point x="532" y="316"/>
-      <point x="549" y="376" type="curve"/>
-      <point x="534" y="380" type="line"/>
-      <point x="517" y="334"/>
-      <point x="477" y="291"/>
-      <point x="428" y="291" type="curve" smooth="yes"/>
-      <point x="353" y="291"/>
-      <point x="313" y="387"/>
-      <point x="235" y="387" type="curve" smooth="yes"/>
-      <point x="174" y="387"/>
-      <point x="118" y="336"/>
-      <point x="103" y="283" type="curve"/>
+      <point x="388" y="268" type="curve" smooth="yes"/>
+      <point x="443" y="268"/>
+      <point x="496" y="311"/>
+      <point x="513" y="371" type="curve"/>
+      <point x="498" y="375" type="line"/>
+      <point x="481" y="329"/>
+      <point x="441" y="286"/>
+      <point x="392" y="286" type="curve" smooth="yes"/>
+      <point x="317" y="286"/>
+      <point x="277" y="382"/>
+      <point x="199" y="382" type="curve" smooth="yes"/>
+      <point x="138" y="382"/>
+      <point x="82" y="331"/>
+      <point x="67" y="278" type="curve"/>
+      <point x="81" y="273" type="line"/>
+      <point x="100" y="321"/>
+      <point x="144" y="363"/>
+      <point x="193" y="363" type="curve" smooth="yes"/>
+      <point x="262" y="363"/>
+      <point x="305" y="268"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/asterisk.glif b/src/Cantarell-Light.ufo/glyphs/asterisk.glif
index 4d527bf0..95a2ab9b 100644
--- a/src/Cantarell-Light.ufo/glyphs/asterisk.glif
+++ b/src/Cantarell-Light.ufo/glyphs/asterisk.glif
@@ -1,43 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="asterisk" format="2">
-  <advance width="461"/>
+  <advance width="479"/>
   <unicode hex="002A"/>
   <outline>
     <contour>
-      <point x="232" y="488" type="line"/>
-      <point x="409" y="585" type="line"/>
-      <point x="397" y="603" type="line"/>
-      <point x="226" y="497" type="line"/>
+      <point x="408" y="369" type="line"/>
+      <point x="420" y="387" type="line"/>
+      <point x="241" y="494" type="line"/>
+      <point x="234" y="484" type="line"/>
     </contour>
     <contour>
-      <point x="62" y="372" type="line"/>
-      <point x="232" y="487" type="line"/>
-      <point x="226" y="497" type="line"/>
-      <point x="50" y="390" type="line"/>
+      <point x="71" y="372" type="line"/>
+      <point x="241" y="487" type="line"/>
+      <point x="235" y="497" type="line"/>
+      <point x="59" y="390" type="line"/>
     </contour>
     <contour>
-      <point x="216" y="283" type="line"/>
-      <point x="237" y="283" type="line"/>
-      <point x="234" y="487" type="line"/>
-      <point x="220" y="487" type="line"/>
+      <point x="225" y="283" type="line"/>
+      <point x="246" y="283" type="line"/>
+      <point x="243" y="487" type="line"/>
+      <point x="229" y="487" type="line"/>
     </contour>
     <contour>
-      <point x="225" y="484" type="line"/>
-      <point x="230" y="494" type="line"/>
-      <point x="63" y="608" type="line"/>
-      <point x="51" y="590" type="line"/>
+      <point x="234" y="484" type="line"/>
+      <point x="239" y="494" type="line"/>
+      <point x="72" y="608" type="line"/>
+      <point x="60" y="590" type="line"/>
     </contour>
     <contour>
-      <point x="399" y="369" type="line"/>
-      <point x="411" y="387" type="line"/>
-      <point x="232" y="494" type="line"/>
-      <point x="225" y="484" type="line"/>
+      <point x="229" y="487" type="line"/>
+      <point x="243" y="487" type="line"/>
+      <point x="246" y="694" type="line"/>
+      <point x="225" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="220" y="487" type="line"/>
-      <point x="234" y="487" type="line"/>
-      <point x="237" y="694" type="line"/>
-      <point x="216" y="694" type="line"/>
+      <point x="241" y="488" type="line"/>
+      <point x="418" y="585" type="line"/>
+      <point x="406" y="603" type="line"/>
+      <point x="235" y="497" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/at.glif b/src/Cantarell-Light.ufo/glyphs/at.glif
index cf41bd63..9b614749 100644
--- a/src/Cantarell-Light.ufo/glyphs/at.glif
+++ b/src/Cantarell-Light.ufo/glyphs/at.glif
@@ -1,82 +1,82 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="at" format="2">
-  <advance width="1004"/>
+  <advance width="984"/>
   <unicode hex="0040"/>
   <outline>
     <contour>
-      <point x="501" y="-148" type="curve" smooth="yes"/>
-      <point x="569" y="-148"/>
-      <point x="633" y="-135"/>
-      <point x="675" y="-113" type="curve"/>
-      <point x="670" y="-98" type="line"/>
-      <point x="627" y="-122"/>
-      <point x="563" y="-133"/>
-      <point x="502" y="-133" type="curve" smooth="yes"/>
-      <point x="273" y="-133"/>
-      <point x="121" y="24"/>
-      <point x="121" y="265" type="curve" smooth="yes"/>
-      <point x="121" y="512"/>
-      <point x="280" y="687"/>
-      <point x="524" y="687" type="curve" smooth="yes"/>
-      <point x="743" y="687"/>
-      <point x="887" y="546"/>
-      <point x="887" y="326" type="curve" smooth="yes"/>
-      <point x="887" y="181"/>
-      <point x="824" y="86"/>
-      <point x="730" y="86" type="curve" smooth="yes"/>
-      <point x="679" y="86"/>
-      <point x="645" y="116"/>
-      <point x="645" y="162" type="curve"/>
-      <point x="626" y="162" type="line"/>
-      <point x="626" y="106"/>
-      <point x="666" y="69"/>
-      <point x="729" y="69" type="curve" smooth="yes"/>
-      <point x="835" y="69"/>
-      <point x="907" y="172"/>
-      <point x="907" y="329" type="curve" smooth="yes"/>
-      <point x="907" y="558"/>
-      <point x="755" y="704"/>
-      <point x="525" y="704" type="curve" smooth="yes"/>
-      <point x="269" y="704"/>
-      <point x="101" y="522"/>
-      <point x="101" y="265" type="curve" smooth="yes"/>
-      <point x="101" y="14"/>
-      <point x="260" y="-148"/>
+      <point x="491" y="-148" type="curve" smooth="yes"/>
+      <point x="559" y="-148"/>
+      <point x="623" y="-135"/>
+      <point x="665" y="-113" type="curve"/>
+      <point x="660" y="-98" type="line"/>
+      <point x="617" y="-122"/>
+      <point x="553" y="-133"/>
+      <point x="492" y="-133" type="curve" smooth="yes"/>
+      <point x="263" y="-133"/>
+      <point x="111" y="24"/>
+      <point x="111" y="265" type="curve" smooth="yes"/>
+      <point x="111" y="512"/>
+      <point x="270" y="687"/>
+      <point x="514" y="687" type="curve" smooth="yes"/>
+      <point x="733" y="687"/>
+      <point x="877" y="546"/>
+      <point x="877" y="326" type="curve" smooth="yes"/>
+      <point x="877" y="181"/>
+      <point x="814" y="86"/>
+      <point x="720" y="86" type="curve" smooth="yes"/>
+      <point x="669" y="86"/>
+      <point x="635" y="116"/>
+      <point x="635" y="162" type="curve"/>
+      <point x="616" y="162" type="line"/>
+      <point x="616" y="106"/>
+      <point x="656" y="69"/>
+      <point x="719" y="69" type="curve" smooth="yes"/>
+      <point x="825" y="69"/>
+      <point x="897" y="172"/>
+      <point x="897" y="329" type="curve" smooth="yes"/>
+      <point x="897" y="558"/>
+      <point x="745" y="704"/>
+      <point x="515" y="704" type="curve" smooth="yes"/>
+      <point x="259" y="704"/>
+      <point x="91" y="522"/>
+      <point x="91" y="265" type="curve" smooth="yes"/>
+      <point x="91" y="14"/>
+      <point x="250" y="-148"/>
     </contour>
     <contour>
-      <point x="484" y="59" type="curve" smooth="yes"/>
-      <point x="535" y="59"/>
-      <point x="595" y="82"/>
-      <point x="637" y="143" type="curve"/>
-      <point x="630" y="150" type="line"/>
-      <point x="576" y="89"/>
-      <point x="524" y="76"/>
-      <point x="487" y="76" type="curve" smooth="yes"/>
-      <point x="408" y="76"/>
-      <point x="353" y="141"/>
-      <point x="353" y="253" type="curve" smooth="yes"/>
-      <point x="353" y="381"/>
-      <point x="425" y="473"/>
-      <point x="520" y="473" type="curve" smooth="yes"/>
-      <point x="582" y="473"/>
-      <point x="622" y="434"/>
-      <point x="648" y="375" type="curve"/>
-      <point x="653" y="385" type="line"/>
-      <point x="635" y="448"/>
-      <point x="595" y="490"/>
-      <point x="524" y="490" type="curve" smooth="yes"/>
-      <point x="413" y="490"/>
-      <point x="332" y="387"/>
-      <point x="332" y="251" type="curve" smooth="yes"/>
-      <point x="332" y="130"/>
-      <point x="396" y="59"/>
+      <point x="474" y="59" type="curve" smooth="yes"/>
+      <point x="525" y="59"/>
+      <point x="585" y="82"/>
+      <point x="627" y="143" type="curve"/>
+      <point x="620" y="150" type="line"/>
+      <point x="566" y="89"/>
+      <point x="514" y="76"/>
+      <point x="477" y="76" type="curve" smooth="yes"/>
+      <point x="398" y="76"/>
+      <point x="343" y="141"/>
+      <point x="343" y="253" type="curve" smooth="yes"/>
+      <point x="343" y="381"/>
+      <point x="415" y="473"/>
+      <point x="510" y="473" type="curve" smooth="yes"/>
+      <point x="572" y="473"/>
+      <point x="612" y="434"/>
+      <point x="638" y="375" type="curve"/>
+      <point x="643" y="385" type="line"/>
+      <point x="625" y="448"/>
+      <point x="585" y="490"/>
+      <point x="514" y="490" type="curve" smooth="yes"/>
+      <point x="403" y="490"/>
+      <point x="322" y="387"/>
+      <point x="322" y="251" type="curve" smooth="yes"/>
+      <point x="322" y="130"/>
+      <point x="386" y="59"/>
     </contour>
     <contour>
-      <point x="626" y="162" type="line"/>
-      <point x="645" y="162" type="line"/>
-      <point x="664" y="478" type="line"/>
-      <point x="649" y="478" type="line"/>
-      <point x="640" y="396" type="line"/>
+      <point x="616" y="162" type="line"/>
+      <point x="635" y="162" type="line"/>
+      <point x="654" y="478" type="line"/>
+      <point x="639" y="478" type="line"/>
+      <point x="630" y="396" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/atilde.glif b/src/Cantarell-Light.ufo/glyphs/atilde.glif
index fb10455b..192af12a 100644
--- a/src/Cantarell-Light.ufo/glyphs/atilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/atilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="atilde" format="2">
-  <advance width="466"/>
+  <advance width="501"/>
   <unicode hex="00E3"/>
   <outline>
     <component base="a"/>
-    <component base="tildecomb" xOffset="-22"/>
+    <component base="tildecomb" xOffset="-4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/b.glif b/src/Cantarell-Light.ufo/glyphs/b.glif
index 25b42c33..5753be2f 100644
--- a/src/Cantarell-Light.ufo/glyphs/b.glif
+++ b/src/Cantarell-Light.ufo/glyphs/b.glif
@@ -1,47 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="b" format="2">
-  <advance width="534"/>
+  <advance width="564"/>
   <unicode hex="0062"/>
-  <note>
-b
-</note>
-  <anchor x="260" y="0" name="bottom"/>
-  <anchor x="260" y="480" name="top"/>
+  <anchor x="279" y="0" name="bottom"/>
+  <anchor x="279" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="104" y="0" type="line"/>
-      <point x="107" y="64" type="line"/>
-      <point x="107" y="739" type="line"/>
-      <point x="88" y="739" type="line"/>
+      <point x="286" y="-10" type="curve" smooth="yes"/>
+      <point x="411" y="-10"/>
+      <point x="496" y="90"/>
+      <point x="496" y="240" type="curve" smooth="yes"/>
+      <point x="496" y="389"/>
+      <point x="412" y="486"/>
+      <point x="288" y="486" type="curve" smooth="yes"/>
+      <point x="205" y="486"/>
+      <point x="145" y="444"/>
+      <point x="112" y="375" type="curve"/>
+      <point x="116" y="355" type="line"/>
+      <point x="146" y="425"/>
+      <point x="204" y="468"/>
+      <point x="283" y="468" type="curve" smooth="yes"/>
+      <point x="399" y="468"/>
+      <point x="475" y="378"/>
+      <point x="475" y="237" type="curve" smooth="yes"/>
+      <point x="475" y="97"/>
+      <point x="400" y="8"/>
+      <point x="288" y="8" type="curve" smooth="yes"/>
+      <point x="208" y="8"/>
+      <point x="147" y="53"/>
+      <point x="117" y="126" type="curve"/>
+      <point x="114" y="96" type="line"/>
+      <point x="147" y="29"/>
+      <point x="206" y="-10"/>
     </contour>
     <contour>
-      <point x="267" y="-10" type="curve" smooth="yes"/>
-      <point x="392" y="-10"/>
-      <point x="477" y="90"/>
-      <point x="477" y="240" type="curve" smooth="yes"/>
-      <point x="477" y="389"/>
-      <point x="393" y="486"/>
-      <point x="269" y="486" type="curve" smooth="yes"/>
-      <point x="186" y="486"/>
-      <point x="126" y="444"/>
-      <point x="93" y="375" type="curve"/>
-      <point x="97" y="355" type="line"/>
-      <point x="127" y="425"/>
-      <point x="185" y="468"/>
-      <point x="264" y="468" type="curve" smooth="yes"/>
-      <point x="380" y="468"/>
-      <point x="456" y="378"/>
-      <point x="456" y="237" type="curve" smooth="yes"/>
-      <point x="456" y="97"/>
-      <point x="381" y="8"/>
-      <point x="269" y="8" type="curve" smooth="yes"/>
-      <point x="189" y="8"/>
-      <point x="128" y="53"/>
-      <point x="98" y="126" type="curve"/>
-      <point x="95" y="96" type="line"/>
-      <point x="128" y="29"/>
-      <point x="187" y="-10"/>
+      <point x="107" y="0" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="126" y="64" type="line"/>
+      <point x="126" y="739" type="line"/>
+      <point x="107" y="739" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/backslash.glif b/src/Cantarell-Light.ufo/glyphs/backslash.glif
index f47b6f94..67d5aae2 100644
--- a/src/Cantarell-Light.ufo/glyphs/backslash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/backslash.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="backslash" format="2">
-  <advance width="293"/>
+  <advance width="303"/>
   <unicode hex="005C"/>
   <outline>
-    <component base="slash" xScale="-1" xOffset="302"/>
+    <component base="slash" xScale="-1" xOffset="303"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|slash</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|slash</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/bar.glif b/src/Cantarell-Light.ufo/glyphs/bar.glif
index 7b8c0d19..8d888ff8 100644
--- a/src/Cantarell-Light.ufo/glyphs/bar.glif
+++ b/src/Cantarell-Light.ufo/glyphs/bar.glif
@@ -1,13 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bar" format="2">
-  <advance width="307"/>
+  <advance width="265"/>
   <unicode hex="007C"/>
   <outline>
     <contour>
-      <point x="144" y="-157" type="line"/>
-      <point x="163" y="-157" type="line"/>
-      <point x="163" y="739" type="line"/>
-      <point x="144" y="739" type="line"/>
+      <point x="123" y="-180" type="line"/>
+      <point x="142" y="-180" type="line"/>
+      <point x="142" y="739" type="line"/>
+      <point x="123" y="739" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/be-cy.glif b/src/Cantarell-Light.ufo/glyphs/be-cy.glif
index b5711caa..9805c202 100644
--- a/src/Cantarell-Light.ufo/glyphs/be-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/be-cy.glif
@@ -1,47 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="be-cy" format="2">
-  <advance width="515"/>
+  <advance width="551"/>
   <unicode hex="0431"/>
   <outline>
     <contour>
-      <point x="265" y="-10" type="curve" smooth="yes"/>
-      <point x="384" y="-10"/>
-      <point x="460" y="83"/>
-      <point x="460" y="222" type="curve" smooth="yes"/>
-      <point x="460" y="363"/>
-      <point x="390" y="446"/>
-      <point x="273" y="446" type="curve" smooth="yes"/>
-      <point x="183" y="446"/>
-      <point x="112" y="400"/>
-      <point x="81" y="322" type="curve"/>
-      <point x="81" y="292" type="line"/>
-      <point x="115" y="381"/>
-      <point x="180" y="428"/>
-      <point x="265" y="428" type="curve" smooth="yes"/>
-      <point x="374" y="428"/>
-      <point x="439" y="353"/>
-      <point x="439" y="220" type="curve" smooth="yes"/>
-      <point x="439" y="91"/>
-      <point x="372" y="8"/>
-      <point x="266" y="8" type="curve" smooth="yes"/>
-      <point x="149" y="8"/>
-      <point x="89" y="115"/>
-      <point x="89" y="322" type="curve" smooth="yes"/>
-      <point x="89" y="574"/>
-      <point x="147" y="673"/>
-      <point x="295" y="673" type="curve" smooth="yes"/>
-      <point x="363" y="673"/>
-      <point x="406" y="695"/>
-      <point x="424" y="739" type="curve"/>
-      <point x="408" y="744" type="line"/>
-      <point x="391" y="711"/>
-      <point x="350" y="694"/>
-      <point x="288" y="694" type="curve" smooth="yes"/>
-      <point x="135" y="694"/>
-      <point x="69" y="581"/>
-      <point x="69" y="316" type="curve" smooth="yes"/>
-      <point x="69" y="101"/>
-      <point x="135" y="-10"/>
+      <point x="283" y="-10" type="curve" smooth="yes"/>
+      <point x="402" y="-10"/>
+      <point x="478" y="83"/>
+      <point x="478" y="222" type="curve" smooth="yes"/>
+      <point x="478" y="363"/>
+      <point x="408" y="446"/>
+      <point x="291" y="446" type="curve" smooth="yes"/>
+      <point x="201" y="446"/>
+      <point x="130" y="400"/>
+      <point x="99" y="322" type="curve"/>
+      <point x="99" y="292" type="line"/>
+      <point x="133" y="381"/>
+      <point x="198" y="428"/>
+      <point x="283" y="428" type="curve" smooth="yes"/>
+      <point x="392" y="428"/>
+      <point x="457" y="353"/>
+      <point x="457" y="220" type="curve" smooth="yes"/>
+      <point x="457" y="91"/>
+      <point x="390" y="8"/>
+      <point x="284" y="8" type="curve" smooth="yes"/>
+      <point x="167" y="8"/>
+      <point x="107" y="115"/>
+      <point x="107" y="322" type="curve" smooth="yes"/>
+      <point x="107" y="560"/>
+      <point x="156" y="643"/>
+      <point x="317" y="678" type="curve" smooth="yes"/>
+      <point x="427" y="702" type="line"/>
+      <point x="422" y="720" type="line"/>
+      <point x="311" y="696" type="line" smooth="yes"/>
+      <point x="144" y="660"/>
+      <point x="87" y="563"/>
+      <point x="87" y="316" type="curve" smooth="yes"/>
+      <point x="87" y="101"/>
+      <point x="153" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/blackC_ircle.glif 
b/src/Cantarell-Light.ufo/glyphs/blackC_ircle.glif
index 086e2c50..85f3ab7c 100644
--- a/src/Cantarell-Light.ufo/glyphs/blackC_ircle.glif
+++ b/src/Cantarell-Light.ufo/glyphs/blackC_ircle.glif
@@ -2,9 +2,6 @@
 <glyph name="blackCircle" format="2">
   <advance width="673"/>
   <unicode hex="25CF"/>
-  <note>
-H18533
-</note>
   <outline>
     <contour>
       <point x="334" y="109" type="curve" smooth="yes"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/blank.glif b/src/Cantarell-Light.ufo/glyphs/blank.glif
index 809261f8..15890f83 100644
--- a/src/Cantarell-Light.ufo/glyphs/blank.glif
+++ b/src/Cantarell-Light.ufo/glyphs/blank.glif
@@ -1,20 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="blank" format="2">
-  <advance width="801"/>
+  <advance width="759"/>
   <unicode hex="2423"/>
-  <note>
-uni2423
-</note>
   <outline>
     <contour>
-      <point x="144" y="0" type="line"/>
-      <point x="657" y="0" type="line"/>
-      <point x="657" y="116" type="line"/>
-      <point x="637" y="116" type="line"/>
-      <point x="637" y="17" type="line"/>
-      <point x="164" y="17" type="line"/>
-      <point x="164" y="116" type="line"/>
-      <point x="144" y="116" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="636" y="0" type="line"/>
+      <point x="636" y="116" type="line"/>
+      <point x="616" y="116" type="line"/>
+      <point x="616" y="17" type="line"/>
+      <point x="143" y="17" type="line"/>
+      <point x="143" y="116" type="line"/>
+      <point x="123" y="116" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/braceleft.glif b/src/Cantarell-Light.ufo/glyphs/braceleft.glif
index 65ac723b..63814f60 100644
--- a/src/Cantarell-Light.ufo/glyphs/braceleft.glif
+++ b/src/Cantarell-Light.ufo/glyphs/braceleft.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="braceleft" format="2">
-  <advance width="334"/>
+  <advance width="327"/>
   <unicode hex="007B"/>
   <outline>
     <contour>
-      <point x="296" y="-161" type="curve"/>
-      <point x="296" y="-144" type="line"/>
-      <point x="210" y="-144"/>
-      <point x="158" y="-100"/>
-      <point x="158" y="-25" type="curve" smooth="yes"/>
-      <point x="158" y="143" type="line" smooth="yes"/>
-      <point x="158" y="221"/>
-      <point x="118" y="288"/>
-      <point x="55" y="309" type="curve"/>
-      <point x="55" y="307" type="line"/>
-      <point x="120" y="326"/>
-      <point x="159" y="392"/>
-      <point x="159" y="467" type="curve" smooth="yes"/>
-      <point x="159" y="603" type="line" smooth="yes"/>
-      <point x="159" y="681"/>
-      <point x="210" y="727"/>
-      <point x="296" y="727" type="curve"/>
-      <point x="296" y="744" type="line"/>
-      <point x="197" y="744"/>
-      <point x="138" y="688"/>
-      <point x="138" y="593" type="curve" smooth="yes"/>
-      <point x="138" y="457" type="line" smooth="yes"/>
-      <point x="138" y="389"/>
-      <point x="98" y="334"/>
-      <point x="36" y="317" type="curve"/>
-      <point x="36" y="299" type="line"/>
-      <point x="98" y="280"/>
-      <point x="138" y="214"/>
-      <point x="138" y="133" type="curve" smooth="yes"/>
-      <point x="138" y="-35" type="line" smooth="yes"/>
-      <point x="138" y="-114"/>
-      <point x="197" y="-161"/>
+      <point x="272" y="-189" type="curve"/>
+      <point x="275" y="-172" type="line"/>
+      <point x="184" y="-172"/>
+      <point x="139" y="-129"/>
+      <point x="149" y="-53" type="curve" smooth="yes"/>
+      <point x="169" y="107" type="line" smooth="yes"/>
+      <point x="178" y="178"/>
+      <point x="137" y="250"/>
+      <point x="74" y="272" type="curve"/>
+      <point x="74" y="271" type="line"/>
+      <point x="138" y="291"/>
+      <point x="178" y="360"/>
+      <point x="170" y="431" type="curve" smooth="yes"/>
+      <point x="150" y="608" type="line" smooth="yes"/>
+      <point x="141" y="688"/>
+      <point x="184" y="732"/>
+      <point x="275" y="732" type="curve"/>
+      <point x="272" y="749" type="line"/>
+      <point x="168" y="749"/>
+      <point x="118" y="695"/>
+      <point x="129" y="598" type="curve" smooth="yes"/>
+      <point x="149" y="421" type="line" smooth="yes"/>
+      <point x="156" y="358"/>
+      <point x="117" y="299"/>
+      <point x="55" y="283" type="curve"/>
+      <point x="55" y="260" type="line"/>
+      <point x="117" y="246"/>
+      <point x="159" y="173"/>
+      <point x="149" y="97" type="curve" smooth="yes"/>
+      <point x="129" y="-63" type="line" smooth="yes"/>
+      <point x="119" y="-144"/>
+      <point x="170" y="-189"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/braceright.glif b/src/Cantarell-Light.ufo/glyphs/braceright.glif
index 437abe31..01bf72d5 100644
--- a/src/Cantarell-Light.ufo/glyphs/braceright.glif
+++ b/src/Cantarell-Light.ufo/glyphs/braceright.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="braceright" format="2">
-  <advance width="334"/>
+  <advance width="327"/>
   <unicode hex="007D"/>
   <outline>
-    <component base="braceleft" xScale="-1" yScale="-1" xOffset="334" yOffset="583"/>
+    <component base="braceleft" xScale="-1" yScale="-1" xOffset="327" yOffset="560"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|braceleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>braceleft</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/bracketleft.glif b/src/Cantarell-Light.ufo/glyphs/bracketleft.glif
index 947f0e09..131ec8c0 100644
--- a/src/Cantarell-Light.ufo/glyphs/bracketleft.glif
+++ b/src/Cantarell-Light.ufo/glyphs/bracketleft.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bracketleft" format="2">
-  <advance width="328"/>
+  <advance width="345"/>
   <unicode hex="005B"/>
   <outline>
     <contour>
-      <point x="105" y="-180" type="line"/>
-      <point x="290" y="-180" type="line"/>
-      <point x="290" y="-163" type="line"/>
-      <point x="125" y="-163" type="line"/>
-      <point x="125" y="722" type="line"/>
-      <point x="290" y="722" type="line"/>
-      <point x="290" y="739" type="line"/>
-      <point x="105" y="739" type="line"/>
+      <point x="128" y="-180" type="line"/>
+      <point x="293" y="-180" type="line"/>
+      <point x="293" y="-163" type="line"/>
+      <point x="148" y="-163" type="line"/>
+      <point x="148" y="722" type="line"/>
+      <point x="293" y="722" type="line"/>
+      <point x="293" y="739" type="line"/>
+      <point x="128" y="739" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/bracketright.glif 
b/src/Cantarell-Light.ufo/glyphs/bracketright.glif
index c9f0ded9..6e6b5f38 100644
--- a/src/Cantarell-Light.ufo/glyphs/bracketright.glif
+++ b/src/Cantarell-Light.ufo/glyphs/bracketright.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bracketright" format="2">
-  <advance width="338"/>
+  <advance width="345"/>
   <unicode hex="005D"/>
   <outline>
-    <component base="bracketleft" xScale="-1" xOffset="338"/>
+    <component base="bracketleft" xScale="-1" xOffset="345"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|bracketleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>bracketleft</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/breve.glif b/src/Cantarell-Light.ufo/glyphs/breve.glif
index dd85f437..a9398b53 100644
--- a/src/Cantarell-Light.ufo/glyphs/breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/breve.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="breve" format="2">
-  <advance width="404"/>
+  <advance width="500"/>
   <unicode hex="02D8"/>
   <outline>
-    <component base="brevecomb" xOffset="-7"/>
+    <component base="brevecomb" xOffset="64"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/brevecomb-cy.case.glif 
b/src/Cantarell-Light.ufo/glyphs/brevecomb-cy.case.glif
index 43133b12..cb614d89 100644
--- a/src/Cantarell-Light.ufo/glyphs/brevecomb-cy.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/brevecomb-cy.case.glif
@@ -3,7 +3,7 @@
   <anchor x="193" y="694" name="_top"/>
   <anchor x="193" y="892" name="top"/>
   <outline>
-    <component base="brevecomb-cy" yOffset="164"/>
+    <component base="brevecomb-cy" yOffset="174"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/brevecomb-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/brevecomb-cy.glif
index a1871a27..f9fcb323 100644
--- a/src/Cantarell-Light.ufo/glyphs/brevecomb-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/brevecomb-cy.glif
@@ -12,8 +12,8 @@
       <point x="311" y="637"/>
       <point x="264" y="592"/>
       <point x="201" y="592" type="curve" smooth="yes"/>
-      <point x="137" y="592"/>
-      <point x="90" y="638"/>
+      <point x="139" y="592"/>
+      <point x="90" y="636"/>
       <point x="80" y="702" type="curve"/>
       <point x="64" y="697" type="line"/>
       <point x="74" y="623"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/brevecomb.case.glif 
b/src/Cantarell-Light.ufo/glyphs/brevecomb.case.glif
index deb58056..93a1bfee 100644
--- a/src/Cantarell-Light.ufo/glyphs/brevecomb.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/brevecomb.case.glif
@@ -3,7 +3,7 @@
   <anchor x="203" y="694" name="_top"/>
   <anchor x="203" y="805" name="top"/>
   <outline>
-    <component base="brevecomb" yOffset="164"/>
+    <component base="brevecomb" xOffset="15" yOffset="176"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/breveinvertedcomb.case.glif 
b/src/Cantarell-Light.ufo/glyphs/breveinvertedcomb.case.glif
index e6be0ea7..cdff8035 100644
--- a/src/Cantarell-Light.ufo/glyphs/breveinvertedcomb.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/breveinvertedcomb.case.glif
@@ -3,7 +3,7 @@
   <anchor x="206" y="694" name="_top"/>
   <anchor x="206" y="872" name="top"/>
   <outline>
-    <component base="breveinvertedcomb" yOffset="160"/>
+    <component base="breveinvertedcomb" yOffset="170"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/brokenbar.glif b/src/Cantarell-Light.ufo/glyphs/brokenbar.glif
index bc2a267d..1e1961da 100644
--- a/src/Cantarell-Light.ufo/glyphs/brokenbar.glif
+++ b/src/Cantarell-Light.ufo/glyphs/brokenbar.glif
@@ -1,19 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="brokenbar" format="2">
-  <advance width="308"/>
+  <advance width="266"/>
   <unicode hex="00A6"/>
   <outline>
     <contour>
-      <point x="144" y="-157" type="line"/>
-      <point x="164" y="-157" type="line"/>
-      <point x="164" y="181" type="line"/>
-      <point x="144" y="181" type="line"/>
+      <point x="123" y="-181" type="line"/>
+      <point x="143" y="-181" type="line"/>
+      <point x="143" y="181" type="line"/>
+      <point x="123" y="181" type="line"/>
     </contour>
     <contour>
-      <point x="144" y="412" type="line"/>
-      <point x="164" y="412" type="line"/>
-      <point x="164" y="739" type="line"/>
-      <point x="144" y="739" type="line"/>
+      <point x="123" y="412" type="line"/>
+      <point x="143" y="412" type="line"/>
+      <point x="143" y="740" type="line"/>
+      <point x="123" y="740" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/bullet.glif b/src/Cantarell-Light.ufo/glyphs/bullet.glif
index 00ad2d5d..f5f267e7 100644
--- a/src/Cantarell-Light.ufo/glyphs/bullet.glif
+++ b/src/Cantarell-Light.ufo/glyphs/bullet.glif
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bullet" format="2">
-  <advance width="270"/>
+  <advance width="290"/>
   <unicode hex="2022"/>
   <outline>
-    <component base="period" xScale="2" yScale="2" xOffset="-93" yOffset="252"/>
+    <contour>
+      <point x="145" y="309" type="curve" smooth="yes"/>
+      <point x="173" y="309"/>
+      <point x="191" y="329"/>
+      <point x="191" y="355" type="curve" smooth="yes"/>
+      <point x="191" y="383"/>
+      <point x="173" y="403"/>
+      <point x="145" y="403" type="curve" smooth="yes"/>
+      <point x="117" y="403"/>
+      <point x="99" y="383"/>
+      <point x="99" y="355" type="curve" smooth="yes"/>
+      <point x="99" y="329"/>
+      <point x="117" y="309"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/bulletoperator.glif 
b/src/Cantarell-Light.ufo/glyphs/bulletoperator.glif
index 992aed90..94021d61 100644
--- a/src/Cantarell-Light.ufo/glyphs/bulletoperator.glif
+++ b/src/Cantarell-Light.ufo/glyphs/bulletoperator.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bulletoperator" format="2">
-  <advance width="338"/>
+  <advance width="230"/>
   <unicode hex="2219"/>
   <outline>
-    <component base="period" xScale="1.25716" yScale="1.25716" xOffset="26" yOffset="330"/>
+    <component base="period" yOffset="323"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>period</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/c.glif b/src/Cantarell-Light.ufo/glyphs/c.glif
index 78162514..91339ee3 100644
--- a/src/Cantarell-Light.ufo/glyphs/c.glif
+++ b/src/Cantarell-Light.ufo/glyphs/c.glif
@@ -1,40 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="c" format="2">
-  <advance width="430"/>
+  <advance width="464"/>
   <unicode hex="0063"/>
-  <note>
-c
-</note>
-  <anchor x="218" y="0" name="bottom"/>
-  <anchor x="233" y="480" name="top"/>
+  <anchor x="229" y="0" name="bottom"/>
+  <anchor x="244" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="261" y="-10" type="curve" smooth="yes"/>
-      <point x="309" y="-10"/>
-      <point x="359" y="4"/>
-      <point x="400" y="28" type="curve"/>
-      <point x="395" y="42" type="line"/>
-      <point x="351" y="18"/>
-      <point x="306" y="6"/>
-      <point x="265" y="6" type="curve" smooth="yes"/>
-      <point x="152" y="6"/>
-      <point x="78" y="98"/>
-      <point x="78" y="241" type="curve" smooth="yes"/>
-      <point x="78" y="384"/>
-      <point x="151" y="468"/>
-      <point x="273" y="468" type="curve" smooth="yes"/>
-      <point x="317" y="468"/>
-      <point x="357" y="457"/>
-      <point x="395" y="436" type="curve"/>
-      <point x="402" y="452" type="line"/>
-      <point x="361" y="475"/>
-      <point x="320" y="486"/>
-      <point x="275" y="486" type="curve" smooth="yes"/>
-      <point x="140" y="486"/>
-      <point x="57" y="391"/>
-      <point x="57" y="236" type="curve" smooth="yes"/>
-      <point x="57" y="85"/>
-      <point x="136" y="-10"/>
+      <point x="272" y="-10" type="curve" smooth="yes"/>
+      <point x="320" y="-10"/>
+      <point x="370" y="4"/>
+      <point x="411" y="28" type="curve"/>
+      <point x="406" y="42" type="line"/>
+      <point x="362" y="18"/>
+      <point x="317" y="6"/>
+      <point x="276" y="6" type="curve" smooth="yes"/>
+      <point x="163" y="6"/>
+      <point x="89" y="98"/>
+      <point x="89" y="241" type="curve" smooth="yes"/>
+      <point x="89" y="384"/>
+      <point x="162" y="468"/>
+      <point x="284" y="468" type="curve" smooth="yes"/>
+      <point x="328" y="468"/>
+      <point x="368" y="457"/>
+      <point x="406" y="436" type="curve"/>
+      <point x="413" y="452" type="line"/>
+      <point x="372" y="475"/>
+      <point x="331" y="486"/>
+      <point x="286" y="486" type="curve" smooth="yes"/>
+      <point x="151" y="486"/>
+      <point x="68" y="391"/>
+      <point x="68" y="236" type="curve" smooth="yes"/>
+      <point x="68" y="85"/>
+      <point x="147" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/cacute.glif b/src/Cantarell-Light.ufo/glyphs/cacute.glif
index 4feab123..06696c08 100644
--- a/src/Cantarell-Light.ufo/glyphs/cacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/cacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cacute" format="2">
-  <advance width="430"/>
+  <advance width="464"/>
   <unicode hex="0107"/>
   <outline>
     <component base="c"/>
-    <component base="acutecomb" xOffset="166"/>
+    <component base="acutecomb" xOffset="177"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/caron.glif b/src/Cantarell-Light.ufo/glyphs/caron.glif
index 3e4db130..f36b2b92 100644
--- a/src/Cantarell-Light.ufo/glyphs/caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/caron.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="caron" format="2">
-  <advance width="362"/>
+  <advance width="500"/>
   <unicode hex="02C7"/>
   <outline>
-    <component base="caroncomb" xOffset="-15"/>
+    <component base="caroncomb" xOffset="71"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/caroncomb.loclV_I_E_T_.glif 
b/src/Cantarell-Light.ufo/glyphs/caroncomb.loclV_I_E_T_.glif
index 2827e809..b8c5fdd0 100644
--- a/src/Cantarell-Light.ufo/glyphs/caroncomb.loclV_I_E_T_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/caroncomb.loclV_I_E_T_.glif
@@ -4,13 +4,13 @@
   <anchor x="185" y="579" name="top"/>
   <outline>
     <contour>
+      <point x="176" y="562" type="line"/>
+      <point x="191" y="562" type="line"/>
       <point x="306" y="665" type="line"/>
       <point x="300" y="671" type="line"/>
       <point x="184" y="580" type="line"/>
       <point x="69" y="667" type="line"/>
       <point x="58" y="656" type="line"/>
-      <point x="176" y="562" type="line"/>
-      <point x="191" y="562" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/ccaron.glif b/src/Cantarell-Light.ufo/glyphs/ccaron.glif
index 4b9220d6..956939ca 100644
--- a/src/Cantarell-Light.ufo/glyphs/ccaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ccaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccaron" format="2">
-  <advance width="430"/>
+  <advance width="464"/>
   <unicode hex="010D"/>
   <outline>
     <component base="c"/>
-    <component base="caroncomb" xOffset="50"/>
+    <component base="caroncomb" xOffset="61"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ccedilla.glif b/src/Cantarell-Light.ufo/glyphs/ccedilla.glif
index bab05cb2..1b79a333 100644
--- a/src/Cantarell-Light.ufo/glyphs/ccedilla.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ccedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccedilla" format="2">
-  <advance width="430"/>
+  <advance width="464"/>
   <unicode hex="00E7"/>
   <outline>
     <component base="c"/>
-    <component base="cedillacomb" xOffset="93"/>
+    <component base="cedillacomb" xOffset="104"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ccedillaacute.glif 
b/src/Cantarell-Light.ufo/glyphs/ccedillaacute.glif
index 816610dc..429d937c 100644
--- a/src/Cantarell-Light.ufo/glyphs/ccedillaacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ccedillaacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccedillaacute" format="2">
-  <advance width="430"/>
+  <advance width="464"/>
   <unicode hex="1E09"/>
   <outline>
     <component base="c"/>
-    <component base="cedillacomb" xOffset="93"/>
-    <component base="acutecomb" xOffset="166"/>
+    <component base="cedillacomb" xOffset="104"/>
+    <component base="acutecomb" xOffset="177"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ccircumflex.glif b/src/Cantarell-Light.ufo/glyphs/ccircumflex.glif
index ffc3adba..5136182f 100644
--- a/src/Cantarell-Light.ufo/glyphs/ccircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ccircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccircumflex" format="2">
-  <advance width="430"/>
+  <advance width="464"/>
   <unicode hex="0109"/>
   <outline>
     <component base="c"/>
-    <component base="circumflexcomb" xOffset="62"/>
+    <component base="circumflexcomb" xOffset="73"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/cdotaccent.glif b/src/Cantarell-Light.ufo/glyphs/cdotaccent.glif
index 16b93abe..f35a647c 100644
--- a/src/Cantarell-Light.ufo/glyphs/cdotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/cdotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cdotaccent" format="2">
-  <advance width="430"/>
+  <advance width="464"/>
   <unicode hex="010B"/>
   <outline>
     <component base="c"/>
-    <component base="dotaccentcomb" xOffset="114"/>
+    <component base="dotaccentcomb" xOffset="125"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/cedi.glif b/src/Cantarell-Light.ufo/glyphs/cedi.glif
index 24b0d2af..18e5ef0a 100644
--- a/src/Cantarell-Light.ufo/glyphs/cedi.glif
+++ b/src/Cantarell-Light.ufo/glyphs/cedi.glif
@@ -1,20 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cedi" format="2">
-  <advance width="694"/>
+  <advance width="580"/>
   <unicode hex="20B5"/>
   <outline>
-    <component base="C" xOffset="20"/>
-    <component base="_currencyvstem" xOffset="4"/>
-    <component base="_currencyvstem" xOffset="-6" yOffset="-840"/>
+    <contour>
+      <point x="349" y="-10" type="curve" smooth="yes"/>
+      <point x="406" y="-10"/>
+      <point x="470" y="6"/>
+      <point x="523" y="33" type="curve"/>
+      <point x="518" y="49" type="line"/>
+      <point x="467" y="24"/>
+      <point x="404" y="9"/>
+      <point x="353" y="9" type="curve" smooth="yes"/>
+      <point x="196" y="9"/>
+      <point x="89" y="145"/>
+      <point x="89" y="348" type="curve" smooth="yes"/>
+      <point x="89" y="549"/>
+      <point x="198" y="683"/>
+      <point x="361" y="683" type="curve" smooth="yes"/>
+      <point x="413" y="683"/>
+      <point x="467" y="670"/>
+      <point x="517" y="645" type="curve"/>
+      <point x="524" y="662" type="line"/>
+      <point x="474" y="689"/>
+      <point x="419" y="702"/>
+      <point x="364" y="702" type="curve" smooth="yes"/>
+      <point x="186" y="702"/>
+      <point x="67" y="556"/>
+      <point x="67" y="338" type="curve" smooth="yes"/>
+      <point x="67" y="129"/>
+      <point x="181" y="-10"/>
+    </contour>
+    <contour>
+      <point x="341" y="-120" type="line"/>
+      <point x="359" y="-120" type="line"/>
+      <point x="359" y="0" type="line"/>
+      <point x="341" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="350" y="693" type="line"/>
+      <point x="368" y="693" type="line"/>
+      <point x="368" y="813" type="line"/>
+      <point x="350" y="813" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>-1</integer>
-        <integer>-1</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/cedilla.glif b/src/Cantarell-Light.ufo/glyphs/cedilla.glif
index d08fdc1a..1599ae29 100644
--- a/src/Cantarell-Light.ufo/glyphs/cedilla.glif
+++ b/src/Cantarell-Light.ufo/glyphs/cedilla.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cedilla" format="2">
-  <advance width="314"/>
+  <advance width="500"/>
   <unicode hex="00B8"/>
   <outline>
-    <component base="cedillacomb"/>
+    <component base="cedillacomb" xOffset="95"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/cent.glif b/src/Cantarell-Light.ufo/glyphs/cent.glif
index 772e0038..9f125cd8 100644
--- a/src/Cantarell-Light.ufo/glyphs/cent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/cent.glif
@@ -1,14 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cent" format="2">
-  <advance width="517"/>
+  <advance width="580"/>
   <unicode hex="00A2"/>
   <outline>
-    <component base="c" xOffset="35"/>
-    <component base="_currencyvstem" xOffset="-125" yOffset="-215"/>
-    <component base="_currencyvstem" xOffset="-110" yOffset="-840"/>
+    <component base="c" xOffset="68"/>
+    <component base="_currencyvstem" xOffset="-92" yOffset="-223"/>
+    <component base="_currencyvstem" xOffset="-77" yOffset="-823"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Light.ufo/glyphs/che-cy.glif b/src/Cantarell-Light.ufo/glyphs/che-cy.glif
index b92c11d8..361de341 100644
--- a/src/Cantarell-Light.ufo/glyphs/che-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/che-cy.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="che-cy" format="2">
-  <advance width="485"/>
+  <advance width="516"/>
   <unicode hex="0447"/>
-  <anchor x="424" y="0" name="bottomright"/>
-  <anchor x="242" y="480" name="top"/>
+  <anchor x="436" y="0" name="bottomright"/>
+  <anchor x="254" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="215" y="181" type="curve" smooth="yes"/>
-      <point x="277" y="181"/>
-      <point x="347" y="198"/>
-      <point x="392" y="228" type="curve"/>
-      <point x="384" y="239" type="line"/>
-      <point x="348" y="216"/>
-      <point x="279" y="199"/>
-      <point x="218" y="199" type="curve" smooth="yes"/>
-      <point x="129" y="199"/>
-      <point x="74" y="237"/>
-      <point x="74" y="301" type="curve" smooth="yes"/>
-      <point x="74" y="480" type="line"/>
-      <point x="53" y="480" type="line"/>
-      <point x="53" y="300" type="line" smooth="yes"/>
-      <point x="53" y="225"/>
-      <point x="115" y="181"/>
+      <point x="227" y="181" type="curve" smooth="yes"/>
+      <point x="289" y="181"/>
+      <point x="359" y="198"/>
+      <point x="404" y="228" type="curve"/>
+      <point x="396" y="239" type="line"/>
+      <point x="360" y="216"/>
+      <point x="291" y="199"/>
+      <point x="230" y="199" type="curve" smooth="yes"/>
+      <point x="141" y="199"/>
+      <point x="86" y="237"/>
+      <point x="86" y="301" type="curve" smooth="yes"/>
+      <point x="86" y="480" type="line"/>
+      <point x="65" y="480" type="line"/>
+      <point x="65" y="300" type="line" smooth="yes"/>
+      <point x="65" y="225"/>
+      <point x="127" y="181"/>
     </contour>
     <contour>
-      <point x="377" y="0" type="line"/>
-      <point x="397" y="0" type="line"/>
-      <point x="397" y="480" type="line"/>
-      <point x="377" y="480" type="line"/>
+      <point x="389" y="0" type="line"/>
+      <point x="409" y="0" type="line"/>
+      <point x="409" y="480" type="line"/>
+      <point x="389" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -39,6 +39,8 @@
         <key>width</key>
         <integer>78</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/chedescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/chedescender-cy.glif
index c1d3844d..38875a1a 100644
--- a/src/Cantarell-Light.ufo/glyphs/chedescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/chedescender-cy.glif
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="chedescender-cy" format="2">
-  <advance width="496"/>
+  <advance width="516"/>
   <unicode hex="04B7"/>
   <outline>
     <component base="che-cy"/>
-    <component base="descender-cy" xOffset="328"/>
+    <component base="descender-cy" xOffset="340"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>che-cy</string>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>0</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>tse-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/chedieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/chedieresis-cy.glif
index a0bada6a..46c6d5e2 100644
--- a/src/Cantarell-Light.ufo/glyphs/chedieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/chedieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="chedieresis-cy" format="2">
-  <advance width="485"/>
+  <advance width="516"/>
   <unicode hex="04F5"/>
   <outline>
     <component base="che-cy"/>
-    <component base="dieresiscomb" xOffset="23"/>
+    <component base="dieresiscomb" xOffset="35"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/chekhakassian-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/chekhakassian-cy.glif
index 5a388dbe..8c86ac9c 100644
--- a/src/Cantarell-Light.ufo/glyphs/chekhakassian-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/chekhakassian-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="chekhakassian-cy" format="2">
-  <advance width="485"/>
+  <advance width="516"/>
   <unicode hex="04CC"/>
   <outline>
     <component base="che-cy"/>
-    <component base="_descenderreversed-cy" xOffset="274"/>
+    <component base="_descenderreversed-cy" xOffset="283"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/cheverticalstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/cheverticalstroke-cy.glif
index 7b57fbef..d17eb3c3 100644
--- a/src/Cantarell-Light.ufo/glyphs/cheverticalstroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/cheverticalstroke-cy.glif
@@ -1,37 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cheverticalstroke-cy" format="2">
-  <advance width="500"/>
+  <advance width="531"/>
   <unicode hex="04B9"/>
   <outline>
     <contour>
-      <point x="222" y="181" type="curve" smooth="yes"/>
-      <point x="289" y="181"/>
-      <point x="362" y="199"/>
-      <point x="407" y="228" type="curve"/>
-      <point x="399" y="239" type="line"/>
-      <point x="360" y="215"/>
-      <point x="286" y="199"/>
-      <point x="225" y="199" type="curve" smooth="yes"/>
-      <point x="131" y="199"/>
-      <point x="74" y="237"/>
-      <point x="74" y="301" type="curve" smooth="yes"/>
-      <point x="74" y="480" type="line"/>
-      <point x="53" y="480" type="line"/>
-      <point x="53" y="300" type="line" smooth="yes"/>
-      <point x="53" y="225"/>
-      <point x="117" y="181"/>
+      <point x="234" y="181" type="curve" smooth="yes"/>
+      <point x="301" y="181"/>
+      <point x="374" y="199"/>
+      <point x="419" y="228" type="curve"/>
+      <point x="411" y="239" type="line"/>
+      <point x="372" y="215"/>
+      <point x="298" y="199"/>
+      <point x="237" y="199" type="curve" smooth="yes"/>
+      <point x="143" y="199"/>
+      <point x="86" y="237"/>
+      <point x="86" y="301" type="curve" smooth="yes"/>
+      <point x="86" y="480" type="line"/>
+      <point x="65" y="480" type="line"/>
+      <point x="65" y="300" type="line" smooth="yes"/>
+      <point x="65" y="225"/>
+      <point x="129" y="181"/>
     </contour>
     <contour>
-      <point x="392" y="0" type="line"/>
-      <point x="412" y="0" type="line"/>
-      <point x="412" y="480" type="line"/>
-      <point x="392" y="480" type="line"/>
+      <point x="230" y="51" type="line"/>
+      <point x="249" y="51" type="line"/>
+      <point x="249" y="351" type="line"/>
+      <point x="230" y="351" type="line"/>
     </contour>
     <contour>
-      <point x="218" y="51" type="line"/>
-      <point x="237" y="51" type="line"/>
-      <point x="237" y="351" type="line"/>
-      <point x="218" y="351" type="line"/>
+      <point x="404" y="0" type="line"/>
+      <point x="424" y="0" type="line"/>
+      <point x="424" y="480" type="line"/>
+      <point x="404" y="480" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>che-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>en-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/circumflex.glif b/src/Cantarell-Light.ufo/glyphs/circumflex.glif
index 419f6e21..d32a55c5 100644
--- a/src/Cantarell-Light.ufo/glyphs/circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/circumflex.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="circumflex" format="2">
-  <advance width="362"/>
+  <advance width="500"/>
   <unicode hex="02C6"/>
   <outline>
-    <component base="circumflexcomb" xOffset="-11"/>
+    <component base="circumflexcomb" xOffset="77"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/circumflexcomb.glif 
b/src/Cantarell-Light.ufo/glyphs/circumflexcomb.glif
index a6603d9b..5b881813 100644
--- a/src/Cantarell-Light.ufo/glyphs/circumflexcomb.glif
+++ b/src/Cantarell-Light.ufo/glyphs/circumflexcomb.glif
@@ -6,13 +6,13 @@
   <anchor x="299" y="622" name="top_viet"/>
   <outline>
     <contour>
-      <point x="55" y="584" type="line"/>
       <point x="61" y="578" type="line"/>
       <point x="171" y="691" type="line"/>
       <point x="284" y="577" type="line"/>
       <point x="296" y="588" type="line"/>
       <point x="181" y="708" type="line"/>
       <point x="165" y="708" type="line"/>
+      <point x="55" y="584" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif 
b/src/Cantarell-Light.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif
index 853012cb..2722d9dc 100644
--- a/src/Cantarell-Light.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif
@@ -5,13 +5,13 @@
   <anchor x="284" y="554" name="top_viet"/>
   <outline>
     <contour>
-      <point x="55" y="561" type="line"/>
       <point x="61" y="555" type="line"/>
       <point x="171" y="643" type="line"/>
       <point x="284" y="554" type="line"/>
       <point x="296" y="565" type="line"/>
       <point x="181" y="660" type="line"/>
       <point x="165" y="660" type="line"/>
+      <point x="55" y="561" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/colon.glif b/src/Cantarell-Light.ufo/glyphs/colon.glif
index b2bdcfc8..d6700235 100644
--- a/src/Cantarell-Light.ufo/glyphs/colon.glif
+++ b/src/Cantarell-Light.ufo/glyphs/colon.glif
@@ -8,6 +8,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>period</string>
       <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
       <string>period</string>
     </dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/colonsign.glif b/src/Cantarell-Light.ufo/glyphs/colonsign.glif
index c17b3e0c..5963a746 100644
--- a/src/Cantarell-Light.ufo/glyphs/colonsign.glif
+++ b/src/Cantarell-Light.ufo/glyphs/colonsign.glif
@@ -1,32 +1,65 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="colonsign" format="2">
-  <advance width="695"/>
+  <advance width="580"/>
   <unicode hex="20A1"/>
   <outline>
     <contour>
-      <point x="492" y="694" type="line"/>
-      <point x="508" y="694" type="line"/>
-      <point x="529" y="824" type="line"/>
-      <point x="513" y="824" type="line"/>
+      <point x="352" y="-10" type="curve" smooth="yes"/>
+      <point x="409" y="-10"/>
+      <point x="473" y="6"/>
+      <point x="526" y="33" type="curve"/>
+      <point x="521" y="49" type="line"/>
+      <point x="470" y="24"/>
+      <point x="407" y="9"/>
+      <point x="356" y="9" type="curve" smooth="yes"/>
+      <point x="199" y="9"/>
+      <point x="92" y="145"/>
+      <point x="92" y="348" type="curve" smooth="yes"/>
+      <point x="92" y="549"/>
+      <point x="201" y="683"/>
+      <point x="364" y="683" type="curve" smooth="yes"/>
+      <point x="416" y="683"/>
+      <point x="470" y="670"/>
+      <point x="520" y="645" type="curve"/>
+      <point x="527" y="662" type="line"/>
+      <point x="477" y="689"/>
+      <point x="422" y="702"/>
+      <point x="367" y="702" type="curve" smooth="yes"/>
+      <point x="189" y="702"/>
+      <point x="70" y="556"/>
+      <point x="70" y="338" type="curve" smooth="yes"/>
+      <point x="70" y="129"/>
+      <point x="184" y="-10"/>
     </contour>
     <contour>
-      <point x="300" y="-130" type="line"/>
-      <point x="316" y="-130" type="line"/>
-      <point x="337" y="11" type="line"/>
-      <point x="321" y="11" type="line"/>
+      <point x="255" y="-120" type="line"/>
+      <point x="270" y="-120" type="line"/>
+      <point x="289" y="11" type="line"/>
+      <point x="273" y="11" type="line"/>
     </contour>
     <contour>
-      <point x="400" y="694" type="line"/>
-      <point x="416" y="694" type="line"/>
-      <point x="437" y="824" type="line"/>
-      <point x="421" y="824" type="line"/>
+      <point x="335" y="-120" type="line"/>
+      <point x="350" y="-120" type="line"/>
+      <point x="367" y="3" type="line"/>
+      <point x="351" y="3" type="line"/>
     </contour>
     <contour>
-      <point x="391" y="-130" type="line"/>
-      <point x="407" y="-130" type="line"/>
-      <point x="426" y="3" type="line"/>
-      <point x="410" y="3" type="line"/>
+      <point x="341" y="694" type="line"/>
+      <point x="357" y="694" type="line"/>
+      <point x="375" y="813" type="line"/>
+      <point x="360" y="813" type="line"/>
+    </contour>
+    <contour>
+      <point x="422" y="694" type="line"/>
+      <point x="438" y="694" type="line"/>
+      <point x="456" y="813" type="line"/>
+      <point x="440" y="813" type="line"/>
     </contour>
-    <component base="C" xOffset="21"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/comma.glif b/src/Cantarell-Light.ufo/glyphs/comma.glif
index acb74717..2ab5b563 100644
--- a/src/Cantarell-Light.ufo/glyphs/comma.glif
+++ b/src/Cantarell-Light.ufo/glyphs/comma.glif
@@ -4,14 +4,14 @@
   <unicode hex="002C"/>
   <outline>
     <contour>
-      <point x="68" y="-167" type="curve"/>
-      <point x="87" y="-167" type="line"/>
-      <point x="113" y="-96"/>
-      <point x="129" y="4"/>
-      <point x="129" y="103" type="curve"/>
-      <point x="106" y="103" type="line"/>
-      <point x="106" y="4"/>
-      <point x="92" y="-96"/>
+      <point x="76" y="-170" type="curve"/>
+      <point x="95" y="-170" type="line"/>
+      <point x="123" y="-95"/>
+      <point x="140" y="6"/>
+      <point x="140" y="103" type="curve"/>
+      <point x="116" y="103" type="line"/>
+      <point x="116" y="3"/>
+      <point x="101" y="-97"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/commaturnedabovecomb.glif 
b/src/Cantarell-Light.ufo/glyphs/commaturnedabovecomb.glif
index 3b7a8633..698c42af 100644
--- a/src/Cantarell-Light.ufo/glyphs/commaturnedabovecomb.glif
+++ b/src/Cantarell-Light.ufo/glyphs/commaturnedabovecomb.glif
@@ -5,14 +5,14 @@
   <anchor x="104" y="739" name="top"/>
   <outline>
     <contour>
-      <point x="141" y="742" type="curve"/>
-      <point x="129" y="742" type="line"/>
-      <point x="107" y="712"/>
-      <point x="91" y="657"/>
       <point x="91" y="590" type="curve"/>
       <point x="110" y="590" type="line"/>
       <point x="110" y="653"/>
       <point x="122" y="708"/>
+      <point x="141" y="742" type="curve"/>
+      <point x="129" y="742" type="line"/>
+      <point x="107" y="712"/>
+      <point x="91" y="657"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/commaturnedmod.glif 
b/src/Cantarell-Light.ufo/glyphs/commaturnedmod.glif
index 2bf2a279..0f02a8c4 100644
--- a/src/Cantarell-Light.ufo/glyphs/commaturnedmod.glif
+++ b/src/Cantarell-Light.ufo/glyphs/commaturnedmod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="commaturnedmod" format="2">
-  <advance width="222"/>
+  <advance width="144"/>
   <unicode hex="02BB"/>
   <outline>
-    <component base="commaturnedabovecomb"/>
+    <component base="commaturnedabovecomb" xOffset="-39"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/commercialM_inusS_ign.glif 
b/src/Cantarell-Light.ufo/glyphs/commercialM_inusS_ign.glif
index 19cd2e91..552b13b9 100644
--- a/src/Cantarell-Light.ufo/glyphs/commercialM_inusS_ign.glif
+++ b/src/Cantarell-Light.ufo/glyphs/commercialM_inusS_ign.glif
@@ -1,41 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="commercialMinusSign" format="2">
-  <advance width="642"/>
+  <advance width="580"/>
   <unicode hex="2052"/>
   <outline>
     <contour>
-      <point x="77" y="0" type="line"/>
-      <point x="95" y="0" type="line"/>
-      <point x="565" y="694" type="line"/>
-      <point x="540" y="694" type="line"/>
+      <point x="64" y="0" type="line"/>
+      <point x="82" y="0" type="line"/>
+      <point x="516" y="694" type="line"/>
+      <point x="491" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="496" y="-7" type="curve" smooth="yes"/>
-      <point x="511" y="-7"/>
-      <point x="521" y="4"/>
-      <point x="521" y="18" type="curve" smooth="yes"/>
-      <point x="521" y="34"/>
-      <point x="511" y="45"/>
-      <point x="496" y="45" type="curve" smooth="yes"/>
-      <point x="481" y="45"/>
-      <point x="471" y="34"/>
-      <point x="471" y="18" type="curve" smooth="yes"/>
-      <point x="471" y="4"/>
-      <point x="481" y="-7"/>
+      <point x="439" y="-7" type="curve" smooth="yes"/>
+      <point x="452" y="-7"/>
+      <point x="462" y="4"/>
+      <point x="462" y="18" type="curve" smooth="yes"/>
+      <point x="462" y="34"/>
+      <point x="452" y="45"/>
+      <point x="439" y="45" type="curve" smooth="yes"/>
+      <point x="425" y="45"/>
+      <point x="414" y="34"/>
+      <point x="414" y="18" type="curve" smooth="yes"/>
+      <point x="414" y="4"/>
+      <point x="425" y="-7"/>
     </contour>
     <contour>
-      <point x="146" y="649" type="curve" smooth="yes"/>
-      <point x="161" y="649"/>
-      <point x="171" y="660"/>
-      <point x="171" y="675" type="curve" smooth="yes"/>
-      <point x="171" y="690"/>
-      <point x="161" y="701"/>
-      <point x="146" y="701" type="curve" smooth="yes"/>
-      <point x="131" y="701"/>
-      <point x="121" y="690"/>
-      <point x="121" y="675" type="curve" smooth="yes"/>
-      <point x="121" y="660"/>
-      <point x="131" y="649"/>
+      <point x="149" y="649" type="curve" smooth="yes"/>
+      <point x="163" y="649"/>
+      <point x="173" y="660"/>
+      <point x="173" y="675" type="curve" smooth="yes"/>
+      <point x="173" y="690"/>
+      <point x="163" y="701"/>
+      <point x="149" y="701" type="curve" smooth="yes"/>
+      <point x="136" y="701"/>
+      <point x="125" y="690"/>
+      <point x="125" y="675" type="curve" smooth="yes"/>
+      <point x="125" y="660"/>
+      <point x="136" y="649"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/contents.plist b/src/Cantarell-Light.ufo/glyphs/contents.plist
index 818d6b92..286fd932 100644
--- a/src/Cantarell-Light.ufo/glyphs/contents.plist
+++ b/src/Cantarell-Light.ufo/glyphs/contents.plist
@@ -686,8 +686,6 @@
     <string>_descenderreverse-cy.case.glif</string>
     <key>_descenderreversed-cy</key>
     <string>_descenderreversed-cy.glif</string>
-    <key>_o.numero</key>
-    <string>_o.numero.glif</string>
     <key>_slash.zero</key>
     <string>_slash.zero.glif</string>
     <key>_slash.zero.osf</key>
@@ -736,8 +734,6 @@
     <string>acutecomb.case.glif</string>
     <key>acutecomb.loclVIET</key>
     <string>acutecomb.loclV_I_E_T_.glif</string>
-    <key>acutecomb_dotaccentcomb</key>
-    <string>acutecomb_dotaccentcomb.glif</string>
     <key>adblgrave</key>
     <string>adblgrave.glif</string>
     <key>adieresis</key>
@@ -768,8 +764,6 @@
     <string>apostrophemod.glif</string>
     <key>approxequal</key>
     <string>approxequal.glif</string>
-    <key>approxequal.tf</key>
-    <string>approxequal.tf.glif</string>
     <key>aring</key>
     <string>aring.glif</string>
     <key>aringacute</key>
@@ -818,22 +812,6 @@
     <string>brevecomb.case.glif</string>
     <key>brevecomb.loclVIET</key>
     <string>brevecomb.loclV_I_E_T_.glif</string>
-    <key>brevecomb_acutecomb</key>
-    <string>brevecomb_acutecomb.glif</string>
-    <key>brevecomb_acutecomb.case</key>
-    <string>brevecomb_acutecomb.case.glif</string>
-    <key>brevecomb_gravecomb</key>
-    <string>brevecomb_gravecomb.glif</string>
-    <key>brevecomb_gravecomb.case</key>
-    <string>brevecomb_gravecomb.case.glif</string>
-    <key>brevecomb_hookabovecomb</key>
-    <string>brevecomb_hookabovecomb.glif</string>
-    <key>brevecomb_hookabovecomb.case</key>
-    <string>brevecomb_hookabovecomb.case.glif</string>
-    <key>brevecomb_tildecomb</key>
-    <string>brevecomb_tildecomb.glif</string>
-    <key>brevecomb_tildecomb.case</key>
-    <string>brevecomb_tildecomb.case.glif</string>
     <key>breveinvertedcomb</key>
     <string>breveinvertedcomb.glif</string>
     <key>breveinvertedcomb.case</key>
@@ -844,8 +822,6 @@
     <string>bullet.glif</string>
     <key>bulletoperator</key>
     <string>bulletoperator.glif</string>
-    <key>bulletoperator.tf</key>
-    <string>bulletoperator.tf.glif</string>
     <key>c</key>
     <string>c.glif</string>
     <key>cacute</key>
@@ -860,8 +836,6 @@
     <string>caroncomb.case.glif</string>
     <key>caroncomb.loclVIET</key>
     <string>caroncomb.loclV_I_E_T_.glif</string>
-    <key>caroncomb_dotaccentcomb</key>
-    <string>caroncomb_dotaccentcomb.glif</string>
     <key>ccaron</key>
     <string>ccaron.glif</string>
     <key>ccedilla</key>
@@ -898,22 +872,6 @@
     <string>circumflexcomb.case.glif</string>
     <key>circumflexcomb.loclVIET</key>
     <string>circumflexcomb.loclV_I_E_T_.glif</string>
-    <key>circumflexcomb_acutecomb</key>
-    <string>circumflexcomb_acutecomb.glif</string>
-    <key>circumflexcomb_acutecomb.case</key>
-    <string>circumflexcomb_acutecomb.case.glif</string>
-    <key>circumflexcomb_gravecomb</key>
-    <string>circumflexcomb_gravecomb.glif</string>
-    <key>circumflexcomb_gravecomb.case</key>
-    <string>circumflexcomb_gravecomb.case.glif</string>
-    <key>circumflexcomb_hookabovecomb</key>
-    <string>circumflexcomb_hookabovecomb.glif</string>
-    <key>circumflexcomb_hookabovecomb.case</key>
-    <string>circumflexcomb_hookabovecomb.case.glif</string>
-    <key>circumflexcomb_tildecomb</key>
-    <string>circumflexcomb_tildecomb.glif</string>
-    <key>circumflexcomb_tildecomb.case</key>
-    <string>circumflexcomb_tildecomb.case.glif</string>
     <key>colon</key>
     <string>colon.glif</string>
     <key>colonsign</key>
@@ -928,8 +886,6 @@
     <string>commaturnedmod.glif</string>
     <key>commercialMinusSign</key>
     <string>commercialM_inusS_ign.glif</string>
-    <key>commercialMinusSign.tf</key>
-    <string>commercialM_inusS_ign.tf.glif</string>
     <key>copyright</key>
     <string>copyright.glif</string>
     <key>currency</key>
@@ -970,22 +926,10 @@
     <string>dieresiscomb.case.glif</string>
     <key>dieresiscomb.loclVIET</key>
     <string>dieresiscomb.loclV_I_E_T_.glif</string>
-    <key>dieresiscomb_acutecomb</key>
-    <string>dieresiscomb_acutecomb.glif</string>
-    <key>dieresiscomb_caroncomb</key>
-    <string>dieresiscomb_caroncomb.glif</string>
-    <key>dieresiscomb_gravecomb</key>
-    <string>dieresiscomb_gravecomb.glif</string>
-    <key>dieresiscomb_macroncomb</key>
-    <string>dieresiscomb_macroncomb.glif</string>
     <key>divide</key>
     <string>divide.glif</string>
-    <key>divide.tf</key>
-    <string>divide.tf.glif</string>
     <key>divisionslash</key>
     <string>divisionslash.glif</string>
-    <key>divisionslash.tf</key>
-    <string>divisionslash.tf.glif</string>
     <key>dje-cy</key>
     <string>dje-cy.glif</string>
     <key>dlinebelow</key>
@@ -1002,8 +946,6 @@
     <string>dotaccentcomb.case.glif</string>
     <key>dotaccentcomb.loclVIET</key>
     <string>dotaccentcomb.loclV_I_E_T_.glif</string>
-    <key>dotaccentcomb_macroncomb</key>
-    <string>dotaccentcomb_macroncomb.glif</string>
     <key>dotbelowcomb</key>
     <string>dotbelowcomb.glif</string>
     <key>doubleprimemod</key>
@@ -1064,8 +1006,6 @@
     <string>eight.osf.glif</string>
     <key>eight.tf</key>
     <string>eight.tf.glif</string>
-    <key>eight.tosf</key>
-    <string>eight.tosf.glif</string>
     <key>eightinferior</key>
     <string>eightinferior.glif</string>
     <key>eightsuperior</key>
@@ -1088,8 +1028,6 @@
     <string>emdash.glif</string>
     <key>emptyset</key>
     <string>emptyset.glif</string>
-    <key>emquad</key>
-    <string>emquad.glif</string>
     <key>emspace</key>
     <string>emspace.glif</string>
     <key>en-cy</key>
@@ -1102,20 +1040,14 @@
     <string>eng.glif</string>
     <key>enghe-cy</key>
     <string>enghe-cy.glif</string>
-    <key>enquad</key>
-    <string>enquad.glif</string>
     <key>enspace</key>
     <string>enspace.glif</string>
     <key>eogonek</key>
     <string>eogonek.glif</string>
     <key>equal</key>
     <string>equal.glif</string>
-    <key>equal.tf</key>
-    <string>equal.tf.glif</string>
     <key>equivalence</key>
     <string>equivalence.glif</string>
-    <key>equivalence.tf</key>
-    <string>equivalence.tf.glif</string>
     <key>er-cy</key>
     <string>er-cy.glif</string>
     <key>ereversed-cy</key>
@@ -1138,12 +1070,6 @@
     <string>exclamdown.glif</string>
     <key>f</key>
     <string>f.glif</string>
-    <key>f_f</key>
-    <string>f_f.glif</string>
-    <key>f_f_i</key>
-    <string>f_f_i.glif</string>
-    <key>f_f_l</key>
-    <string>f_f_l.glif</string>
     <key>fi</key>
     <string>fi.glif</string>
     <key>figuredash</key>
@@ -1164,8 +1090,6 @@
     <string>five.osf.glif</string>
     <key>five.tf</key>
     <string>five.tf.glif</string>
-    <key>five.tosf</key>
-    <string>five.tosf.glif</string>
     <key>fiveeighths</key>
     <string>fiveeighths.glif</string>
     <key>fiveinferior</key>
@@ -1188,8 +1112,6 @@
     <string>four.osf.glif</string>
     <key>four.tf</key>
     <string>four.tf.glif</string>
-    <key>four.tosf</key>
-    <string>four.tosf.glif</string>
     <key>fourfifths</key>
     <string>fourfifths.glif</string>
     <key>fourinferior</key>
@@ -1242,12 +1164,8 @@
     <string>gravecomb.loclV_I_E_T_.glif</string>
     <key>greater</key>
     <string>greater.glif</string>
-    <key>greater.tf</key>
-    <string>greater.tf.glif</string>
     <key>greaterequal</key>
     <string>greaterequal.glif</string>
-    <key>greaterequal.tf</key>
-    <string>greaterequal.tf.glif</string>
     <key>guarani</key>
     <string>guarani.glif</string>
     <key>guillemetleft</key>
@@ -1282,8 +1200,6 @@
     <string>hookabovecomb.case.glif</string>
     <key>hookabovecomb.loclVIET</key>
     <string>hookabovecomb.loclV_I_E_T_.glif</string>
-    <key>horizontalbar</key>
-    <string>horizontalbar.glif</string>
     <key>horncomb</key>
     <string>horncomb.glif</string>
     <key>hryvnia</key>
@@ -1296,8 +1212,6 @@
     <string>hungarumlautcomb.case.glif</string>
     <key>hyphen</key>
     <string>hyphen.glif</string>
-    <key>hyphentwo</key>
-    <string>hyphentwo.glif</string>
     <key>i</key>
     <string>i.glif</string>
     <key>i-cy</key>
@@ -1396,6 +1310,8 @@
     <string>kje-cy.glif</string>
     <key>l</key>
     <string>l.glif</string>
+    <key>l.ss01</key>
+    <string>l.ss01.glif</string>
     <key>lacute</key>
     <string>lacute.glif</string>
     <key>lcaron</key>
@@ -1412,12 +1328,8 @@
     <string>leftanglebracket-math.glif</string>
     <key>less</key>
     <string>less.glif</string>
-    <key>less.tf</key>
-    <string>less.tf.glif</string>
     <key>lessequal</key>
     <string>lessequal.glif</string>
-    <key>lessequal.tf</key>
-    <string>lessequal.tf.glif</string>
     <key>lira</key>
     <string>lira.glif</string>
     <key>liraTurkish</key>
@@ -1432,8 +1344,6 @@
     <string>llinebelow.glif</string>
     <key>logicalnot</key>
     <string>logicalnot.glif</string>
-    <key>logicalnot.tf</key>
-    <string>logicalnot.tf.glif</string>
     <key>lozenge</key>
     <string>lozenge.glif</string>
     <key>lslash</key>
@@ -1456,12 +1366,6 @@
     <string>macroncomb.narrow.glif</string>
     <key>macroncomb.narrow.case</key>
     <string>macroncomb.narrow.case.glif</string>
-    <key>macroncomb_acutecomb</key>
-    <string>macroncomb_acutecomb.glif</string>
-    <key>macroncomb_dieresiscomb</key>
-    <string>macroncomb_dieresiscomb.glif</string>
-    <key>macroncomb_gravecomb</key>
-    <string>macroncomb_gravecomb.glif</string>
     <key>manat</key>
     <string>manat.glif</string>
     <key>mdotbelow</key>
@@ -1470,22 +1374,16 @@
     <string>micro.glif</string>
     <key>minus</key>
     <string>minus.glif</string>
-    <key>minus.tf</key>
-    <string>minus.tf.glif</string>
     <key>minute</key>
     <string>minute.glif</string>
     <key>multiply</key>
     <string>multiply.glif</string>
-    <key>multiply.tf</key>
-    <string>multiply.tf.glif</string>
     <key>n</key>
     <string>n.glif</string>
     <key>nacute</key>
     <string>nacute.glif</string>
     <key>naira</key>
     <string>naira.glif</string>
-    <key>nbspace</key>
-    <string>nbspace.glif</string>
     <key>ncaron</key>
     <string>ncaron.glif</string>
     <key>ncommaaccent</key>
@@ -1504,8 +1402,6 @@
     <string>nine.osf.glif</string>
     <key>nine.tf</key>
     <string>nine.tf.glif</string>
-    <key>nine.tosf</key>
-    <string>nine.tosf.glif</string>
     <key>nineinferior</key>
     <string>nineinferior.glif</string>
     <key>ninesuperior</key>
@@ -1516,16 +1412,10 @@
     <string>nje-cy.glif</string>
     <key>nlinebelow</key>
     <string>nlinebelow.glif</string>
-    <key>nonbreakinghyphen</key>
-    <string>nonbreakinghyphen.glif</string>
     <key>notequal</key>
     <string>notequal.glif</string>
-    <key>notequal.tf</key>
-    <string>notequal.tf.glif</string>
     <key>notidentical</key>
     <string>notidentical.glif</string>
-    <key>notidentical.tf</key>
-    <string>notidentical.tf.glif</string>
     <key>ntilde</key>
     <string>ntilde.glif</string>
     <key>numbersign</key>
@@ -1616,8 +1506,6 @@
     <string>one.osf.glif</string>
     <key>one.tf</key>
     <string>one.tf.glif</string>
-    <key>one.tosf</key>
-    <string>one.tosf.glif</string>
     <key>oneeighth</key>
     <string>oneeighth.glif</string>
     <key>onefifth</key>
@@ -1694,12 +1582,8 @@
     <string>pi.glif</string>
     <key>plus</key>
     <string>plus.glif</string>
-    <key>plus.tf</key>
-    <string>plus.tf.glif</string>
     <key>plusminus</key>
     <string>plusminus.glif</string>
-    <key>plusminus.tf</key>
-    <string>plusminus.tf.glif</string>
     <key>primeReversed</key>
     <string>primeR_eversed.glif</string>
     <key>primemod</key>
@@ -1822,8 +1706,6 @@
     <string>seven.osf.glif</string>
     <key>seven.tf</key>
     <string>seven.tf.glif</string>
-    <key>seven.tosf</key>
-    <string>seven.tosf.glif</string>
     <key>seveneighths</key>
     <string>seveneighths.glif</string>
     <key>seveninferior</key>
@@ -1846,8 +1728,6 @@
     <string>six.osf.glif</string>
     <key>six.tf</key>
     <string>six.tf.glif</string>
-    <key>six.tosf</key>
-    <string>six.tosf.glif</string>
     <key>sixinferior</key>
     <string>sixinferior.glif</string>
     <key>sixperemspace</key>
@@ -1864,8 +1744,6 @@
     <string>slashshortcomb.glif</string>
     <key>slashshortcomb.case</key>
     <string>slashshortcomb.case.glif</string>
-    <key>softhyphen</key>
-    <string>softhyphen.glif</string>
     <key>softsign-cy</key>
     <string>softsign-cy.glif</string>
     <key>space</key>
@@ -1912,8 +1790,6 @@
     <string>three.osf.glif</string>
     <key>three.tf</key>
     <string>three.tf.glif</string>
-    <key>three.tosf</key>
-    <string>three.tosf.glif</string>
     <key>threeeighths</key>
     <string>threeeighths.glif</string>
     <key>threefifths</key>
@@ -1934,12 +1810,6 @@
     <string>tildecomb.case.glif</string>
     <key>tildecomb.loclVIET</key>
     <string>tildecomb.loclV_I_E_T_.glif</string>
-    <key>tildecomb_acutecomb</key>
-    <string>tildecomb_acutecomb.glif</string>
-    <key>tildecomb_dieresiscomb</key>
-    <string>tildecomb_dieresiscomb.glif</string>
-    <key>tildecomb_macroncomb</key>
-    <string>tildecomb_macroncomb.glif</string>
     <key>tlinebelow</key>
     <string>tlinebelow.glif</string>
     <key>trademark</key>
@@ -1962,8 +1832,6 @@
     <string>two.osf.glif</string>
     <key>two.tf</key>
     <string>two.tf.glif</string>
-    <key>two.tosf</key>
-    <string>two.tosf.glif</string>
     <key>twofifths</key>
     <string>twofifths.glif</string>
     <key>twoinferior</key>
@@ -2138,10 +2006,6 @@
     <string>zero.tf.glif</string>
     <key>zero.tf.zero</key>
     <string>zero.tf.zero.glif</string>
-    <key>zero.tosf</key>
-    <string>zero.tosf.glif</string>
-    <key>zero.tosf.zero</key>
-    <string>zero.tosf.zero.glif</string>
     <key>zero.zero</key>
     <string>zero.zero.glif</string>
     <key>zeroinferior</key>
diff --git a/src/Cantarell-Light.ufo/glyphs/copyright.glif b/src/Cantarell-Light.ufo/glyphs/copyright.glif
index 15facb82..277e19bd 100644
--- a/src/Cantarell-Light.ufo/glyphs/copyright.glif
+++ b/src/Cantarell-Light.ufo/glyphs/copyright.glif
@@ -1,63 +1,69 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="copyright" format="2">
-  <advance width="886"/>
+  <advance width="868"/>
   <unicode hex="00A9"/>
   <outline>
     <contour>
-      <point x="442" y="-3" type="curve" smooth="yes"/>
-      <point x="646" y="-3"/>
-      <point x="782" y="137"/>
-      <point x="782" y="347" type="curve" smooth="yes"/>
-      <point x="782" y="561"/>
-      <point x="647" y="704"/>
-      <point x="444" y="704" type="curve" smooth="yes"/>
-      <point x="240" y="704"/>
-      <point x="104" y="560"/>
-      <point x="104" y="344" type="curve" smooth="yes"/>
-      <point x="104" y="136"/>
-      <point x="239" y="-3"/>
+      <point x="433" y="-3" type="curve" smooth="yes"/>
+      <point x="637" y="-3"/>
+      <point x="773" y="137"/>
+      <point x="773" y="347" type="curve" smooth="yes"/>
+      <point x="773" y="561"/>
+      <point x="638" y="704"/>
+      <point x="435" y="704" type="curve" smooth="yes"/>
+      <point x="231" y="704"/>
+      <point x="95" y="560"/>
+      <point x="95" y="344" type="curve" smooth="yes"/>
+      <point x="95" y="136"/>
+      <point x="230" y="-3"/>
     </contour>
     <contour>
-      <point x="445" y="15" type="curve" smooth="yes"/>
-      <point x="253" y="15"/>
-      <point x="125" y="148"/>
-      <point x="125" y="347" type="curve" smooth="yes"/>
-      <point x="125" y="550"/>
-      <point x="251" y="686"/>
-      <point x="441" y="686" type="curve" smooth="yes"/>
-      <point x="634" y="686"/>
-      <point x="762" y="549"/>
-      <point x="762" y="344" type="curve" smooth="yes"/>
-      <point x="762" y="147"/>
-      <point x="635" y="15"/>
+      <point x="443" y="134" type="curve" smooth="yes"/>
+      <point x="482" y="134"/>
+      <point x="525" y="143"/>
+      <point x="562" y="160" type="curve"/>
+      <point x="557" y="176" type="line"/>
+      <point x="523" y="162"/>
+      <point x="482" y="154"/>
+      <point x="448" y="154" type="curve" smooth="yes"/>
+      <point x="342" y="154"/>
+      <point x="271" y="232"/>
+      <point x="271" y="350" type="curve" smooth="yes"/>
+      <point x="271" y="466"/>
+      <point x="342" y="542"/>
+      <point x="451" y="542" type="curve" smooth="yes"/>
+      <point x="486" y="542"/>
+      <point x="523" y="534"/>
+      <point x="556" y="520" type="curve"/>
+      <point x="563" y="537" type="line"/>
+      <point x="530" y="553"/>
+      <point x="492" y="561"/>
+      <point x="453" y="561" type="curve" smooth="yes"/>
+      <point x="330" y="561"/>
+      <point x="248" y="474"/>
+      <point x="248" y="343" type="curve" smooth="yes"/>
+      <point x="248" y="218"/>
+      <point x="326" y="134"/>
     </contour>
     <contour>
-      <point x="452" y="134" type="curve" smooth="yes"/>
-      <point x="491" y="134"/>
-      <point x="534" y="143"/>
-      <point x="571" y="160" type="curve"/>
-      <point x="566" y="176" type="line"/>
-      <point x="532" y="162"/>
-      <point x="491" y="154"/>
-      <point x="457" y="154" type="curve" smooth="yes"/>
-      <point x="351" y="154"/>
-      <point x="280" y="232"/>
-      <point x="280" y="350" type="curve" smooth="yes"/>
-      <point x="280" y="466"/>
-      <point x="351" y="542"/>
-      <point x="460" y="542" type="curve" smooth="yes"/>
-      <point x="495" y="542"/>
-      <point x="532" y="534"/>
-      <point x="565" y="520" type="curve"/>
-      <point x="572" y="537" type="line"/>
-      <point x="539" y="553"/>
-      <point x="501" y="561"/>
-      <point x="462" y="561" type="curve" smooth="yes"/>
-      <point x="339" y="561"/>
-      <point x="257" y="474"/>
-      <point x="257" y="343" type="curve" smooth="yes"/>
-      <point x="257" y="218"/>
-      <point x="335" y="134"/>
+      <point x="436" y="15" type="curve" smooth="yes"/>
+      <point x="244" y="15"/>
+      <point x="116" y="148"/>
+      <point x="116" y="347" type="curve" smooth="yes"/>
+      <point x="116" y="550"/>
+      <point x="242" y="686"/>
+      <point x="432" y="686" type="curve" smooth="yes"/>
+      <point x="625" y="686"/>
+      <point x="753" y="549"/>
+      <point x="753" y="344" type="curve" smooth="yes"/>
+      <point x="753" y="147"/>
+      <point x="626" y="15"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/currency.glif b/src/Cantarell-Light.ufo/glyphs/currency.glif
index b2139f8f..e2a5d7bf 100644
--- a/src/Cantarell-Light.ufo/glyphs/currency.glif
+++ b/src/Cantarell-Light.ufo/glyphs/currency.glif
@@ -1,59 +1,65 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="currency" format="2">
-  <advance width="622"/>
+  <advance width="580"/>
   <unicode hex="00A4"/>
   <outline>
     <contour>
-      <point x="310" y="159" type="curve" smooth="yes"/>
-      <point x="414" y="159"/>
-      <point x="483" y="231"/>
-      <point x="483" y="339" type="curve" smooth="yes"/>
-      <point x="483" y="443"/>
-      <point x="415" y="513"/>
-      <point x="313" y="513" type="curve" smooth="yes"/>
-      <point x="209" y="513"/>
-      <point x="140" y="442"/>
-      <point x="140" y="335" type="curve" smooth="yes"/>
-      <point x="140" y="229"/>
-      <point x="208" y="159"/>
+      <point x="290" y="159" type="curve" smooth="yes"/>
+      <point x="394" y="159"/>
+      <point x="463" y="231"/>
+      <point x="463" y="339" type="curve" smooth="yes"/>
+      <point x="463" y="443"/>
+      <point x="395" y="513"/>
+      <point x="293" y="513" type="curve" smooth="yes"/>
+      <point x="189" y="513"/>
+      <point x="120" y="442"/>
+      <point x="120" y="335" type="curve" smooth="yes"/>
+      <point x="120" y="229"/>
+      <point x="188" y="159"/>
     </contour>
     <contour>
-      <point x="101" y="105" type="line"/>
-      <point x="203" y="204" type="line"/>
-      <point x="191" y="216" type="line"/>
-      <point x="89" y="117" type="line"/>
+      <point x="81" y="105" type="line"/>
+      <point x="183" y="204" type="line"/>
+      <point x="171" y="216" type="line"/>
+      <point x="69" y="117" type="line"/>
     </contour>
     <contour>
-      <point x="521" y="105" type="line"/>
-      <point x="533" y="117" type="line"/>
-      <point x="429" y="218" type="line"/>
-      <point x="417" y="206" type="line"/>
+      <point x="501" y="105" type="line"/>
+      <point x="513" y="117" type="line"/>
+      <point x="409" y="218" type="line"/>
+      <point x="397" y="206" type="line"/>
     </contour>
     <contour>
-      <point x="313" y="177" type="curve" smooth="yes"/>
-      <point x="222" y="177"/>
-      <point x="161" y="241"/>
-      <point x="161" y="338" type="curve" smooth="yes"/>
-      <point x="161" y="432"/>
-      <point x="221" y="495"/>
-      <point x="310" y="495" type="curve" smooth="yes"/>
-      <point x="401" y="495"/>
-      <point x="462" y="431"/>
-      <point x="462" y="336" type="curve" smooth="yes"/>
-      <point x="462" y="241"/>
-      <point x="402" y="177"/>
+      <point x="293" y="177" type="curve" smooth="yes"/>
+      <point x="202" y="177"/>
+      <point x="141" y="241"/>
+      <point x="141" y="338" type="curve" smooth="yes"/>
+      <point x="141" y="432"/>
+      <point x="201" y="495"/>
+      <point x="290" y="495" type="curve" smooth="yes"/>
+      <point x="381" y="495"/>
+      <point x="442" y="431"/>
+      <point x="442" y="336" type="curve" smooth="yes"/>
+      <point x="442" y="241"/>
+      <point x="382" y="177"/>
     </contour>
     <contour>
-      <point x="187" y="454" type="line"/>
-      <point x="199" y="466" type="line"/>
-      <point x="101" y="566" type="line"/>
-      <point x="89" y="554" type="line"/>
+      <point x="167" y="454" type="line"/>
+      <point x="179" y="466" type="line"/>
+      <point x="81" y="566" type="line"/>
+      <point x="69" y="554" type="line"/>
     </contour>
     <contour>
-      <point x="433" y="454" type="line"/>
-      <point x="533" y="554" type="line"/>
-      <point x="521" y="566" type="line"/>
-      <point x="421" y="466" type="line"/>
+      <point x="413" y="454" type="line"/>
+      <point x="513" y="554" type="line"/>
+      <point x="501" y="566" type="line"/>
+      <point x="401" y="466" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/d.glif b/src/Cantarell-Light.ufo/glyphs/d.glif
index d4df06b1..729934f9 100644
--- a/src/Cantarell-Light.ufo/glyphs/d.glif
+++ b/src/Cantarell-Light.ufo/glyphs/d.glif
@@ -1,49 +1,54 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="d" format="2">
-  <advance width="534"/>
+  <advance width="564"/>
   <unicode hex="0064"/>
-  <note>
-d
-</note>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="391" y="592" name="center"/>
-  <anchor x="275" y="480" name="top"/>
-  <anchor x="548" y="480" name="topright"/>
+  <anchor x="286" y="0" name="bottom"/>
+  <anchor x="402" y="592" name="center"/>
+  <anchor x="286" y="480" name="top"/>
+  <anchor x="559" y="480" name="topright"/>
   <outline>
     <contour>
-      <point x="430" y="0" type="line"/>
-      <point x="446" y="0" type="line"/>
-      <point x="446" y="739" type="line"/>
-      <point x="427" y="739" type="line"/>
-      <point x="427" y="64" type="line"/>
+      <point x="279" y="-10" type="curve" smooth="yes"/>
+      <point x="350" y="-10"/>
+      <point x="407" y="23"/>
+      <point x="443" y="85" type="curve"/>
+      <point x="440" y="106" type="line"/>
+      <point x="408" y="44"/>
+      <point x="352" y="8"/>
+      <point x="281" y="8" type="curve" smooth="yes"/>
+      <point x="164" y="8"/>
+      <point x="89" y="101"/>
+      <point x="89" y="239" type="curve" smooth="yes"/>
+      <point x="89" y="374"/>
+      <point x="161" y="468"/>
+      <point x="276" y="468" type="curve" smooth="yes"/>
+      <point x="350" y="468"/>
+      <point x="408" y="431"/>
+      <point x="440" y="367" type="curve"/>
+      <point x="444" y="396" type="line"/>
+      <point x="410" y="454"/>
+      <point x="354" y="486"/>
+      <point x="281" y="486" type="curve" smooth="yes"/>
+      <point x="153" y="486"/>
+      <point x="68" y="386"/>
+      <point x="68" y="237" type="curve" smooth="yes"/>
+      <point x="68" y="89"/>
+      <point x="152" y="-10"/>
     </contour>
     <contour>
-      <point x="268" y="-10" type="curve" smooth="yes"/>
-      <point x="339" y="-10"/>
-      <point x="396" y="23"/>
-      <point x="432" y="85" type="curve"/>
-      <point x="429" y="106" type="line"/>
-      <point x="397" y="44"/>
-      <point x="341" y="8"/>
-      <point x="270" y="8" type="curve" smooth="yes"/>
-      <point x="153" y="8"/>
-      <point x="78" y="101"/>
-      <point x="78" y="239" type="curve" smooth="yes"/>
-      <point x="78" y="374"/>
-      <point x="150" y="468"/>
-      <point x="265" y="468" type="curve" smooth="yes"/>
-      <point x="339" y="468"/>
-      <point x="397" y="431"/>
-      <point x="429" y="367" type="curve"/>
-      <point x="433" y="396" type="line"/>
-      <point x="399" y="454"/>
-      <point x="343" y="486"/>
-      <point x="270" y="486" type="curve" smooth="yes"/>
-      <point x="142" y="486"/>
-      <point x="57" y="386"/>
-      <point x="57" y="237" type="curve" smooth="yes"/>
-      <point x="57" y="89"/>
-      <point x="141" y="-10"/>
+      <point x="441" y="0" type="line"/>
+      <point x="457" y="0" type="line"/>
+      <point x="457" y="739" type="line"/>
+      <point x="438" y="739" type="line"/>
+      <point x="438" y="64" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dagger.glif b/src/Cantarell-Light.ufo/glyphs/dagger.glif
index 40e778c8..1957e183 100644
--- a/src/Cantarell-Light.ufo/glyphs/dagger.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dagger.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dagger" format="2">
-  <advance width="426"/>
+  <advance width="400"/>
   <unicode hex="2020"/>
   <outline>
     <contour>
-      <point x="201" y="0" type="line"/>
-      <point x="223" y="0" type="line"/>
-      <point x="220" y="526" type="line"/>
-      <point x="223" y="694" type="line"/>
-      <point x="201" y="694" type="line"/>
-      <point x="203" y="526" type="line"/>
+      <point x="188" y="0" type="line"/>
+      <point x="210" y="0" type="line"/>
+      <point x="207" y="526" type="line"/>
+      <point x="210" y="694" type="line"/>
+      <point x="188" y="694" type="line"/>
+      <point x="190" y="526" type="line"/>
     </contour>
     <contour>
-      <point x="78" y="517" type="line"/>
-      <point x="208" y="519" type="line"/>
-      <point x="208" y="533" type="line"/>
-      <point x="78" y="536" type="line"/>
+      <point x="65" y="517" type="line"/>
+      <point x="195" y="519" type="line"/>
+      <point x="195" y="533" type="line"/>
+      <point x="65" y="536" type="line"/>
     </contour>
     <contour>
-      <point x="348" y="517" type="line"/>
-      <point x="348" y="536" type="line"/>
-      <point x="214" y="533" type="line"/>
-      <point x="214" y="519" type="line"/>
+      <point x="335" y="517" type="line"/>
+      <point x="335" y="536" type="line"/>
+      <point x="201" y="533" type="line"/>
+      <point x="201" y="519" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/daggerdbl.glif b/src/Cantarell-Light.ufo/glyphs/daggerdbl.glif
index 62442448..73540776 100644
--- a/src/Cantarell-Light.ufo/glyphs/daggerdbl.glif
+++ b/src/Cantarell-Light.ufo/glyphs/daggerdbl.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="daggerdbl" format="2">
-  <advance width="426"/>
+  <advance width="406"/>
   <unicode hex="2021"/>
   <outline>
     <contour>
-      <point x="202" y="0" type="line"/>
-      <point x="223" y="0" type="line"/>
-      <point x="220" y="175" type="line"/>
-      <point x="223" y="346" type="line"/>
-      <point x="220" y="506" type="line"/>
-      <point x="223" y="694" type="line"/>
-      <point x="202" y="694" type="line"/>
-      <point x="204" y="506" type="line"/>
-      <point x="201" y="346" type="line"/>
-      <point x="204" y="175" type="line"/>
+      <point x="192" y="0" type="line"/>
+      <point x="213" y="0" type="line"/>
+      <point x="210" y="175" type="line"/>
+      <point x="213" y="346" type="line"/>
+      <point x="210" y="506" type="line"/>
+      <point x="213" y="694" type="line"/>
+      <point x="192" y="694" type="line"/>
+      <point x="194" y="506" type="line"/>
+      <point x="191" y="346" type="line"/>
+      <point x="194" y="175" type="line"/>
     </contour>
     <contour>
-      <point x="88" y="165" type="line"/>
-      <point x="208" y="167" type="line"/>
-      <point x="208" y="181" type="line"/>
-      <point x="88" y="184" type="line"/>
+      <point x="78" y="165" type="line"/>
+      <point x="198" y="167" type="line"/>
+      <point x="198" y="181" type="line"/>
+      <point x="78" y="184" type="line"/>
     </contour>
     <contour>
-      <point x="338" y="165" type="line"/>
-      <point x="338" y="184" type="line"/>
-      <point x="215" y="181" type="line"/>
-      <point x="215" y="167" type="line"/>
+      <point x="328" y="165" type="line"/>
+      <point x="328" y="184" type="line"/>
+      <point x="205" y="181" type="line"/>
+      <point x="205" y="167" type="line"/>
     </contour>
     <contour>
-      <point x="88" y="511" type="line"/>
-      <point x="208" y="513" type="line"/>
-      <point x="208" y="527" type="line"/>
-      <point x="88" y="530" type="line"/>
+      <point x="78" y="511" type="line"/>
+      <point x="198" y="513" type="line"/>
+      <point x="198" y="527" type="line"/>
+      <point x="78" y="530" type="line"/>
     </contour>
     <contour>
-      <point x="338" y="511" type="line"/>
-      <point x="338" y="530" type="line"/>
-      <point x="215" y="527" type="line"/>
-      <point x="215" y="513" type="line"/>
+      <point x="328" y="511" type="line"/>
+      <point x="328" y="530" type="line"/>
+      <point x="205" y="527" type="line"/>
+      <point x="205" y="513" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dblgravecomb.glif 
b/src/Cantarell-Light.ufo/glyphs/dblgravecomb.glif
index 5a989b55..0ddc39d4 100644
--- a/src/Cantarell-Light.ufo/glyphs/dblgravecomb.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dblgravecomb.glif
@@ -4,18 +4,18 @@
   <anchor x="252" y="480" name="_top"/>
   <anchor x="252" y="708" name="top"/>
   <outline>
-    <contour>
-      <point x="188" y="570" type="line"/>
-      <point x="195" y="574" type="line"/>
-      <point x="127" y="727" type="line"/>
-      <point x="107" y="718" type="line"/>
-    </contour>
     <contour>
       <point x="326" y="570" type="line"/>
       <point x="333" y="574" type="line"/>
       <point x="265" y="727" type="line"/>
       <point x="245" y="718" type="line"/>
     </contour>
+    <contour>
+      <point x="188" y="570" type="line"/>
+      <point x="195" y="574" type="line"/>
+      <point x="127" y="727" type="line"/>
+      <point x="107" y="718" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/dcaron.glif b/src/Cantarell-Light.ufo/glyphs/dcaron.glif
index 9d283d93..cafae937 100644
--- a/src/Cantarell-Light.ufo/glyphs/dcaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dcaron.glif
@@ -4,7 +4,7 @@
   <unicode hex="010F"/>
   <outline>
     <component base="d"/>
-    <component base="caroncomb.alt" xOffset="436"/>
+    <component base="caroncomb.alt" xOffset="447"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/dcroat.glif b/src/Cantarell-Light.ufo/glyphs/dcroat.glif
index 13226ef7..f2583208 100644
--- a/src/Cantarell-Light.ufo/glyphs/dcroat.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dcroat.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dcroat" format="2">
-  <advance width="534"/>
+  <advance width="564"/>
   <unicode hex="0111"/>
   <outline>
     <component base="d"/>
-    <component base="strokeshortcomb" xOffset="150" yOffset="293"/>
+    <component base="strokeshortcomb" xOffset="161" yOffset="293"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ddotbelow.glif b/src/Cantarell-Light.ufo/glyphs/ddotbelow.glif
index 1452961a..dd9356d1 100644
--- a/src/Cantarell-Light.ufo/glyphs/ddotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ddotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ddotbelow" format="2">
-  <advance width="534"/>
+  <advance width="564"/>
   <unicode hex="1E0D"/>
   <outline>
     <component base="d"/>
-    <component base="dotbelowcomb" xOffset="155"/>
+    <component base="dotbelowcomb" xOffset="166"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/de-cy.glif b/src/Cantarell-Light.ufo/glyphs/de-cy.glif
index 3eff4c87..4e068b13 100644
--- a/src/Cantarell-Light.ufo/glyphs/de-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/de-cy.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="de-cy" format="2">
-  <advance width="517"/>
+  <advance width="536"/>
   <unicode hex="0434"/>
   <outline>
     <contour>
-      <point x="50" y="0" type="line"/>
-      <point x="130" y="0"/>
-      <point x="172" y="95"/>
-      <point x="172" y="278" type="curve" smooth="yes"/>
-      <point x="172" y="463" type="line"/>
-      <point x="403" y="463" type="line"/>
-      <point x="403" y="4" type="line"/>
-      <point x="422" y="4" type="line"/>
-      <point x="422" y="480" type="line"/>
-      <point x="153" y="480" type="line"/>
-      <point x="153" y="279" type="line" smooth="yes"/>
-      <point x="153" y="106"/>
-      <point x="116" y="16"/>
-      <point x="47" y="16" type="curve"/>
+      <point x="51" y="0" type="line"/>
+      <point x="131" y="0"/>
+      <point x="173" y="95"/>
+      <point x="173" y="278" type="curve" smooth="yes"/>
+      <point x="173" y="463" type="line"/>
+      <point x="404" y="463" type="line"/>
+      <point x="404" y="4" type="line"/>
+      <point x="423" y="4" type="line"/>
+      <point x="423" y="480" type="line"/>
+      <point x="154" y="480" type="line"/>
+      <point x="154" y="279" type="line" smooth="yes"/>
+      <point x="154" y="106"/>
+      <point x="117" y="16"/>
+      <point x="48" y="16" type="curve"/>
     </contour>
     <contour>
-      <point x="20" y="-121" type="line"/>
-      <point x="38" y="-121" type="line"/>
-      <point x="38" y="0" type="line"/>
-      <point x="466" y="0" type="line"/>
-      <point x="466" y="-121" type="line"/>
-      <point x="484" y="-121" type="line"/>
-      <point x="484" y="17" type="line"/>
-      <point x="20" y="17" type="line"/>
+      <point x="31" y="-121" type="line"/>
+      <point x="49" y="-121" type="line"/>
+      <point x="49" y="0" type="line"/>
+      <point x="467" y="0" type="line"/>
+      <point x="467" y="-121" type="line"/>
+      <point x="485" y="-121" type="line"/>
+      <point x="485" y="17" type="line"/>
+      <point x="31" y="17" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/degree.glif b/src/Cantarell-Light.ufo/glyphs/degree.glif
index 882716b8..d1b67602 100644
--- a/src/Cantarell-Light.ufo/glyphs/degree.glif
+++ b/src/Cantarell-Light.ufo/glyphs/degree.glif
@@ -1,35 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="degree" format="2">
-  <advance width="512"/>
+  <advance width="487"/>
   <unicode hex="00B0"/>
   <outline>
     <contour>
-      <point x="255" y="417" type="curve" smooth="yes"/>
-      <point x="337" y="417"/>
-      <point x="391" y="475"/>
-      <point x="391" y="561" type="curve" smooth="yes"/>
-      <point x="391" y="647"/>
-      <point x="337" y="704"/>
-      <point x="257" y="704" type="curve" smooth="yes"/>
-      <point x="175" y="704"/>
-      <point x="120" y="646"/>
-      <point x="120" y="559" type="curve" smooth="yes"/>
-      <point x="120" y="474"/>
-      <point x="174" y="417"/>
+      <point x="243" y="417" type="curve" smooth="yes"/>
+      <point x="325" y="417"/>
+      <point x="379" y="475"/>
+      <point x="379" y="561" type="curve" smooth="yes"/>
+      <point x="379" y="647"/>
+      <point x="325" y="704"/>
+      <point x="245" y="704" type="curve" smooth="yes"/>
+      <point x="163" y="704"/>
+      <point x="108" y="646"/>
+      <point x="108" y="559" type="curve" smooth="yes"/>
+      <point x="108" y="474"/>
+      <point x="162" y="417"/>
     </contour>
     <contour>
-      <point x="257" y="434" type="curve" smooth="yes"/>
-      <point x="186" y="434"/>
-      <point x="139" y="485"/>
-      <point x="139" y="561" type="curve" smooth="yes"/>
-      <point x="139" y="637"/>
-      <point x="185" y="687"/>
-      <point x="255" y="687" type="curve" smooth="yes"/>
-      <point x="325" y="687"/>
-      <point x="372" y="636"/>
-      <point x="372" y="559" type="curve" smooth="yes"/>
-      <point x="372" y="484"/>
-      <point x="326" y="434"/>
+      <point x="245" y="434" type="curve" smooth="yes"/>
+      <point x="174" y="434"/>
+      <point x="127" y="485"/>
+      <point x="127" y="561" type="curve" smooth="yes"/>
+      <point x="127" y="637"/>
+      <point x="173" y="687"/>
+      <point x="243" y="687" type="curve" smooth="yes"/>
+      <point x="313" y="687"/>
+      <point x="360" y="636"/>
+      <point x="360" y="559" type="curve" smooth="yes"/>
+      <point x="360" y="484"/>
+      <point x="314" y="434"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/descender-cy.case.glif 
b/src/Cantarell-Light.ufo/glyphs/descender-cy.case.glif
index 3d0bacbd..b8d6b5e5 100644
--- a/src/Cantarell-Light.ufo/glyphs/descender-cy.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/descender-cy.case.glif
@@ -4,12 +4,12 @@
   <anchor x="96" y="0" name="_bottomright"/>
   <outline>
     <contour>
-      <point x="131" y="0" type="line"/>
       <point x="131" y="-175" type="line"/>
       <point x="152" y="-175" type="line"/>
       <point x="152" y="19" type="line"/>
-      <point x="67" y="19" type="line"/>
-      <point x="67" y="0" type="line"/>
+      <point x="76" y="19" type="line"/>
+      <point x="76" y="0" type="line"/>
+      <point x="131" y="0" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/descender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/descender-cy.glif
index 299ace20..15659909 100644
--- a/src/Cantarell-Light.ufo/glyphs/descender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/descender-cy.glif
@@ -6,9 +6,9 @@
     <contour>
       <point x="106" y="-119" type="line"/>
       <point x="127" y="-119" type="line"/>
-      <point x="127" y="19" type="line"/>
-      <point x="57" y="19" type="line"/>
-      <point x="57" y="0" type="line"/>
+      <point x="127" y="17" type="line"/>
+      <point x="65" y="17" type="line"/>
+      <point x="65" y="0" type="line"/>
       <point x="106" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/dieresis.glif b/src/Cantarell-Light.ufo/glyphs/dieresis.glif
index 96ec4eec..0706b8e4 100644
--- a/src/Cantarell-Light.ufo/glyphs/dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dieresis.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dieresis" format="2">
-  <advance width="438"/>
+  <advance width="500"/>
   <unicode hex="00A8"/>
   <outline>
-    <component base="dieresiscomb" xOffset="-1"/>
+    <component base="dieresiscomb" xOffset="31"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dieresisbelowcomb.glif 
b/src/Cantarell-Light.ufo/glyphs/dieresisbelowcomb.glif
index ac8d5e69..d2e0e93c 100644
--- a/src/Cantarell-Light.ufo/glyphs/dieresisbelowcomb.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dieresisbelowcomb.glif
@@ -4,20 +4,6 @@
   <anchor x="220" y="0" name="_bottom"/>
   <anchor x="220" y="-143" name="bottom"/>
   <outline>
-    <contour>
-      <point x="120" y="-143" type="curve" smooth="yes"/>
-      <point x="132" y="-143"/>
-      <point x="141" y="-134"/>
-      <point x="141" y="-122" type="curve" smooth="yes"/>
-      <point x="141" y="-110"/>
-      <point x="132" y="-101"/>
-      <point x="120" y="-101" type="curve" smooth="yes"/>
-      <point x="108" y="-101"/>
-      <point x="99" y="-110"/>
-      <point x="99" y="-122" type="curve" smooth="yes"/>
-      <point x="99" y="-134"/>
-      <point x="108" y="-143"/>
-    </contour>
     <contour>
       <point x="320" y="-143" type="curve" smooth="yes"/>
       <point x="332" y="-143"/>
@@ -32,6 +18,20 @@
       <point x="299" y="-134"/>
       <point x="308" y="-143"/>
     </contour>
+    <contour>
+      <point x="120" y="-143" type="curve" smooth="yes"/>
+      <point x="132" y="-143"/>
+      <point x="141" y="-134"/>
+      <point x="141" y="-122" type="curve" smooth="yes"/>
+      <point x="141" y="-110"/>
+      <point x="132" y="-101"/>
+      <point x="120" y="-101" type="curve" smooth="yes"/>
+      <point x="108" y="-101"/>
+      <point x="99" y="-110"/>
+      <point x="99" y="-122" type="curve" smooth="yes"/>
+      <point x="99" y="-134"/>
+      <point x="108" y="-143"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/dieresiscomb.glif 
b/src/Cantarell-Light.ufo/glyphs/dieresiscomb.glif
index a7a1e8d6..4b8b59bb 100644
--- a/src/Cantarell-Light.ufo/glyphs/dieresiscomb.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dieresiscomb.glif
@@ -4,20 +4,6 @@
   <anchor x="219" y="480" name="_top"/>
   <anchor x="219" y="639" name="top"/>
   <outline>
-    <contour>
-      <point x="134" y="627" type="curve" smooth="yes"/>
-      <point x="146" y="627"/>
-      <point x="155" y="636"/>
-      <point x="155" y="648" type="curve" smooth="yes"/>
-      <point x="155" y="660"/>
-      <point x="146" y="669"/>
-      <point x="134" y="669" type="curve" smooth="yes"/>
-      <point x="122" y="669"/>
-      <point x="113" y="660"/>
-      <point x="113" y="648" type="curve" smooth="yes"/>
-      <point x="113" y="636"/>
-      <point x="122" y="627"/>
-    </contour>
     <contour>
       <point x="304" y="627" type="curve" smooth="yes"/>
       <point x="316" y="627"/>
@@ -32,6 +18,20 @@
       <point x="283" y="636"/>
       <point x="292" y="627"/>
     </contour>
+    <contour>
+      <point x="134" y="627" type="curve" smooth="yes"/>
+      <point x="146" y="627"/>
+      <point x="155" y="636"/>
+      <point x="155" y="648" type="curve" smooth="yes"/>
+      <point x="155" y="660"/>
+      <point x="146" y="669"/>
+      <point x="134" y="669" type="curve" smooth="yes"/>
+      <point x="122" y="669"/>
+      <point x="113" y="660"/>
+      <point x="113" y="648" type="curve" smooth="yes"/>
+      <point x="113" y="636"/>
+      <point x="122" y="627"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif 
b/src/Cantarell-Light.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif
index d1c4b8e7..164b19c1 100644
--- a/src/Cantarell-Light.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif
@@ -3,20 +3,6 @@
   <anchor x="219" y="480" name="_top"/>
   <anchor x="219" y="559" name="top"/>
   <outline>
-    <contour>
-      <point x="139" y="567" type="curve" smooth="yes"/>
-      <point x="151" y="567"/>
-      <point x="160" y="576"/>
-      <point x="160" y="588" type="curve" smooth="yes"/>
-      <point x="160" y="600"/>
-      <point x="151" y="609"/>
-      <point x="139" y="609" type="curve" smooth="yes"/>
-      <point x="127" y="609"/>
-      <point x="118" y="600"/>
-      <point x="118" y="588" type="curve" smooth="yes"/>
-      <point x="118" y="576"/>
-      <point x="127" y="567"/>
-    </contour>
     <contour>
       <point x="299" y="567" type="curve" smooth="yes"/>
       <point x="311" y="567"/>
@@ -31,6 +17,20 @@
       <point x="278" y="576"/>
       <point x="287" y="567"/>
     </contour>
+    <contour>
+      <point x="139" y="567" type="curve" smooth="yes"/>
+      <point x="151" y="567"/>
+      <point x="160" y="576"/>
+      <point x="160" y="588" type="curve" smooth="yes"/>
+      <point x="160" y="600"/>
+      <point x="151" y="609"/>
+      <point x="139" y="609" type="curve" smooth="yes"/>
+      <point x="127" y="609"/>
+      <point x="118" y="600"/>
+      <point x="118" y="588" type="curve" smooth="yes"/>
+      <point x="118" y="576"/>
+      <point x="127" y="567"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/divide.glif b/src/Cantarell-Light.ufo/glyphs/divide.glif
index ab6f75ec..cd6d8c90 100644
--- a/src/Cantarell-Light.ufo/glyphs/divide.glif
+++ b/src/Cantarell-Light.ufo/glyphs/divide.glif
@@ -1,41 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="divide" format="2">
-  <advance width="632"/>
+  <advance width="580"/>
   <unicode hex="00F7"/>
   <outline>
     <contour>
-      <point x="80" y="349" type="line"/>
-      <point x="532" y="349" type="line"/>
-      <point x="532" y="366" type="line"/>
-      <point x="80" y="366" type="line"/>
+      <point x="60" y="322" type="line"/>
+      <point x="520" y="322" type="line"/>
+      <point x="520" y="339" type="line"/>
+      <point x="60" y="339" type="line"/>
     </contour>
     <contour>
-      <point x="307" y="538" type="curve" smooth="yes"/>
-      <point x="319" y="538"/>
-      <point x="328" y="547"/>
-      <point x="328" y="559" type="curve" smooth="yes"/>
-      <point x="328" y="571"/>
-      <point x="319" y="580"/>
-      <point x="307" y="580" type="curve" smooth="yes"/>
-      <point x="295" y="580"/>
-      <point x="286" y="571"/>
-      <point x="286" y="559" type="curve" smooth="yes"/>
-      <point x="286" y="547"/>
-      <point x="295" y="538"/>
+      <point x="281" y="118" type="curve" smooth="yes"/>
+      <point x="292" y="118"/>
+      <point x="302" y="127"/>
+      <point x="302" y="139" type="curve" smooth="yes"/>
+      <point x="302" y="151"/>
+      <point x="292" y="160"/>
+      <point x="281" y="160" type="curve" smooth="yes"/>
+      <point x="271" y="160"/>
+      <point x="261" y="151"/>
+      <point x="261" y="139" type="curve" smooth="yes"/>
+      <point x="261" y="127"/>
+      <point x="271" y="118"/>
     </contour>
     <contour>
-      <point x="307" y="134" type="curve" smooth="yes"/>
-      <point x="319" y="134"/>
-      <point x="328" y="143"/>
-      <point x="328" y="155" type="curve" smooth="yes"/>
-      <point x="328" y="167"/>
-      <point x="319" y="176"/>
-      <point x="307" y="176" type="curve" smooth="yes"/>
-      <point x="295" y="176"/>
-      <point x="286" y="167"/>
-      <point x="286" y="155" type="curve" smooth="yes"/>
-      <point x="286" y="143"/>
-      <point x="295" y="134"/>
+      <point x="281" y="502" type="curve" smooth="yes"/>
+      <point x="292" y="502"/>
+      <point x="302" y="511"/>
+      <point x="302" y="523" type="curve" smooth="yes"/>
+      <point x="302" y="535"/>
+      <point x="292" y="544"/>
+      <point x="281" y="544" type="curve" smooth="yes"/>
+      <point x="271" y="544"/>
+      <point x="261" y="535"/>
+      <point x="261" y="523" type="curve" smooth="yes"/>
+      <point x="261" y="511"/>
+      <point x="271" y="502"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minus</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/divisionslash.glif 
b/src/Cantarell-Light.ufo/glyphs/divisionslash.glif
index b411cd66..00b95908 100644
--- a/src/Cantarell-Light.ufo/glyphs/divisionslash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/divisionslash.glif
@@ -1,8 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="divisionslash" format="2">
-  <advance width="300"/>
+  <advance width="580"/>
   <unicode hex="2215"/>
   <outline>
-    <component base="fraction"/>
+    <contour>
+      <point x="129" y="0" type="line"/>
+      <point x="147" y="0" type="line"/>
+      <point x="453" y="694" type="line"/>
+      <point x="428" y="694" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dje-cy.glif b/src/Cantarell-Light.ufo/glyphs/dje-cy.glif
index b85ffd6c..ec43bc39 100644
--- a/src/Cantarell-Light.ufo/glyphs/dje-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dje-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dje-cy" format="2">
-  <advance width="525"/>
+  <advance width="563"/>
   <unicode hex="0452"/>
   <outline>
     <component base="tshe-cy"/>
-    <component base="_bottomhook" xOffset="-15"/>
+    <component base="_bottomhook" xOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dlinebelow.glif b/src/Cantarell-Light.ufo/glyphs/dlinebelow.glif
index b0304428..1c7b8b34 100644
--- a/src/Cantarell-Light.ufo/glyphs/dlinebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dlinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dlinebelow" format="2">
-  <advance width="534"/>
+  <advance width="564"/>
   <unicode hex="1E0F"/>
   <outline>
     <component base="d"/>
-    <component base="macronbelowcomb" xOffset="25"/>
+    <component base="macronbelowcomb" xOffset="36"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dollar.glif b/src/Cantarell-Light.ufo/glyphs/dollar.glif
index 12f51f39..9355ddf4 100644
--- a/src/Cantarell-Light.ufo/glyphs/dollar.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dollar.glif
@@ -1,20 +1,59 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dollar" format="2">
-  <advance width="615"/>
+  <advance width="580"/>
   <unicode hex="0024"/>
   <outline>
-    <component base="S" xOffset="23"/>
-    <component base="_currencyvstem" xOffset="-94"/>
-    <component base="_currencyvstem" xOffset="-95" yOffset="-840"/>
+    <contour>
+      <point x="283" y="-1" type="curve" smooth="yes"/>
+      <point x="415" y="-1"/>
+      <point x="500" y="74"/>
+      <point x="500" y="181" type="curve" smooth="yes"/>
+      <point x="500" y="411"/>
+      <point x="111" y="312"/>
+      <point x="111" y="528" type="curve" smooth="yes"/>
+      <point x="111" y="620"/>
+      <point x="181" y="675"/>
+      <point x="302" y="675" type="curve" smooth="yes"/>
+      <point x="356" y="675"/>
+      <point x="414" y="663"/>
+      <point x="464" y="637" type="curve"/>
+      <point x="471" y="655" type="line"/>
+      <point x="421" y="683"/>
+      <point x="361" y="694"/>
+      <point x="306" y="694" type="curve" smooth="yes"/>
+      <point x="171" y="694"/>
+      <point x="89" y="629"/>
+      <point x="89" y="524" type="curve" smooth="yes"/>
+      <point x="89" y="295"/>
+      <point x="478" y="389"/>
+      <point x="478" y="176" type="curve" smooth="yes"/>
+      <point x="478" y="83"/>
+      <point x="403" y="18"/>
+      <point x="287" y="18" type="curve" smooth="yes"/>
+      <point x="224" y="18"/>
+      <point x="155" y="36"/>
+      <point x="88" y="69" type="curve"/>
+      <point x="81" y="50" type="line"/>
+      <point x="148" y="16"/>
+      <point x="220" y="-1"/>
+    </contour>
+    <contour>
+      <point x="292" y="-120" type="line"/>
+      <point x="310" y="-120" type="line"/>
+      <point x="310" y="9" type="line"/>
+      <point x="292" y="9" type="line"/>
+    </contour>
+    <contour>
+      <point x="292" y="677" type="line"/>
+      <point x="310" y="677" type="line"/>
+      <point x="310" y="813" type="line"/>
+      <point x="292" y="813" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>-1</integer>
-        <integer>-1</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dong.glif b/src/Cantarell-Light.ufo/glyphs/dong.glif
index 0a4663d1..e98b9815 100644
--- a/src/Cantarell-Light.ufo/glyphs/dong.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dong.glif
@@ -1,14 +1,60 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dong" format="2">
-  <advance width="628"/>
+  <advance width="580"/>
   <unicode hex="20AB"/>
   <outline>
     <contour>
-      <point x="139" y="-117" type="line"/>
-      <point x="521" y="-117" type="line"/>
-      <point x="521" y="-100" type="line"/>
-      <point x="139" y="-100" type="line"/>
+      <point x="284" y="-10" type="curve" smooth="yes"/>
+      <point x="353" y="-10"/>
+      <point x="409" y="23"/>
+      <point x="444" y="85" type="curve"/>
+      <point x="441" y="106" type="line"/>
+      <point x="410" y="44"/>
+      <point x="356" y="8"/>
+      <point x="286" y="8" type="curve" smooth="yes"/>
+      <point x="172" y="8"/>
+      <point x="99" y="102"/>
+      <point x="99" y="239" type="curve" smooth="yes"/>
+      <point x="99" y="373"/>
+      <point x="169" y="468"/>
+      <point x="281" y="468" type="curve" smooth="yes"/>
+      <point x="353" y="468"/>
+      <point x="410" y="431"/>
+      <point x="441" y="367" type="curve"/>
+      <point x="445" y="396" type="line"/>
+      <point x="412" y="454"/>
+      <point x="357" y="486"/>
+      <point x="286" y="486" type="curve" smooth="yes"/>
+      <point x="161" y="486"/>
+      <point x="78" y="385"/>
+      <point x="78" y="237" type="curve" smooth="yes"/>
+      <point x="78" y="90"/>
+      <point x="160" y="-10"/>
+    </contour>
+    <contour>
+      <point x="125" y="-117" type="line"/>
+      <point x="498" y="-117" type="line"/>
+      <point x="498" y="-100" type="line"/>
+      <point x="125" y="-100" type="line"/>
+    </contour>
+    <contour>
+      <point x="442" y="0" type="line"/>
+      <point x="458" y="0" type="line"/>
+      <point x="458" y="739" type="line"/>
+      <point x="439" y="739" type="line"/>
+      <point x="439" y="64" type="line"/>
+    </contour>
+    <contour>
+      <point x="293" y="584" type="line"/>
+      <point x="515" y="584" type="line"/>
+      <point x="515" y="600" type="line"/>
+      <point x="293" y="600" type="line"/>
     </contour>
-    <component base="dcroat" xOffset="34"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/dotaccent.glif
index d9a0c214..3b3aa1a1 100644
--- a/src/Cantarell-Light.ufo/glyphs/dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dotaccent.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dotaccent" format="2">
-  <advance width="238"/>
+  <advance width="500"/>
   <unicode hex="02D9"/>
   <outline>
-    <component base="dotaccentcomb" xOffset="27"/>
+    <component base="dotaccentcomb" xOffset="131"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/doubleprimemod.glif 
b/src/Cantarell-Light.ufo/glyphs/doubleprimemod.glif
index 537bbcea..e2828413 100644
--- a/src/Cantarell-Light.ufo/glyphs/doubleprimemod.glif
+++ b/src/Cantarell-Light.ufo/glyphs/doubleprimemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="doubleprimemod" format="2">
-  <advance width="501"/>
+  <advance width="326"/>
   <unicode hex="02BA"/>
   <outline>
-    <component base="second"/>
+    <component base="second" xOffset="-76"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/downA_rrow.glif b/src/Cantarell-Light.ufo/glyphs/downA_rrow.glif
index d502c2f3..02b4a930 100644
--- a/src/Cantarell-Light.ufo/glyphs/downA_rrow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/downA_rrow.glif
@@ -1,11 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="downArrow" format="2">
-  <advance width="640"/>
+  <advance width="616"/>
   <unicode hex="2193"/>
-  <note>
-arrowdown
-</note>
   <outline>
-    <component base="upArrow" xScale="-1" yScale="-1" xOffset="652" yOffset="642"/>
+    <component base="upArrow" xScale="-1" yScale="-1" xOffset="616" yOffset="642"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>upArrow</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>upArrow</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dzcaron.glif b/src/Cantarell-Light.ufo/glyphs/dzcaron.glif
index 279c87ac..eb73fab5 100644
--- a/src/Cantarell-Light.ufo/glyphs/dzcaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dzcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dzcaron" format="2">
-  <advance width="948"/>
+  <advance width="1015"/>
   <unicode hex="01C6"/>
   <outline>
     <component base="d"/>
-    <component base="zcaron" xOffset="534"/>
+    <component base="zcaron" xOffset="564"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dze-cy.glif b/src/Cantarell-Light.ufo/glyphs/dze-cy.glif
index 6b356323..a3da0ad9 100644
--- a/src/Cantarell-Light.ufo/glyphs/dze-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dze-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dze-cy" format="2">
-  <advance width="430"/>
+  <advance width="451"/>
   <unicode hex="0455"/>
   <outline>
     <component base="s"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/dzhe-cy.glif b/src/Cantarell-Light.ufo/glyphs/dzhe-cy.glif
index d3b01e6a..78fab397 100644
--- a/src/Cantarell-Light.ufo/glyphs/dzhe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dzhe-cy.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dzhe-cy" format="2">
-  <advance width="533"/>
+  <advance width="571"/>
   <unicode hex="045F"/>
   <outline>
     <contour>
-      <point x="261" y="-122" type="line"/>
-      <point x="281" y="-122" type="line"/>
-      <point x="281" y="0" type="line"/>
-      <point x="445" y="0" type="line"/>
-      <point x="445" y="480" type="line"/>
-      <point x="425" y="480" type="line"/>
-      <point x="425" y="18" type="line"/>
-      <point x="108" y="18" type="line"/>
-      <point x="108" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
-      <point x="88" y="0" type="line"/>
-      <point x="261" y="0" type="line"/>
+      <point x="280" y="-122" type="line"/>
+      <point x="300" y="-122" type="line"/>
+      <point x="300" y="0" type="line"/>
+      <point x="464" y="0" type="line"/>
+      <point x="464" y="480" type="line"/>
+      <point x="444" y="480" type="line"/>
+      <point x="444" y="18" type="line"/>
+      <point x="127" y="18" type="line"/>
+      <point x="127" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="280" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -27,6 +27,10 @@
         <key>width</key>
         <integer>70</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/e-cy.glif b/src/Cantarell-Light.ufo/glyphs/e-cy.glif
index b39d00b8..0b6091eb 100644
--- a/src/Cantarell-Light.ufo/glyphs/e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/e-cy.glif
@@ -1,43 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="e-cy" format="2">
-  <advance width="458"/>
+  <advance width="484"/>
   <unicode hex="0454"/>
-  <anchor x="227" y="0" name="bottom"/>
-  <anchor x="242" y="480" name="top"/>
+  <anchor x="239" y="0" name="bottom"/>
+  <anchor x="254" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="272" y="-10" type="curve" smooth="yes"/>
-      <point x="324" y="-10"/>
-      <point x="375" y="4"/>
-      <point x="419" y="28" type="curve"/>
-      <point x="414" y="42" type="line"/>
-      <point x="369" y="19"/>
-      <point x="321" y="6"/>
-      <point x="276" y="6" type="curve" smooth="yes"/>
-      <point x="157" y="6"/>
-      <point x="77" y="98"/>
-      <point x="77" y="241" type="curve" smooth="yes"/>
-      <point x="77" y="384"/>
-      <point x="156" y="468"/>
-      <point x="284" y="468" type="curve" smooth="yes"/>
-      <point x="327" y="468"/>
-      <point x="372" y="458"/>
-      <point x="414" y="436" type="curve"/>
-      <point x="421" y="452" type="line"/>
-      <point x="378" y="475"/>
-      <point x="332" y="486"/>
-      <point x="287" y="486" type="curve" smooth="yes"/>
-      <point x="145" y="486"/>
-      <point x="56" y="391"/>
-      <point x="56" y="236" type="curve" smooth="yes"/>
-      <point x="56" y="85"/>
-      <point x="141" y="-10"/>
+      <point x="284" y="-10" type="curve" smooth="yes"/>
+      <point x="336" y="-10"/>
+      <point x="387" y="4"/>
+      <point x="431" y="28" type="curve"/>
+      <point x="426" y="42" type="line"/>
+      <point x="381" y="19"/>
+      <point x="333" y="6"/>
+      <point x="288" y="6" type="curve" smooth="yes"/>
+      <point x="169" y="6"/>
+      <point x="89" y="98"/>
+      <point x="89" y="241" type="curve" smooth="yes"/>
+      <point x="89" y="384"/>
+      <point x="168" y="468"/>
+      <point x="296" y="468" type="curve" smooth="yes"/>
+      <point x="339" y="468"/>
+      <point x="384" y="458"/>
+      <point x="426" y="436" type="curve"/>
+      <point x="433" y="452" type="line"/>
+      <point x="390" y="475"/>
+      <point x="344" y="486"/>
+      <point x="299" y="486" type="curve" smooth="yes"/>
+      <point x="157" y="486"/>
+      <point x="68" y="391"/>
+      <point x="68" y="236" type="curve" smooth="yes"/>
+      <point x="68" y="85"/>
+      <point x="153" y="-10"/>
     </contour>
     <contour>
-      <point x="71" y="247" type="line"/>
-      <point x="383" y="247" type="line"/>
-      <point x="383" y="264" type="line"/>
-      <point x="71" y="264" type="line"/>
+      <point x="83" y="247" type="line"/>
+      <point x="395" y="247" type="line"/>
+      <point x="395" y="264" type="line"/>
+      <point x="83" y="264" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>es-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>es-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/e.glif b/src/Cantarell-Light.ufo/glyphs/e.glif
index 14633561..f4645e32 100644
--- a/src/Cantarell-Light.ufo/glyphs/e.glif
+++ b/src/Cantarell-Light.ufo/glyphs/e.glif
@@ -1,46 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="e" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="0065"/>
-  <note>
-e
-</note>
-  <anchor x="249" y="0" name="bottom"/>
-  <anchor x="395" y="10" name="ogonek"/>
-  <anchor x="253" y="480" name="top"/>
+  <anchor x="260" y="0" name="bottom"/>
+  <anchor x="406" y="10" name="ogonek"/>
+  <anchor x="264" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="282" y="-10" type="curve" smooth="yes"/>
-      <point x="334" y="-10"/>
-      <point x="383" y="3"/>
-      <point x="423" y="30" type="curve"/>
-      <point x="418" y="44" type="line"/>
-      <point x="375" y="19"/>
-      <point x="330" y="7"/>
-      <point x="284" y="7" type="curve" smooth="yes"/>
-      <point x="157" y="7"/>
-      <point x="78" y="97"/>
-      <point x="78" y="242" type="curve" smooth="yes"/>
-      <point x="78" y="382"/>
-      <point x="146" y="468"/>
-      <point x="256" y="468" type="curve" smooth="yes"/>
-      <point x="360" y="468"/>
-      <point x="425" y="388"/>
-      <point x="425" y="261" type="curve"/>
-      <point x="67" y="261" type="line"/>
-      <point x="67" y="244" type="line"/>
-      <point x="445" y="244" type="line"/>
-      <point x="446" y="251"/>
-      <point x="446" y="256"/>
-      <point x="446" y="264" type="curve" smooth="yes"/>
-      <point x="446" y="396"/>
-      <point x="370" y="486"/>
-      <point x="258" y="486" type="curve" smooth="yes"/>
-      <point x="137" y="486"/>
-      <point x="57" y="387"/>
-      <point x="57" y="239" type="curve" smooth="yes"/>
-      <point x="57" y="87"/>
-      <point x="145" y="-10"/>
+      <point x="293" y="-10" type="curve" smooth="yes"/>
+      <point x="345" y="-10"/>
+      <point x="394" y="3"/>
+      <point x="434" y="30" type="curve"/>
+      <point x="429" y="44" type="line"/>
+      <point x="386" y="19"/>
+      <point x="341" y="7"/>
+      <point x="295" y="7" type="curve" smooth="yes"/>
+      <point x="168" y="7"/>
+      <point x="89" y="97"/>
+      <point x="89" y="242" type="curve" smooth="yes"/>
+      <point x="89" y="382"/>
+      <point x="157" y="468"/>
+      <point x="267" y="468" type="curve" smooth="yes"/>
+      <point x="371" y="468"/>
+      <point x="436" y="388"/>
+      <point x="436" y="261" type="curve"/>
+      <point x="78" y="261" type="line"/>
+      <point x="78" y="244" type="line"/>
+      <point x="456" y="244" type="line"/>
+      <point x="457" y="251"/>
+      <point x="457" y="256"/>
+      <point x="457" y="264" type="curve" smooth="yes"/>
+      <point x="457" y="396"/>
+      <point x="381" y="486"/>
+      <point x="269" y="486" type="curve" smooth="yes"/>
+      <point x="148" y="486"/>
+      <point x="68" y="387"/>
+      <point x="68" y="239" type="curve" smooth="yes"/>
+      <point x="68" y="87"/>
+      <point x="156" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
+      <string>=o-5</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/eacute.glif b/src/Cantarell-Light.ufo/glyphs/eacute.glif
index fdf5ba0d..1747dcda 100644
--- a/src/Cantarell-Light.ufo/glyphs/eacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eacute" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="00E9"/>
   <outline>
     <component base="e"/>
-    <component base="acutecomb" xOffset="186"/>
+    <component base="acutecomb" xOffset="197"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ebreve.glif b/src/Cantarell-Light.ufo/glyphs/ebreve.glif
index a76f3463..fff79a82 100644
--- a/src/Cantarell-Light.ufo/glyphs/ebreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ebreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ebreve" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="0115"/>
   <outline>
     <component base="e"/>
-    <component base="brevecomb" xOffset="67"/>
+    <component base="brevecomb" xOffset="78"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecaron.glif b/src/Cantarell-Light.ufo/glyphs/ecaron.glif
index 9597137e..a6a674c6 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecaron" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="011B"/>
   <outline>
     <component base="e"/>
-    <component base="caroncomb" xOffset="70"/>
+    <component base="caroncomb" xOffset="81"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecedillabreve.glif 
b/src/Cantarell-Light.ufo/glyphs/ecedillabreve.glif
index 82671ddb..da4b7f22 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecedillabreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecedillabreve.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecedillabreve" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="1E1D"/>
   <outline>
     <component base="e"/>
-    <component base="cedillacomb" xOffset="124"/>
-    <component base="brevecomb" xOffset="67"/>
+    <component base="cedillacomb" xOffset="135"/>
+    <component base="brevecomb" xOffset="78"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecircumflex.glif b/src/Cantarell-Light.ufo/glyphs/ecircumflex.glif
index da5f72a5..56208348 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflex" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="00EA"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb" xOffset="82"/>
+    <component base="circumflexcomb" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecircumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/ecircumflexacute.glif
index 2a93c86e..91e0bf52 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecircumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecircumflexacute.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexacute" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="1EBF"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb_acutecomb" xOffset="77"/>
+    <component base="circumflexcomb.loclVIET" xOffset="88"/>
+    <component base="acutecomb.loclVIET" xOffset="307" yOffset="74"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecircumflexdotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/ecircumflexdotbelow.glif
index e2982686..2ba67c22 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecircumflexdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecircumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexdotbelow" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="1EC7"/>
   <outline>
     <component base="e"/>
-    <component base="dotbelowcomb" xOffset="129"/>
-    <component base="circumflexcomb" xOffset="82"/>
+    <component base="dotbelowcomb" xOffset="140"/>
+    <component base="circumflexcomb" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecircumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/ecircumflexgrave.glif
index ece89368..5a394138 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecircumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecircumflexgrave.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexgrave" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="1EC1"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb_gravecomb" xOffset="77"/>
+    <component base="circumflexcomb.loclVIET" xOffset="88"/>
+    <component base="gravecomb.loclVIET" xOffset="203" yOffset="74"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecircumflexhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/ecircumflexhookabove.glif
index 8b7ad717..0a3a61b33 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecircumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecircumflexhookabove.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexhookabove" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="1EC3"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb_hookabovecomb" xOffset="91"/>
+    <component base="circumflexcomb.loclVIET" xOffset="88"/>
+    <component base="hookabovecomb.loclVIET" xOffset="234" yOffset="74"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecircumflextilde.glif 
b/src/Cantarell-Light.ufo/glyphs/ecircumflextilde.glif
index 774bfc0d..ca5b4f09 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecircumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecircumflextilde.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflextilde" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="1EC5"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb_tildecomb" xOffset="38"/>
+    <component base="circumflexcomb.loclVIET" xOffset="88"/>
+    <component base="tildecomb.loclVIET" xOffset="37" yOffset="80"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>tildecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/edblgrave.glif b/src/Cantarell-Light.ufo/glyphs/edblgrave.glif
index 4b18c68a..b266f691 100644
--- a/src/Cantarell-Light.ufo/glyphs/edblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/edblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edblgrave" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="0205"/>
   <outline>
     <component base="e"/>
-    <component base="dblgravecomb" xOffset="1"/>
+    <component base="dblgravecomb" xOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/edieresis.glif b/src/Cantarell-Light.ufo/glyphs/edieresis.glif
index afedb3f1..bf138635 100644
--- a/src/Cantarell-Light.ufo/glyphs/edieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/edieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edieresis" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="00EB"/>
   <outline>
     <component base="e"/>
-    <component base="dieresiscomb" xOffset="34"/>
+    <component base="dieresiscomb" xOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/edotaccent.glif b/src/Cantarell-Light.ufo/glyphs/edotaccent.glif
index 731fa151..1b2672f7 100644
--- a/src/Cantarell-Light.ufo/glyphs/edotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/edotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edotaccent" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="0117"/>
   <outline>
     <component base="e"/>
-    <component base="dotaccentcomb" xOffset="134"/>
+    <component base="dotaccentcomb" xOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/edotbelow.glif b/src/Cantarell-Light.ufo/glyphs/edotbelow.glif
index 061a0cf8..5dfcb3ad 100644
--- a/src/Cantarell-Light.ufo/glyphs/edotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/edotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edotbelow" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="1EB9"/>
   <outline>
     <component base="e"/>
-    <component base="dotbelowcomb" xOffset="129"/>
+    <component base="dotbelowcomb" xOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ef-cy.glif b/src/Cantarell-Light.ufo/glyphs/ef-cy.glif
index 92977ece..d19147cc 100644
--- a/src/Cantarell-Light.ufo/glyphs/ef-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ef-cy.glif
@@ -1,69 +1,77 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ef-cy" format="2">
-  <advance width="762"/>
+  <advance width="781"/>
   <unicode hex="0444"/>
   <outline>
     <contour>
-      <point x="371" y="-217" type="line"/>
-      <point x="390" y="-217" type="line"/>
-      <point x="390" y="739" type="line"/>
-      <point x="371" y="739" type="line"/>
+      <point x="534" y="-5" type="curve" smooth="yes"/>
+      <point x="640" y="-5"/>
+      <point x="713" y="96"/>
+      <point x="713" y="242" type="curve" smooth="yes"/>
+      <point x="713" y="384"/>
+      <point x="641" y="482"/>
+      <point x="536" y="482" type="curve" smooth="yes"/>
+      <point x="469" y="482"/>
+      <point x="415" y="442"/>
+      <point x="387" y="371" type="curve"/>
+      <point x="391" y="351" type="line"/>
+      <point x="416" y="422"/>
+      <point x="468" y="464"/>
+      <point x="531" y="464" type="curve" smooth="yes"/>
+      <point x="627" y="464"/>
+      <point x="692" y="374"/>
+      <point x="692" y="239" type="curve" smooth="yes"/>
+      <point x="692" y="104"/>
+      <point x="629" y="13"/>
+      <point x="535" y="13" type="curve" smooth="yes"/>
+      <point x="471" y="13"/>
+      <point x="417" y="57"/>
+      <point x="392" y="131" type="curve"/>
+      <point x="388" y="101" type="line"/>
+      <point x="417" y="32"/>
+      <point x="469" y="-5"/>
     </contour>
     <contour>
-      <point x="237" y="-5" type="curve" smooth="yes"/>
-      <point x="295" y="-5"/>
-      <point x="346" y="28"/>
-      <point x="377" y="90" type="curve"/>
-      <point x="373" y="111" type="line"/>
-      <point x="346" y="49"/>
-      <point x="297" y="13"/>
-      <point x="240" y="13" type="curve" smooth="yes"/>
-      <point x="144" y="13"/>
-      <point x="79" y="104"/>
-      <point x="79" y="239" type="curve" smooth="yes"/>
-      <point x="79" y="372"/>
-      <point x="143" y="462"/>
-      <point x="236" y="462" type="curve" smooth="yes"/>
-      <point x="295" y="462"/>
-      <point x="346" y="425"/>
-      <point x="373" y="361" type="curve"/>
-      <point x="378" y="390" type="line"/>
-      <point x="348" y="449"/>
-      <point x="299" y="480"/>
-      <point x="239" y="480" type="curve" smooth="yes"/>
-      <point x="132" y="480"/>
-      <point x="58" y="380"/>
-      <point x="58" y="237" type="curve" smooth="yes"/>
-      <point x="58" y="94"/>
-      <point x="131" y="-5"/>
+      <point x="247" y="-5" type="curve" smooth="yes"/>
+      <point x="306" y="-5"/>
+      <point x="357" y="29"/>
+      <point x="387" y="90" type="curve"/>
+      <point x="383" y="111" type="line"/>
+      <point x="356" y="49"/>
+      <point x="307" y="13"/>
+      <point x="250" y="13" type="curve" smooth="yes"/>
+      <point x="154" y="13"/>
+      <point x="89" y="106"/>
+      <point x="89" y="241" type="curve" smooth="yes"/>
+      <point x="89" y="374"/>
+      <point x="153" y="464"/>
+      <point x="246" y="464" type="curve" smooth="yes"/>
+      <point x="305" y="464"/>
+      <point x="356" y="427"/>
+      <point x="383" y="363" type="curve"/>
+      <point x="388" y="392" type="line"/>
+      <point x="358" y="451"/>
+      <point x="309" y="482"/>
+      <point x="249" y="482" type="curve" smooth="yes"/>
+      <point x="142" y="482"/>
+      <point x="68" y="382"/>
+      <point x="68" y="239" type="curve" smooth="yes"/>
+      <point x="68" y="95"/>
+      <point x="142" y="-5"/>
     </contour>
     <contour>
-      <point x="524" y="-5" type="curve" smooth="yes"/>
-      <point x="630" y="-5"/>
-      <point x="703" y="95"/>
-      <point x="703" y="240" type="curve" smooth="yes"/>
-      <point x="703" y="382"/>
-      <point x="631" y="480"/>
-      <point x="526" y="480" type="curve" smooth="yes"/>
-      <point x="457" y="480"/>
-      <point x="404" y="438"/>
-      <point x="377" y="369" type="curve"/>
-      <point x="381" y="349" type="line"/>
-      <point x="406" y="419"/>
-      <point x="457" y="462"/>
-      <point x="521" y="462" type="curve" smooth="yes"/>
-      <point x="617" y="462"/>
-      <point x="682" y="372"/>
-      <point x="682" y="237" type="curve" smooth="yes"/>
-      <point x="682" y="103"/>
-      <point x="619" y="13"/>
-      <point x="525" y="13" type="curve" smooth="yes"/>
-      <point x="460" y="13"/>
-      <point x="407" y="58"/>
-      <point x="382" y="131" type="curve"/>
-      <point x="378" y="101" type="line"/>
-      <point x="406" y="34"/>
-      <point x="457" y="-5"/>
+      <point x="381" y="-217" type="line"/>
+      <point x="400" y="-217" type="line"/>
+      <point x="400" y="739" type="line"/>
+      <point x="381" y="739" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/egrave.glif b/src/Cantarell-Light.ufo/glyphs/egrave.glif
index 82e38adc..7d26533c 100644
--- a/src/Cantarell-Light.ufo/glyphs/egrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/egrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="egrave" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="00E8"/>
   <outline>
     <component base="e"/>
-    <component base="gravecomb" xOffset="69"/>
+    <component base="gravecomb" xOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ehookabove.glif b/src/Cantarell-Light.ufo/glyphs/ehookabove.glif
index c66156d7..d3ae0d1d 100644
--- a/src/Cantarell-Light.ufo/glyphs/ehookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ehookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ehookabove" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="1EBB"/>
   <outline>
     <component base="e"/>
-    <component base="hookabovecomb" xOffset="101"/>
+    <component base="hookabovecomb" xOffset="112"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/eight.dnom.glif b/src/Cantarell-Light.ufo/glyphs/eight.dnom.glif
index 05e69b74..83887b63 100644
--- a/src/Cantarell-Light.ufo/glyphs/eight.dnom.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eight.dnom.glif
@@ -1,55 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight.dnom" format="2">
-  <advance width="431"/>
-  <note>
-eight
-</note>
+  <advance width="393"/>
   <outline>
     <contour>
-      <point x="219" y="-7" type="curve" smooth="yes"/>
-      <point x="317" y="-7"/>
-      <point x="382" y="40"/>
-      <point x="382" y="112" type="curve" smooth="yes"/>
-      <point x="382" y="266"/>
-      <point x="92" y="225"/>
-      <point x="92" y="366" type="curve" smooth="yes"/>
-      <point x="92" y="424"/>
-      <point x="141" y="461"/>
-      <point x="210" y="461" type="curve" smooth="yes"/>
-      <point x="281" y="461"/>
-      <point x="335" y="422"/>
-      <point x="335" y="367" type="curve" smooth="yes"/>
-      <point x="335" y="312"/>
-      <point x="283" y="271"/>
-      <point x="205" y="253" type="curve"/>
-      <point x="222" y="243" type="line"/>
-      <point x="304" y="262"/>
-      <point x="355" y="309"/>
-      <point x="355" y="369" type="curve" smooth="yes"/>
-      <point x="355" y="434"/>
-      <point x="295" y="479"/>
-      <point x="212" y="479" type="curve" smooth="yes"/>
-      <point x="129" y="479"/>
-      <point x="71" y="433"/>
-      <point x="71" y="364" type="curve" smooth="yes"/>
-      <point x="71" y="208"/>
-      <point x="361" y="249"/>
-      <point x="361" y="110" type="curve" smooth="yes"/>
-      <point x="361" y="50"/>
-      <point x="306" y="12"/>
-      <point x="222" y="12" type="curve" smooth="yes"/>
-      <point x="135" y="12"/>
-      <point x="75" y="53"/>
-      <point x="75" y="115" type="curve" smooth="yes"/>
-      <point x="75" y="172"/>
-      <point x="127" y="220"/>
-      <point x="206" y="236" type="curve"/>
-      <point x="190" y="247" type="line"/>
-      <point x="108" y="231"/>
-      <point x="53" y="178"/>
-      <point x="53" y="113" type="curve" smooth="yes"/>
-      <point x="53" y="41"/>
-      <point x="120" y="-7"/>
+      <point x="199" y="-6" type="curve" smooth="yes"/>
+      <point x="283" y="-6"/>
+      <point x="339" y="36"/>
+      <point x="339" y="100" type="curve" smooth="yes"/>
+      <point x="339" y="234"/>
+      <point x="96" y="199"/>
+      <point x="96" y="322" type="curve" smooth="yes"/>
+      <point x="96" y="371"/>
+      <point x="133" y="403"/>
+      <point x="191" y="403" type="curve" smooth="yes"/>
+      <point x="250" y="403"/>
+      <point x="295" y="370"/>
+      <point x="295" y="322" type="curve" smooth="yes"/>
+      <point x="295" y="275"/>
+      <point x="251" y="239"/>
+      <point x="188" y="224" type="curve"/>
+      <point x="205" y="214" type="line"/>
+      <point x="274" y="231"/>
+      <point x="317" y="273"/>
+      <point x="317" y="325" type="curve" smooth="yes"/>
+      <point x="317" y="383"/>
+      <point x="264" y="422"/>
+      <point x="194" y="422" type="curve" smooth="yes"/>
+      <point x="122" y="422"/>
+      <point x="75" y="382"/>
+      <point x="75" y="320" type="curve" smooth="yes"/>
+      <point x="75" y="183"/>
+      <point x="317" y="220"/>
+      <point x="317" y="98" type="curve" smooth="yes"/>
+      <point x="317" y="47"/>
+      <point x="272" y="13"/>
+      <point x="202" y="13" type="curve" smooth="yes"/>
+      <point x="129" y="13"/>
+      <point x="79" y="50"/>
+      <point x="79" y="103" type="curve" smooth="yes"/>
+      <point x="79" y="155"/>
+      <point x="126" y="194"/>
+      <point x="189" y="207" type="curve"/>
+      <point x="173" y="217" type="line"/>
+      <point x="103" y="204"/>
+      <point x="56" y="157"/>
+      <point x="56" y="100" type="curve" smooth="yes"/>
+      <point x="56" y="37"/>
+      <point x="114" y="-6"/>
     </contour>
   </outline>
   <lib>
@@ -57,11 +54,11 @@ eight
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>68</integer>
+        <integer>60</integer>
         <key>weight</key>
-        <integer>1</integer>
+        <integer>2</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>63</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/eight.glif b/src/Cantarell-Light.ufo/glyphs/eight.glif
index 59fc7f67..071cf529 100644
--- a/src/Cantarell-Light.ufo/glyphs/eight.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eight.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight" format="2">
-  <advance width="582"/>
+  <advance width="575"/>
   <unicode hex="0038"/>
   <outline>
     <contour>
-      <point x="296" y="-10" type="curve" smooth="yes"/>
-      <point x="426" y="-10"/>
-      <point x="513" y="57"/>
-      <point x="513" y="163" type="curve" smooth="yes"/>
-      <point x="513" y="389"/>
-      <point x="118" y="324"/>
-      <point x="118" y="540" type="curve" smooth="yes"/>
-      <point x="118" y="629"/>
-      <point x="185" y="687"/>
-      <point x="283" y="687" type="curve" smooth="yes"/>
-      <point x="381" y="687"/>
-      <point x="456" y="628"/>
-      <point x="456" y="543" type="curve" smooth="yes"/>
-      <point x="456" y="460"/>
-      <point x="384" y="397"/>
-      <point x="275" y="369" type="curve"/>
-      <point x="291" y="358" type="line"/>
-      <point x="404" y="385"/>
-      <point x="475" y="454"/>
-      <point x="475" y="543" type="curve" smooth="yes"/>
-      <point x="475" y="639"/>
-      <point x="394" y="704"/>
-      <point x="285" y="704" type="curve" smooth="yes"/>
-      <point x="175" y="704"/>
-      <point x="99" y="639"/>
-      <point x="99" y="538" type="curve" smooth="yes"/>
-      <point x="99" y="307"/>
-      <point x="493" y="372"/>
-      <point x="493" y="161" type="curve" smooth="yes"/>
-      <point x="493" y="67"/>
-      <point x="416" y="7"/>
-      <point x="298" y="7" type="curve" smooth="yes"/>
-      <point x="177" y="7"/>
-      <point x="94" y="71"/>
-      <point x="94" y="166" type="curve" smooth="yes"/>
-      <point x="94" y="254"/>
-      <point x="166" y="325"/>
-      <point x="275" y="352" type="curve"/>
-      <point x="259" y="363" type="line"/>
-      <point x="148" y="338"/>
-      <point x="74" y="260"/>
-      <point x="74" y="164" type="curve" smooth="yes"/>
-      <point x="74" y="60"/>
-      <point x="163" y="-10"/>
+      <point x="292" y="-10" type="curve" smooth="yes"/>
+      <point x="422" y="-10"/>
+      <point x="509" y="57"/>
+      <point x="509" y="163" type="curve" smooth="yes"/>
+      <point x="509" y="387"/>
+      <point x="120" y="324"/>
+      <point x="120" y="540" type="curve" smooth="yes"/>
+      <point x="120" y="629"/>
+      <point x="181" y="687"/>
+      <point x="279" y="687" type="curve" smooth="yes"/>
+      <point x="377" y="687"/>
+      <point x="452" y="628"/>
+      <point x="452" y="543" type="curve" smooth="yes"/>
+      <point x="452" y="460"/>
+      <point x="380" y="397"/>
+      <point x="271" y="369" type="curve"/>
+      <point x="287" y="358" type="line"/>
+      <point x="400" y="385"/>
+      <point x="471" y="454"/>
+      <point x="471" y="543" type="curve" smooth="yes"/>
+      <point x="471" y="639"/>
+      <point x="390" y="704"/>
+      <point x="281" y="704" type="curve" smooth="yes"/>
+      <point x="171" y="704"/>
+      <point x="101" y="639"/>
+      <point x="101" y="538" type="curve" smooth="yes"/>
+      <point x="101" y="309"/>
+      <point x="489" y="374"/>
+      <point x="489" y="161" type="curve" smooth="yes"/>
+      <point x="489" y="67"/>
+      <point x="412" y="7"/>
+      <point x="294" y="7" type="curve" smooth="yes"/>
+      <point x="173" y="7"/>
+      <point x="90" y="71"/>
+      <point x="90" y="166" type="curve" smooth="yes"/>
+      <point x="90" y="254"/>
+      <point x="162" y="325"/>
+      <point x="271" y="353" type="curve"/>
+      <point x="255" y="364" type="line"/>
+      <point x="144" y="338"/>
+      <point x="70" y="260"/>
+      <point x="70" y="164" type="curve" smooth="yes"/>
+      <point x="70" y="60"/>
+      <point x="159" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/eight.numr.glif b/src/Cantarell-Light.ufo/glyphs/eight.numr.glif
index 531f919c..e0cc0d60 100644
--- a/src/Cantarell-Light.ufo/glyphs/eight.numr.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eight.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight.numr" format="2">
-  <advance width="431"/>
+  <advance width="393"/>
   <outline>
     <component base="eight.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/eight.osf.glif b/src/Cantarell-Light.ufo/glyphs/eight.osf.glif
index 43eef923..1d421865 100644
--- a/src/Cantarell-Light.ufo/glyphs/eight.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eight.osf.glif
@@ -1,52 +1,60 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight.osf" format="2">
-  <advance width="582"/>
+  <advance width="575"/>
   <outline>
     <contour>
-      <point x="296" y="-10" type="curve" smooth="yes"/>
-      <point x="426" y="-10"/>
-      <point x="513" y="57"/>
-      <point x="513" y="163" type="curve" smooth="yes"/>
-      <point x="513" y="389"/>
-      <point x="118" y="324"/>
-      <point x="118" y="540" type="curve" smooth="yes"/>
-      <point x="118" y="629"/>
-      <point x="185" y="687"/>
-      <point x="283" y="687" type="curve" smooth="yes"/>
-      <point x="381" y="687"/>
-      <point x="456" y="628"/>
-      <point x="456" y="543" type="curve" smooth="yes"/>
-      <point x="456" y="460"/>
-      <point x="384" y="397"/>
-      <point x="275" y="369" type="curve"/>
-      <point x="291" y="358" type="line"/>
-      <point x="404" y="385"/>
-      <point x="475" y="454"/>
-      <point x="475" y="543" type="curve" smooth="yes"/>
-      <point x="475" y="639"/>
-      <point x="394" y="704"/>
-      <point x="285" y="704" type="curve" smooth="yes"/>
-      <point x="175" y="704"/>
-      <point x="99" y="639"/>
-      <point x="99" y="538" type="curve" smooth="yes"/>
-      <point x="99" y="307"/>
-      <point x="493" y="372"/>
-      <point x="493" y="161" type="curve" smooth="yes"/>
-      <point x="493" y="67"/>
-      <point x="416" y="7"/>
-      <point x="298" y="7" type="curve" smooth="yes"/>
-      <point x="177" y="7"/>
-      <point x="94" y="71"/>
-      <point x="94" y="166" type="curve" smooth="yes"/>
-      <point x="94" y="254"/>
-      <point x="166" y="325"/>
-      <point x="275" y="352" type="curve"/>
-      <point x="259" y="363" type="line"/>
-      <point x="148" y="338"/>
-      <point x="74" y="260"/>
-      <point x="74" y="164" type="curve" smooth="yes"/>
-      <point x="74" y="60"/>
-      <point x="163" y="-10"/>
+      <point x="292" y="-10" type="curve" smooth="yes"/>
+      <point x="422" y="-10"/>
+      <point x="509" y="57"/>
+      <point x="509" y="163" type="curve" smooth="yes"/>
+      <point x="509" y="389"/>
+      <point x="114" y="324"/>
+      <point x="114" y="540" type="curve" smooth="yes"/>
+      <point x="114" y="629"/>
+      <point x="181" y="687"/>
+      <point x="279" y="687" type="curve" smooth="yes"/>
+      <point x="377" y="687"/>
+      <point x="452" y="628"/>
+      <point x="452" y="543" type="curve" smooth="yes"/>
+      <point x="452" y="460"/>
+      <point x="380" y="397"/>
+      <point x="271" y="369" type="curve"/>
+      <point x="287" y="358" type="line"/>
+      <point x="400" y="385"/>
+      <point x="471" y="454"/>
+      <point x="471" y="543" type="curve" smooth="yes"/>
+      <point x="471" y="639"/>
+      <point x="390" y="704"/>
+      <point x="281" y="704" type="curve" smooth="yes"/>
+      <point x="171" y="704"/>
+      <point x="95" y="639"/>
+      <point x="95" y="538" type="curve" smooth="yes"/>
+      <point x="95" y="307"/>
+      <point x="489" y="372"/>
+      <point x="489" y="161" type="curve" smooth="yes"/>
+      <point x="489" y="67"/>
+      <point x="412" y="7"/>
+      <point x="294" y="7" type="curve" smooth="yes"/>
+      <point x="173" y="7"/>
+      <point x="90" y="71"/>
+      <point x="90" y="166" type="curve" smooth="yes"/>
+      <point x="90" y="254"/>
+      <point x="162" y="325"/>
+      <point x="271" y="352" type="curve"/>
+      <point x="255" y="363" type="line"/>
+      <point x="144" y="338"/>
+      <point x="70" y="260"/>
+      <point x="70" y="164" type="curve" smooth="yes"/>
+      <point x="70" y="60"/>
+      <point x="159" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>eight</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>eight</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/eight.tf.glif b/src/Cantarell-Light.ufo/glyphs/eight.tf.glif
index 611a5391..3a853e57 100644
--- a/src/Cantarell-Light.ufo/glyphs/eight.tf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eight.tf.glif
@@ -2,52 +2,7 @@
 <glyph name="eight.tf" format="2">
   <advance width="580"/>
   <outline>
-    <contour>
-      <point x="295" y="-10" type="curve" smooth="yes"/>
-      <point x="425" y="-10"/>
-      <point x="512" y="57"/>
-      <point x="512" y="163" type="curve" smooth="yes"/>
-      <point x="512" y="389"/>
-      <point x="118" y="324"/>
-      <point x="118" y="540" type="curve" smooth="yes"/>
-      <point x="118" y="629"/>
-      <point x="185" y="687"/>
-      <point x="282" y="687" type="curve" smooth="yes"/>
-      <point x="380" y="687"/>
-      <point x="455" y="628"/>
-      <point x="455" y="543" type="curve" smooth="yes"/>
-      <point x="455" y="460"/>
-      <point x="383" y="397"/>
-      <point x="274" y="369" type="curve"/>
-      <point x="290" y="358" type="line"/>
-      <point x="403" y="385"/>
-      <point x="474" y="454"/>
-      <point x="474" y="543" type="curve" smooth="yes"/>
-      <point x="474" y="639"/>
-      <point x="393" y="704"/>
-      <point x="284" y="704" type="curve" smooth="yes"/>
-      <point x="175" y="704"/>
-      <point x="99" y="639"/>
-      <point x="99" y="538" type="curve" smooth="yes"/>
-      <point x="99" y="307"/>
-      <point x="492" y="372"/>
-      <point x="492" y="161" type="curve" smooth="yes"/>
-      <point x="492" y="67"/>
-      <point x="415" y="7"/>
-      <point x="297" y="7" type="curve" smooth="yes"/>
-      <point x="177" y="7"/>
-      <point x="94" y="71"/>
-      <point x="94" y="166" type="curve" smooth="yes"/>
-      <point x="94" y="254"/>
-      <point x="166" y="325"/>
-      <point x="274" y="352" type="curve"/>
-      <point x="258" y="363" type="line"/>
-      <point x="148" y="338"/>
-      <point x="74" y="260"/>
-      <point x="74" y="164" type="curve" smooth="yes"/>
-      <point x="74" y="60"/>
-      <point x="163" y="-10"/>
-    </contour>
+    <component base="eight" xOffset="20"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/eightinferior.glif 
b/src/Cantarell-Light.ufo/glyphs/eightinferior.glif
index 41a805ea..1f7b6958 100644
--- a/src/Cantarell-Light.ufo/glyphs/eightinferior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eightinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eightinferior" format="2">
-  <advance width="431"/>
+  <advance width="393"/>
   <unicode hex="2088"/>
   <outline>
     <component base="eight.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/eightsuperior.glif 
b/src/Cantarell-Light.ufo/glyphs/eightsuperior.glif
index 72ce1e42..1588197d 100644
--- a/src/Cantarell-Light.ufo/glyphs/eightsuperior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eightsuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eightsuperior" format="2">
-  <advance width="431"/>
+  <advance width="393"/>
   <unicode hex="2078"/>
   <outline>
     <component base="eight.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/einvertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/einvertedbreve.glif
index 5c366dd4..b107cecd 100644
--- a/src/Cantarell-Light.ufo/glyphs/einvertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/einvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="einvertedbreve" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="0207"/>
   <outline>
     <component base="e"/>
-    <component base="breveinvertedcomb" xOffset="52"/>
+    <component base="breveinvertedcomb" xOffset="63"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/el-cy.glif b/src/Cantarell-Light.ufo/glyphs/el-cy.glif
index 94cc15a3..3b3b42bf 100644
--- a/src/Cantarell-Light.ufo/glyphs/el-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/el-cy.glif
@@ -1,29 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="el-cy" format="2">
-  <advance width="541"/>
+  <advance width="564"/>
   <unicode hex="043B"/>
   <outline>
     <contour>
-      <point x="74" y="-7" type="curve" smooth="yes"/>
-      <point x="140" y="-7"/>
-      <point x="173" y="75"/>
-      <point x="173" y="221" type="curve" smooth="yes"/>
-      <point x="173" y="463" type="line"/>
-      <point x="433" y="463" type="line"/>
-      <point x="433" y="0" type="line"/>
-      <point x="453" y="0" type="line"/>
-      <point x="453" y="480" type="line"/>
-      <point x="154" y="480" type="line"/>
-      <point x="154" y="212" type="line" smooth="yes"/>
-      <point x="154" y="83"/>
-      <point x="127" y="10"/>
-      <point x="72" y="10" type="curve" smooth="yes"/>
-      <point x="61" y="10"/>
-      <point x="46" y="14"/>
-      <point x="27" y="27" type="curve"/>
-      <point x="20" y="13" type="line"/>
-      <point x="33" y="1"/>
-      <point x="54" y="-7"/>
+      <point x="78" y="-7" type="curve" smooth="yes"/>
+      <point x="143" y="-7"/>
+      <point x="177" y="72"/>
+      <point x="177" y="221" type="curve" smooth="yes"/>
+      <point x="177" y="463" type="line"/>
+      <point x="437" y="463" type="line"/>
+      <point x="437" y="0" type="line"/>
+      <point x="457" y="0" type="line"/>
+      <point x="457" y="480" type="line"/>
+      <point x="158" y="480" type="line"/>
+      <point x="158" y="212" type="line" smooth="yes"/>
+      <point x="158" y="79"/>
+      <point x="130" y="10"/>
+      <point x="76" y="10" type="curve" smooth="yes"/>
+      <point x="63" y="10"/>
+      <point x="47" y="16"/>
+      <point x="31" y="27" type="curve"/>
+      <point x="24" y="13" type="line"/>
+      <point x="37" y="1"/>
+      <point x="58" y="-7"/>
     </contour>
   </outline>
   <lib>
@@ -37,6 +37,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ellipsis.glif b/src/Cantarell-Light.ufo/glyphs/ellipsis.glif
index a171e063..8aa0d3e8 100644
--- a/src/Cantarell-Light.ufo/glyphs/ellipsis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ellipsis.glif
@@ -1,10 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ellipsis" format="2">
-  <advance width="630"/>
+  <advance width="1034"/>
   <unicode hex="2026"/>
   <outline>
-    <component base="period" xOffset="400"/>
-    <component base="period" xOffset="200"/>
-    <component base="period"/>
+    <component base="period" xOffset="736"/>
+    <component base="period" xOffset="402" yOffset="-1"/>
+    <component base="period" xOffset="68"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/em-cy.glif b/src/Cantarell-Light.ufo/glyphs/em-cy.glif
index 0df3e5ff..ceb6b5a0 100644
--- a/src/Cantarell-Light.ufo/glyphs/em-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/em-cy.glif
@@ -1,25 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="em-cy" format="2">
-  <advance width="610"/>
+  <advance width="648"/>
   <unicode hex="043C"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
       <point x="107" y="0" type="line"/>
-      <point x="107" y="461" type="line"/>
-      <point x="101" y="461" type="line"/>
-      <point x="294" y="75" type="line"/>
-      <point x="311" y="75" type="line"/>
-      <point x="509" y="461" type="line"/>
-      <point x="504" y="461" type="line"/>
-      <point x="504" y="0" type="line"/>
-      <point x="522" y="0" type="line"/>
-      <point x="522" y="480" type="line"/>
-      <point x="501" y="480" type="line"/>
-      <point x="299" y="85" type="line"/>
-      <point x="309" y="85" type="line"/>
-      <point x="111" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="126" y="0" type="line"/>
+      <point x="126" y="461" type="line"/>
+      <point x="120" y="461" type="line"/>
+      <point x="313" y="75" type="line"/>
+      <point x="330" y="75" type="line"/>
+      <point x="528" y="461" type="line"/>
+      <point x="523" y="461" type="line"/>
+      <point x="523" y="0" type="line"/>
+      <point x="541" y="0" type="line"/>
+      <point x="541" y="480" type="line"/>
+      <point x="520" y="480" type="line"/>
+      <point x="318" y="85" type="line"/>
+      <point x="328" y="85" type="line"/>
+      <point x="130" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -33,6 +33,10 @@
         <key>width</key>
         <integer>75</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/emacron.glif b/src/Cantarell-Light.ufo/glyphs/emacron.glif
index 080067da..76cb1b62 100644
--- a/src/Cantarell-Light.ufo/glyphs/emacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/emacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacron" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="0113"/>
   <outline>
     <component base="e"/>
-    <component base="macroncomb" xOffset="10"/>
+    <component base="macroncomb" xOffset="21"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/emacronacute.glif 
b/src/Cantarell-Light.ufo/glyphs/emacronacute.glif
index 23132b80..795acc71 100644
--- a/src/Cantarell-Light.ufo/glyphs/emacronacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/emacronacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacronacute" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="1E17"/>
   <outline>
     <component base="e"/>
-    <component base="macroncomb_acutecomb" xOffset="15"/>
+    <component base="macroncomb.loclVIET" xOffset="26"/>
+    <component base="acutecomb" xOffset="197" yOffset="69"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/emacrongrave.glif 
b/src/Cantarell-Light.ufo/glyphs/emacrongrave.glif
index daf653a3..55377736 100644
--- a/src/Cantarell-Light.ufo/glyphs/emacrongrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/emacrongrave.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacrongrave" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="1E15"/>
   <outline>
     <component base="e"/>
-    <component base="macroncomb_gravecomb" xOffset="15"/>
+    <component base="macroncomb.loclVIET" xOffset="26"/>
+    <component base="gravecomb" xOffset="80" yOffset="69"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/emdash.glif b/src/Cantarell-Light.ufo/glyphs/emdash.glif
index 93deca68..7659c0b8 100644
--- a/src/Cantarell-Light.ufo/glyphs/emdash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/emdash.glif
@@ -1,13 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emdash" format="2">
-  <advance width="1192"/>
+  <advance width="1000"/>
   <unicode hex="2014"/>
+  <unicode hex="2015"/>
   <outline>
     <contour>
-      <point x="96" y="240" type="line"/>
-      <point x="1096" y="240" type="line"/>
-      <point x="1096" y="257" type="line"/>
-      <point x="96" y="257" type="line"/>
+      <point x="-10" y="240" type="line"/>
+      <point x="1010" y="240" type="line"/>
+      <point x="1010" y="257" type="line"/>
+      <point x="-10" y="257" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/emptyset.glif b/src/Cantarell-Light.ufo/glyphs/emptyset.glif
index 59fdb971..20e3d0f2 100644
--- a/src/Cantarell-Light.ufo/glyphs/emptyset.glif
+++ b/src/Cantarell-Light.ufo/glyphs/emptyset.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emptyset" format="2">
-  <advance width="744"/>
+  <advance width="728"/>
   <unicode hex="2205"/>
   <outline>
     <contour>
-      <point x="371" y="74" type="curve" smooth="yes"/>
-      <point x="533" y="74"/>
-      <point x="641" y="181"/>
-      <point x="641" y="342" type="curve" smooth="yes"/>
-      <point x="641" y="502"/>
-      <point x="534" y="609"/>
-      <point x="373" y="609" type="curve" smooth="yes"/>
-      <point x="211" y="609"/>
-      <point x="103" y="501"/>
-      <point x="103" y="340" type="curve" smooth="yes"/>
-      <point x="103" y="180"/>
-      <point x="210" y="74"/>
+      <point x="169" y="48" type="line"/>
+      <point x="573" y="647" type="line"/>
+      <point x="559" y="657" type="line"/>
+      <point x="155" y="58" type="line"/>
     </contour>
     <contour>
-      <point x="373" y="92" type="curve" smooth="yes"/>
-      <point x="223" y="92"/>
-      <point x="123" y="192"/>
-      <point x="123" y="342" type="curve" smooth="yes"/>
-      <point x="123" y="491"/>
-      <point x="222" y="591"/>
-      <point x="370" y="591" type="curve" smooth="yes"/>
-      <point x="521" y="591"/>
-      <point x="621" y="491"/>
-      <point x="621" y="340" type="curve" smooth="yes"/>
-      <point x="621" y="191"/>
-      <point x="522" y="92"/>
+      <point x="363" y="74" type="curve" smooth="yes"/>
+      <point x="525" y="74"/>
+      <point x="633" y="181"/>
+      <point x="633" y="342" type="curve" smooth="yes"/>
+      <point x="633" y="502"/>
+      <point x="526" y="609"/>
+      <point x="365" y="609" type="curve" smooth="yes"/>
+      <point x="203" y="609"/>
+      <point x="95" y="501"/>
+      <point x="95" y="340" type="curve" smooth="yes"/>
+      <point x="95" y="180"/>
+      <point x="202" y="74"/>
     </contour>
     <contour>
-      <point x="177" y="48" type="line"/>
-      <point x="581" y="647" type="line"/>
-      <point x="567" y="657" type="line"/>
-      <point x="163" y="58" type="line"/>
+      <point x="365" y="92" type="curve" smooth="yes"/>
+      <point x="215" y="92"/>
+      <point x="115" y="192"/>
+      <point x="115" y="342" type="curve" smooth="yes"/>
+      <point x="115" y="491"/>
+      <point x="214" y="591"/>
+      <point x="362" y="591" type="curve" smooth="yes"/>
+      <point x="513" y="591"/>
+      <point x="613" y="491"/>
+      <point x="613" y="340" type="curve" smooth="yes"/>
+      <point x="613" y="191"/>
+      <point x="514" y="92"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/emspace.glif b/src/Cantarell-Light.ufo/glyphs/emspace.glif
index 33d6e61a..e6faaef2 100644
--- a/src/Cantarell-Light.ufo/glyphs/emspace.glif
+++ b/src/Cantarell-Light.ufo/glyphs/emspace.glif
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emspace" format="2">
   <advance width="1000"/>
+  <unicode hex="2001"/>
   <unicode hex="2003"/>
   <outline>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/en-cy.glif b/src/Cantarell-Light.ufo/glyphs/en-cy.glif
index b4893ea3..bf392819 100644
--- a/src/Cantarell-Light.ufo/glyphs/en-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/en-cy.glif
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="en-cy" format="2">
-  <advance width="529"/>
+  <advance width="567"/>
   <unicode hex="043D"/>
-  <anchor x="473" y="0" name="bottomright"/>
+  <anchor x="491" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="420" y="0" type="line"/>
-      <point x="441" y="0" type="line"/>
-      <point x="441" y="480" type="line"/>
-      <point x="420" y="480" type="line"/>
+      <point x="439" y="0" type="line"/>
+      <point x="460" y="0" type="line"/>
+      <point x="460" y="480" type="line"/>
+      <point x="439" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="109" y="0" type="line"/>
-      <point x="109" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="100" y="245" type="line"/>
-      <point x="428" y="245" type="line"/>
-      <point x="428" y="262" type="line"/>
-      <point x="100" y="262" type="line"/>
+      <point x="119" y="245" type="line"/>
+      <point x="447" y="245" type="line"/>
+      <point x="447" y="262" type="line"/>
+      <point x="119" y="262" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -32,6 +32,10 @@
         <key>width</key>
         <integer>79</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/endash.glif b/src/Cantarell-Light.ufo/glyphs/endash.glif
index c473d754..c827e077 100644
--- a/src/Cantarell-Light.ufo/glyphs/endash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/endash.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="endash" format="2">
-  <advance width="692"/>
+  <advance width="500"/>
   <unicode hex="2013"/>
   <outline>
     <contour>
-      <point x="96" y="240" type="line"/>
-      <point x="596" y="240" type="line"/>
-      <point x="596" y="257" type="line"/>
-      <point x="96" y="257" type="line"/>
+      <point x="-10" y="240" type="line"/>
+      <point x="510" y="240" type="line"/>
+      <point x="510" y="257" type="line"/>
+      <point x="-10" y="257" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/endescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/endescender-cy.glif
index bb9288da..d3f0b646 100644
--- a/src/Cantarell-Light.ufo/glyphs/endescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/endescender-cy.glif
@@ -1,15 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="endescender-cy" format="2">
-  <advance width="536"/>
+  <advance width="573"/>
   <unicode hex="04A3"/>
   <outline>
     <component base="en-cy"/>
-    <component base="descender-cy" xOffset="377"/>
+    <component base="descender-cy" xOffset="395"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>tse-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Light.ufo/glyphs/eng.glif b/src/Cantarell-Light.ufo/glyphs/eng.glif
index 85285524..fad077bd 100644
--- a/src/Cantarell-Light.ufo/glyphs/eng.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eng.glif
@@ -1,44 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eng" format="2">
-  <advance width="525"/>
+  <advance width="563"/>
   <unicode hex="014B"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="109" y="0" type="line"/>
-      <point x="109" y="399" type="line"/>
-      <point x="105" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="444" y="0" type="line"/>
+      <point x="465" y="0" type="line"/>
+      <point x="465" y="314" type="line" smooth="yes"/>
+      <point x="465" y="421"/>
+      <point x="405" y="486"/>
+      <point x="299" y="486" type="curve" smooth="yes"/>
+      <point x="223" y="486"/>
+      <point x="153" y="454"/>
+      <point x="112" y="399" type="curve"/>
+      <point x="121" y="388" type="line"/>
+      <point x="155" y="436"/>
+      <point x="225" y="468"/>
+      <point x="296" y="468" type="curve" smooth="yes"/>
+      <point x="391" y="468"/>
+      <point x="444" y="411"/>
+      <point x="444" y="314" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="425" y="0" type="line"/>
-      <point x="446" y="0" type="line"/>
-      <point x="446" y="314" type="line" smooth="yes"/>
-      <point x="446" y="421"/>
-      <point x="386" y="486"/>
-      <point x="280" y="486" type="curve" smooth="yes"/>
-      <point x="204" y="486"/>
-      <point x="134" y="454"/>
-      <point x="93" y="399" type="curve"/>
-      <point x="102" y="388" type="line"/>
-      <point x="136" y="436"/>
-      <point x="206" y="468"/>
-      <point x="277" y="468" type="curve" smooth="yes"/>
-      <point x="372" y="468"/>
-      <point x="425" y="411"/>
-      <point x="425" y="314" type="curve" smooth="yes"/>
+      <point x="359" y="-217" type="line"/>
+      <point x="423" y="-187"/>
+      <point x="465" y="-110"/>
+      <point x="465" y="-23" type="curve" smooth="yes"/>
+      <point x="465" y="0" type="line"/>
+      <point x="444" y="0" type="line"/>
+      <point x="444" y="-35" type="line" smooth="yes"/>
+      <point x="444" y="-104"/>
+      <point x="408" y="-173"/>
+      <point x="354" y="-207" type="curve"/>
     </contour>
     <contour>
-      <point x="340" y="-217" type="line"/>
-      <point x="404" y="-187"/>
-      <point x="446" y="-110"/>
-      <point x="446" y="-23" type="curve" smooth="yes"/>
-      <point x="446" y="0" type="line"/>
-      <point x="425" y="0" type="line"/>
-      <point x="425" y="-35" type="line" smooth="yes"/>
-      <point x="425" y="-104"/>
-      <point x="389" y="-173"/>
-      <point x="335" y="-207" type="curve"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="399" type="line"/>
+      <point x="124" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/enghe-cy.glif b/src/Cantarell-Light.ufo/glyphs/enghe-cy.glif
index 6674f55f..fe482f25 100644
--- a/src/Cantarell-Light.ufo/glyphs/enghe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/enghe-cy.glif
@@ -1,31 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="enghe-cy" format="2">
-  <advance width="648"/>
+  <advance width="671"/>
   <unicode hex="04A5"/>
   <outline>
     <contour>
-      <point x="420" y="0" type="line"/>
-      <point x="441" y="0" type="line"/>
-      <point x="441" y="480" type="line"/>
-      <point x="420" y="480" type="line"/>
+      <point x="439" y="0" type="line"/>
+      <point x="460" y="0" type="line"/>
+      <point x="460" y="463" type="line"/>
+      <point x="655" y="463" type="line"/>
+      <point x="655" y="480" type="line"/>
+      <point x="439" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="109" y="0" type="line"/>
-      <point x="109" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="100" y="245" type="line"/>
-      <point x="428" y="245" type="line"/>
-      <point x="428" y="262" type="line"/>
-      <point x="100" y="262" type="line"/>
-    </contour>
-    <contour>
-      <point x="428" y="463" type="line"/>
-      <point x="636" y="463" type="line"/>
-      <point x="636" y="480" type="line"/>
-      <point x="428" y="480" type="line"/>
+      <point x="119" y="245" type="line"/>
+      <point x="447" y="245" type="line"/>
+      <point x="447" y="262" type="line"/>
+      <point x="119" y="262" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/enspace.glif b/src/Cantarell-Light.ufo/glyphs/enspace.glif
index 41767d40..f91bc29a 100644
--- a/src/Cantarell-Light.ufo/glyphs/enspace.glif
+++ b/src/Cantarell-Light.ufo/glyphs/enspace.glif
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="enspace" format="2">
   <advance width="500"/>
+  <unicode hex="2000"/>
   <unicode hex="2002"/>
   <outline>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/eogonek.glif b/src/Cantarell-Light.ufo/glyphs/eogonek.glif
index b26769d2..d2850435 100644
--- a/src/Cantarell-Light.ufo/glyphs/eogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eogonek" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="0119"/>
   <outline>
     <component base="e"/>
-    <component base="ogonekcomb.tall" xOffset="-6" yOffset="-1"/>
+    <component base="ogonekcomb.tall" xOffset="5" yOffset="-1"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/equal.glif b/src/Cantarell-Light.ufo/glyphs/equal.glif
index 594df207..67d852fe 100644
--- a/src/Cantarell-Light.ufo/glyphs/equal.glif
+++ b/src/Cantarell-Light.ufo/glyphs/equal.glif
@@ -1,19 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="equal" format="2">
-  <advance width="723"/>
+  <advance width="580"/>
   <unicode hex="003D"/>
   <outline>
-    <contour>
-      <point x="144" y="442" type="line"/>
-      <point x="579" y="442" type="line"/>
-      <point x="579" y="459" type="line"/>
-      <point x="144" y="459" type="line"/>
-    </contour>
-    <contour>
-      <point x="144" y="202" type="line"/>
-      <point x="579" y="202" type="line"/>
-      <point x="579" y="219" type="line"/>
-      <point x="144" y="219" type="line"/>
-    </contour>
+    <component base="minus" yOffset="114"/>
+    <component base="minus" yOffset="-129"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minus</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/equivalence.glif b/src/Cantarell-Light.ufo/glyphs/equivalence.glif
index fa390d98..169f1562 100644
--- a/src/Cantarell-Light.ufo/glyphs/equivalence.glif
+++ b/src/Cantarell-Light.ufo/glyphs/equivalence.glif
@@ -1,25 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="equivalence" format="2">
-  <advance width="713"/>
+  <advance width="580"/>
   <unicode hex="2261"/>
   <outline>
     <contour>
-      <point x="144" y="492" type="line"/>
-      <point x="569" y="492" type="line"/>
-      <point x="569" y="509" type="line"/>
-      <point x="144" y="509" type="line"/>
+      <point x="60" y="502" type="line"/>
+      <point x="520" y="502" type="line"/>
+      <point x="520" y="519" type="line"/>
+      <point x="60" y="519" type="line"/>
     </contour>
     <contour>
-      <point x="144" y="148" type="line"/>
-      <point x="569" y="148" type="line"/>
-      <point x="569" y="165" type="line"/>
-      <point x="144" y="165" type="line"/>
+      <point x="60" y="158" type="line"/>
+      <point x="520" y="158" type="line"/>
+      <point x="520" y="175" type="line"/>
+      <point x="60" y="175" type="line"/>
     </contour>
     <contour>
-      <point x="144" y="320" type="line"/>
-      <point x="569" y="320" type="line"/>
-      <point x="569" y="337" type="line"/>
-      <point x="144" y="337" type="line"/>
+      <point x="60" y="330" type="line"/>
+      <point x="520" y="330" type="line"/>
+      <point x="520" y="347" type="line"/>
+      <point x="60" y="347" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minus</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/er-cy.glif b/src/Cantarell-Light.ufo/glyphs/er-cy.glif
index 08ea121c..3d9a5de6 100644
--- a/src/Cantarell-Light.ufo/glyphs/er-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/er-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="er-cy" format="2">
-  <advance width="535"/>
+  <advance width="565"/>
   <unicode hex="0440"/>
   <outline>
     <component base="p"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ereversed-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/ereversed-cy.glif
index 84c01e8d..233889c4 100644
--- a/src/Cantarell-Light.ufo/glyphs/ereversed-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ereversed-cy.glif
@@ -1,42 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ereversed-cy" format="2">
-  <advance width="458"/>
+  <advance width="482"/>
   <unicode hex="044D"/>
-  <anchor x="228" y="480" name="top"/>
+  <anchor x="242" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="179" y="-7" type="curve" smooth="yes"/>
-      <point x="316" y="-7"/>
-      <point x="400" y="89"/>
-      <point x="400" y="247" type="curve" smooth="yes"/>
-      <point x="400" y="398"/>
-      <point x="321" y="490"/>
-      <point x="193" y="490" type="curve" smooth="yes"/>
-      <point x="147" y="490"/>
-      <point x="81" y="478"/>
-      <point x="38" y="459" type="curve"/>
-      <point x="43" y="444" type="line"/>
-      <point x="83" y="461"/>
-      <point x="152" y="471"/>
-      <point x="191" y="471" type="curve" smooth="yes"/>
-      <point x="307" y="471"/>
-      <point x="378" y="383"/>
-      <point x="378" y="240" type="curve" smooth="yes"/>
-      <point x="378" y="96"/>
-      <point x="306" y="12"/>
-      <point x="183" y="12" type="curve" smooth="yes"/>
-      <point x="142" y="12"/>
-      <point x="83" y="21"/>
-      <point x="44" y="38" type="curve"/>
-      <point x="37" y="21" type="line"/>
-      <point x="76" y="3"/>
-      <point x="135" y="-7"/>
+      <point x="193" y="-7" type="curve" smooth="yes"/>
+      <point x="330" y="-7"/>
+      <point x="414" y="89"/>
+      <point x="414" y="247" type="curve" smooth="yes"/>
+      <point x="414" y="398"/>
+      <point x="335" y="490"/>
+      <point x="207" y="490" type="curve" smooth="yes"/>
+      <point x="161" y="490"/>
+      <point x="95" y="478"/>
+      <point x="52" y="459" type="curve"/>
+      <point x="57" y="444" type="line"/>
+      <point x="97" y="461"/>
+      <point x="166" y="471"/>
+      <point x="205" y="471" type="curve" smooth="yes"/>
+      <point x="321" y="471"/>
+      <point x="392" y="383"/>
+      <point x="392" y="240" type="curve" smooth="yes"/>
+      <point x="392" y="96"/>
+      <point x="320" y="12"/>
+      <point x="197" y="12" type="curve" smooth="yes"/>
+      <point x="156" y="12"/>
+      <point x="97" y="21"/>
+      <point x="58" y="38" type="curve"/>
+      <point x="51" y="21" type="line"/>
+      <point x="90" y="3"/>
+      <point x="149" y="-7"/>
     </contour>
     <contour>
-      <point x="72" y="243" type="line"/>
-      <point x="386" y="243" type="line"/>
-      <point x="386" y="260" type="line"/>
-      <point x="72" y="260" type="line"/>
+      <point x="86" y="243" type="line"/>
+      <point x="400" y="243" type="line"/>
+      <point x="400" y="260" type="line"/>
+      <point x="86" y="260" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -48,6 +48,10 @@
         <key>width</key>
         <integer>74</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|es-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|es-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/es-cy.glif b/src/Cantarell-Light.ufo/glyphs/es-cy.glif
index 353469d4..30dc1c11 100644
--- a/src/Cantarell-Light.ufo/glyphs/es-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/es-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="es-cy" format="2">
-  <advance width="430"/>
+  <advance width="464"/>
   <unicode hex="0441"/>
   <anchor x="248" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/esdescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/esdescender-cy.glif
index c8f47b4a..2021f080 100644
--- a/src/Cantarell-Light.ufo/glyphs/esdescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/esdescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="esdescender-cy" format="2">
-  <advance width="430"/>
+  <advance width="464"/>
   <unicode hex="04AB"/>
   <outline>
     <component base="es-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/estimated.glif b/src/Cantarell-Light.ufo/glyphs/estimated.glif
index 59312eb6..fc3b3d28 100644
--- a/src/Cantarell-Light.ufo/glyphs/estimated.glif
+++ b/src/Cantarell-Light.ufo/glyphs/estimated.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="estimated" format="2">
-  <advance width="893"/>
+  <advance width="881"/>
   <unicode hex="212E"/>
   <outline>
     <contour>
-      <point x="450" y="-10" type="curve" smooth="yes"/>
-      <point x="581" y="-10"/>
-      <point x="705" y="42"/>
-      <point x="777" y="119" type="curve"/>
-      <point x="711" y="119" type="line"/>
-      <point x="639" y="62"/>
-      <point x="547" y="36"/>
-      <point x="458" y="36" type="curve" smooth="yes"/>
-      <point x="336" y="36"/>
-      <point x="262" y="84"/>
-      <point x="215" y="145" type="curve"/>
-      <point x="215" y="315" type="line"/>
-      <point x="798" y="315" type="line"/>
-      <point x="798" y="545"/>
-      <point x="681" y="704"/>
-      <point x="453" y="704" type="curve" smooth="yes"/>
-      <point x="222" y="704"/>
-      <point x="104" y="541"/>
-      <point x="104" y="339" type="curve" smooth="yes"/>
-      <point x="104" y="123"/>
-      <point x="240" y="-10"/>
+      <point x="444" y="-10" type="curve" smooth="yes"/>
+      <point x="575" y="-10"/>
+      <point x="699" y="42"/>
+      <point x="771" y="119" type="curve"/>
+      <point x="705" y="119" type="line"/>
+      <point x="633" y="62"/>
+      <point x="541" y="36"/>
+      <point x="452" y="36" type="curve" smooth="yes"/>
+      <point x="330" y="36"/>
+      <point x="256" y="84"/>
+      <point x="209" y="145" type="curve"/>
+      <point x="209" y="315" type="line"/>
+      <point x="792" y="315" type="line"/>
+      <point x="792" y="545"/>
+      <point x="675" y="704"/>
+      <point x="447" y="704" type="curve" smooth="yes"/>
+      <point x="216" y="704"/>
+      <point x="98" y="541"/>
+      <point x="98" y="339" type="curve" smooth="yes"/>
+      <point x="98" y="123"/>
+      <point x="234" y="-10"/>
     </contour>
     <contour>
-      <point x="215" y="358" type="line"/>
-      <point x="215" y="535" type="line"/>
-      <point x="261" y="619"/>
-      <point x="336" y="662"/>
-      <point x="450" y="662" type="curve" smooth="yes"/>
-      <point x="564" y="662"/>
-      <point x="638" y="619"/>
-      <point x="684" y="535" type="curve"/>
-      <point x="684" y="358" type="line"/>
+      <point x="209" y="358" type="line"/>
+      <point x="209" y="535" type="line"/>
+      <point x="255" y="619"/>
+      <point x="330" y="662"/>
+      <point x="444" y="662" type="curve" smooth="yes"/>
+      <point x="558" y="662"/>
+      <point x="632" y="619"/>
+      <point x="678" y="535" type="curve"/>
+      <point x="678" y="358" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/eth.glif b/src/Cantarell-Light.ufo/glyphs/eth.glif
index 2521ec49..fafbd7ee 100644
--- a/src/Cantarell-Light.ufo/glyphs/eth.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eth.glif
@@ -1,49 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eth" format="2">
-  <advance width="556"/>
+  <advance width="564"/>
   <unicode hex="00F0"/>
   <outline>
     <contour>
-      <point x="278" y="-9" type="curve" smooth="yes"/>
-      <point x="401" y="-9"/>
-      <point x="476" y="86"/>
-      <point x="476" y="249" type="curve" smooth="yes"/>
-      <point x="476" y="488"/>
-      <point x="351" y="687"/>
-      <point x="161" y="744" type="curve"/>
-      <point x="155" y="728" type="line"/>
-      <point x="342" y="667"/>
-      <point x="463" y="471"/>
-      <point x="457" y="237" type="curve"/>
-      <point x="459" y="317" type="line"/>
-      <point x="433" y="400"/>
-      <point x="364" y="449"/>
-      <point x="274" y="449" type="curve" smooth="yes"/>
-      <point x="151" y="449"/>
-      <point x="69" y="357"/>
-      <point x="69" y="221" type="curve" smooth="yes"/>
-      <point x="69" y="83"/>
-      <point x="157" y="-9"/>
+      <point x="281" y="-9" type="curve" smooth="yes"/>
+      <point x="404" y="-9"/>
+      <point x="479" y="86"/>
+      <point x="479" y="249" type="curve" smooth="yes"/>
+      <point x="479" y="488"/>
+      <point x="354" y="687"/>
+      <point x="164" y="744" type="curve"/>
+      <point x="158" y="728" type="line"/>
+      <point x="345" y="667"/>
+      <point x="466" y="471"/>
+      <point x="460" y="237" type="curve"/>
+      <point x="462" y="317" type="line"/>
+      <point x="436" y="400"/>
+      <point x="367" y="449"/>
+      <point x="277" y="449" type="curve" smooth="yes"/>
+      <point x="154" y="449"/>
+      <point x="72" y="357"/>
+      <point x="72" y="221" type="curve" smooth="yes"/>
+      <point x="72" y="83"/>
+      <point x="160" y="-9"/>
     </contour>
     <contour>
-      <point x="279" y="9" type="curve" smooth="yes"/>
-      <point x="170" y="9"/>
-      <point x="90" y="94"/>
-      <point x="90" y="226" type="curve" smooth="yes"/>
-      <point x="90" y="351"/>
-      <point x="160" y="431"/>
-      <point x="272" y="431" type="curve" smooth="yes"/>
-      <point x="381" y="431"/>
-      <point x="456" y="355"/>
-      <point x="456" y="221" type="curve" smooth="yes"/>
-      <point x="456" y="94"/>
-      <point x="385" y="9"/>
+      <point x="282" y="9" type="curve" smooth="yes"/>
+      <point x="173" y="9"/>
+      <point x="93" y="94"/>
+      <point x="93" y="226" type="curve" smooth="yes"/>
+      <point x="93" y="351"/>
+      <point x="163" y="431"/>
+      <point x="275" y="431" type="curve" smooth="yes"/>
+      <point x="384" y="431"/>
+      <point x="459" y="355"/>
+      <point x="459" y="221" type="curve" smooth="yes"/>
+      <point x="459" y="94"/>
+      <point x="388" y="9"/>
     </contour>
     <contour>
-      <point x="163" y="602" type="line"/>
-      <point x="394" y="706" type="line"/>
-      <point x="387" y="720" type="line"/>
-      <point x="156" y="616" type="line"/>
+      <point x="166" y="602" type="line"/>
+      <point x="397" y="706" type="line"/>
+      <point x="390" y="720" type="line"/>
+      <point x="159" y="616" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etilde.glif b/src/Cantarell-Light.ufo/glyphs/etilde.glif
index b89e27e9..ae6acbae 100644
--- a/src/Cantarell-Light.ufo/glyphs/etilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etilde" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="1EBD"/>
   <outline>
     <component base="e"/>
-    <component base="tildecomb" xOffset="18"/>
+    <component base="tildecomb" xOffset="29"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/euro.glif b/src/Cantarell-Light.ufo/glyphs/euro.glif
index f0ec5dc5..d30200b9 100644
--- a/src/Cantarell-Light.ufo/glyphs/euro.glif
+++ b/src/Cantarell-Light.ufo/glyphs/euro.glif
@@ -1,47 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="euro" format="2">
-  <advance width="777"/>
+  <advance width="580"/>
   <unicode hex="20AC"/>
   <outline>
     <contour>
-      <point x="83" y="426" type="line"/>
-      <point x="628" y="426" type="line"/>
-      <point x="628" y="443" type="line"/>
-      <point x="83" y="443" type="line"/>
+      <point x="382" y="-10" type="curve" smooth="yes"/>
+      <point x="439" y="-10"/>
+      <point x="504" y="6"/>
+      <point x="557" y="33" type="curve"/>
+      <point x="552" y="49" type="line"/>
+      <point x="500" y="24"/>
+      <point x="438" y="9"/>
+      <point x="386" y="9" type="curve" smooth="yes"/>
+      <point x="229" y="9"/>
+      <point x="121" y="145"/>
+      <point x="121" y="348" type="curve" smooth="yes"/>
+      <point x="121" y="549"/>
+      <point x="231" y="683"/>
+      <point x="394" y="683" type="curve" smooth="yes"/>
+      <point x="446" y="683"/>
+      <point x="501" y="670"/>
+      <point x="551" y="645" type="curve"/>
+      <point x="558" y="662" type="line"/>
+      <point x="508" y="689"/>
+      <point x="451" y="702"/>
+      <point x="397" y="702" type="curve" smooth="yes"/>
+      <point x="220" y="702"/>
+      <point x="100" y="556"/>
+      <point x="100" y="338" type="curve" smooth="yes"/>
+      <point x="100" y="129"/>
+      <point x="214" y="-10"/>
     </contour>
     <contour>
-      <point x="83" y="266" type="line"/>
-      <point x="605" y="266" type="line"/>
-      <point x="605" y="283" type="line"/>
-      <point x="83" y="283" type="line"/>
+      <point x="25" y="261" type="line"/>
+      <point x="473" y="261" type="line"/>
+      <point x="473" y="278" type="line"/>
+      <point x="25" y="278" type="line"/>
     </contour>
     <contour>
-      <point x="494" y="-10" type="curve" smooth="yes"/>
-      <point x="560" y="-10"/>
-      <point x="634" y="6"/>
-      <point x="695" y="33" type="curve"/>
-      <point x="690" y="49" type="line"/>
-      <point x="630" y="24"/>
-      <point x="558" y="9"/>
-      <point x="498" y="9" type="curve" smooth="yes"/>
-      <point x="315" y="9"/>
-      <point x="191" y="145"/>
-      <point x="191" y="348" type="curve" smooth="yes"/>
-      <point x="191" y="549"/>
-      <point x="318" y="683"/>
-      <point x="508" y="683" type="curve" smooth="yes"/>
-      <point x="568" y="683"/>
-      <point x="631" y="670"/>
-      <point x="689" y="645" type="curve"/>
-      <point x="696" y="662" type="line"/>
-      <point x="638" y="689"/>
-      <point x="575" y="702"/>
-      <point x="511" y="702" type="curve" smooth="yes"/>
-      <point x="306" y="702"/>
-      <point x="169" y="556"/>
-      <point x="169" y="338" type="curve" smooth="yes"/>
-      <point x="169" y="129"/>
-      <point x="300" y="-10"/>
+      <point x="25" y="418" type="line"/>
+      <point x="493" y="418" type="line"/>
+      <point x="493" y="435" type="line"/>
+      <point x="25" y="435" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/exclam.glif b/src/Cantarell-Light.ufo/glyphs/exclam.glif
index 5e325349..304db523 100644
--- a/src/Cantarell-Light.ufo/glyphs/exclam.glif
+++ b/src/Cantarell-Light.ufo/glyphs/exclam.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="exclam" format="2">
-  <advance width="214"/>
+  <advance width="255"/>
   <unicode hex="0021"/>
   <outline>
     <contour>
-      <point x="98" y="155" type="line"/>
-      <point x="115" y="155" type="line"/>
-      <point x="117" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="118" y="155" type="line"/>
+      <point x="135" y="155" type="line"/>
+      <point x="137" y="694" type="line"/>
+      <point x="116" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="109" y="-10" type="curve" smooth="yes"/>
-      <point x="123" y="-10"/>
-      <point x="132" y="0"/>
-      <point x="132" y="13" type="curve" smooth="yes"/>
-      <point x="132" y="27"/>
-      <point x="123" y="37"/>
-      <point x="109" y="37" type="curve" smooth="yes"/>
-      <point x="95" y="37"/>
-      <point x="86" y="27"/>
-      <point x="86" y="13" type="curve" smooth="yes"/>
-      <point x="86" y="0"/>
-      <point x="95" y="-10"/>
+      <point x="128" y="-10" type="curve" smooth="yes"/>
+      <point x="142" y="-10"/>
+      <point x="151" y="0"/>
+      <point x="151" y="13" type="curve" smooth="yes"/>
+      <point x="151" y="27"/>
+      <point x="142" y="37"/>
+      <point x="128" y="37" type="curve" smooth="yes"/>
+      <point x="114" y="37"/>
+      <point x="105" y="27"/>
+      <point x="105" y="13" type="curve" smooth="yes"/>
+      <point x="105" y="0"/>
+      <point x="114" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/exclamdown.glif b/src/Cantarell-Light.ufo/glyphs/exclamdown.glif
index cb71790c..f3b86fa9 100644
--- a/src/Cantarell-Light.ufo/glyphs/exclamdown.glif
+++ b/src/Cantarell-Light.ufo/glyphs/exclamdown.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="exclamdown" format="2">
-  <advance width="214"/>
+  <advance width="255"/>
   <unicode hex="00A1"/>
   <outline>
-    <component base="exclam" yScale="-1" xOffset="-5" yOffset="470"/>
+    <component base="exclam" yScale="-1" yOffset="470"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>exclam</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>exclam</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/f.glif b/src/Cantarell-Light.ufo/glyphs/f.glif
index 1de1c1fd..dd815d9a 100644
--- a/src/Cantarell-Light.ufo/glyphs/f.glif
+++ b/src/Cantarell-Light.ufo/glyphs/f.glif
@@ -1,36 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="f" format="2">
-  <advance width="295"/>
+  <advance width="314"/>
   <unicode hex="0066"/>
-  <note>
-f
-</note>
-  <anchor x="106" y="0" name="bottom"/>
-  <anchor x="213" y="739" name="top"/>
+  <anchor x="125" y="0" name="bottom"/>
+  <anchor x="232" y="739" name="top"/>
   <outline>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="116" y="0" type="line"/>
-      <point x="116" y="636" type="line" smooth="yes"/>
-      <point x="116" y="694"/>
-      <point x="156" y="731"/>
-      <point x="217" y="731" type="curve" smooth="yes"/>
-      <point x="244" y="731"/>
-      <point x="274" y="724"/>
-      <point x="297" y="712" type="curve"/>
-      <point x="303" y="726" type="line"/>
-      <point x="276" y="741"/>
-      <point x="248" y="749"/>
-      <point x="220" y="749" type="curve" smooth="yes"/>
-      <point x="146" y="749"/>
-      <point x="96" y="702"/>
-      <point x="96" y="631" type="curve" smooth="yes"/>
+      <point x="115" y="0" type="line"/>
+      <point x="135" y="0" type="line"/>
+      <point x="135" y="636" type="line" smooth="yes"/>
+      <point x="135" y="694"/>
+      <point x="175" y="731"/>
+      <point x="236" y="731" type="curve" smooth="yes"/>
+      <point x="263" y="731"/>
+      <point x="293" y="724"/>
+      <point x="316" y="712" type="curve"/>
+      <point x="322" y="726" type="line"/>
+      <point x="295" y="741"/>
+      <point x="267" y="749"/>
+      <point x="239" y="749" type="curve" smooth="yes"/>
+      <point x="165" y="749"/>
+      <point x="115" y="702"/>
+      <point x="115" y="631" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="22" y="463" type="line"/>
-      <point x="275" y="463" type="line"/>
-      <point x="275" y="480" type="line"/>
-      <point x="22" y="480" type="line"/>
+      <point x="41" y="463" type="line"/>
+      <point x="294" y="463" type="line"/>
+      <point x="294" y="480" type="line"/>
+      <point x="41" y="480" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/fi.glif b/src/Cantarell-Light.ufo/glyphs/fi.glif
index 30d55751..bfdcee8d 100644
--- a/src/Cantarell-Light.ufo/glyphs/fi.glif
+++ b/src/Cantarell-Light.ufo/glyphs/fi.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fi" format="2">
-  <advance width="496"/>
+  <advance width="549"/>
   <unicode hex="FB01"/>
   <outline>
     <component base="f"/>
-    <component base="i" xOffset="295"/>
+    <component base="i" xOffset="314"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/figuredash.glif b/src/Cantarell-Light.ufo/glyphs/figuredash.glif
index 9219c463..06d6fa9f 100644
--- a/src/Cantarell-Light.ufo/glyphs/figuredash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/figuredash.glif
@@ -1,13 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="figuredash" format="2">
-  <advance width="792"/>
+  <advance width="580"/>
   <unicode hex="2012"/>
   <outline>
     <contour>
-      <point x="96" y="240" type="line"/>
-      <point x="696" y="240" type="line"/>
-      <point x="696" y="257" type="line"/>
-      <point x="96" y="257" type="line"/>
+      <point x="40" y="240" type="line"/>
+      <point x="540" y="240" type="line"/>
+      <point x="540" y="257" type="line"/>
+      <point x="40" y="257" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/figurespace.glif b/src/Cantarell-Light.ufo/glyphs/figurespace.glif
index 8513f6fc..ac02adab 100644
--- a/src/Cantarell-Light.ufo/glyphs/figurespace.glif
+++ b/src/Cantarell-Light.ufo/glyphs/figurespace.glif
@@ -1,7 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="figurespace" format="2">
-  <advance width="600"/>
+  <advance width="580"/>
   <unicode hex="2007"/>
   <outline>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>zero.tf</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/firsttonechinese.glif 
b/src/Cantarell-Light.ufo/glyphs/firsttonechinese.glif
index 22d19c3c..00beaa1e 100644
--- a/src/Cantarell-Light.ufo/glyphs/firsttonechinese.glif
+++ b/src/Cantarell-Light.ufo/glyphs/firsttonechinese.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="firsttonechinese" format="2">
-  <advance width="475"/>
+  <advance width="407"/>
   <unicode hex="02C9"/>
   <outline>
-    <component base="macroncomb"/>
+    <component base="macroncomb" xOffset="-39"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/fita-cy.glif b/src/Cantarell-Light.ufo/glyphs/fita-cy.glif
index 3c35b8c2..4c17b745 100644
--- a/src/Cantarell-Light.ufo/glyphs/fita-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/fita-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fita-cy" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="0473"/>
   <outline>
     <component base="obarred-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/five.dnom.glif b/src/Cantarell-Light.ufo/glyphs/five.dnom.glif
index 8b7d2810..2d6e8f57 100644
--- a/src/Cantarell-Light.ufo/glyphs/five.dnom.glif
+++ b/src/Cantarell-Light.ufo/glyphs/five.dnom.glif
@@ -1,42 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five.dnom" format="2">
-  <advance width="400"/>
-  <note>
-five
-</note>
+  <advance width="367"/>
   <outline>
     <contour>
-      <point x="185" y="-7" type="curve" smooth="yes"/>
-      <point x="289" y="-7"/>
-      <point x="355" y="54"/>
-      <point x="355" y="140" type="curve" smooth="yes"/>
-      <point x="355" y="224"/>
-      <point x="290" y="277"/>
-      <point x="181" y="277" type="curve" smooth="yes"/>
-      <point x="156" y="277"/>
-      <point x="120" y="274"/>
-      <point x="83" y="267" type="curve"/>
-      <point x="92" y="262" type="line"/>
-      <point x="102" y="454" type="line"/>
-      <point x="333" y="454" type="line"/>
-      <point x="333" y="472" type="line"/>
-      <point x="83" y="472" type="line"/>
-      <point x="71" y="247" type="line"/>
-      <point x="105" y="254"/>
-      <point x="144" y="258"/>
-      <point x="174" y="258" type="curve" smooth="yes"/>
-      <point x="278" y="258"/>
-      <point x="333" y="209"/>
-      <point x="333" y="137" type="curve" smooth="yes"/>
-      <point x="333" y="63"/>
-      <point x="276" y="13"/>
-      <point x="189" y="13" type="curve" smooth="yes"/>
-      <point x="142" y="13"/>
+      <point x="172" y="-6" type="curve" smooth="yes"/>
+      <point x="259" y="-6"/>
+      <point x="318" y="46"/>
+      <point x="318" y="124" type="curve" smooth="yes"/>
+      <point x="318" y="200"/>
+      <point x="260" y="249"/>
+      <point x="168" y="249" type="curve" smooth="yes"/>
+      <point x="147" y="249"/>
+      <point x="117" y="246"/>
+      <point x="87" y="239" type="curve"/>
+      <point x="96" y="233" type="line"/>
+      <point x="103" y="397" type="line"/>
+      <point x="299" y="397" type="line"/>
+      <point x="299" y="416" type="line"/>
+      <point x="83" y="416" type="line"/>
+      <point x="73" y="219" type="line"/>
+      <point x="100" y="225"/>
+      <point x="135" y="229"/>
+      <point x="161" y="229" type="curve" smooth="yes"/>
+      <point x="244" y="229"/>
+      <point x="295" y="188"/>
+      <point x="295" y="122" type="curve" smooth="yes"/>
+      <point x="295" y="57"/>
+      <point x="246" y="14"/>
+      <point x="174" y="14" type="curve" smooth="yes"/>
+      <point x="136" y="14"/>
       <point x="91" y="26"/>
-      <point x="56" y="45" type="curve"/>
-      <point x="50" y="28" type="line"/>
-      <point x="88" y="6"/>
-      <point x="138" y="-7"/>
+      <point x="62" y="43" type="curve"/>
+      <point x="55" y="25" type="line"/>
+      <point x="91" y="4"/>
+      <point x="133" y="-6"/>
     </contour>
   </outline>
   <lib>
@@ -44,11 +41,11 @@ five
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>68</integer>
+        <integer>60</integer>
         <key>weight</key>
-        <integer>1</integer>
+        <integer>2</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>63</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/five.glif b/src/Cantarell-Light.ufo/glyphs/five.glif
index 23cb4f36..b3bed89b 100644
--- a/src/Cantarell-Light.ufo/glyphs/five.glif
+++ b/src/Cantarell-Light.ufo/glyphs/five.glif
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five" format="2">
-  <advance width="542"/>
+  <advance width="545"/>
   <unicode hex="0035"/>
   <outline>
     <contour>
-      <point x="251" y="-10" type="curve" smooth="yes"/>
-      <point x="389" y="-10"/>
-      <point x="475" y="80"/>
-      <point x="475" y="203" type="curve" smooth="yes"/>
-      <point x="475" y="326"/>
-      <point x="388" y="403"/>
-      <point x="243" y="403" type="curve" smooth="yes"/>
-      <point x="206" y="403"/>
-      <point x="156" y="398"/>
-      <point x="106" y="388" type="curve"/>
-      <point x="118" y="384" type="line"/>
-      <point x="131" y="677" type="line"/>
-      <point x="446" y="677" type="line"/>
-      <point x="446" y="694" type="line"/>
-      <point x="113" y="694" type="line"/>
-      <point x="97" y="369" type="line"/>
-      <point x="143" y="379"/>
-      <point x="195" y="385"/>
-      <point x="236" y="385" type="curve" smooth="yes"/>
-      <point x="380" y="385"/>
-      <point x="454" y="310"/>
-      <point x="454" y="201" type="curve" smooth="yes"/>
-      <point x="454" y="88"/>
-      <point x="376" y="9"/>
-      <point x="255" y="9" type="curve" smooth="yes"/>
-      <point x="193" y="9"/>
-      <point x="121" y="29"/>
-      <point x="76" y="58" type="curve"/>
-      <point x="70" y="41" type="line"/>
-      <point x="120" y="9"/>
-      <point x="187" y="-10"/>
+      <point x="252" y="-10" type="curve" smooth="yes"/>
+      <point x="386" y="-10"/>
+      <point x="476" y="75"/>
+      <point x="476" y="203" type="curve" smooth="yes"/>
+      <point x="476" y="330"/>
+      <point x="385" y="410"/>
+      <point x="242" y="410" type="curve" smooth="yes"/>
+      <point x="203" y="410"/>
+      <point x="152" y="404"/>
+      <point x="107" y="393" type="curve"/>
+      <point x="119" y="389" type="line"/>
+      <point x="132" y="677" type="line"/>
+      <point x="447" y="677" type="line"/>
+      <point x="447" y="694" type="line"/>
+      <point x="114" y="694" type="line"/>
+      <point x="98" y="374" type="line"/>
+      <point x="141" y="385"/>
+      <point x="193" y="392"/>
+      <point x="235" y="392" type="curve" smooth="yes"/>
+      <point x="371" y="392"/>
+      <point x="455" y="319"/>
+      <point x="455" y="201" type="curve" smooth="yes"/>
+      <point x="455" y="86"/>
+      <point x="375" y="9"/>
+      <point x="256" y="9" type="curve" smooth="yes"/>
+      <point x="194" y="9"/>
+      <point x="122" y="29"/>
+      <point x="77" y="58" type="curve"/>
+      <point x="71" y="41" type="line"/>
+      <point x="121" y="9"/>
+      <point x="188" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/five.numr.glif b/src/Cantarell-Light.ufo/glyphs/five.numr.glif
index 274171a9..5e423162 100644
--- a/src/Cantarell-Light.ufo/glyphs/five.numr.glif
+++ b/src/Cantarell-Light.ufo/glyphs/five.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five.numr" format="2">
-  <advance width="400"/>
+  <advance width="367"/>
   <outline>
     <component base="five.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/five.osf.glif b/src/Cantarell-Light.ufo/glyphs/five.osf.glif
index f78453f9..4a21a387 100644
--- a/src/Cantarell-Light.ufo/glyphs/five.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/five.osf.glif
@@ -1,39 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five.osf" format="2">
-  <advance width="542"/>
+  <advance width="545"/>
   <outline>
     <contour>
-      <point x="251" y="-110" type="curve" smooth="yes"/>
-      <point x="389" y="-110"/>
-      <point x="475" y="-20"/>
-      <point x="475" y="103" type="curve" smooth="yes"/>
-      <point x="475" y="226"/>
-      <point x="388" y="303"/>
-      <point x="243" y="303" type="curve" smooth="yes"/>
-      <point x="206" y="303"/>
-      <point x="156" y="298"/>
-      <point x="106" y="288" type="curve"/>
-      <point x="118" y="284" type="line"/>
-      <point x="131" y="577" type="line"/>
-      <point x="446" y="577" type="line"/>
-      <point x="446" y="594" type="line"/>
-      <point x="113" y="594" type="line"/>
-      <point x="97" y="269" type="line"/>
-      <point x="143" y="279"/>
-      <point x="195" y="285"/>
-      <point x="236" y="285" type="curve" smooth="yes"/>
-      <point x="380" y="285"/>
-      <point x="454" y="210"/>
-      <point x="454" y="101" type="curve" smooth="yes"/>
-      <point x="454" y="-12"/>
-      <point x="376" y="-91"/>
-      <point x="255" y="-91" type="curve" smooth="yes"/>
-      <point x="193" y="-91"/>
-      <point x="121" y="-71"/>
-      <point x="76" y="-42" type="curve"/>
-      <point x="70" y="-59" type="line"/>
-      <point x="120" y="-91"/>
-      <point x="187" y="-110"/>
+      <point x="252" y="-110" type="curve" smooth="yes"/>
+      <point x="390" y="-110"/>
+      <point x="476" y="-20"/>
+      <point x="476" y="103" type="curve" smooth="yes"/>
+      <point x="476" y="226"/>
+      <point x="389" y="303"/>
+      <point x="244" y="303" type="curve" smooth="yes"/>
+      <point x="207" y="303"/>
+      <point x="157" y="298"/>
+      <point x="107" y="288" type="curve"/>
+      <point x="119" y="284" type="line"/>
+      <point x="132" y="577" type="line"/>
+      <point x="447" y="577" type="line"/>
+      <point x="447" y="594" type="line"/>
+      <point x="114" y="594" type="line"/>
+      <point x="98" y="269" type="line"/>
+      <point x="144" y="279"/>
+      <point x="196" y="285"/>
+      <point x="237" y="285" type="curve" smooth="yes"/>
+      <point x="381" y="285"/>
+      <point x="455" y="210"/>
+      <point x="455" y="101" type="curve" smooth="yes"/>
+      <point x="455" y="-12"/>
+      <point x="377" y="-91"/>
+      <point x="256" y="-91" type="curve" smooth="yes"/>
+      <point x="194" y="-91"/>
+      <point x="122" y="-71"/>
+      <point x="77" y="-42" type="curve"/>
+      <point x="71" y="-59" type="line"/>
+      <point x="121" y="-91"/>
+      <point x="188" y="-110"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>five</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>five</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/five.tf.glif b/src/Cantarell-Light.ufo/glyphs/five.tf.glif
index 2cd9df74..86adaade 100644
--- a/src/Cantarell-Light.ufo/glyphs/five.tf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/five.tf.glif
@@ -2,39 +2,7 @@
 <glyph name="five.tf" format="2">
   <advance width="580"/>
   <outline>
-    <contour>
-      <point x="269" y="-10" type="curve" smooth="yes"/>
-      <point x="415" y="-10"/>
-      <point x="506" y="80"/>
-      <point x="506" y="203" type="curve" smooth="yes"/>
-      <point x="506" y="326"/>
-      <point x="413" y="403"/>
-      <point x="260" y="403" type="curve" smooth="yes"/>
-      <point x="222" y="403"/>
-      <point x="168" y="398"/>
-      <point x="115" y="388" type="curve"/>
-      <point x="127" y="384" type="line"/>
-      <point x="141" y="677" type="line"/>
-      <point x="475" y="677" type="line"/>
-      <point x="475" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
-      <point x="106" y="369" type="line"/>
-      <point x="155" y="379"/>
-      <point x="211" y="385"/>
-      <point x="254" y="385" type="curve" smooth="yes"/>
-      <point x="406" y="385"/>
-      <point x="485" y="310"/>
-      <point x="485" y="201" type="curve" smooth="yes"/>
-      <point x="485" y="88"/>
-      <point x="401" y="9"/>
-      <point x="274" y="9" type="curve" smooth="yes"/>
-      <point x="209" y="9"/>
-      <point x="134" y="28"/>
-      <point x="84" y="58" type="curve"/>
-      <point x="78" y="41" type="line"/>
-      <point x="131" y="9"/>
-      <point x="201" y="-10"/>
-    </contour>
+    <component base="five" xOffset="39"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/fiveeighths.glif b/src/Cantarell-Light.ufo/glyphs/fiveeighths.glif
index a78260fd..6746db66 100644
--- a/src/Cantarell-Light.ufo/glyphs/fiveeighths.glif
+++ b/src/Cantarell-Light.ufo/glyphs/fiveeighths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fiveeighths" format="2">
-  <advance width="1131"/>
+  <advance width="925"/>
   <unicode hex="215D"/>
   <outline>
     <component base="five.numr"/>
-    <component base="fraction" xOffset="400"/>
-    <component base="eight.dnom" xOffset="700"/>
+    <component base="fraction" xOffset="367"/>
+    <component base="eight.dnom" xOffset="532"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/fiveinferior.glif 
b/src/Cantarell-Light.ufo/glyphs/fiveinferior.glif
index 6977b1a1..3909a28e 100644
--- a/src/Cantarell-Light.ufo/glyphs/fiveinferior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/fiveinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fiveinferior" format="2">
-  <advance width="400"/>
+  <advance width="367"/>
   <unicode hex="2085"/>
   <outline>
     <component base="five.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/fivesixths.glif b/src/Cantarell-Light.ufo/glyphs/fivesixths.glif
index 3db7a01e..21cc1ac4 100644
--- a/src/Cantarell-Light.ufo/glyphs/fivesixths.glif
+++ b/src/Cantarell-Light.ufo/glyphs/fivesixths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fivesixths" format="2">
-  <advance width="1132"/>
+  <advance width="927"/>
   <unicode hex="215A"/>
   <outline>
     <component base="five.numr"/>
-    <component base="fraction" xOffset="400"/>
-    <component base="six.dnom" xOffset="700"/>
+    <component base="fraction" xOffset="367"/>
+    <component base="six.dnom" xOffset="532"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/fivesuperior.glif 
b/src/Cantarell-Light.ufo/glyphs/fivesuperior.glif
index b7737b45..ad76c957 100644
--- a/src/Cantarell-Light.ufo/glyphs/fivesuperior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/fivesuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fivesuperior" format="2">
-  <advance width="400"/>
+  <advance width="367"/>
   <unicode hex="2075"/>
   <outline>
     <component base="five.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/fl.glif b/src/Cantarell-Light.ufo/glyphs/fl.glif
index d545e13c..a1113721 100644
--- a/src/Cantarell-Light.ufo/glyphs/fl.glif
+++ b/src/Cantarell-Light.ufo/glyphs/fl.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fl" format="2">
-  <advance width="527"/>
+  <advance width="583"/>
   <unicode hex="FB02"/>
   <outline>
     <component base="f"/>
-    <component base="l" xOffset="295"/>
+    <component base="l" xOffset="314"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/florin.glif b/src/Cantarell-Light.ufo/glyphs/florin.glif
index ff255cd3..3dd13bfb 100644
--- a/src/Cantarell-Light.ufo/glyphs/florin.glif
+++ b/src/Cantarell-Light.ufo/glyphs/florin.glif
@@ -1,43 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="florin" format="2">
-  <advance width="430"/>
+  <advance width="580"/>
   <unicode hex="0192"/>
   <outline>
     <contour>
-      <point x="164" y="0" type="line"/>
-      <point x="184" y="0" type="line"/>
-      <point x="184" y="636" type="line" smooth="yes"/>
-      <point x="184" y="695"/>
-      <point x="218" y="731"/>
-      <point x="275" y="731" type="curve" smooth="yes"/>
-      <point x="302" y="731"/>
-      <point x="331" y="723"/>
-      <point x="350" y="711" type="curve"/>
-      <point x="356" y="727" type="line"/>
-      <point x="335" y="741"/>
-      <point x="307" y="749"/>
-      <point x="278" y="749" type="curve" smooth="yes"/>
-      <point x="211" y="749"/>
-      <point x="164" y="702"/>
-      <point x="164" y="631" type="curve" smooth="yes"/>
+      <point x="240" y="0" type="line"/>
+      <point x="260" y="0" type="line"/>
+      <point x="260" y="636" type="line" smooth="yes"/>
+      <point x="260" y="695"/>
+      <point x="294" y="731"/>
+      <point x="351" y="731" type="curve" smooth="yes"/>
+      <point x="378" y="731"/>
+      <point x="407" y="723"/>
+      <point x="426" y="711" type="curve"/>
+      <point x="432" y="727" type="line"/>
+      <point x="411" y="741"/>
+      <point x="383" y="749"/>
+      <point x="354" y="749" type="curve" smooth="yes"/>
+      <point x="287" y="749"/>
+      <point x="240" y="702"/>
+      <point x="240" y="631" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="87" y="463" type="line"/>
-      <point x="338" y="463" type="line"/>
-      <point x="338" y="480" type="line"/>
-      <point x="87" y="480" type="line"/>
+      <point x="154" y="-217" type="line"/>
+      <point x="218" y="-187"/>
+      <point x="260" y="-110"/>
+      <point x="260" y="-23" type="curve" smooth="yes"/>
+      <point x="260" y="0" type="line"/>
+      <point x="240" y="0" type="line"/>
+      <point x="240" y="-35" type="line" smooth="yes"/>
+      <point x="240" y="-104"/>
+      <point x="203" y="-173"/>
+      <point x="149" y="-207" type="curve"/>
     </contour>
     <contour>
-      <point x="78" y="-217" type="line"/>
-      <point x="142" y="-187"/>
-      <point x="184" y="-110"/>
-      <point x="184" y="-23" type="curve" smooth="yes"/>
-      <point x="184" y="0" type="line"/>
-      <point x="164" y="0" type="line"/>
-      <point x="164" y="-35" type="line" smooth="yes"/>
-      <point x="164" y="-104"/>
-      <point x="127" y="-173"/>
-      <point x="73" y="-207" type="curve"/>
+      <point x="163" y="463" type="line"/>
+      <point x="414" y="463" type="line"/>
+      <point x="414" y="480" type="line"/>
+      <point x="163" y="480" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/four.dnom.glif b/src/Cantarell-Light.ufo/glyphs/four.dnom.glif
index b1075c74..5979f5e9 100644
--- a/src/Cantarell-Light.ufo/glyphs/four.dnom.glif
+++ b/src/Cantarell-Light.ufo/glyphs/four.dnom.glif
@@ -1,23 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four.dnom" format="2">
-  <advance width="425"/>
-  <note>
-four
-</note>
+  <advance width="379"/>
   <outline>
     <contour>
-      <point x="289" y="-7" type="line"/>
-      <point x="308" y="-7" type="line"/>
-      <point x="308" y="472" type="line"/>
-      <point x="290" y="472" type="line"/>
-      <point x="27" y="137" type="line"/>
-      <point x="27" y="126" type="line"/>
-      <point x="399" y="126" type="line"/>
-      <point x="399" y="144" type="line"/>
-      <point x="50" y="144" type="line"/>
-      <point x="49" y="139" type="line"/>
-      <point x="289" y="443" type="line"/>
-      <point x="289" y="440" type="line"/>
+      <point x="254" y="-6" type="line"/>
+      <point x="275" y="-6" type="line"/>
+      <point x="275" y="416" type="line"/>
+      <point x="254" y="416" type="line"/>
+      <point x="29" y="121" type="line"/>
+      <point x="29" y="110" type="line"/>
+      <point x="352" y="110" type="line"/>
+      <point x="352" y="128" type="line"/>
+      <point x="52" y="128" type="line"/>
+      <point x="53" y="123" type="line"/>
+      <point x="256" y="391" type="line"/>
+      <point x="254" y="390" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -25,11 +22,11 @@ four
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>68</integer>
+        <integer>60</integer>
         <key>weight</key>
-        <integer>1</integer>
+        <integer>2</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>63</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/four.glif b/src/Cantarell-Light.ufo/glyphs/four.glif
index 75c060f7..99e07bed 100644
--- a/src/Cantarell-Light.ufo/glyphs/four.glif
+++ b/src/Cantarell-Light.ufo/glyphs/four.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four" format="2">
-  <advance width="568"/>
+  <advance width="565"/>
   <unicode hex="0034"/>
   <outline>
     <contour>
@@ -8,12 +8,12 @@
       <point x="411" y="-10" type="line"/>
       <point x="411" y="694" type="line"/>
       <point x="394" y="694" type="line"/>
-      <point x="37" y="200" type="line"/>
-      <point x="37" y="190" type="line"/>
-      <point x="533" y="190" type="line"/>
-      <point x="533" y="207" type="line"/>
-      <point x="59" y="207" type="line"/>
-      <point x="59" y="202" type="line"/>
+      <point x="33" y="200" type="line"/>
+      <point x="33" y="190" type="line"/>
+      <point x="534" y="190" type="line"/>
+      <point x="534" y="207" type="line"/>
+      <point x="55" y="207" type="line"/>
+      <point x="55" y="202" type="line"/>
       <point x="393" y="667" type="line"/>
       <point x="393" y="665" type="line"/>
     </contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/four.numr.glif b/src/Cantarell-Light.ufo/glyphs/four.numr.glif
index a545045a..ff87c77b 100644
--- a/src/Cantarell-Light.ufo/glyphs/four.numr.glif
+++ b/src/Cantarell-Light.ufo/glyphs/four.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four.numr" format="2">
-  <advance width="425"/>
+  <advance width="379"/>
   <outline>
     <component base="four.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/four.osf.glif b/src/Cantarell-Light.ufo/glyphs/four.osf.glif
index a09bbe17..b0b54bd0 100644
--- a/src/Cantarell-Light.ufo/glyphs/four.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/four.osf.glif
@@ -1,20 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four.osf" format="2">
-  <advance width="568"/>
+  <advance width="560"/>
   <outline>
     <contour>
-      <point x="393" y="-110" type="line"/>
-      <point x="411" y="-110" type="line"/>
-      <point x="411" y="594" type="line"/>
-      <point x="394" y="594" type="line"/>
-      <point x="37" y="100" type="line"/>
-      <point x="37" y="90" type="line"/>
-      <point x="533" y="90" type="line"/>
-      <point x="533" y="107" type="line"/>
-      <point x="59" y="107" type="line"/>
-      <point x="59" y="102" type="line"/>
-      <point x="393" y="567" type="line"/>
-      <point x="393" y="565" type="line"/>
+      <point x="389" y="-110" type="line"/>
+      <point x="407" y="-110" type="line"/>
+      <point x="407" y="594" type="line"/>
+      <point x="390" y="594" type="line"/>
+      <point x="33" y="100" type="line"/>
+      <point x="33" y="90" type="line"/>
+      <point x="529" y="90" type="line"/>
+      <point x="529" y="107" type="line"/>
+      <point x="55" y="107" type="line"/>
+      <point x="55" y="102" type="line"/>
+      <point x="389" y="567" type="line"/>
+      <point x="389" y="565" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>four</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>four</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/fourfifths.glif b/src/Cantarell-Light.ufo/glyphs/fourfifths.glif
index c9c65063..c74f959d 100644
--- a/src/Cantarell-Light.ufo/glyphs/fourfifths.glif
+++ b/src/Cantarell-Light.ufo/glyphs/fourfifths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fourfifths" format="2">
-  <advance width="1125"/>
+  <advance width="911"/>
   <unicode hex="2158"/>
   <outline>
     <component base="four.numr"/>
-    <component base="fraction" xOffset="425"/>
-    <component base="five.dnom" xOffset="725"/>
+    <component base="fraction" xOffset="379"/>
+    <component base="five.dnom" xOffset="544"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/fourinferior.glif 
b/src/Cantarell-Light.ufo/glyphs/fourinferior.glif
index 8952bc83..040b97aa 100644
--- a/src/Cantarell-Light.ufo/glyphs/fourinferior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/fourinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fourinferior" format="2">
-  <advance width="425"/>
+  <advance width="379"/>
   <unicode hex="2084"/>
   <outline>
     <component base="four.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/foursuperior.glif 
b/src/Cantarell-Light.ufo/glyphs/foursuperior.glif
index a574d343..2a7ff2c9 100644
--- a/src/Cantarell-Light.ufo/glyphs/foursuperior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/foursuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="foursuperior" format="2">
-  <advance width="425"/>
+  <advance width="379"/>
   <unicode hex="2074"/>
   <outline>
     <component base="four.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/fourthtonechinese.glif 
b/src/Cantarell-Light.ufo/glyphs/fourthtonechinese.glif
index ad21e32b..6f275c57 100644
--- a/src/Cantarell-Light.ufo/glyphs/fourthtonechinese.glif
+++ b/src/Cantarell-Light.ufo/glyphs/fourthtonechinese.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fourthtonechinese" format="2">
-  <advance width="242"/>
+  <advance width="150"/>
   <unicode hex="02CB"/>
   <outline>
-    <component base="gravecomb"/>
+    <component base="gravecomb" xOffset="-58"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/fraction.glif b/src/Cantarell-Light.ufo/glyphs/fraction.glif
index c6a5874d..e8793d2b 100644
--- a/src/Cantarell-Light.ufo/glyphs/fraction.glif
+++ b/src/Cantarell-Light.ufo/glyphs/fraction.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fraction" format="2">
-  <advance width="300"/>
+  <advance width="165"/>
   <unicode hex="2044"/>
   <outline>
     <contour>
-      <point x="-15" y="0" type="line"/>
-      <point x="3" y="0" type="line"/>
-      <point x="321" y="694" type="line"/>
-      <point x="296" y="694" type="line"/>
+      <point x="-100" y="0" type="line"/>
+      <point x="-82" y="0" type="line"/>
+      <point x="285" y="694" type="line"/>
+      <point x="260" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/franc.glif b/src/Cantarell-Light.ufo/glyphs/franc.glif
index aea91e9e..292a3042 100644
--- a/src/Cantarell-Light.ufo/glyphs/franc.glif
+++ b/src/Cantarell-Light.ufo/glyphs/franc.glif
@@ -1,18 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="franc" format="2">
-  <advance width="611"/>
+  <advance width="580"/>
   <unicode hex="20A3"/>
   <outline>
-    <component base="F" xOffset="40"/>
-    <component base="strokeshortcomb.case" xScale="0.9" xOffset="-32" yOffset="-121"/>
+    <contour>
+      <point x="153" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="366" type="line"/>
+      <point x="477" y="366" type="line"/>
+      <point x="477" y="384" type="line"/>
+      <point x="175" y="384" type="line"/>
+      <point x="175" y="676" type="line"/>
+      <point x="498" y="676" type="line"/>
+      <point x="498" y="694" type="line"/>
+      <point x="153" y="694" type="line"/>
+    </contour>
+    <contour>
+      <point x="68" y="209" type="line"/>
+      <point x="314" y="209" type="line"/>
+      <point x="314" y="226" type="line"/>
+      <point x="68" y="226" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>0</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/g.glif b/src/Cantarell-Light.ufo/glyphs/g.glif
index 1b6d99bf..9495aaa8 100644
--- a/src/Cantarell-Light.ufo/glyphs/g.glif
+++ b/src/Cantarell-Light.ufo/glyphs/g.glif
@@ -1,59 +1,64 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="g" format="2">
-  <advance width="537"/>
+  <advance width="567"/>
   <unicode hex="0067"/>
-  <note>
-g
-</note>
-  <anchor x="268" y="0" name="bottom"/>
-  <anchor x="258" y="480" name="top"/>
+  <anchor x="279" y="0" name="bottom"/>
+  <anchor x="269" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="262" y="-227" type="curve" smooth="yes"/>
-      <point x="379" y="-227"/>
-      <point x="449" y="-154"/>
-      <point x="449" y="-32" type="curve" smooth="yes"/>
-      <point x="449" y="482" type="line"/>
-      <point x="433" y="482" type="line"/>
-      <point x="428" y="408" type="line"/>
-      <point x="428" y="-32" type="line" smooth="yes"/>
-      <point x="428" y="-145"/>
-      <point x="369" y="-209"/>
-      <point x="264" y="-209" type="curve" smooth="yes"/>
-      <point x="219" y="-209"/>
-      <point x="175" y="-197"/>
-      <point x="121" y="-170" type="curve"/>
-      <point x="115" y="-187" type="line"/>
-      <point x="167" y="-214"/>
-      <point x="213" y="-227"/>
+      <point x="273" y="-227" type="curve" smooth="yes"/>
+      <point x="390" y="-227"/>
+      <point x="460" y="-154"/>
+      <point x="460" y="-32" type="curve" smooth="yes"/>
+      <point x="460" y="482" type="line"/>
+      <point x="444" y="482" type="line"/>
+      <point x="439" y="408" type="line"/>
+      <point x="439" y="-32" type="line" smooth="yes"/>
+      <point x="439" y="-145"/>
+      <point x="380" y="-209"/>
+      <point x="275" y="-209" type="curve" smooth="yes"/>
+      <point x="230" y="-209"/>
+      <point x="186" y="-197"/>
+      <point x="132" y="-170" type="curve"/>
+      <point x="126" y="-187" type="line"/>
+      <point x="178" y="-214"/>
+      <point x="224" y="-227"/>
     </contour>
     <contour>
-      <point x="268" y="-10" type="curve" smooth="yes"/>
-      <point x="339" y="-10"/>
-      <point x="396" y="23"/>
-      <point x="432" y="85" type="curve"/>
-      <point x="429" y="106" type="line"/>
-      <point x="397" y="44"/>
-      <point x="341" y="8"/>
-      <point x="270" y="8" type="curve" smooth="yes"/>
-      <point x="153" y="8"/>
-      <point x="78" y="101"/>
-      <point x="78" y="239" type="curve" smooth="yes"/>
-      <point x="78" y="374"/>
-      <point x="150" y="468"/>
-      <point x="265" y="468" type="curve" smooth="yes"/>
-      <point x="339" y="468"/>
-      <point x="397" y="431"/>
-      <point x="429" y="367" type="curve"/>
-      <point x="433" y="396" type="line"/>
-      <point x="399" y="454"/>
-      <point x="343" y="486"/>
-      <point x="270" y="486" type="curve" smooth="yes"/>
-      <point x="142" y="486"/>
-      <point x="57" y="386"/>
-      <point x="57" y="237" type="curve" smooth="yes"/>
-      <point x="57" y="89"/>
-      <point x="141" y="-10"/>
+      <point x="279" y="-10" type="curve" smooth="yes"/>
+      <point x="350" y="-10"/>
+      <point x="407" y="23"/>
+      <point x="443" y="85" type="curve"/>
+      <point x="440" y="106" type="line"/>
+      <point x="408" y="44"/>
+      <point x="352" y="8"/>
+      <point x="281" y="8" type="curve" smooth="yes"/>
+      <point x="164" y="8"/>
+      <point x="89" y="101"/>
+      <point x="89" y="239" type="curve" smooth="yes"/>
+      <point x="89" y="374"/>
+      <point x="161" y="468"/>
+      <point x="276" y="468" type="curve" smooth="yes"/>
+      <point x="350" y="468"/>
+      <point x="408" y="431"/>
+      <point x="440" y="367" type="curve"/>
+      <point x="444" y="396" type="line"/>
+      <point x="410" y="454"/>
+      <point x="354" y="486"/>
+      <point x="281" y="486" type="curve" smooth="yes"/>
+      <point x="153" y="486"/>
+      <point x="68" y="386"/>
+      <point x="68" y="237" type="curve" smooth="yes"/>
+      <point x="68" y="89"/>
+      <point x="152" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/gbreve.glif b/src/Cantarell-Light.ufo/glyphs/gbreve.glif
index e413d29f..24791570 100644
--- a/src/Cantarell-Light.ufo/glyphs/gbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gbreve" format="2">
-  <advance width="537"/>
+  <advance width="567"/>
   <unicode hex="011F"/>
   <outline>
     <component base="g"/>
-    <component base="brevecomb" xOffset="72"/>
+    <component base="brevecomb" xOffset="83"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/gcaron.glif b/src/Cantarell-Light.ufo/glyphs/gcaron.glif
index b1fa4f02..e0db26cf 100644
--- a/src/Cantarell-Light.ufo/glyphs/gcaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gcaron" format="2">
-  <advance width="537"/>
+  <advance width="567"/>
   <unicode hex="01E7"/>
   <outline>
     <component base="g"/>
-    <component base="caroncomb" xOffset="75"/>
+    <component base="caroncomb" xOffset="86"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/gcircumflex.glif b/src/Cantarell-Light.ufo/glyphs/gcircumflex.glif
index b4491300..61eb6ae3 100644
--- a/src/Cantarell-Light.ufo/glyphs/gcircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gcircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gcircumflex" format="2">
-  <advance width="537"/>
+  <advance width="567"/>
   <unicode hex="011D"/>
   <outline>
     <component base="g"/>
-    <component base="circumflexcomb" xOffset="87"/>
+    <component base="circumflexcomb" xOffset="98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/gcommaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/gcommaaccent.glif
index 13bf3199..141215b7 100644
--- a/src/Cantarell-Light.ufo/glyphs/gcommaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gcommaaccent" format="2">
-  <advance width="537"/>
+  <advance width="567"/>
   <unicode hex="0123"/>
   <outline>
     <component base="g"/>
-    <component base="commaturnedabovecomb" xOffset="154"/>
+    <component base="commaturnedabovecomb" xOffset="165"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/gdotaccent.glif b/src/Cantarell-Light.ufo/glyphs/gdotaccent.glif
index 219828d0..6ba0f5ab 100644
--- a/src/Cantarell-Light.ufo/glyphs/gdotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gdotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gdotaccent" format="2">
-  <advance width="537"/>
+  <advance width="567"/>
   <unicode hex="0121"/>
   <outline>
     <component base="g"/>
-    <component base="dotaccentcomb" xOffset="139"/>
+    <component base="dotaccentcomb" xOffset="150"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ge-cy.glif b/src/Cantarell-Light.ufo/glyphs/ge-cy.glif
index c5936cb9..5c6592e0 100644
--- a/src/Cantarell-Light.ufo/glyphs/ge-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ge-cy.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ge-cy" format="2">
-  <advance width="401"/>
+  <advance width="424"/>
   <unicode hex="0433"/>
-  <anchor x="143" y="0" name="bottomright"/>
-  <anchor x="205" y="480" name="top"/>
+  <anchor x="159" y="0" name="bottomright"/>
+  <anchor x="224" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="109" y="0" type="line"/>
-      <point x="109" y="463" type="line"/>
-      <point x="389" y="463" type="line"/>
-      <point x="389" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="463" type="line"/>
+      <point x="408" y="463" type="line"/>
+      <point x="408" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -23,6 +23,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/gedescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/gedescender-cy.glif
index 4798302b..768ceb7e 100644
--- a/src/Cantarell-Light.ufo/glyphs/gedescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gedescender-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gedescender-cy" format="2">
-  <advance width="401"/>
+  <advance width="424"/>
   <unicode hex="04F7"/>
   <outline>
     <component base="ge-cy"/>
-    <component base="descender-cy" xOffset="47"/>
+    <component base="descender-cy" xOffset="63"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/germandbls.glif b/src/Cantarell-Light.ufo/glyphs/germandbls.glif
index f3653449..ccda2de2 100644
--- a/src/Cantarell-Light.ufo/glyphs/germandbls.glif
+++ b/src/Cantarell-Light.ufo/glyphs/germandbls.glif
@@ -4,46 +4,52 @@
   <unicode hex="00DF"/>
   <outline>
     <contour>
-      <point x="357" y="-10" type="curve" smooth="yes"/>
-      <point x="448" y="-10"/>
-      <point x="513" y="44"/>
-      <point x="513" y="134" type="curve" smooth="yes"/>
-      <point x="513" y="290"/>
-      <point x="315" y="292"/>
-      <point x="315" y="384" type="curve" smooth="yes"/>
-      <point x="315" y="457"/>
-      <point x="438" y="464"/>
-      <point x="438" y="591" type="curve" smooth="yes"/>
-      <point x="438" y="685"/>
-      <point x="371" y="749"/>
-      <point x="277" y="749" type="curve" smooth="yes"/>
-      <point x="169" y="749"/>
-      <point x="102" y="664"/>
-      <point x="102" y="539" type="curve" smooth="yes"/>
-      <point x="102" y="0" type="line"/>
-      <point x="123" y="0" type="line"/>
-      <point x="123" y="548" type="line" smooth="yes"/>
-      <point x="123" y="659"/>
-      <point x="181" y="731"/>
-      <point x="274" y="731" type="curve" smooth="yes"/>
-      <point x="357" y="731"/>
-      <point x="418" y="673"/>
-      <point x="418" y="588" type="curve" smooth="yes"/>
-      <point x="418" y="468"/>
-      <point x="294" y="465"/>
-      <point x="294" y="381" type="curve" smooth="yes"/>
-      <point x="294" y="275"/>
-      <point x="492" y="281"/>
-      <point x="492" y="131" type="curve" smooth="yes"/>
-      <point x="492" y="54"/>
-      <point x="438" y="8"/>
-      <point x="359" y="8" type="curve" smooth="yes"/>
-      <point x="316" y="8"/>
-      <point x="266" y="21"/>
-      <point x="225" y="43" type="curve"/>
-      <point x="219" y="26" type="line"/>
-      <point x="257" y="4"/>
-      <point x="311" y="-10"/>
+      <point x="362" y="-10" type="curve" smooth="yes"/>
+      <point x="453" y="-10"/>
+      <point x="518" y="44"/>
+      <point x="518" y="134" type="curve" smooth="yes"/>
+      <point x="518" y="290"/>
+      <point x="320" y="292"/>
+      <point x="320" y="384" type="curve" smooth="yes"/>
+      <point x="320" y="457"/>
+      <point x="443" y="464"/>
+      <point x="443" y="591" type="curve" smooth="yes"/>
+      <point x="443" y="685"/>
+      <point x="376" y="749"/>
+      <point x="282" y="749" type="curve" smooth="yes"/>
+      <point x="174" y="749"/>
+      <point x="107" y="664"/>
+      <point x="107" y="539" type="curve" smooth="yes"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="548" type="line" smooth="yes"/>
+      <point x="128" y="659"/>
+      <point x="186" y="731"/>
+      <point x="279" y="731" type="curve" smooth="yes"/>
+      <point x="362" y="731"/>
+      <point x="423" y="673"/>
+      <point x="423" y="588" type="curve" smooth="yes"/>
+      <point x="423" y="468"/>
+      <point x="299" y="465"/>
+      <point x="299" y="381" type="curve" smooth="yes"/>
+      <point x="299" y="275"/>
+      <point x="497" y="281"/>
+      <point x="497" y="131" type="curve" smooth="yes"/>
+      <point x="497" y="54"/>
+      <point x="443" y="8"/>
+      <point x="364" y="8" type="curve" smooth="yes"/>
+      <point x="321" y="8"/>
+      <point x="271" y="21"/>
+      <point x="230" y="43" type="curve"/>
+      <point x="224" y="26" type="line"/>
+      <point x="262" y="4"/>
+      <point x="316" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ghemiddlehook-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/ghemiddlehook-cy.glif
index 00872a64..4514b6b5 100644
--- a/src/Cantarell-Light.ufo/glyphs/ghemiddlehook-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ghemiddlehook-cy.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ghemiddlehook-cy" format="2">
-  <advance width="506"/>
+  <advance width="540"/>
   <unicode hex="0495"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="109" y="0" type="line"/>
-      <point x="109" y="463" type="line"/>
-      <point x="387" y="463" type="line"/>
-      <point x="387" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="238" y="-217" type="line"/>
+      <point x="381" y="-210"/>
+      <point x="483" y="-98"/>
+      <point x="483" y="63" type="curve" smooth="yes"/>
+      <point x="483" y="198"/>
+      <point x="406" y="283"/>
+      <point x="282" y="283" type="curve" smooth="yes"/>
+      <point x="217" y="283"/>
+      <point x="153" y="259"/>
+      <point x="114" y="220" type="curve"/>
+      <point x="123" y="209" type="line"/>
+      <point x="156" y="242"/>
+      <point x="220" y="265"/>
+      <point x="280" y="265" type="curve" smooth="yes"/>
+      <point x="391" y="265"/>
+      <point x="462" y="186"/>
+      <point x="462" y="60" type="curve" smooth="yes"/>
+      <point x="462" y="-87"/>
+      <point x="367" y="-193"/>
+      <point x="235" y="-206" type="curve"/>
     </contour>
     <contour>
-      <point x="95" y="220" type="curve"/>
-      <point x="104" y="209" type="line"/>
-      <point x="137" y="242"/>
-      <point x="201" y="265"/>
-      <point x="261" y="265" type="curve" smooth="yes"/>
-      <point x="372" y="265"/>
-      <point x="443" y="186"/>
-      <point x="443" y="60" type="curve" smooth="yes"/>
-      <point x="443" y="-87"/>
-      <point x="348" y="-193"/>
-      <point x="216" y="-206" type="curve"/>
-      <point x="219" y="-217" type="line"/>
-      <point x="362" y="-210"/>
-      <point x="464" y="-98"/>
-      <point x="464" y="63" type="curve" smooth="yes"/>
-      <point x="464" y="198"/>
-      <point x="387" y="283"/>
-      <point x="263" y="283" type="curve" smooth="yes"/>
-      <point x="198" y="283"/>
-      <point x="134" y="259"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="463" type="line"/>
+      <point x="406" y="463" type="line"/>
+      <point x="406" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -43,6 +43,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ghestroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/ghestroke-cy.glif
index 7e9af49c..2a3b2f24 100644
--- a/src/Cantarell-Light.ufo/glyphs/ghestroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ghestroke-cy.glif
@@ -1,21 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ghestroke-cy" format="2">
-  <advance width="418"/>
+  <advance width="441"/>
   <unicode hex="0493"/>
   <outline>
     <contour>
-      <point x="105" y="0" type="line"/>
-      <point x="126" y="0" type="line"/>
-      <point x="126" y="463" type="line"/>
-      <point x="406" y="463" type="line"/>
-      <point x="406" y="480" type="line"/>
-      <point x="105" y="480" type="line"/>
+      <point x="124" y="0" type="line"/>
+      <point x="145" y="0" type="line"/>
+      <point x="145" y="463" type="line"/>
+      <point x="425" y="463" type="line"/>
+      <point x="425" y="480" type="line"/>
+      <point x="124" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="19" y="252" type="line"/>
-      <point x="328" y="252" type="line"/>
-      <point x="328" y="269" type="line"/>
-      <point x="19" y="269" type="line"/>
+      <point x="38" y="252" type="line"/>
+      <point x="347" y="252" type="line"/>
+      <point x="347" y="269" type="line"/>
+      <point x="38" y="269" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/gheupturn-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/gheupturn-cy.glif
index c0f26f9b..164083ba 100644
--- a/src/Cantarell-Light.ufo/glyphs/gheupturn-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gheupturn-cy.glif
@@ -1,17 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gheupturn-cy" format="2">
-  <advance width="411"/>
+  <advance width="434"/>
   <unicode hex="0491"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="109" y="0" type="line"/>
-      <point x="109" y="463" type="line"/>
-      <point x="399" y="463" type="line"/>
-      <point x="399" y="602" type="line"/>
-      <point x="379" y="602" type="line"/>
-      <point x="379" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="463" type="line"/>
+      <point x="418" y="463" type="line"/>
+      <point x="418" y="602" type="line"/>
+      <point x="398" y="602" type="line"/>
+      <point x="398" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/gje-cy.glif b/src/Cantarell-Light.ufo/glyphs/gje-cy.glif
index 42dae16b..1cdb57aa 100644
--- a/src/Cantarell-Light.ufo/glyphs/gje-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gje-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gje-cy" format="2">
-  <advance width="401"/>
+  <advance width="424"/>
   <unicode hex="0453"/>
   <outline>
     <component base="ge-cy"/>
-    <component base="acutecomb" xOffset="138"/>
+    <component base="acutecomb" xOffset="157"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/gmacron.glif b/src/Cantarell-Light.ufo/glyphs/gmacron.glif
index 92e8711e..71999a7a 100644
--- a/src/Cantarell-Light.ufo/glyphs/gmacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gmacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gmacron" format="2">
-  <advance width="537"/>
+  <advance width="567"/>
   <unicode hex="1E21"/>
   <outline>
     <component base="g"/>
-    <component base="macroncomb" xOffset="15"/>
+    <component base="macroncomb" xOffset="26"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/grave.glif b/src/Cantarell-Light.ufo/glyphs/grave.glif
index 74e97c15..bdeed7ba 100644
--- a/src/Cantarell-Light.ufo/glyphs/grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/grave.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="grave" format="2">
-  <advance width="242"/>
+  <advance width="500"/>
   <unicode hex="0060"/>
   <outline>
-    <component base="gravecomb" xOffset="3"/>
+    <component base="gravecomb" xOffset="118"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/greater.glif b/src/Cantarell-Light.ufo/glyphs/greater.glif
index 55e5921e..1d4717a3 100644
--- a/src/Cantarell-Light.ufo/glyphs/greater.glif
+++ b/src/Cantarell-Light.ufo/glyphs/greater.glif
@@ -1,17 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="greater" format="2">
-  <advance width="594"/>
+  <advance width="580"/>
   <unicode hex="003E"/>
   <outline>
     <contour>
-      <point x="85" y="74" type="line"/>
-      <point x="511" y="308" type="line"/>
-      <point x="511" y="332" type="line"/>
-      <point x="85" y="567" type="line"/>
-      <point x="85" y="547" type="line"/>
-      <point x="506" y="314" type="line"/>
-      <point x="506" y="325" type="line"/>
-      <point x="85" y="93" type="line"/>
+      <point x="95" y="44" type="line"/>
+      <point x="485" y="298" type="line"/>
+      <point x="485" y="322" type="line"/>
+      <point x="95" y="577" type="line"/>
+      <point x="95" y="557" type="line"/>
+      <point x="479" y="304" type="line"/>
+      <point x="479" y="315" type="line"/>
+      <point x="95" y="63" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/greaterequal.glif 
b/src/Cantarell-Light.ufo/glyphs/greaterequal.glif
index a5e08fe4..c890062e 100644
--- a/src/Cantarell-Light.ufo/glyphs/greaterequal.glif
+++ b/src/Cantarell-Light.ufo/glyphs/greaterequal.glif
@@ -1,23 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="greaterequal" format="2">
-  <advance width="664"/>
+  <advance width="580"/>
   <unicode hex="2265"/>
   <outline>
     <contour>
-      <point x="101" y="172" type="line"/>
-      <point x="572" y="357" type="line"/>
-      <point x="572" y="383" type="line"/>
-      <point x="101" y="569" type="line"/>
-      <point x="101" y="550" type="line"/>
-      <point x="569" y="366" type="line"/>
-      <point x="569" y="373" type="line"/>
-      <point x="101" y="189" type="line"/>
+      <point x="70" y="172" type="line"/>
+      <point x="510" y="357" type="line"/>
+      <point x="510" y="383" type="line"/>
+      <point x="70" y="569" type="line"/>
+      <point x="70" y="550" type="line"/>
+      <point x="506" y="366" type="line"/>
+      <point x="506" y="373" type="line"/>
+      <point x="70" y="189" type="line"/>
     </contour>
     <contour>
-      <point x="107" y="55" type="line"/>
-      <point x="572" y="55" type="line"/>
-      <point x="572" y="72" type="line"/>
-      <point x="107" y="72" type="line"/>
+      <point x="76" y="55" type="line"/>
+      <point x="510" y="55" type="line"/>
+      <point x="510" y="72" type="line"/>
+      <point x="76" y="72" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/guarani.glif b/src/Cantarell-Light.ufo/glyphs/guarani.glif
index d979e916..23069f8e 100644
--- a/src/Cantarell-Light.ufo/glyphs/guarani.glif
+++ b/src/Cantarell-Light.ufo/glyphs/guarani.glif
@@ -1,20 +1,58 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guarani" format="2">
-  <advance width="753"/>
+  <advance width="580"/>
   <unicode hex="20B2"/>
   <outline>
-    <component base="G" xOffset="19"/>
-    <component base="_currencyvstem" xOffset="3" yOffset="-840"/>
-    <component base="_currencyvstem" xOffset="-8"/>
+    <contour>
+      <point x="324" y="-10" type="curve" smooth="yes"/>
+      <point x="400" y="-10"/>
+      <point x="484" y="19"/>
+      <point x="533" y="60" type="curve"/>
+      <point x="533" y="338" type="line"/>
+      <point x="311" y="338" type="line"/>
+      <point x="311" y="319" type="line"/>
+      <point x="511" y="319" type="line"/>
+      <point x="511" y="57" type="line"/>
+      <point x="516" y="69" type="line"/>
+      <point x="462" y="32"/>
+      <point x="392" y="9"/>
+      <point x="327" y="9" type="curve" smooth="yes"/>
+      <point x="171" y="9"/>
+      <point x="67" y="143"/>
+      <point x="67" y="348" type="curve" smooth="yes"/>
+      <point x="67" y="554"/>
+      <point x="172" y="680"/>
+      <point x="338" y="680" type="curve" smooth="yes"/>
+      <point x="396" y="680"/>
+      <point x="459" y="664"/>
+      <point x="503" y="634" type="curve"/>
+      <point x="509" y="651" type="line"/>
+      <point x="462" y="683"/>
+      <point x="403" y="699"/>
+      <point x="341" y="699" type="curve" smooth="yes"/>
+      <point x="159" y="699"/>
+      <point x="44" y="564"/>
+      <point x="44" y="345" type="curve" smooth="yes"/>
+      <point x="44" y="130"/>
+      <point x="156" y="-10"/>
+    </contour>
+    <contour>
+      <point x="325" y="-120" type="line"/>
+      <point x="343" y="-120" type="line"/>
+      <point x="343" y="0" type="line"/>
+      <point x="325" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="315" y="693" type="line"/>
+      <point x="333" y="693" type="line"/>
+      <point x="333" y="813" type="line"/>
+      <point x="315" y="813" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>-1</integer>
-        <integer>-1</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/guillemetleft.glif 
b/src/Cantarell-Light.ufo/glyphs/guillemetleft.glif
index 32e11ea5..2f5315e0 100644
--- a/src/Cantarell-Light.ufo/glyphs/guillemetleft.glif
+++ b/src/Cantarell-Light.ufo/glyphs/guillemetleft.glif
@@ -1,25 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guillemetleft" format="2">
-  <advance width="441"/>
+  <advance width="488"/>
   <unicode hex="00AB"/>
   <outline>
     <contour>
-      <point x="193" y="37" type="line"/>
-      <point x="217" y="37" type="line"/>
-      <point x="66" y="259" type="line"/>
-      <point x="68" y="244" type="line"/>
-      <point x="214" y="456" type="line"/>
-      <point x="194" y="456" type="line"/>
-      <point x="50" y="250" type="line"/>
+      <point x="219" y="37" type="line"/>
+      <point x="245" y="37" type="line"/>
+      <point x="85" y="259" type="line"/>
+      <point x="87" y="243" type="line"/>
+      <point x="242" y="456" type="line"/>
+      <point x="220" y="456" type="line"/>
+      <point x="67" y="250" type="line"/>
     </contour>
     <contour>
-      <point x="368" y="37" type="line"/>
-      <point x="392" y="37" type="line"/>
-      <point x="241" y="259" type="line"/>
-      <point x="243" y="244" type="line"/>
-      <point x="389" y="456" type="line"/>
-      <point x="369" y="456" type="line"/>
-      <point x="225" y="250" type="line"/>
+      <point x="396" y="37" type="line"/>
+      <point x="423" y="37" type="line"/>
+      <point x="261" y="259" type="line"/>
+      <point x="263" y="243" type="line"/>
+      <point x="420" y="456" type="line"/>
+      <point x="397" y="456" type="line"/>
+      <point x="244" y="250" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/guillemetright.glif 
b/src/Cantarell-Light.ufo/glyphs/guillemetright.glif
index 8a795714..2ee6a4a2 100644
--- a/src/Cantarell-Light.ufo/glyphs/guillemetright.glif
+++ b/src/Cantarell-Light.ufo/glyphs/guillemetright.glif
@@ -1,25 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guillemetright" format="2">
-  <advance width="432"/>
+  <advance width="488"/>
   <unicode hex="00BB"/>
   <outline>
     <contour>
-      <point x="219" y="36" type="line"/>
-      <point x="239" y="36" type="line"/>
-      <point x="382" y="247" type="line"/>
-      <point x="239" y="455" type="line"/>
-      <point x="215" y="455" type="line"/>
-      <point x="366" y="238" type="line"/>
-      <point x="364" y="253" type="line"/>
+      <point x="245" y="36" type="line"/>
+      <point x="268" y="36" type="line"/>
+      <point x="421" y="247" type="line"/>
+      <point x="268" y="455" type="line"/>
+      <point x="241" y="455" type="line"/>
+      <point x="403" y="237" type="line"/>
+      <point x="401" y="253" type="line"/>
     </contour>
     <contour>
-      <point x="54" y="36" type="line"/>
-      <point x="74" y="36" type="line"/>
-      <point x="217" y="247" type="line"/>
-      <point x="74" y="455" type="line"/>
-      <point x="50" y="455" type="line"/>
-      <point x="201" y="238" type="line"/>
-      <point x="199" y="253" type="line"/>
+      <point x="69" y="36" type="line"/>
+      <point x="91" y="36" type="line"/>
+      <point x="244" y="247" type="line"/>
+      <point x="91" y="455" type="line"/>
+      <point x="65" y="455" type="line"/>
+      <point x="226" y="237" type="line"/>
+      <point x="224" y="253" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|guillemetleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>guillemetleft</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/guilsinglleft.glif 
b/src/Cantarell-Light.ufo/glyphs/guilsinglleft.glif
index e4013173..69f1cf1c 100644
--- a/src/Cantarell-Light.ufo/glyphs/guilsinglleft.glif
+++ b/src/Cantarell-Light.ufo/glyphs/guilsinglleft.glif
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guilsinglleft" format="2">
-  <advance width="266"/>
+  <advance width="319"/>
   <unicode hex="2039"/>
   <outline>
     <contour>
-      <point x="193" y="32" type="line"/>
-      <point x="217" y="32" type="line"/>
-      <point x="66" y="254" type="line"/>
-      <point x="68" y="239" type="line"/>
-      <point x="214" y="451" type="line"/>
-      <point x="194" y="451" type="line"/>
-      <point x="50" y="245" type="line"/>
+      <point x="229" y="32" type="line"/>
+      <point x="255" y="32" type="line"/>
+      <point x="83" y="254" type="line"/>
+      <point x="86" y="238" type="line"/>
+      <point x="252" y="451" type="line"/>
+      <point x="230" y="451" type="line"/>
+      <point x="66" y="245" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/guilsinglright.glif 
b/src/Cantarell-Light.ufo/glyphs/guilsinglright.glif
index 1ab8d171..ed515b5f 100644
--- a/src/Cantarell-Light.ufo/glyphs/guilsinglright.glif
+++ b/src/Cantarell-Light.ufo/glyphs/guilsinglright.glif
@@ -1,16 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guilsinglright" format="2">
-  <advance width="267"/>
+  <advance width="319"/>
   <unicode hex="203A"/>
   <outline>
     <contour>
-      <point x="54" y="32" type="line"/>
-      <point x="74" y="32" type="line"/>
-      <point x="217" y="243" type="line"/>
-      <point x="74" y="451" type="line"/>
-      <point x="50" y="451" type="line"/>
-      <point x="201" y="234" type="line"/>
-      <point x="199" y="249" type="line"/>
+      <point x="68" y="32" type="line"/>
+      <point x="90" y="32" type="line"/>
+      <point x="253" y="243" type="line"/>
+      <point x="90" y="451" type="line"/>
+      <point x="64" y="451" type="line"/>
+      <point x="236" y="233" type="line"/>
+      <point x="233" y="249" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|guilsinglleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>guilsinglleft</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/h.glif b/src/Cantarell-Light.ufo/glyphs/h.glif
index 757b8c21..b94d2b4c 100644
--- a/src/Cantarell-Light.ufo/glyphs/h.glif
+++ b/src/Cantarell-Light.ufo/glyphs/h.glif
@@ -1,37 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="h" format="2">
-  <advance width="525"/>
+  <advance width="563"/>
   <unicode hex="0068"/>
-  <note>
-h
-</note>
-  <anchor x="266" y="0" name="bottom"/>
-  <anchor x="143" y="592" name="center"/>
-  <anchor x="286" y="739" name="top"/>
+  <anchor x="285" y="0" name="bottom"/>
+  <anchor x="162" y="592" name="center"/>
+  <anchor x="305" y="739" name="top"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="108" y="0" type="line"/>
-      <point x="108" y="739" type="line"/>
-      <point x="88" y="739" type="line"/>
+      <point x="444" y="0" type="line"/>
+      <point x="465" y="0" type="line"/>
+      <point x="465" y="314" type="line" smooth="yes"/>
+      <point x="465" y="421"/>
+      <point x="404" y="486"/>
+      <point x="302" y="486" type="curve" smooth="yes"/>
+      <point x="229" y="486"/>
+      <point x="159" y="452"/>
+      <point x="112" y="394" type="curve"/>
+      <point x="121" y="383" type="line"/>
+      <point x="164" y="436"/>
+      <point x="230" y="468"/>
+      <point x="298" y="468" type="curve" smooth="yes"/>
+      <point x="390" y="468"/>
+      <point x="444" y="411"/>
+      <point x="444" y="314" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="425" y="0" type="line"/>
-      <point x="446" y="0" type="line"/>
-      <point x="446" y="314" type="line" smooth="yes"/>
-      <point x="446" y="421"/>
-      <point x="385" y="486"/>
-      <point x="283" y="486" type="curve" smooth="yes"/>
-      <point x="210" y="486"/>
-      <point x="140" y="452"/>
-      <point x="93" y="394" type="curve"/>
-      <point x="102" y="383" type="line"/>
-      <point x="145" y="436"/>
-      <point x="211" y="468"/>
-      <point x="279" y="468" type="curve" smooth="yes"/>
-      <point x="371" y="468"/>
-      <point x="425" y="411"/>
-      <point x="425" y="314" type="curve" smooth="yes"/>
+      <point x="107" y="0" type="line"/>
+      <point x="127" y="0" type="line"/>
+      <point x="127" y="739" type="line"/>
+      <point x="107" y="739" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ha-cy.glif b/src/Cantarell-Light.ufo/glyphs/ha-cy.glif
index 9905a85a..92b118d8 100644
--- a/src/Cantarell-Light.ufo/glyphs/ha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ha-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ha-cy" format="2">
-  <advance width="437"/>
+  <advance width="446"/>
   <unicode hex="0445"/>
   <anchor x="414" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/hadescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/hadescender-cy.glif
index bb858238..02dae669 100644
--- a/src/Cantarell-Light.ufo/glyphs/hadescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hadescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hadescender-cy" format="2">
-  <advance width="468"/>
+  <advance width="446"/>
   <unicode hex="04B3"/>
   <outline>
     <component base="ha-cy"/>
@@ -10,11 +10,8 @@
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>ha-cy</string>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>0</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>kadescender-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/hairspace.glif b/src/Cantarell-Light.ufo/glyphs/hairspace.glif
index beba6181..9f460d9a 100644
--- a/src/Cantarell-Light.ufo/glyphs/hairspace.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hairspace.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hairspace" format="2">
-  <advance width="98"/>
+  <advance width="100"/>
   <unicode hex="200A"/>
   <outline>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/hardsign-cy.glif b/src/Cantarell-Light.ufo/glyphs/hardsign-cy.glif
index 7b78389d..a21d9c6c 100644
--- a/src/Cantarell-Light.ufo/glyphs/hardsign-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hardsign-cy.glif
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hardsign-cy" format="2">
-  <advance width="542"/>
+  <advance width="553"/>
   <unicode hex="044A"/>
   <outline>
     <contour>
-      <point x="169" y="0" type="line"/>
-      <point x="326" y="0" type="line" smooth="yes"/>
-      <point x="434" y="0"/>
-      <point x="499" y="56"/>
-      <point x="499" y="150" type="curve" smooth="yes"/>
-      <point x="499" y="241"/>
-      <point x="440" y="301"/>
-      <point x="351" y="301" type="curve" smooth="yes"/>
-      <point x="183" y="301" type="line"/>
-      <point x="183" y="284" type="line"/>
-      <point x="343" y="284" type="line" smooth="yes"/>
-      <point x="424" y="284"/>
-      <point x="478" y="228"/>
-      <point x="478" y="145" type="curve" smooth="yes"/>
-      <point x="478" y="65"/>
-      <point x="424" y="17"/>
-      <point x="334" y="17" type="curve" smooth="yes"/>
-      <point x="190" y="17" type="line"/>
-      <point x="190" y="480" type="line"/>
-      <point x="169" y="480" type="line"/>
+      <point x="165" y="0" type="line"/>
+      <point x="322" y="0" type="line" smooth="yes"/>
+      <point x="430" y="0"/>
+      <point x="495" y="56"/>
+      <point x="495" y="150" type="curve" smooth="yes"/>
+      <point x="495" y="241"/>
+      <point x="436" y="301"/>
+      <point x="347" y="301" type="curve" smooth="yes"/>
+      <point x="179" y="301" type="line"/>
+      <point x="179" y="284" type="line"/>
+      <point x="339" y="284" type="line" smooth="yes"/>
+      <point x="420" y="284"/>
+      <point x="474" y="228"/>
+      <point x="474" y="145" type="curve" smooth="yes"/>
+      <point x="474" y="65"/>
+      <point x="420" y="17"/>
+      <point x="330" y="17" type="curve" smooth="yes"/>
+      <point x="186" y="17" type="line"/>
+      <point x="186" y="480" type="line"/>
+      <point x="165" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="20" y="463" type="line"/>
-      <point x="179" y="463" type="line"/>
-      <point x="179" y="480" type="line"/>
-      <point x="20" y="480" type="line"/>
+      <point x="16" y="463" type="line"/>
+      <point x="175" y="463" type="line"/>
+      <point x="175" y="480" type="line"/>
+      <point x="16" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -41,6 +41,10 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|ge-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>softsign-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/hbar.glif b/src/Cantarell-Light.ufo/glyphs/hbar.glif
index 063c4706..b69b5b91 100644
--- a/src/Cantarell-Light.ufo/glyphs/hbar.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hbar.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hbar" format="2">
-  <advance width="525"/>
+  <advance width="563"/>
   <unicode hex="0127"/>
   <outline>
     <component base="h"/>
-    <component base="strokeshortcomb" xOffset="-98" yOffset="293"/>
+    <component base="strokeshortcomb" xOffset="-79" yOffset="293"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/hbrevebelow.glif b/src/Cantarell-Light.ufo/glyphs/hbrevebelow.glif
index a348a7dc..c9e833bc 100644
--- a/src/Cantarell-Light.ufo/glyphs/hbrevebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hbrevebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hbrevebelow" format="2">
-  <advance width="525"/>
+  <advance width="563"/>
   <unicode hex="1E2B"/>
   <outline>
     <component base="h"/>
-    <component base="brevebelowcomb" xOffset="60"/>
+    <component base="brevebelowcomb" xOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/hcircumflex.glif b/src/Cantarell-Light.ufo/glyphs/hcircumflex.glif
index b0345927..fb24783c 100644
--- a/src/Cantarell-Light.ufo/glyphs/hcircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hcircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hcircumflex" format="2">
-  <advance width="525"/>
+  <advance width="563"/>
   <unicode hex="0125"/>
   <outline>
     <component base="h"/>
-    <component base="circumflexcomb.case" xOffset="109" yOffset="45"/>
+    <component base="circumflexcomb.case" xOffset="128" yOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/hdotbelow.glif b/src/Cantarell-Light.ufo/glyphs/hdotbelow.glif
index afa8c279..eae900a4 100644
--- a/src/Cantarell-Light.ufo/glyphs/hdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hdotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hdotbelow" format="2">
-  <advance width="525"/>
+  <advance width="563"/>
   <unicode hex="1E25"/>
   <outline>
     <component base="h"/>
-    <component base="dotbelowcomb" xOffset="146"/>
+    <component base="dotbelowcomb" xOffset="165"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/hryvnia.glif b/src/Cantarell-Light.ufo/glyphs/hryvnia.glif
index b02df3ed..bcfd5f24 100644
--- a/src/Cantarell-Light.ufo/glyphs/hryvnia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hryvnia.glif
@@ -1,7 +1,69 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hryvnia" format="2">
-  <advance width="600"/>
+  <advance width="580"/>
   <unicode hex="20B4"/>
   <outline>
+    <contour>
+      <point x="306" y="-10" type="curve" smooth="yes"/>
+      <point x="367" y="-10"/>
+      <point x="432" y="8"/>
+      <point x="493" y="42" type="curve"/>
+      <point x="486" y="58" type="line"/>
+      <point x="412" y="22"/>
+      <point x="362" y="9"/>
+      <point x="312" y="9" type="curve" smooth="yes"/>
+      <point x="204" y="9"/>
+      <point x="130" y="76"/>
+      <point x="130" y="174" type="curve" smooth="yes"/>
+      <point x="130" y="213"/>
+      <point x="142" y="247"/>
+      <point x="167" y="273" type="curve"/>
+      <point x="138" y="273" type="line"/>
+      <point x="117" y="246"/>
+      <point x="108" y="212"/>
+      <point x="108" y="173" type="curve" smooth="yes"/>
+      <point x="108" y="62"/>
+      <point x="187" y="-10"/>
+    </contour>
+    <contour>
+      <point x="25" y="261" type="line"/>
+      <point x="555" y="261" type="line"/>
+      <point x="555" y="278" type="line"/>
+      <point x="25" y="278" type="line"/>
+    </contour>
+    <contour>
+      <point x="25" y="418" type="line"/>
+      <point x="555" y="418" type="line"/>
+      <point x="555" y="435" type="line"/>
+      <point x="25" y="435" type="line"/>
+    </contour>
+    <contour>
+      <point x="407" y="428" type="curve"/>
+      <point x="439" y="428" type="line"/>
+      <point x="462" y="452"/>
+      <point x="476" y="496"/>
+      <point x="476" y="540" type="curve" smooth="yes"/>
+      <point x="476" y="644"/>
+      <point x="407" y="702"/>
+      <point x="283" y="702" type="curve" smooth="yes"/>
+      <point x="221" y="702"/>
+      <point x="165" y="687"/>
+      <point x="126" y="663" type="curve"/>
+      <point x="133" y="645" type="line"/>
+      <point x="178" y="671"/>
+      <point x="226" y="683"/>
+      <point x="279" y="683" type="curve" smooth="yes"/>
+      <point x="392" y="683"/>
+      <point x="454" y="632"/>
+      <point x="454" y="540" type="curve" smooth="yes"/>
+      <point x="454" y="494"/>
+      <point x="436" y="451"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/hungarumlaut.glif 
b/src/Cantarell-Light.ufo/glyphs/hungarumlaut.glif
index 5312acb5..c21380f7 100644
--- a/src/Cantarell-Light.ufo/glyphs/hungarumlaut.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hungarumlaut.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hungarumlaut" format="2">
-  <advance width="402"/>
+  <advance width="500"/>
   <unicode hex="02DD"/>
   <outline>
-    <component base="hungarumlautcomb" xOffset="-55"/>
+    <component base="hungarumlautcomb" xOffset="73"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/hungarumlautcomb.case.glif 
b/src/Cantarell-Light.ufo/glyphs/hungarumlautcomb.case.glif
index c34bde6a..7b2843be 100644
--- a/src/Cantarell-Light.ufo/glyphs/hungarumlautcomb.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hungarumlautcomb.case.glif
@@ -3,18 +3,18 @@
   <anchor x="172" y="694" name="_top"/>
   <anchor x="172" y="926" name="top"/>
   <outline>
-    <contour>
-      <point x="59" y="772" type="line"/>
-      <point x="182" y="895" type="line"/>
-      <point x="166" y="911" type="line"/>
-      <point x="53" y="777" type="line"/>
-    </contour>
     <contour>
       <point x="239" y="772" type="line"/>
       <point x="362" y="895" type="line"/>
       <point x="346" y="911" type="line"/>
       <point x="233" y="777" type="line"/>
     </contour>
+    <contour>
+      <point x="59" y="772" type="line"/>
+      <point x="182" y="895" type="line"/>
+      <point x="166" y="911" type="line"/>
+      <point x="53" y="777" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/hyphen.glif b/src/Cantarell-Light.ufo/glyphs/hyphen.glif
index b6c04ce3..2595eb78 100644
--- a/src/Cantarell-Light.ufo/glyphs/hyphen.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hyphen.glif
@@ -1,13 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hyphen" format="2">
-  <advance width="462"/>
+  <advance width="450"/>
   <unicode hex="002D"/>
+  <unicode hex="00AD"/>
+  <unicode hex="2010"/>
+  <unicode hex="2011"/>
   <outline>
     <contour>
-      <point x="96" y="240" type="line"/>
-      <point x="366" y="240" type="line"/>
-      <point x="366" y="257" type="line"/>
-      <point x="96" y="257" type="line"/>
+      <point x="85" y="240" type="line"/>
+      <point x="365" y="240" type="line"/>
+      <point x="365" y="257" type="line"/>
+      <point x="85" y="257" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/i-cy.glif b/src/Cantarell-Light.ufo/glyphs/i-cy.glif
index a8a01ab8..459cab53 100644
--- a/src/Cantarell-Light.ufo/glyphs/i-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/i-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="i-cy" format="2">
-  <advance width="201"/>
+  <advance width="235"/>
   <unicode hex="0456"/>
   <outline>
     <component base="i"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/i.glif b/src/Cantarell-Light.ufo/glyphs/i.glif
index 78a06a4f..77026e88 100644
--- a/src/Cantarell-Light.ufo/glyphs/i.glif
+++ b/src/Cantarell-Light.ufo/glyphs/i.glif
@@ -1,13 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="i" format="2">
-  <advance width="201"/>
+  <advance width="235"/>
   <unicode hex="0069"/>
-  <note>
-i
-</note>
-  <anchor x="114" y="0" name="bottom"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb" xOffset="-17"/>
+    <component base="dotaccentcomb"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ia-cy.glif b/src/Cantarell-Light.ufo/glyphs/ia-cy.glif
index 924f8363..579112d1 100644
--- a/src/Cantarell-Light.ufo/glyphs/ia-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ia-cy.glif
@@ -1,40 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ia-cy" format="2">
-  <advance width="477"/>
+  <advance width="515"/>
   <unicode hex="044F"/>
-  <anchor x="238" y="480" name="top"/>
+  <anchor x="257" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="221" y="196" type="curve" smooth="yes"/>
-      <point x="377" y="196" type="line"/>
-      <point x="377" y="214" type="line"/>
-      <point x="226" y="214" type="line" smooth="yes"/>
-      <point x="130" y="214"/>
-      <point x="70" y="262"/>
-      <point x="70" y="341" type="curve" smooth="yes"/>
-      <point x="70" y="417"/>
-      <point x="128" y="462"/>
-      <point x="220" y="462" type="curve" smooth="yes"/>
-      <point x="377" y="462" type="line"/>
-      <point x="377" y="480" type="line"/>
-      <point x="226" y="480" type="line" smooth="yes"/>
-      <point x="116" y="480"/>
-      <point x="49" y="424"/>
-      <point x="49" y="336" type="curve" smooth="yes"/>
-      <point x="49" y="250"/>
-      <point x="116" y="196"/>
+      <point x="387" y="0" type="line"/>
+      <point x="408" y="0" type="line"/>
+      <point x="408" y="480" type="line"/>
+      <point x="245" y="480" type="line" smooth="yes"/>
+      <point x="135" y="480"/>
+      <point x="68" y="424"/>
+      <point x="68" y="336" type="curve" smooth="yes"/>
+      <point x="68" y="250"/>
+      <point x="135" y="196"/>
+      <point x="240" y="196" type="curve" smooth="yes"/>
+      <point x="396" y="196" type="line"/>
+      <point x="396" y="214" type="line"/>
+      <point x="245" y="214" type="line" smooth="yes"/>
+      <point x="149" y="214"/>
+      <point x="89" y="262"/>
+      <point x="89" y="341" type="curve" smooth="yes"/>
+      <point x="89" y="417"/>
+      <point x="147" y="462"/>
+      <point x="239" y="462" type="curve" smooth="yes"/>
+      <point x="387" y="462" type="line"/>
     </contour>
     <contour>
-      <point x="45" y="0" type="line"/>
-      <point x="70" y="0" type="line"/>
-      <point x="210" y="209" type="line"/>
-      <point x="188" y="209" type="line"/>
-    </contour>
-    <contour>
-      <point x="368" y="0" type="line"/>
-      <point x="389" y="0" type="line"/>
-      <point x="389" y="480" type="line"/>
-      <point x="368" y="480" type="line"/>
+      <point x="64" y="0" type="line"/>
+      <point x="89" y="0" type="line"/>
+      <point x="229" y="209" type="line"/>
+      <point x="207" y="209" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -46,6 +42,8 @@
         <key>width</key>
         <integer>76</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iacute.glif b/src/Cantarell-Light.ufo/glyphs/iacute.glif
index 69d279d2..e10a98ca 100644
--- a/src/Cantarell-Light.ufo/glyphs/iacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iacute" format="2">
-  <advance width="201"/>
+  <advance width="235"/>
   <unicode hex="00ED"/>
   <outline>
     <component base="idotless"/>
-    <component base="acutecomb" xOffset="35"/>
+    <component base="acutecomb" xOffset="52"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ibreve.glif b/src/Cantarell-Light.ufo/glyphs/ibreve.glif
index 8bf804c7..12067356 100644
--- a/src/Cantarell-Light.ufo/glyphs/ibreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ibreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ibreve" format="2">
-  <advance width="201"/>
+  <advance width="235"/>
   <unicode hex="012D"/>
   <outline>
     <component base="idotless"/>
-    <component base="brevecomb" xOffset="-84"/>
+    <component base="brevecomb" xOffset="-67"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/icaron.glif b/src/Cantarell-Light.ufo/glyphs/icaron.glif
index 760e3e7b..b2564857 100644
--- a/src/Cantarell-Light.ufo/glyphs/icaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/icaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="icaron" format="2">
-  <advance width="201"/>
+  <advance width="235"/>
   <unicode hex="01D0"/>
   <outline>
     <component base="idotless"/>
-    <component base="caroncomb" xOffset="-81"/>
+    <component base="caroncomb" xOffset="-64"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/icircumflex.glif b/src/Cantarell-Light.ufo/glyphs/icircumflex.glif
index 0e1fc858..3d920170 100644
--- a/src/Cantarell-Light.ufo/glyphs/icircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/icircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="icircumflex" format="2">
-  <advance width="201"/>
+  <advance width="235"/>
   <unicode hex="00EE"/>
   <outline>
     <component base="idotless"/>
-    <component base="circumflexcomb" xOffset="-69"/>
+    <component base="circumflexcomb" xOffset="-52"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/idblgrave.glif b/src/Cantarell-Light.ufo/glyphs/idblgrave.glif
index ee76ea4f..7b11265b 100644
--- a/src/Cantarell-Light.ufo/glyphs/idblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/idblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idblgrave" format="2">
-  <advance width="201"/>
+  <advance width="235"/>
   <unicode hex="0209"/>
   <outline>
     <component base="idotless"/>
-    <component base="dblgravecomb" xOffset="-150"/>
+    <component base="dblgravecomb" xOffset="-133"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/idieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/idieresis-cy.glif
index 2927ae74..e51bd539 100644
--- a/src/Cantarell-Light.ufo/glyphs/idieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/idieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idieresis-cy" format="2">
-  <advance width="536"/>
+  <advance width="574"/>
   <unicode hex="04E5"/>
   <outline>
     <component base="ii-cy"/>
-    <component base="dieresiscomb" xOffset="49"/>
+    <component base="dieresiscomb" xOffset="68"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/idieresis.glif b/src/Cantarell-Light.ufo/glyphs/idieresis.glif
index a3d4369d..cc297e24 100644
--- a/src/Cantarell-Light.ufo/glyphs/idieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/idieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idieresis" format="2">
-  <advance width="201"/>
+  <advance width="235"/>
   <unicode hex="00EF"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb" xOffset="-117"/>
+    <component base="dieresiscomb" xOffset="-100"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/idieresisacute.glif 
b/src/Cantarell-Light.ufo/glyphs/idieresisacute.glif
index 9fbcb67f..581d333d 100644
--- a/src/Cantarell-Light.ufo/glyphs/idieresisacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/idieresisacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idieresisacute" format="2">
-  <advance width="201"/>
+  <advance width="235"/>
   <unicode hex="1E2F"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb_acutecomb" xOffset="-117"/>
+    <component base="dieresiscomb.loclVIET" xOffset="-100"/>
+    <component base="acutecomb" xOffset="52" yOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/idotaccent.glif b/src/Cantarell-Light.ufo/glyphs/idotaccent.glif
index 3a7ab240..853f2e2e 100644
--- a/src/Cantarell-Light.ufo/glyphs/idotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/idotaccent.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotaccent" format="2">
-  <advance width="201"/>
+  <advance width="235"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb" xOffset="-17"/>
+    <component base="dotaccentcomb"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/idotbelow.glif b/src/Cantarell-Light.ufo/glyphs/idotbelow.glif
index fa8cc1e1..c10da12f 100644
--- a/src/Cantarell-Light.ufo/glyphs/idotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/idotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotbelow" format="2">
-  <advance width="201"/>
+  <advance width="235"/>
   <unicode hex="1ECB"/>
   <outline>
     <component base="i"/>
-    <component base="dotbelowcomb" xScale="0.91" yScale="0.91" xOffset="5"/>
+    <component base="dotbelowcomb" xScale="0.91" yScale="0.91" xOffset="8"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/idotless.glif b/src/Cantarell-Light.ufo/glyphs/idotless.glif
index dfbe0659..96d9e15c 100644
--- a/src/Cantarell-Light.ufo/glyphs/idotless.glif
+++ b/src/Cantarell-Light.ufo/glyphs/idotless.glif
@@ -1,19 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotless" format="2">
-  <advance width="201"/>
+  <advance width="235"/>
   <unicode hex="0131"/>
-  <note>
-dotlessi
-</note>
-  <anchor x="100" y="0" name="bottom"/>
-  <anchor x="105" y="10" name="ogonek"/>
-  <anchor x="102" y="480" name="top"/>
+  <anchor x="117" y="0" name="bottom"/>
+  <anchor x="122" y="10" name="ogonek"/>
+  <anchor x="119" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="90" y="0" type="line"/>
-      <point x="111" y="0" type="line"/>
-      <point x="111" y="480" type="line"/>
-      <point x="90" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ie-cy.glif b/src/Cantarell-Light.ufo/glyphs/ie-cy.glif
index 3bcca582..ff6bb122 100644
--- a/src/Cantarell-Light.ufo/glyphs/ie-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ie-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ie-cy" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="0435"/>
-  <anchor x="247" y="480" name="top"/>
   <outline>
     <component base="e"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/iebreve-cy.glif b/src/Cantarell-Light.ufo/glyphs/iebreve-cy.glif
index a67fd4c8..2bed22b0 100644
--- a/src/Cantarell-Light.ufo/glyphs/iebreve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iebreve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iebreve-cy" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="04D7"/>
   <outline>
     <component base="ie-cy"/>
-    <component base="brevecomb-cy" xOffset="50"/>
+    <component base="brevecomb-cy" xOffset="67"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iegrave-cy.glif b/src/Cantarell-Light.ufo/glyphs/iegrave-cy.glif
index 241dd331..fa827004 100644
--- a/src/Cantarell-Light.ufo/glyphs/iegrave-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iegrave-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iegrave-cy" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="0450"/>
   <outline>
     <component base="ie-cy"/>
-    <component base="gravecomb" xOffset="63"/>
+    <component base="gravecomb" xOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/igrave.glif b/src/Cantarell-Light.ufo/glyphs/igrave.glif
index f6eb2b0c..87667594 100644
--- a/src/Cantarell-Light.ufo/glyphs/igrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/igrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="igrave" format="2">
-  <advance width="201"/>
+  <advance width="235"/>
   <unicode hex="00EC"/>
   <outline>
     <component base="idotless"/>
-    <component base="gravecomb" xOffset="-82"/>
+    <component base="gravecomb" xOffset="-65"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ihookabove.glif b/src/Cantarell-Light.ufo/glyphs/ihookabove.glif
index 954f49b0..754fe1c6 100644
--- a/src/Cantarell-Light.ufo/glyphs/ihookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ihookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ihookabove" format="2">
-  <advance width="201"/>
+  <advance width="235"/>
   <unicode hex="1EC9"/>
   <outline>
     <component base="idotless"/>
-    <component base="hookabovecomb" xOffset="-50"/>
+    <component base="hookabovecomb" xOffset="-33"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ii-cy.glif b/src/Cantarell-Light.ufo/glyphs/ii-cy.glif
index 1d07fda4..6ec4c1a7 100644
--- a/src/Cantarell-Light.ufo/glyphs/ii-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ii-cy.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ii-cy" format="2">
-  <advance width="536"/>
+  <advance width="574"/>
   <unicode hex="0438"/>
-  <anchor x="509" y="0" name="bottomright"/>
-  <anchor x="268" y="480" name="top"/>
+  <anchor x="528" y="0" name="bottomright"/>
+  <anchor x="287" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="110" y="0" type="line"/>
-      <point x="431" y="460" type="line"/>
-      <point x="429" y="460" type="line"/>
-      <point x="429" y="0" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="129" y="0" type="line"/>
+      <point x="450" y="460" type="line"/>
+      <point x="448" y="460" type="line"/>
       <point x="448" y="0" type="line"/>
-      <point x="448" y="480" type="line"/>
-      <point x="426" y="480" type="line"/>
-      <point x="105" y="19" type="line"/>
-      <point x="107" y="20" type="line"/>
+      <point x="467" y="0" type="line"/>
+      <point x="467" y="480" type="line"/>
+      <point x="445" y="480" type="line"/>
+      <point x="124" y="19" type="line"/>
+      <point x="126" y="20" type="line"/>
+      <point x="126" y="480" type="line"/>
       <point x="107" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -31,6 +31,10 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iigrave-cy.glif b/src/Cantarell-Light.ufo/glyphs/iigrave-cy.glif
index 485fd747..8b435d87 100644
--- a/src/Cantarell-Light.ufo/glyphs/iigrave-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iigrave-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iigrave-cy" format="2">
-  <advance width="536"/>
+  <advance width="574"/>
   <unicode hex="045D"/>
   <outline>
     <component base="ii-cy"/>
-    <component base="gravecomb" xOffset="84"/>
+    <component base="gravecomb" xOffset="103"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iinvertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/iinvertedbreve.glif
index bdc1a3ec..026fed8e 100644
--- a/src/Cantarell-Light.ufo/glyphs/iinvertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iinvertedbreve" format="2">
-  <advance width="201"/>
+  <advance width="235"/>
   <unicode hex="020B"/>
   <outline>
     <component base="idotless"/>
-    <component base="breveinvertedcomb" xOffset="-99"/>
+    <component base="breveinvertedcomb" xOffset="-82"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iishort-cy.glif b/src/Cantarell-Light.ufo/glyphs/iishort-cy.glif
index 0caea658..af43b6b1 100644
--- a/src/Cantarell-Light.ufo/glyphs/iishort-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iishort-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iishort-cy" format="2">
-  <advance width="536"/>
+  <advance width="574"/>
   <unicode hex="0439"/>
   <outline>
     <component base="ii-cy"/>
-    <component base="brevecomb-cy" xOffset="71"/>
+    <component base="brevecomb-cy" xOffset="90"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/imacron-cy.glif b/src/Cantarell-Light.ufo/glyphs/imacron-cy.glif
index 92fefdc7..c6ba16ed 100644
--- a/src/Cantarell-Light.ufo/glyphs/imacron-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/imacron-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="imacron-cy" format="2">
-  <advance width="536"/>
+  <advance width="574"/>
   <unicode hex="04E3"/>
   <outline>
     <component base="ii-cy"/>
-    <component base="macroncomb" xOffset="25"/>
+    <component base="macroncomb" xOffset="44"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/imacron.glif b/src/Cantarell-Light.ufo/glyphs/imacron.glif
index e1bfd5cd..42edb38f 100644
--- a/src/Cantarell-Light.ufo/glyphs/imacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/imacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="imacron" format="2">
-  <advance width="201"/>
+  <advance width="235"/>
   <unicode hex="012B"/>
   <outline>
     <component base="idotless"/>
-    <component base="macroncomb.narrow" xOffset="-95"/>
+    <component base="macroncomb.narrow" xOffset="-78"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/increment.glif b/src/Cantarell-Light.ufo/glyphs/increment.glif
index e9d5f0c8..d8fda2ce 100644
--- a/src/Cantarell-Light.ufo/glyphs/increment.glif
+++ b/src/Cantarell-Light.ufo/glyphs/increment.glif
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="increment" format="2">
-  <advance width="672"/>
+  <advance width="648"/>
   <unicode hex="2206"/>
   <outline>
     <contour>
-      <point x="81" y="1" type="line"/>
-      <point x="591" y="1" type="line"/>
-      <point x="591" y="14" type="line"/>
-      <point x="342" y="694" type="line"/>
-      <point x="324" y="694" type="line"/>
-      <point x="81" y="14" type="line"/>
+      <point x="69" y="1" type="line"/>
+      <point x="579" y="1" type="line"/>
+      <point x="579" y="14" type="line"/>
+      <point x="330" y="694" type="line"/>
+      <point x="312" y="694" type="line"/>
+      <point x="69" y="14" type="line"/>
     </contour>
     <contour>
-      <point x="105" y="18" type="line"/>
-      <point x="333" y="666" type="line"/>
-      <point x="566" y="18" type="line"/>
+      <point x="93" y="18" type="line"/>
+      <point x="321" y="666" type="line"/>
+      <point x="554" y="18" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/infinity.glif b/src/Cantarell-Light.ufo/glyphs/infinity.glif
index 9fe7a13f..78cba980 100644
--- a/src/Cantarell-Light.ufo/glyphs/infinity.glif
+++ b/src/Cantarell-Light.ufo/glyphs/infinity.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="infinity" format="2">
-  <advance width="941"/>
+  <advance width="929"/>
   <unicode hex="221E"/>
   <outline>
     <contour>
-      <point x="670" y="171" type="curve" smooth="yes"/>
-      <point x="762" y="171"/>
-      <point x="823" y="238"/>
-      <point x="823" y="340" type="curve" smooth="yes"/>
-      <point x="823" y="440"/>
-      <point x="764" y="507"/>
-      <point x="675" y="507" type="curve" smooth="yes"/>
-      <point x="480" y="507"/>
-      <point x="439" y="189"/>
-      <point x="266" y="189" type="curve" smooth="yes"/>
-      <point x="190" y="189"/>
-      <point x="138" y="249"/>
-      <point x="138" y="339" type="curve" smooth="yes"/>
-      <point x="138" y="429"/>
-      <point x="191" y="489"/>
-      <point x="270" y="489" type="curve" smooth="yes"/>
-      <point x="452" y="489"/>
-      <point x="470" y="171"/>
+      <point x="664" y="171" type="curve" smooth="yes"/>
+      <point x="756" y="171"/>
+      <point x="817" y="238"/>
+      <point x="817" y="340" type="curve" smooth="yes"/>
+      <point x="817" y="440"/>
+      <point x="758" y="507"/>
+      <point x="669" y="507" type="curve" smooth="yes"/>
+      <point x="474" y="507"/>
+      <point x="433" y="189"/>
+      <point x="260" y="189" type="curve" smooth="yes"/>
+      <point x="184" y="189"/>
+      <point x="132" y="249"/>
+      <point x="132" y="339" type="curve" smooth="yes"/>
+      <point x="132" y="429"/>
+      <point x="185" y="489"/>
+      <point x="264" y="489" type="curve" smooth="yes"/>
+      <point x="446" y="489"/>
+      <point x="464" y="171"/>
     </contour>
     <contour>
-      <point x="263" y="171" type="curve" smooth="yes"/>
-      <point x="455" y="171"/>
-      <point x="495" y="489"/>
-      <point x="672" y="489" type="curve" smooth="yes"/>
-      <point x="750" y="489"/>
-      <point x="803" y="427"/>
-      <point x="803" y="337" type="curve" smooth="yes"/>
-      <point x="803" y="247"/>
-      <point x="750" y="189"/>
-      <point x="672" y="189" type="curve" smooth="yes"/>
-      <point x="491" y="189"/>
-      <point x="472" y="507"/>
-      <point x="273" y="507" type="curve" smooth="yes"/>
-      <point x="180" y="507"/>
-      <point x="118" y="439"/>
-      <point x="118" y="336" type="curve" smooth="yes"/>
-      <point x="118" y="236"/>
-      <point x="176" y="171"/>
+      <point x="257" y="171" type="curve" smooth="yes"/>
+      <point x="449" y="171"/>
+      <point x="489" y="489"/>
+      <point x="666" y="489" type="curve" smooth="yes"/>
+      <point x="744" y="489"/>
+      <point x="797" y="427"/>
+      <point x="797" y="337" type="curve" smooth="yes"/>
+      <point x="797" y="247"/>
+      <point x="744" y="189"/>
+      <point x="666" y="189" type="curve" smooth="yes"/>
+      <point x="485" y="189"/>
+      <point x="466" y="507"/>
+      <point x="267" y="507" type="curve" smooth="yes"/>
+      <point x="174" y="507"/>
+      <point x="112" y="439"/>
+      <point x="112" y="336" type="curve" smooth="yes"/>
+      <point x="112" y="236"/>
+      <point x="170" y="171"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/integral.glif b/src/Cantarell-Light.ufo/glyphs/integral.glif
index 791647d7..f7556e79 100644
--- a/src/Cantarell-Light.ufo/glyphs/integral.glif
+++ b/src/Cantarell-Light.ufo/glyphs/integral.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="integral" format="2">
-  <advance width="397"/>
+  <advance width="376"/>
   <unicode hex="222B"/>
   <outline>
     <contour>
-      <point x="172" y="-170" type="curve" smooth="yes"/>
-      <point x="236" y="-170"/>
-      <point x="280" y="-108"/>
-      <point x="280" y="-15" type="curve" smooth="yes"/>
-      <point x="280" y="157"/>
-      <point x="129" y="394"/>
-      <point x="129" y="580" type="curve" smooth="yes"/>
-      <point x="129" y="667"/>
-      <point x="162" y="728"/>
-      <point x="227" y="728" type="curve" smooth="yes"/>
-      <point x="247" y="728"/>
-      <point x="287" y="721"/>
-      <point x="307" y="712" type="curve"/>
-      <point x="313" y="729" type="line"/>
-      <point x="296" y="737"/>
-      <point x="258" y="746"/>
-      <point x="230" y="746" type="curve" smooth="yes"/>
-      <point x="151" y="746"/>
-      <point x="110" y="675"/>
-      <point x="110" y="576" type="curve" smooth="yes"/>
-      <point x="110" y="388"/>
-      <point x="260" y="145"/>
-      <point x="260" y="-19" type="curve" smooth="yes"/>
-      <point x="260" y="-99"/>
-      <point x="224" y="-152"/>
-      <point x="172" y="-152" type="curve" smooth="yes"/>
-      <point x="152" y="-152"/>
-      <point x="129" y="-146"/>
-      <point x="96" y="-131" type="curve"/>
-      <point x="90" y="-147" type="line"/>
-      <point x="124" y="-163"/>
-      <point x="150" y="-170"/>
+      <point x="162" y="-170" type="curve" smooth="yes"/>
+      <point x="226" y="-170"/>
+      <point x="270" y="-108"/>
+      <point x="270" y="-15" type="curve" smooth="yes"/>
+      <point x="270" y="157"/>
+      <point x="119" y="394"/>
+      <point x="119" y="580" type="curve" smooth="yes"/>
+      <point x="119" y="667"/>
+      <point x="152" y="728"/>
+      <point x="217" y="728" type="curve" smooth="yes"/>
+      <point x="237" y="728"/>
+      <point x="277" y="721"/>
+      <point x="297" y="712" type="curve"/>
+      <point x="303" y="729" type="line"/>
+      <point x="286" y="737"/>
+      <point x="248" y="746"/>
+      <point x="220" y="746" type="curve" smooth="yes"/>
+      <point x="141" y="746"/>
+      <point x="100" y="675"/>
+      <point x="100" y="576" type="curve" smooth="yes"/>
+      <point x="100" y="388"/>
+      <point x="250" y="145"/>
+      <point x="250" y="-19" type="curve" smooth="yes"/>
+      <point x="250" y="-99"/>
+      <point x="214" y="-152"/>
+      <point x="162" y="-152" type="curve" smooth="yes"/>
+      <point x="142" y="-152"/>
+      <point x="119" y="-146"/>
+      <point x="86" y="-131" type="curve"/>
+      <point x="80" y="-147" type="line"/>
+      <point x="114" y="-163"/>
+      <point x="140" y="-170"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/io-cy.glif b/src/Cantarell-Light.ufo/glyphs/io-cy.glif
index ca23dce1..b8b4536a 100644
--- a/src/Cantarell-Light.ufo/glyphs/io-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/io-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="io-cy" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="0451"/>
   <outline>
     <component base="ie-cy"/>
-    <component base="dieresiscomb" xOffset="28"/>
+    <component base="dieresiscomb" xOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iogonek.glif b/src/Cantarell-Light.ufo/glyphs/iogonek.glif
index f54cc3d5..f90abcbb 100644
--- a/src/Cantarell-Light.ufo/glyphs/iogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iogonek" format="2">
-  <advance width="201"/>
+  <advance width="235"/>
   <unicode hex="012F"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb" xOffset="-17"/>
-    <component base="ogonekcomb.narrow" xOffset="-271"/>
+    <component base="dotaccentcomb"/>
+    <component base="ogonekcomb.narrow" xOffset="-254"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/itilde.glif b/src/Cantarell-Light.ufo/glyphs/itilde.glif
index 3af3a145..dd4c0d7a 100644
--- a/src/Cantarell-Light.ufo/glyphs/itilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/itilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="itilde" format="2">
-  <advance width="201"/>
+  <advance width="235"/>
   <unicode hex="0129"/>
   <outline>
     <component base="idotless"/>
-    <component base="tildecomb" xOffset="-133"/>
+    <component base="tildecomb" xOffset="-116"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iu-cy.glif b/src/Cantarell-Light.ufo/glyphs/iu-cy.glif
index e3dd7cc9..8cd31a39 100644
--- a/src/Cantarell-Light.ufo/glyphs/iu-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iu-cy.glif
@@ -1,48 +1,48 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iu-cy" format="2">
-  <advance width="709"/>
+  <advance width="739"/>
   <unicode hex="044E"/>
-  <anchor x="365" y="480" name="top"/>
+  <anchor x="384" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="439" y="-7" type="curve" smooth="yes"/>
-      <point x="566" y="-7"/>
-      <point x="652" y="95"/>
-      <point x="652" y="244" type="curve" smooth="yes"/>
-      <point x="652" y="391"/>
-      <point x="568" y="490"/>
-      <point x="442" y="490" type="curve" smooth="yes"/>
-      <point x="318" y="490"/>
-      <point x="240" y="393"/>
-      <point x="240" y="240" type="curve" smooth="yes"/>
-      <point x="240" y="88"/>
-      <point x="317" y="-7"/>
+      <point x="458" y="-7" type="curve" smooth="yes"/>
+      <point x="585" y="-7"/>
+      <point x="671" y="95"/>
+      <point x="671" y="244" type="curve" smooth="yes"/>
+      <point x="671" y="391"/>
+      <point x="587" y="490"/>
+      <point x="461" y="490" type="curve" smooth="yes"/>
+      <point x="337" y="490"/>
+      <point x="259" y="393"/>
+      <point x="259" y="240" type="curve" smooth="yes"/>
+      <point x="259" y="88"/>
+      <point x="336" y="-7"/>
     </contour>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="109" y="0" type="line"/>
-      <point x="109" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="101" y="244" type="line"/>
-      <point x="250" y="244" type="line"/>
-      <point x="250" y="262" type="line"/>
-      <point x="101" y="262" type="line"/>
+      <point x="120" y="244" type="line"/>
+      <point x="269" y="244" type="line"/>
+      <point x="269" y="262" type="line"/>
+      <point x="120" y="262" type="line"/>
     </contour>
     <contour>
-      <point x="441" y="12" type="curve" smooth="yes"/>
-      <point x="330" y="12"/>
-      <point x="262" y="101"/>
-      <point x="262" y="243" type="curve" smooth="yes"/>
-      <point x="262" y="384"/>
-      <point x="329" y="471"/>
-      <point x="439" y="471" type="curve" smooth="yes"/>
-      <point x="553" y="471"/>
-      <point x="631" y="376"/>
-      <point x="631" y="240" type="curve" smooth="yes"/>
-      <point x="631" y="103"/>
-      <point x="554" y="12"/>
+      <point x="460" y="12" type="curve" smooth="yes"/>
+      <point x="349" y="12"/>
+      <point x="281" y="101"/>
+      <point x="281" y="243" type="curve" smooth="yes"/>
+      <point x="281" y="384"/>
+      <point x="348" y="471"/>
+      <point x="458" y="471" type="curve" smooth="yes"/>
+      <point x="572" y="471"/>
+      <point x="650" y="376"/>
+      <point x="650" y="240" type="curve" smooth="yes"/>
+      <point x="650" y="103"/>
+      <point x="573" y="12"/>
     </contour>
   </outline>
   <lib>
@@ -54,6 +54,10 @@
         <key>width</key>
         <integer>69</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/izhitsa-cy.glif b/src/Cantarell-Light.ufo/glyphs/izhitsa-cy.glif
index c2add24f..fad8e575 100644
--- a/src/Cantarell-Light.ufo/glyphs/izhitsa-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/izhitsa-cy.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="izhitsa-cy" format="2">
-  <advance width="472"/>
+  <advance width="474"/>
   <unicode hex="0475"/>
   <outline>
     <contour>
-      <point x="207" y="0" type="line"/>
-      <point x="220" y="0" type="line"/>
-      <point x="348" y="367" type="line" smooth="yes"/>
-      <point x="374" y="441"/>
-      <point x="408" y="476"/>
-      <point x="455" y="476" type="curve"/>
-      <point x="453" y="494" type="line"/>
-      <point x="401" y="494"/>
-      <point x="358" y="452"/>
-      <point x="330" y="370" type="curve" smooth="yes"/>
-      <point x="210" y="20" type="line"/>
-      <point x="219" y="20" type="line"/>
-      <point x="48" y="486" type="line"/>
-      <point x="26" y="486" type="line"/>
+      <point x="213" y="0" type="line"/>
+      <point x="226" y="0" type="line"/>
+      <point x="354" y="367" type="line" smooth="yes"/>
+      <point x="380" y="441"/>
+      <point x="414" y="476"/>
+      <point x="461" y="476" type="curve"/>
+      <point x="459" y="494" type="line"/>
+      <point x="407" y="494"/>
+      <point x="364" y="452"/>
+      <point x="336" y="370" type="curve" smooth="yes"/>
+      <point x="216" y="20" type="line"/>
+      <point x="225" y="20" type="line"/>
+      <point x="54" y="486" type="line"/>
+      <point x="32" y="486" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -29,6 +29,8 @@
         <key>width</key>
         <integer>70</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>v</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/j.glif b/src/Cantarell-Light.ufo/glyphs/j.glif
index fde81334..dc429e8b 100644
--- a/src/Cantarell-Light.ufo/glyphs/j.glif
+++ b/src/Cantarell-Light.ufo/glyphs/j.glif
@@ -1,12 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="j" format="2">
-  <advance width="202"/>
+  <advance width="235"/>
   <unicode hex="006A"/>
-  <note>
-j
-</note>
   <outline>
     <component base="jdotless"/>
-    <component base="dotaccentcomb" xOffset="-18"/>
+    <component base="dotaccentcomb" xOffset="-2"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/jacute.glif b/src/Cantarell-Light.ufo/glyphs/jacute.glif
index bfd7d0dd..590b4537 100644
--- a/src/Cantarell-Light.ufo/glyphs/jacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/jacute.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jacute" format="2">
-  <advance width="202"/>
+  <advance width="235"/>
   <outline>
     <component base="jdotless"/>
-    <component base="acutecomb" xOffset="34"/>
+    <component base="acutecomb" xOffset="50"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/jcircumflex.glif b/src/Cantarell-Light.ufo/glyphs/jcircumflex.glif
index 54e7efc8..8f162893 100644
--- a/src/Cantarell-Light.ufo/glyphs/jcircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/jcircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jcircumflex" format="2">
-  <advance width="202"/>
+  <advance width="235"/>
   <unicode hex="0135"/>
   <outline>
     <component base="jdotless"/>
-    <component base="circumflexcomb" xOffset="-70"/>
+    <component base="circumflexcomb" xOffset="-54"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/jdotless.glif b/src/Cantarell-Light.ufo/glyphs/jdotless.glif
index 0722932c..363ab9ce 100644
--- a/src/Cantarell-Light.ufo/glyphs/jdotless.glif
+++ b/src/Cantarell-Light.ufo/glyphs/jdotless.glif
@@ -1,24 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jdotless" format="2">
-  <advance width="202"/>
+  <advance width="235"/>
   <unicode hex="0237"/>
-  <note>
-uni0237
-</note>
-  <anchor x="101" y="0" name="bottom"/>
-  <anchor x="101" y="480" name="top"/>
+  <anchor x="117" y="0" name="bottom"/>
+  <anchor x="117" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="5" y="-219" type="line"/>
-      <point x="69" y="-191"/>
-      <point x="112" y="-129"/>
-      <point x="112" y="-64" type="curve" smooth="yes"/>
-      <point x="112" y="480" type="line"/>
-      <point x="91" y="480" type="line"/>
-      <point x="91" y="-64" type="line" smooth="yes"/>
-      <point x="91" y="-122"/>
-      <point x="54" y="-178"/>
-      <point x="-2" y="-206" type="curve"/>
+      <point x="21" y="-219" type="line"/>
+      <point x="85" y="-191"/>
+      <point x="128" y="-129"/>
+      <point x="128" y="-64" type="curve" smooth="yes"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
+      <point x="107" y="-64" type="line" smooth="yes"/>
+      <point x="107" y="-122"/>
+      <point x="70" y="-178"/>
+      <point x="14" y="-206" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/je-cy.glif b/src/Cantarell-Light.ufo/glyphs/je-cy.glif
index e5c65f49..e2e5dfb6 100644
--- a/src/Cantarell-Light.ufo/glyphs/je-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/je-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="je-cy" format="2">
-  <advance width="202"/>
+  <advance width="235"/>
   <unicode hex="0458"/>
   <outline>
     <component base="j"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/k.glif b/src/Cantarell-Light.ufo/glyphs/k.glif
index ee7ee5ef..ae54d3a9 100644
--- a/src/Cantarell-Light.ufo/glyphs/k.glif
+++ b/src/Cantarell-Light.ufo/glyphs/k.glif
@@ -1,27 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="k" format="2">
-  <advance width="432"/>
+  <advance width="466"/>
   <unicode hex="006B"/>
-  <note>
-k
-</note>
-  <anchor x="205" y="0" name="bottom"/>
-  <anchor x="185" y="739" name="top"/>
+  <anchor x="224" y="0" name="bottom"/>
+  <anchor x="204" y="739" name="top"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="108" y="0" type="line"/>
-      <point x="108" y="739" type="line"/>
-      <point x="88" y="739" type="line"/>
+      <point x="415" y="0" type="line"/>
+      <point x="444" y="0" type="line"/>
+      <point x="148" y="267" type="line"/>
+      <point x="146" y="249" type="line"/>
+      <point x="422" y="480" type="line"/>
+      <point x="395" y="480" type="line"/>
+      <point x="129" y="257" type="line"/>
     </contour>
     <contour>
-      <point x="396" y="0" type="line"/>
-      <point x="425" y="0" type="line"/>
-      <point x="129" y="267" type="line"/>
-      <point x="127" y="249" type="line"/>
-      <point x="403" y="480" type="line"/>
-      <point x="376" y="480" type="line"/>
-      <point x="110" y="257" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="127" y="0" type="line"/>
+      <point x="127" y="739" type="line"/>
+      <point x="107" y="739" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ka-cy.glif b/src/Cantarell-Light.ufo/glyphs/ka-cy.glif
index 2cdddeed..9064102c 100644
--- a/src/Cantarell-Light.ufo/glyphs/ka-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ka-cy.glif
@@ -1,30 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ka-cy" format="2">
-  <advance width="441"/>
+  <advance width="479"/>
   <unicode hex="043A"/>
-  <anchor x="440" y="0" name="bottomright"/>
-  <anchor x="225" y="480" name="top"/>
+  <anchor x="459" y="0" name="bottomright"/>
+  <anchor x="244" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="401" y="0" type="line"/>
-      <point x="425" y="0" type="line"/>
-      <point x="245" y="260" type="line"/>
-      <point x="245" y="251" type="line"/>
-      <point x="413" y="480" type="line"/>
-      <point x="390" y="480" type="line"/>
-      <point x="226" y="254" type="line"/>
+      <point x="420" y="0" type="line"/>
+      <point x="444" y="0" type="line"/>
+      <point x="264" y="260" type="line"/>
+      <point x="264" y="251" type="line"/>
+      <point x="432" y="480" type="line"/>
+      <point x="409" y="480" type="line"/>
+      <point x="245" y="254" type="line"/>
     </contour>
     <contour>
-      <point x="88" y="0" type="line"/>
       <point x="107" y="0" type="line"/>
+      <point x="126" y="0" type="line"/>
+      <point x="126" y="480" type="line"/>
       <point x="107" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="96" y="245" type="line"/>
-      <point x="239" y="245" type="line"/>
-      <point x="239" y="262" type="line"/>
-      <point x="96" y="262" type="line"/>
+      <point x="115" y="245" type="line"/>
+      <point x="258" y="245" type="line"/>
+      <point x="258" y="262" type="line"/>
+      <point x="115" y="262" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -38,6 +38,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/kabashkir-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/kabashkir-cy.glif
index 77031fcd..cae88bdb 100644
--- a/src/Cantarell-Light.ufo/glyphs/kabashkir-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kabashkir-cy.glif
@@ -1,38 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kabashkir-cy" format="2">
-  <advance width="547"/>
+  <advance width="577"/>
   <unicode hex="04A1"/>
   <outline>
     <contour>
-      <point x="5" y="463" type="line"/>
-      <point x="213" y="463" type="line"/>
-      <point x="213" y="480" type="line"/>
-      <point x="5" y="480" type="line"/>
+      <point x="205" y="0" type="line"/>
+      <point x="224" y="0" type="line"/>
+      <point x="224" y="480" type="line"/>
+      <point x="16" y="480" type="line"/>
+      <point x="16" y="463" type="line"/>
+      <point x="205" y="463" type="line"/>
     </contour>
     <contour>
-      <point x="507" y="0" type="line"/>
-      <point x="531" y="0" type="line"/>
-      <point x="351" y="260" type="line"/>
-      <point x="351" y="251" type="line"/>
-      <point x="519" y="480" type="line"/>
-      <point x="496" y="480" type="line"/>
-      <point x="332" y="254" type="line"/>
+      <point x="518" y="0" type="line"/>
+      <point x="542" y="0" type="line"/>
+      <point x="362" y="260" type="line"/>
+      <point x="362" y="251" type="line"/>
+      <point x="530" y="480" type="line"/>
+      <point x="507" y="480" type="line"/>
+      <point x="343" y="254" type="line"/>
     </contour>
     <contour>
-      <point x="194" y="0" type="line"/>
-      <point x="213" y="0" type="line"/>
-      <point x="213" y="480" type="line"/>
-      <point x="194" y="480" type="line"/>
-    </contour>
-    <contour>
-      <point x="202" y="245" type="line"/>
-      <point x="345" y="245" type="line"/>
-      <point x="345" y="262" type="line"/>
-      <point x="202" y="262" type="line"/>
+      <point x="213" y="245" type="line"/>
+      <point x="356" y="245" type="line"/>
+      <point x="356" y="262" type="line"/>
+      <point x="213" y="262" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|ge-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>ka-cy</string>
     </dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/kacute.glif b/src/Cantarell-Light.ufo/glyphs/kacute.glif
index ff90d51c..f3344a9e 100644
--- a/src/Cantarell-Light.ufo/glyphs/kacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kacute" format="2">
-  <advance width="432"/>
+  <advance width="466"/>
   <unicode hex="1E31"/>
   <outline>
     <component base="k"/>
-    <component base="acutecomb.case" xOffset="127" yOffset="45"/>
+    <component base="acutecomb.case" xOffset="146" yOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/kadescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/kadescender-cy.glif
index 8ab88e18..9daed0a6 100644
--- a/src/Cantarell-Light.ufo/glyphs/kadescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kadescender-cy.glif
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kadescender-cy" format="2">
-  <advance width="480"/>
+  <advance width="479"/>
   <unicode hex="049B"/>
   <outline>
     <component base="ka-cy"/>
-    <component base="descender-cy" xOffset="344"/>
+    <component base="descender-cy" xOffset="363"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>ka-cy</string>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>0</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>ka-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/kaverticalstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/kaverticalstroke-cy.glif
index f8fedebf..7d647663 100644
--- a/src/Cantarell-Light.ufo/glyphs/kaverticalstroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kaverticalstroke-cy.glif
@@ -1,34 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kaverticalstroke-cy" format="2">
-  <advance width="451"/>
+  <advance width="489"/>
   <unicode hex="049D"/>
   <outline>
     <contour>
-      <point x="411" y="0" type="line"/>
-      <point x="435" y="0" type="line"/>
-      <point x="265" y="260" type="line"/>
-      <point x="265" y="251" type="line"/>
-      <point x="423" y="480" type="line"/>
-      <point x="400" y="480" type="line"/>
-      <point x="246" y="254" type="line"/>
+      <point x="430" y="0" type="line"/>
+      <point x="454" y="0" type="line"/>
+      <point x="284" y="260" type="line"/>
+      <point x="284" y="251" type="line"/>
+      <point x="442" y="480" type="line"/>
+      <point x="419" y="480" type="line"/>
+      <point x="265" y="254" type="line"/>
     </contour>
     <contour>
-      <point x="88" y="0" type="line"/>
       <point x="107" y="0" type="line"/>
+      <point x="126" y="0" type="line"/>
+      <point x="126" y="480" type="line"/>
       <point x="107" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="96" y="245" type="line"/>
-      <point x="259" y="245" type="line"/>
-      <point x="259" y="262" type="line"/>
-      <point x="96" y="262" type="line"/>
+      <point x="115" y="245" type="line"/>
+      <point x="278" y="245" type="line"/>
+      <point x="278" y="262" type="line"/>
+      <point x="115" y="262" type="line"/>
     </contour>
     <contour>
-      <point x="192" y="90" type="line"/>
       <point x="211" y="90" type="line"/>
+      <point x="230" y="90" type="line"/>
+      <point x="230" y="410" type="line"/>
       <point x="211" y="410" type="line"/>
-      <point x="192" y="410" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/kcommaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/kcommaaccent.glif
index bbae544b..a20b6fde 100644
--- a/src/Cantarell-Light.ufo/glyphs/kcommaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kcommaaccent" format="2">
-  <advance width="432"/>
+  <advance width="466"/>
   <unicode hex="0137"/>
   <outline>
     <component base="k"/>
-    <component base="commaaccentcomb" xOffset="76"/>
+    <component base="commaaccentcomb" xOffset="95"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/kgreenlandic.glif 
b/src/Cantarell-Light.ufo/glyphs/kgreenlandic.glif
index c6bf340e..01120da5 100644
--- a/src/Cantarell-Light.ufo/glyphs/kgreenlandic.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kgreenlandic.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kgreenlandic" format="2">
-  <advance width="432"/>
+  <advance width="466"/>
   <unicode hex="0138"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="108" y="0" type="line"/>
-      <point x="108" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="415" y="0" type="line"/>
+      <point x="444" y="0" type="line"/>
+      <point x="148" y="267" type="line"/>
+      <point x="146" y="249" type="line"/>
+      <point x="422" y="480" type="line"/>
+      <point x="395" y="480" type="line"/>
+      <point x="129" y="257" type="line"/>
     </contour>
     <contour>
-      <point x="396" y="0" type="line"/>
-      <point x="425" y="0" type="line"/>
-      <point x="129" y="267" type="line"/>
-      <point x="127" y="249" type="line"/>
-      <point x="403" y="480" type="line"/>
-      <point x="376" y="480" type="line"/>
-      <point x="110" y="257" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="127" y="0" type="line"/>
+      <point x="127" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/kip.glif b/src/Cantarell-Light.ufo/glyphs/kip.glif
index ae1e2a23..0316c2eb 100644
--- a/src/Cantarell-Light.ufo/glyphs/kip.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kip.glif
@@ -1,28 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kip" format="2">
-  <advance width="651"/>
+  <advance width="580"/>
   <unicode hex="20AD"/>
   <outline>
     <contour>
-      <point x="74" y="351" type="line"/>
-      <point x="526" y="351" type="line"/>
-      <point x="526" y="368" type="line"/>
-      <point x="74" y="368" type="line"/>
+      <point x="479" y="0" type="line"/>
+      <point x="508" y="0" type="line"/>
+      <point x="188" y="366" type="line"/>
+      <point x="189" y="356" type="line"/>
+      <point x="497" y="694" type="line"/>
+      <point x="468" y="694" type="line"/>
+      <point x="169" y="360" type="line"/>
     </contour>
     <contour>
-      <point x="549" y="0" type="line"/>
-      <point x="579" y="0" type="line"/>
-      <point x="203" y="366" type="line"/>
-      <point x="203" y="356" type="line"/>
-      <point x="565" y="694" type="line"/>
-      <point x="536" y="694" type="line"/>
-      <point x="184" y="360" type="line"/>
+      <point x="148" y="0" type="line"/>
+      <point x="168" y="0" type="line"/>
+      <point x="168" y="694" type="line"/>
+      <point x="148" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="162" y="0" type="line"/>
-      <point x="182" y="0" type="line"/>
-      <point x="182" y="694" type="line"/>
-      <point x="162" y="694" type="line"/>
+      <point x="73" y="351" type="line"/>
+      <point x="482" y="351" type="line"/>
+      <point x="482" y="368" type="line"/>
+      <point x="73" y="368" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/kje-cy.glif b/src/Cantarell-Light.ufo/glyphs/kje-cy.glif
index 2087437c..37d0d5e8 100644
--- a/src/Cantarell-Light.ufo/glyphs/kje-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kje-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kje-cy" format="2">
-  <advance width="441"/>
+  <advance width="479"/>
   <unicode hex="045C"/>
   <outline>
     <component base="ka-cy"/>
-    <component base="acutecomb" xOffset="158"/>
+    <component base="acutecomb" xOffset="177"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/l.glif b/src/Cantarell-Light.ufo/glyphs/l.glif
index f1ebef46..d8b1f4a8 100644
--- a/src/Cantarell-Light.ufo/glyphs/l.glif
+++ b/src/Cantarell-Light.ufo/glyphs/l.glif
@@ -1,33 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="l" format="2">
-  <advance width="232"/>
+  <advance width="269"/>
   <unicode hex="006C"/>
-  <note>
-l
-</note>
-  <anchor x="136" y="0" name="bottom"/>
-  <anchor x="119" y="383" name="center"/>
-  <anchor x="238" y="353" name="periodcentered"/>
-  <anchor x="97" y="739" name="top"/>
-  <anchor x="209" y="480" name="topright"/>
+  <anchor x="157" y="0" name="bottom"/>
+  <anchor x="140" y="383" name="center"/>
+  <anchor x="249" y="353" name="periodcentered"/>
+  <anchor x="118" y="739" name="top"/>
+  <anchor x="230" y="480" name="topright"/>
   <outline>
     <contour>
-      <point x="163" y="-2" type="curve" smooth="yes"/>
-      <point x="180" y="-2"/>
-      <point x="198" y="2"/>
-      <point x="212" y="8" type="curve"/>
-      <point x="207" y="22" type="line"/>
-      <point x="196" y="17"/>
-      <point x="181" y="14"/>
-      <point x="168" y="14" type="curve" smooth="yes"/>
-      <point x="129" y="14"/>
-      <point x="106" y="43"/>
-      <point x="106" y="87" type="curve" smooth="yes"/>
-      <point x="106" y="739" type="line"/>
-      <point x="86" y="739" type="line"/>
-      <point x="86" y="83" type="line" smooth="yes"/>
-      <point x="86" y="31"/>
-      <point x="115" y="-2"/>
+      <point x="184" y="-2" type="curve" smooth="yes"/>
+      <point x="201" y="-2"/>
+      <point x="219" y="2"/>
+      <point x="233" y="8" type="curve"/>
+      <point x="228" y="22" type="line"/>
+      <point x="217" y="17"/>
+      <point x="202" y="14"/>
+      <point x="189" y="14" type="curve" smooth="yes"/>
+      <point x="150" y="14"/>
+      <point x="127" y="43"/>
+      <point x="127" y="87" type="curve" smooth="yes"/>
+      <point x="127" y="739" type="line"/>
+      <point x="107" y="739" type="line"/>
+      <point x="107" y="83" type="line" smooth="yes"/>
+      <point x="107" y="31"/>
+      <point x="136" y="-2"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/l.ss01.glif b/src/Cantarell-Light.ufo/glyphs/l.ss01.glif
new file mode 100644
index 00000000..8b21c39a
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs/l.ss01.glif
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="l.ss01" format="2">
+  <advance width="234"/>
+  <anchor x="157" y="0" name="bottom"/>
+  <anchor x="140" y="383" name="center"/>
+  <anchor x="259" y="353" name="periodcentered"/>
+  <anchor x="118" y="739" name="top"/>
+  <anchor x="230" y="480" name="topright"/>
+  <outline>
+    <contour>
+      <point x="107" y="0" type="line"/>
+      <point x="127" y="0" type="line"/>
+      <point x="127" y="739" type="line"/>
+      <point x="107" y="739" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/lacute.glif b/src/Cantarell-Light.ufo/glyphs/lacute.glif
index cd56c153..2673f29c 100644
--- a/src/Cantarell-Light.ufo/glyphs/lacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lacute" format="2">
-  <advance width="232"/>
+  <advance width="269"/>
   <unicode hex="013A"/>
   <outline>
     <component base="l"/>
-    <component base="acutecomb.case" xOffset="39" yOffset="45"/>
+    <component base="acutecomb.case" xOffset="60" yOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/layerinfo.plist b/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
index 985948f6..fb8dcc04 100644
--- a/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
+++ b/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
@@ -690,8 +690,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph._descenderreversed-cy</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph._o.numero</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph._slash.zero</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph._slash.zero.osf</key>
@@ -740,8 +738,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.acutecomb.loclVIET</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.acutecomb_dotaccentcomb</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.adblgrave</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.adieresis</key>
@@ -771,8 +767,6 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.apostrophemod</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.approxequal</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.approxequal.tf</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.aring</key>
       <integer>2</integer>
@@ -795,7 +789,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.bar</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.be-cy</key>
-      <integer>0</integer>
+      <integer>11</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.blackCircle</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.blank</key>
@@ -822,22 +816,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb.loclVIET</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_acutecomb</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_acutecomb.case</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_gravecomb</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_gravecomb.case</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_hookabovecomb</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_hookabovecomb.case</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_tildecomb</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_tildecomb.case</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.breveinvertedcomb</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.breveinvertedcomb.case</key>
@@ -847,8 +825,6 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.bullet</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.bulletoperator</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.bulletoperator.tf</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.c</key>
       <integer>2</integer>
@@ -864,8 +840,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.caroncomb.loclVIET</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.caroncomb_dotaccentcomb</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ccaron</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ccedilla</key>
@@ -902,22 +876,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb.loclVIET</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_acutecomb</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_acutecomb.case</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_gravecomb</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_gravecomb.case</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_hookabovecomb</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_hookabovecomb.case</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_tildecomb</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_tildecomb.case</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.colon</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.colonsign</key>
@@ -932,8 +890,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.commercialMinusSign</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.commercialMinusSign.tf</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.copyright</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.currency</key>
@@ -974,21 +930,9 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.dieresiscomb.loclVIET</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.dieresiscomb_acutecomb</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.dieresiscomb_caroncomb</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.dieresiscomb_gravecomb</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.dieresiscomb_macroncomb</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.divide</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.divide.tf</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.divisionslash</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.divisionslash.tf</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.dje-cy</key>
       <integer>0</integer>
@@ -1006,8 +950,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.dotaccentcomb.loclVIET</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.dotaccentcomb_macroncomb</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.dotbelowcomb</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.doubleprimemod</key>
@@ -1068,8 +1010,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.eight.tf</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.eight.tosf</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.eightinferior</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.eightsuperior</key>
@@ -1077,7 +1017,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.einvertedbreve</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.el-cy</key>
-      <integer>0</integer>
+      <integer>5</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ellipsis</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.em-cy</key>
@@ -1092,8 +1032,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.emptyset</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.emquad</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.emspace</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.en-cy</key>
@@ -1106,19 +1044,13 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.enghe-cy</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.enquad</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.enspace</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.eogonek</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.equal</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.equal.tf</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.equivalence</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.equivalence.tf</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.er-cy</key>
       <integer>0</integer>
@@ -1142,12 +1074,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.f</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.f_f</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.f_f_i</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.f_f_l</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.fi</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.figuredash</key>
@@ -1168,8 +1094,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.five.tf</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.five.tosf</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.fiveeighths</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.fiveinferior</key>
@@ -1192,8 +1116,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.four.tf</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.four.tosf</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.fourfifths</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.fourinferior</key>
@@ -1245,12 +1167,8 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.gravecomb.loclVIET</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.greater</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.greater.tf</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.greaterequal</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.greaterequal.tf</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.guarani</key>
       <integer>2</integer>
@@ -1286,8 +1204,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.hookabovecomb.loclVIET</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.horizontalbar</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.horncomb</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.hryvnia</key>
@@ -1300,8 +1216,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.hyphen</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.hyphentwo</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.i</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.i-cy</key>
@@ -1400,6 +1314,8 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.l</key>
       <integer>2</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.l.ss01</key>
+      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.lacute</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.lcaron</key>
@@ -1415,12 +1331,8 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.leftanglebracket-math</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.less</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.less.tf</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.lessequal</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.lessequal.tf</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.lira</key>
       <integer>2</integer>
@@ -1435,8 +1347,6 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.llinebelow</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.logicalnot</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.logicalnot.tf</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.lozenge</key>
       <integer>2</integer>
@@ -1460,12 +1370,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.macroncomb.narrow.case</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.macroncomb_acutecomb</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.macroncomb_dieresiscomb</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.macroncomb_gravecomb</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.manat</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.mdotbelow</key>
@@ -1473,23 +1377,17 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.micro</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.minus</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.minus.tf</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.minute</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.multiply</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.multiply.tf</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.n</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.nacute</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.naira</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.nbspace</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ncaron</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ncommaaccent</key>
@@ -1508,8 +1406,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.nine.tf</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.nine.tosf</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.nineinferior</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ninesuperior</key>
@@ -1520,15 +1416,9 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.nlinebelow</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.nonbreakinghyphen</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.notequal</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.notequal.tf</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.notidentical</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.notidentical.tf</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ntilde</key>
       <integer>2</integer>
@@ -1619,8 +1509,6 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.one.osf</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.one.tf</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.one.tosf</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.oneeighth</key>
       <integer>0</integer>
@@ -1697,12 +1585,8 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.pi</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.plus</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.plus.tf</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.plusminus</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.plusminus.tf</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.primeReversed</key>
       <integer>2</integer>
@@ -1826,8 +1710,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.seven.tf</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.seven.tosf</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.seveneighths</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.seveninferior</key>
@@ -1850,8 +1732,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.six.tf</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.six.tosf</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.sixinferior</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.sixperemspace</key>
@@ -1868,8 +1748,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.slashshortcomb.case</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.softhyphen</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.softsign-cy</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.space</key>
@@ -1916,8 +1794,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.three.tf</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.three.tosf</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.threeeighths</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.threefifths</key>
@@ -1938,12 +1814,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.tildecomb.loclVIET</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.tildecomb_acutecomb</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.tildecomb_dieresiscomb</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.tildecomb_macroncomb</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.tlinebelow</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.trademark</key>
@@ -1966,8 +1836,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.two.tf</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.two.tosf</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.twofifths</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.twoinferior</key>
@@ -2142,10 +2010,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.zero.tf.zero</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.zero.tosf</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.zero.tosf.zero</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.zero.zero</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.zeroinferior</key>
diff --git a/src/Cantarell-Light.ufo/glyphs/lcaron.glif b/src/Cantarell-Light.ufo/glyphs/lcaron.glif
index 1dffc629..abc09552 100644
--- a/src/Cantarell-Light.ufo/glyphs/lcaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lcaron.glif
@@ -4,7 +4,7 @@
   <unicode hex="013E"/>
   <outline>
     <component base="l"/>
-    <component base="caroncomb.alt" xOffset="97"/>
+    <component base="caroncomb.alt" xOffset="118"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/lcommaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/lcommaaccent.glif
index 2e90e9bc..35b0d30e 100644
--- a/src/Cantarell-Light.ufo/glyphs/lcommaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lcommaaccent" format="2">
-  <advance width="232"/>
+  <advance width="269"/>
   <unicode hex="013C"/>
   <outline>
     <component base="l"/>
-    <component base="commaaccentcomb" xOffset="7"/>
+    <component base="commaaccentcomb" xOffset="28"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ldot.glif b/src/Cantarell-Light.ufo/glyphs/ldot.glif
index 7a6df3be..5d209c85 100644
--- a/src/Cantarell-Light.ufo/glyphs/ldot.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ldot.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ldot" format="2">
-  <advance width="232"/>
+  <advance width="269"/>
   <unicode hex="0140"/>
   <outline>
     <component base="l"/>
-    <component base="periodcentered.loclCAT" xOffset="238"/>
+    <component base="periodcentered.loclCAT" xOffset="249"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ldotbelow.glif b/src/Cantarell-Light.ufo/glyphs/ldotbelow.glif
index 92d0d71c..2e76530b 100644
--- a/src/Cantarell-Light.ufo/glyphs/ldotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ldotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ldotbelow" format="2">
-  <advance width="232"/>
+  <advance width="269"/>
   <unicode hex="1E37"/>
   <outline>
     <component base="l"/>
-    <component base="dotbelowcomb" xOffset="16"/>
+    <component base="dotbelowcomb" xOffset="37"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/leftA_rrow.glif b/src/Cantarell-Light.ufo/glyphs/leftA_rrow.glif
index 99e3da21..cc5a6bff 100644
--- a/src/Cantarell-Light.ufo/glyphs/leftA_rrow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/leftA_rrow.glif
@@ -1,11 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="leftArrow" format="2">
-  <advance width="686"/>
+  <advance width="664"/>
   <unicode hex="2190"/>
-  <note>
-arrowleft
-</note>
   <outline>
-    <component base="rightArrow" xScale="-1" yScale="-1" xOffset="698" yOffset="643"/>
+    <component base="rightArrow" xScale="-1" yScale="-1" xOffset="664" yOffset="643"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|rightArrow</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|rightArrow</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/leftanglebracket-math.glif 
b/src/Cantarell-Light.ufo/glyphs/leftanglebracket-math.glif
index 0f03df52..95066521 100644
--- a/src/Cantarell-Light.ufo/glyphs/leftanglebracket-math.glif
+++ b/src/Cantarell-Light.ufo/glyphs/leftanglebracket-math.glif
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="leftanglebracket-math" format="2">
-  <advance width="266"/>
+  <advance width="317"/>
   <unicode hex="27E8"/>
   <outline>
     <contour>
-      <point x="197" y="-10" type="line"/>
-      <point x="219" y="-10" type="line"/>
-      <point x="65" y="389" type="line"/>
-      <point x="66" y="374" type="line"/>
-      <point x="213" y="739" type="line"/>
-      <point x="193" y="739" type="line"/>
-      <point x="49" y="380" type="line"/>
+      <point x="232" y="-10" type="line"/>
+      <point x="255" y="-10" type="line"/>
+      <point x="81" y="389" type="line"/>
+      <point x="82" y="374" type="line"/>
+      <point x="248" y="739" type="line"/>
+      <point x="227" y="739" type="line"/>
+      <point x="64" y="380" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/less.glif b/src/Cantarell-Light.ufo/glyphs/less.glif
index 851d7772..3845dc4d 100644
--- a/src/Cantarell-Light.ufo/glyphs/less.glif
+++ b/src/Cantarell-Light.ufo/glyphs/less.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="less" format="2">
-  <advance width="594"/>
+  <advance width="580"/>
   <unicode hex="003C"/>
   <outline>
-    <component base="greater.tf" xScale="-1" yScale="-1" xOffset="594" yOffset="631"/>
+    <component base="greater" xScale="-1" yScale="-1" xOffset="580" yOffset="621"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|greater</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/lessequal.glif b/src/Cantarell-Light.ufo/glyphs/lessequal.glif
index 1beb3394..72083c4e 100644
--- a/src/Cantarell-Light.ufo/glyphs/lessequal.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lessequal.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lessequal" format="2">
-  <advance width="823"/>
+  <advance width="580"/>
   <unicode hex="2264"/>
   <outline>
-    <component base="greaterequal.tf" xScale="-1" xOffset="664"/>
+    <component base="greaterequal" xScale="-1" xOffset="580"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|greaterequal</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/lira.glif b/src/Cantarell-Light.ufo/glyphs/lira.glif
index 8505a3ff..b05bc404 100644
--- a/src/Cantarell-Light.ufo/glyphs/lira.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lira.glif
@@ -1,46 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lira" format="2">
-  <advance width="613"/>
+  <advance width="580"/>
   <unicode hex="20A4"/>
   <outline>
     <contour>
-      <point x="84" y="0" type="line"/>
-      <point x="541" y="0" type="line"/>
-      <point x="541" y="17" type="line"/>
-      <point x="118" y="17" type="line"/>
-      <point x="166" y="38"/>
-      <point x="195" y="107"/>
-      <point x="195" y="201" type="curve" smooth="yes"/>
-      <point x="195" y="484" type="line" smooth="yes"/>
-      <point x="195" y="605"/>
-      <point x="268" y="685"/>
-      <point x="379" y="685" type="curve" smooth="yes"/>
-      <point x="411" y="685"/>
-      <point x="454" y="679"/>
-      <point x="499" y="665" type="curve"/>
-      <point x="505" y="681" type="line"/>
-      <point x="467" y="695"/>
-      <point x="420" y="704"/>
-      <point x="382" y="704" type="curve" smooth="yes"/>
-      <point x="257" y="704"/>
-      <point x="175" y="615"/>
-      <point x="175" y="481" type="curve" smooth="yes"/>
-      <point x="175" y="198" type="line" smooth="yes"/>
-      <point x="175" y="106"/>
-      <point x="141" y="38"/>
-      <point x="84" y="17" type="curve"/>
+      <point x="69" y="0" type="line"/>
+      <point x="516" y="0" type="line"/>
+      <point x="516" y="17" type="line"/>
+      <point x="103" y="17" type="line"/>
+      <point x="153" y="40"/>
+      <point x="188" y="116"/>
+      <point x="188" y="201" type="curve" smooth="yes"/>
+      <point x="188" y="484" type="line" smooth="yes"/>
+      <point x="188" y="614"/>
+      <point x="248" y="685"/>
+      <point x="358" y="685" type="curve" smooth="yes"/>
+      <point x="393" y="685"/>
+      <point x="434" y="678"/>
+      <point x="475" y="665" type="curve"/>
+      <point x="481" y="681" type="line"/>
+      <point x="441" y="696"/>
+      <point x="400" y="704"/>
+      <point x="361" y="704" type="curve" smooth="yes"/>
+      <point x="236" y="704"/>
+      <point x="168" y="625"/>
+      <point x="168" y="481" type="curve" smooth="yes"/>
+      <point x="168" y="198" type="line" smooth="yes"/>
+      <point x="168" y="113"/>
+      <point x="128" y="40"/>
+      <point x="69" y="17" type="curve"/>
     </contour>
     <contour>
-      <point x="97" y="433" type="line"/>
-      <point x="446" y="433" type="line"/>
-      <point x="446" y="450" type="line"/>
-      <point x="97" y="450" type="line"/>
+      <point x="81" y="261" type="line"/>
+      <point x="425" y="261" type="line"/>
+      <point x="425" y="278" type="line"/>
+      <point x="81" y="278" type="line"/>
     </contour>
     <contour>
-      <point x="97" y="273" type="line"/>
-      <point x="446" y="273" type="line"/>
-      <point x="446" y="290" type="line"/>
-      <point x="97" y="290" type="line"/>
+      <point x="81" y="418" type="line"/>
+      <point x="425" y="418" type="line"/>
+      <point x="425" y="435" type="line"/>
+      <point x="81" y="435" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/liraT_urkish.glif 
b/src/Cantarell-Light.ufo/glyphs/liraT_urkish.glif
index 95731f37..46913880 100644
--- a/src/Cantarell-Light.ufo/glyphs/liraT_urkish.glif
+++ b/src/Cantarell-Light.ufo/glyphs/liraT_urkish.glif
@@ -1,35 +1,38 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="liraTurkish" format="2">
-  <advance width="599"/>
+  <advance width="580"/>
   <unicode hex="20BA"/>
   <outline>
     <contour>
-      <point x="184" y="0" type="line"/>
-      <point x="371" y="0"/>
-      <point x="515" y="132"/>
-      <point x="515" y="330" type="curve"/>
-      <point x="495" y="330" type="line"/>
-      <point x="495" y="144"/>
-      <point x="363" y="20"/>
-      <point x="194" y="20" type="curve"/>
+      <point x="154" y="0" type="line"/>
+      <point x="174" y="0" type="line" smooth="yes"/>
+      <point x="350" y="0"/>
+      <point x="469" y="129"/>
+      <point x="469" y="320" type="curve"/>
+      <point x="449" y="320" type="line"/>
+      <point x="449" y="139"/>
+      <point x="340" y="19"/>
+      <point x="174" y="19" type="curve"/>
+      <point x="174" y="694" type="line"/>
+      <point x="154" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="175" y="0" type="line"/>
-      <point x="195" y="0" type="line"/>
-      <point x="195" y="694" type="line"/>
-      <point x="175" y="694" type="line"/>
+      <point x="103" y="270" type="line"/>
+      <point x="366" y="418" type="line"/>
+      <point x="356" y="433" type="line"/>
+      <point x="95" y="284" type="line"/>
     </contour>
     <contour>
-      <point x="87" y="429" type="line"/>
-      <point x="344" y="580" type="line"/>
-      <point x="335" y="595" type="line"/>
+      <point x="87" y="428" type="line"/>
+      <point x="371" y="586" type="line"/>
+      <point x="362" y="602" type="line"/>
       <point x="80" y="443" type="line"/>
     </contour>
-    <contour>
-      <point x="99" y="287" type="line"/>
-      <point x="344" y="430" type="line"/>
-      <point x="335" y="445" type="line"/>
-      <point x="92" y="301" type="line"/>
-    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/literS_ign.glif b/src/Cantarell-Light.ufo/glyphs/literS_ign.glif
index 9fc169e8..ca2723ef 100644
--- a/src/Cantarell-Light.ufo/glyphs/literS_ign.glif
+++ b/src/Cantarell-Light.ufo/glyphs/literS_ign.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="literSign" format="2">
-  <advance width="451"/>
+  <advance width="429"/>
   <unicode hex="2113"/>
   <outline>
     <contour>
-      <point x="283" y="-10" type="curve" smooth="yes"/>
-      <point x="306" y="-10"/>
-      <point x="331" y="-3"/>
-      <point x="353" y="10" type="curve"/>
-      <point x="348" y="24" type="line"/>
-      <point x="328" y="13"/>
-      <point x="305" y="7"/>
-      <point x="286" y="7" type="curve" smooth="yes"/>
-      <point x="234" y="7"/>
-      <point x="200" y="53"/>
-      <point x="200" y="120" type="curve" smooth="yes"/>
-      <point x="200" y="547" type="line" smooth="yes"/>
-      <point x="200" y="657"/>
-      <point x="228" y="731"/>
-      <point x="272" y="731" type="curve" smooth="yes"/>
-      <point x="307" y="731"/>
-      <point x="332" y="684"/>
-      <point x="332" y="616" type="curve" smooth="yes"/>
-      <point x="332" y="522"/>
-      <point x="276" y="405"/>
-      <point x="77" y="138" type="curve"/>
-      <point x="89" y="128" type="line"/>
-      <point x="282" y="385"/>
-      <point x="352" y="512"/>
-      <point x="352" y="618" type="curve" smooth="yes"/>
-      <point x="352" y="695"/>
-      <point x="321" y="749"/>
-      <point x="274" y="749" type="curve" smooth="yes"/>
-      <point x="217" y="749"/>
-      <point x="180" y="667"/>
-      <point x="180" y="544" type="curve" smooth="yes"/>
-      <point x="180" y="117" type="line" smooth="yes"/>
-      <point x="180" y="43"/>
-      <point x="220" y="-10"/>
+      <point x="270" y="-10" type="curve" smooth="yes"/>
+      <point x="293" y="-10"/>
+      <point x="318" y="-3"/>
+      <point x="340" y="10" type="curve"/>
+      <point x="335" y="24" type="line"/>
+      <point x="315" y="13"/>
+      <point x="292" y="7"/>
+      <point x="273" y="7" type="curve" smooth="yes"/>
+      <point x="221" y="7"/>
+      <point x="187" y="53"/>
+      <point x="187" y="120" type="curve" smooth="yes"/>
+      <point x="187" y="547" type="line" smooth="yes"/>
+      <point x="187" y="657"/>
+      <point x="215" y="731"/>
+      <point x="259" y="731" type="curve" smooth="yes"/>
+      <point x="294" y="731"/>
+      <point x="319" y="684"/>
+      <point x="319" y="616" type="curve" smooth="yes"/>
+      <point x="319" y="522"/>
+      <point x="263" y="405"/>
+      <point x="64" y="138" type="curve"/>
+      <point x="76" y="128" type="line"/>
+      <point x="269" y="385"/>
+      <point x="339" y="512"/>
+      <point x="339" y="618" type="curve" smooth="yes"/>
+      <point x="339" y="695"/>
+      <point x="308" y="749"/>
+      <point x="261" y="749" type="curve" smooth="yes"/>
+      <point x="204" y="749"/>
+      <point x="167" y="667"/>
+      <point x="167" y="544" type="curve" smooth="yes"/>
+      <point x="167" y="117" type="line" smooth="yes"/>
+      <point x="167" y="43"/>
+      <point x="207" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/lj.glif b/src/Cantarell-Light.ufo/glyphs/lj.glif
index 8a872605..46afdbbc 100644
--- a/src/Cantarell-Light.ufo/glyphs/lj.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lj.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lj" format="2">
-  <advance width="434"/>
+  <advance width="504"/>
   <unicode hex="01C9"/>
   <outline>
     <component base="l"/>
-    <component base="j" xOffset="232"/>
+    <component base="j" xOffset="269"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/lje-cy.glif b/src/Cantarell-Light.ufo/glyphs/lje-cy.glif
index 482ac05e..38f79506 100644
--- a/src/Cantarell-Light.ufo/glyphs/lje-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lje-cy.glif
@@ -1,55 +1,57 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lje-cy" format="2">
-  <advance width="816"/>
+  <advance width="835"/>
   <unicode hex="0459"/>
   <outline>
     <contour>
-      <point x="443" y="0" type="line"/>
-      <point x="595" y="0" type="line" smooth="yes"/>
-      <point x="706" y="0"/>
-      <point x="773" y="56"/>
-      <point x="773" y="150" type="curve" smooth="yes"/>
-      <point x="773" y="241"/>
-      <point x="712" y="301"/>
-      <point x="621" y="301" type="curve" smooth="yes"/>
-      <point x="446" y="301" type="line"/>
-      <point x="446" y="284" type="line"/>
-      <point x="614" y="284" type="line" smooth="yes"/>
-      <point x="695" y="284"/>
-      <point x="751" y="228"/>
-      <point x="751" y="145" type="curve" smooth="yes"/>
-      <point x="751" y="65"/>
-      <point x="696" y="17"/>
-      <point x="604" y="17" type="curve" smooth="yes"/>
-      <point x="443" y="17" type="line"/>
+      <point x="78" y="-7" type="curve" smooth="yes"/>
+      <point x="144" y="-7"/>
+      <point x="177" y="75"/>
+      <point x="177" y="221" type="curve" smooth="yes"/>
+      <point x="177" y="463" type="line"/>
+      <point x="437" y="463" type="line"/>
+      <point x="437" y="0" type="line"/>
+      <point x="457" y="0" type="line"/>
+      <point x="457" y="480" type="line"/>
+      <point x="158" y="480" type="line"/>
+      <point x="158" y="212" type="line" smooth="yes"/>
+      <point x="158" y="83"/>
+      <point x="131" y="10"/>
+      <point x="76" y="10" type="curve" smooth="yes"/>
+      <point x="65" y="10"/>
+      <point x="50" y="14"/>
+      <point x="31" y="27" type="curve"/>
+      <point x="24" y="13" type="line"/>
+      <point x="37" y="1"/>
+      <point x="58" y="-7"/>
     </contour>
     <contour>
-      <point x="74" y="-7" type="curve" smooth="yes"/>
-      <point x="140" y="-7"/>
-      <point x="173" y="75"/>
-      <point x="173" y="221" type="curve" smooth="yes"/>
-      <point x="173" y="463" type="line"/>
-      <point x="433" y="463" type="line"/>
-      <point x="433" y="0" type="line"/>
-      <point x="453" y="0" type="line"/>
-      <point x="453" y="480" type="line"/>
-      <point x="154" y="480" type="line"/>
-      <point x="154" y="212" type="line" smooth="yes"/>
-      <point x="154" y="83"/>
-      <point x="127" y="10"/>
-      <point x="72" y="10" type="curve" smooth="yes"/>
-      <point x="61" y="10"/>
-      <point x="46" y="14"/>
-      <point x="27" y="27" type="curve"/>
-      <point x="20" y="13" type="line"/>
-      <point x="33" y="1"/>
-      <point x="54" y="-7"/>
+      <point x="447" y="0" type="line"/>
+      <point x="599" y="0" type="line" smooth="yes"/>
+      <point x="710" y="0"/>
+      <point x="777" y="56"/>
+      <point x="777" y="150" type="curve" smooth="yes"/>
+      <point x="777" y="241"/>
+      <point x="716" y="301"/>
+      <point x="625" y="301" type="curve" smooth="yes"/>
+      <point x="450" y="301" type="line"/>
+      <point x="450" y="284" type="line"/>
+      <point x="618" y="284" type="line" smooth="yes"/>
+      <point x="699" y="284"/>
+      <point x="755" y="228"/>
+      <point x="755" y="145" type="curve" smooth="yes"/>
+      <point x="755" y="65"/>
+      <point x="700" y="17"/>
+      <point x="608" y="17" type="curve" smooth="yes"/>
+      <point x="447" y="17" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>el-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>softsign-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/llinebelow.glif b/src/Cantarell-Light.ufo/glyphs/llinebelow.glif
index b5b53ace..4fc43bc3 100644
--- a/src/Cantarell-Light.ufo/glyphs/llinebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/llinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="llinebelow" format="2">
-  <advance width="232"/>
+  <advance width="269"/>
   <unicode hex="1E3B"/>
   <outline>
     <component base="l"/>
-    <component base="macronbelowcomb.narrow" xOffset="-85"/>
+    <component base="macronbelowcomb.narrow" xOffset="-64"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/logicalnot.glif b/src/Cantarell-Light.ufo/glyphs/logicalnot.glif
index d25d6c96..07834db6 100644
--- a/src/Cantarell-Light.ufo/glyphs/logicalnot.glif
+++ b/src/Cantarell-Light.ufo/glyphs/logicalnot.glif
@@ -1,19 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="logicalnot" format="2">
-  <advance width="666"/>
+  <advance width="580"/>
   <unicode hex="00AC"/>
   <outline>
     <contour>
-      <point x="86" y="363" type="line"/>
-      <point x="522" y="363" type="line"/>
-      <point x="522" y="380" type="line"/>
-      <point x="86" y="380" type="line"/>
+      <point x="60" y="322" type="line"/>
+      <point x="520" y="322" type="line"/>
+      <point x="520" y="339" type="line"/>
+      <point x="60" y="339" type="line"/>
     </contour>
     <contour>
-      <point x="502" y="162" type="line"/>
-      <point x="522" y="162" type="line"/>
-      <point x="522" y="363" type="line"/>
-      <point x="502" y="363" type="line"/>
+      <point x="502" y="101" type="line"/>
+      <point x="520" y="101" type="line"/>
+      <point x="520" y="333" type="line"/>
+      <point x="502" y="333" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/lozenge.glif b/src/Cantarell-Light.ufo/glyphs/lozenge.glif
index 44b56dd7..034af270 100644
--- a/src/Cantarell-Light.ufo/glyphs/lozenge.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lozenge.glif
@@ -1,21 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lozenge" format="2">
-  <advance width="555"/>
+  <advance width="533"/>
   <unicode hex="25CA"/>
   <outline>
     <contour>
-      <point x="266" y="0" type="line"/>
-      <point x="288" y="0" type="line"/>
-      <point x="471" y="357" type="line"/>
-      <point x="287" y="694" type="line"/>
-      <point x="268" y="694" type="line"/>
-      <point x="84" y="357" type="line"/>
+      <point x="255" y="0" type="line"/>
+      <point x="277" y="0" type="line"/>
+      <point x="460" y="357" type="line"/>
+      <point x="276" y="694" type="line"/>
+      <point x="257" y="694" type="line"/>
+      <point x="73" y="357" type="line"/>
     </contour>
     <contour>
-      <point x="278" y="18" type="line"/>
-      <point x="106" y="357" type="line"/>
-      <point x="277" y="674" type="line"/>
-      <point x="448" y="356" type="line"/>
+      <point x="267" y="18" type="line"/>
+      <point x="95" y="357" type="line"/>
+      <point x="266" y="674" type="line"/>
+      <point x="437" y="356" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/lslash.glif b/src/Cantarell-Light.ufo/glyphs/lslash.glif
index 60ab54e8..0ab05b1d 100644
--- a/src/Cantarell-Light.ufo/glyphs/lslash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lslash.glif
@@ -1,9 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lslash" format="2">
-  <advance width="232"/>
+  <advance width="309"/>
   <unicode hex="0142"/>
   <outline>
-    <component base="l"/>
-    <component base="slashshortcomb" xOffset="-83" yOffset="87"/>
+    <component base="l" xOffset="13"/>
+    <component base="slashshortcomb" xOffset="-49" yOffset="87"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>-1</integer>
+        <integer>0</integer>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/m.glif b/src/Cantarell-Light.ufo/glyphs/m.glif
index 8c88d59e..b9138da4 100644
--- a/src/Cantarell-Light.ufo/glyphs/m.glif
+++ b/src/Cantarell-Light.ufo/glyphs/m.glif
@@ -1,55 +1,60 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="m" format="2">
-  <advance width="843"/>
+  <advance width="880"/>
   <unicode hex="006D"/>
-  <note>
-m
-</note>
-  <anchor x="433" y="0" name="bottom"/>
-  <anchor x="433" y="480" name="top"/>
+  <anchor x="452" y="0" name="bottom"/>
+  <anchor x="452" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="109" y="0" type="line"/>
-      <point x="109" y="404" type="line"/>
-      <point x="105" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="761" y="0" type="line"/>
+      <point x="782" y="0" type="line"/>
+      <point x="782" y="314" type="line" smooth="yes"/>
+      <point x="782" y="424"/>
+      <point x="721" y="486"/>
+      <point x="622" y="486" type="curve" smooth="yes"/>
+      <point x="552" y="486"/>
+      <point x="484" y="454"/>
+      <point x="436" y="399" type="curve"/>
+      <point x="442" y="386" type="line"/>
+      <point x="488" y="437"/>
+      <point x="553" y="468"/>
+      <point x="618" y="468" type="curve" smooth="yes"/>
+      <point x="707" y="468"/>
+      <point x="761" y="411"/>
+      <point x="761" y="314" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="415" y="0" type="line"/>
-      <point x="436" y="0" type="line"/>
-      <point x="436" y="314" type="line" smooth="yes"/>
-      <point x="436" y="424"/>
-      <point x="375" y="486"/>
-      <point x="277" y="486" type="curve" smooth="yes"/>
-      <point x="207" y="486"/>
-      <point x="139" y="456"/>
-      <point x="92" y="404" type="curve"/>
-      <point x="100" y="393" type="line"/>
-      <point x="145" y="440"/>
-      <point x="209" y="468"/>
-      <point x="273" y="468" type="curve" smooth="yes"/>
-      <point x="361" y="468"/>
-      <point x="415" y="411"/>
-      <point x="415" y="314" type="curve" smooth="yes"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="404" type="line"/>
+      <point x="124" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="742" y="0" type="line"/>
-      <point x="763" y="0" type="line"/>
-      <point x="763" y="314" type="line" smooth="yes"/>
-      <point x="763" y="424"/>
-      <point x="702" y="486"/>
-      <point x="603" y="486" type="curve" smooth="yes"/>
-      <point x="533" y="486"/>
-      <point x="465" y="454"/>
-      <point x="417" y="399" type="curve"/>
-      <point x="423" y="386" type="line"/>
-      <point x="469" y="437"/>
-      <point x="534" y="468"/>
-      <point x="599" y="468" type="curve" smooth="yes"/>
-      <point x="688" y="468"/>
-      <point x="742" y="411"/>
-      <point x="742" y="314" type="curve" smooth="yes"/>
+      <point x="434" y="0" type="line"/>
+      <point x="455" y="0" type="line"/>
+      <point x="455" y="314" type="line" smooth="yes"/>
+      <point x="455" y="424"/>
+      <point x="394" y="486"/>
+      <point x="296" y="486" type="curve" smooth="yes"/>
+      <point x="226" y="486"/>
+      <point x="158" y="456"/>
+      <point x="111" y="404" type="curve"/>
+      <point x="119" y="393" type="line"/>
+      <point x="164" y="440"/>
+      <point x="228" y="468"/>
+      <point x="292" y="468" type="curve" smooth="yes"/>
+      <point x="380" y="468"/>
+      <point x="434" y="411"/>
+      <point x="434" y="314" type="curve" smooth="yes"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/macron.glif b/src/Cantarell-Light.ufo/glyphs/macron.glif
index e14b2e0f..62365e59 100644
--- a/src/Cantarell-Light.ufo/glyphs/macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/macron.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="macron" format="2">
-  <advance width="475"/>
+  <advance width="500"/>
   <unicode hex="00AF"/>
   <outline>
-    <component base="macroncomb" xOffset="-12"/>
+    <component base="macroncomb" xOffset="8"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/manat.glif b/src/Cantarell-Light.ufo/glyphs/manat.glif
index c92ed9c0..08d4b4e5 100644
--- a/src/Cantarell-Light.ufo/glyphs/manat.glif
+++ b/src/Cantarell-Light.ufo/glyphs/manat.glif
@@ -1,33 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="manat" format="2">
-  <advance width="683"/>
+  <advance width="580"/>
   <unicode hex="20BC"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="131" y="0" type="line"/>
-      <point x="131" y="225" type="line" smooth="yes"/>
-      <point x="131" y="421"/>
-      <point x="215" y="551"/>
-      <point x="340" y="551" type="curve" smooth="yes"/>
-      <point x="468" y="551"/>
-      <point x="553" y="419"/>
-      <point x="553" y="222" type="curve" smooth="yes"/>
-      <point x="553" y="0" type="line"/>
-      <point x="573" y="0" type="line"/>
-      <point x="573" y="225" type="line" smooth="yes"/>
-      <point x="573" y="431"/>
-      <point x="481" y="569"/>
-      <point x="343" y="569" type="curve" smooth="yes"/>
-      <point x="203" y="569"/>
-      <point x="110" y="430"/>
-      <point x="110" y="222" type="curve" smooth="yes"/>
+      <point x="74" y="0" type="line"/>
+      <point x="95" y="0" type="line"/>
+      <point x="95" y="225" type="line" smooth="yes"/>
+      <point x="95" y="447"/>
+      <point x="162" y="563"/>
+      <point x="289" y="563" type="curve" smooth="yes"/>
+      <point x="419" y="563"/>
+      <point x="487" y="446"/>
+      <point x="487" y="222" type="curve" smooth="yes"/>
+      <point x="487" y="0" type="line"/>
+      <point x="507" y="0" type="line"/>
+      <point x="507" y="225" type="line" smooth="yes"/>
+      <point x="507" y="459"/>
+      <point x="433" y="581"/>
+      <point x="292" y="581" type="curve" smooth="yes"/>
+      <point x="149" y="581"/>
+      <point x="74" y="458"/>
+      <point x="74" y="222" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="333" y="100" type="line"/>
-      <point x="352" y="100" type="line"/>
-      <point x="352" y="694" type="line"/>
-      <point x="333" y="694" type="line"/>
+      <point x="282" y="100" type="line"/>
+      <point x="301" y="100" type="line"/>
+      <point x="301" y="694" type="line"/>
+      <point x="282" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/mdotbelow.glif b/src/Cantarell-Light.ufo/glyphs/mdotbelow.glif
index 82f4b0da..d7d3ec63 100644
--- a/src/Cantarell-Light.ufo/glyphs/mdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/mdotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="mdotbelow" format="2">
-  <advance width="843"/>
+  <advance width="880"/>
   <unicode hex="1E43"/>
   <outline>
     <component base="m"/>
-    <component base="dotbelowcomb" xOffset="313"/>
+    <component base="dotbelowcomb" xOffset="332"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/micro.glif b/src/Cantarell-Light.ufo/glyphs/micro.glif
index 2db1666e..c69c0782 100644
--- a/src/Cantarell-Light.ufo/glyphs/micro.glif
+++ b/src/Cantarell-Light.ufo/glyphs/micro.glif
@@ -1,36 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="micro" format="2">
-  <advance width="619"/>
+  <advance width="565"/>
   <unicode hex="00B5"/>
   <outline>
     <contour>
-      <point x="303" y="-6" type="curve" smooth="yes"/>
-      <point x="379" y="-6"/>
-      <point x="446" y="31"/>
-      <point x="490" y="96" type="curve"/>
-      <point x="483" y="107" type="line"/>
-      <point x="440" y="46"/>
-      <point x="377" y="12"/>
-      <point x="308" y="12" type="curve" smooth="yes"/>
-      <point x="217" y="12"/>
-      <point x="164" y="69"/>
-      <point x="164" y="166" type="curve"/>
-      <point x="144" y="184" type="line"/>
-      <point x="144" y="55"/>
-      <point x="207" y="-6"/>
+      <point x="107" y="-217" type="line"/>
+      <point x="127" y="-217" type="line"/>
+      <point x="127" y="482" type="line"/>
+      <point x="107" y="482" type="line"/>
     </contour>
     <contour>
-      <point x="144" y="-217" type="line"/>
-      <point x="164" y="-217" type="line"/>
-      <point x="164" y="482" type="line"/>
-      <point x="144" y="482" type="line"/>
+      <point x="266" y="-6" type="curve" smooth="yes"/>
+      <point x="342" y="-6"/>
+      <point x="409" y="31"/>
+      <point x="453" y="96" type="curve"/>
+      <point x="446" y="107" type="line"/>
+      <point x="403" y="46"/>
+      <point x="340" y="12"/>
+      <point x="271" y="12" type="curve" smooth="yes"/>
+      <point x="180" y="12"/>
+      <point x="127" y="69"/>
+      <point x="127" y="166" type="curve"/>
+      <point x="107" y="184" type="line"/>
+      <point x="107" y="55"/>
+      <point x="170" y="-6"/>
     </contour>
     <contour>
-      <point x="478" y="0" type="line"/>
-      <point x="495" y="0" type="line"/>
-      <point x="495" y="480" type="line"/>
-      <point x="474" y="480" type="line"/>
-      <point x="474" y="76" type="line"/>
+      <point x="441" y="0" type="line"/>
+      <point x="458" y="0" type="line"/>
+      <point x="458" y="480" type="line"/>
+      <point x="437" y="480" type="line"/>
+      <point x="437" y="76" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/minus.glif b/src/Cantarell-Light.ufo/glyphs/minus.glif
index c0a43828..4e664c46 100644
--- a/src/Cantarell-Light.ufo/glyphs/minus.glif
+++ b/src/Cantarell-Light.ufo/glyphs/minus.glif
@@ -1,13 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="minus" format="2">
-  <advance width="751"/>
+  <advance width="580"/>
   <unicode hex="2212"/>
   <outline>
     <contour>
-      <point x="144" y="322" type="line"/>
-      <point x="607" y="322" type="line"/>
-      <point x="607" y="339" type="line"/>
-      <point x="144" y="339" type="line"/>
+      <point x="60" y="322" type="line"/>
+      <point x="520" y="322" type="line"/>
+      <point x="520" y="339" type="line"/>
+      <point x="60" y="339" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/minute.glif b/src/Cantarell-Light.ufo/glyphs/minute.glif
index 4478b935..bd9df21d 100644
--- a/src/Cantarell-Light.ufo/glyphs/minute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/minute.glif
@@ -1,11 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="minute" format="2">
-  <advance width="308"/>
+  <advance width="298"/>
   <unicode hex="2032"/>
-  <note>
-minute
-</note>
   <outline>
-    <component base="quotesingle" yxScale="0.19201" xOffset="-64"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="-76"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/multiply.glif b/src/Cantarell-Light.ufo/glyphs/multiply.glif
index d637d7f0..e9284514 100644
--- a/src/Cantarell-Light.ufo/glyphs/multiply.glif
+++ b/src/Cantarell-Light.ufo/glyphs/multiply.glif
@@ -1,19 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="multiply" format="2">
-  <advance width="551"/>
+  <advance width="580"/>
   <unicode hex="00D7"/>
   <outline>
     <contour>
-      <point x="453" y="132" type="line"/>
-      <point x="464" y="143" type="line"/>
-      <point x="106" y="530" type="line"/>
-      <point x="95" y="519" type="line"/>
+      <point x="447" y="162" type="line"/>
+      <point x="121" y="487" type="line"/>
+      <point x="133" y="499" type="line"/>
+      <point x="459" y="174" type="line"/>
     </contour>
     <contour>
-      <point x="98" y="139" type="line"/>
-      <point x="459" y="519" type="line"/>
-      <point x="448" y="530" type="line"/>
-      <point x="87" y="150" type="line"/>
+      <point x="133" y="162" type="line"/>
+      <point x="121" y="174" type="line"/>
+      <point x="447" y="499" type="line"/>
+      <point x="459" y="487" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/n.glif b/src/Cantarell-Light.ufo/glyphs/n.glif
index 8569e0f2..3206d359 100644
--- a/src/Cantarell-Light.ufo/glyphs/n.glif
+++ b/src/Cantarell-Light.ufo/glyphs/n.glif
@@ -1,37 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="n" format="2">
-  <advance width="525"/>
+  <advance width="563"/>
   <unicode hex="006E"/>
-  <note>
-n
-</note>
-  <anchor x="266" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
+  <anchor x="285" y="0" name="bottom"/>
+  <anchor x="281" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="109" y="0" type="line"/>
-      <point x="109" y="399" type="line"/>
-      <point x="105" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="444" y="0" type="line"/>
+      <point x="465" y="0" type="line"/>
+      <point x="465" y="314" type="line" smooth="yes"/>
+      <point x="465" y="421"/>
+      <point x="405" y="486"/>
+      <point x="299" y="486" type="curve" smooth="yes"/>
+      <point x="223" y="486"/>
+      <point x="153" y="454"/>
+      <point x="112" y="399" type="curve"/>
+      <point x="121" y="388" type="line"/>
+      <point x="155" y="436"/>
+      <point x="225" y="468"/>
+      <point x="296" y="468" type="curve" smooth="yes"/>
+      <point x="391" y="468"/>
+      <point x="444" y="411"/>
+      <point x="444" y="314" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="425" y="0" type="line"/>
-      <point x="446" y="0" type="line"/>
-      <point x="446" y="314" type="line" smooth="yes"/>
-      <point x="446" y="421"/>
-      <point x="386" y="486"/>
-      <point x="280" y="486" type="curve" smooth="yes"/>
-      <point x="204" y="486"/>
-      <point x="134" y="454"/>
-      <point x="93" y="399" type="curve"/>
-      <point x="102" y="388" type="line"/>
-      <point x="136" y="436"/>
-      <point x="206" y="468"/>
-      <point x="277" y="468" type="curve" smooth="yes"/>
-      <point x="372" y="468"/>
-      <point x="425" y="411"/>
-      <point x="425" y="314" type="curve" smooth="yes"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="399" type="line"/>
+      <point x="124" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/nacute.glif b/src/Cantarell-Light.ufo/glyphs/nacute.glif
index de3bf498..e4cbb142 100644
--- a/src/Cantarell-Light.ufo/glyphs/nacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nacute" format="2">
-  <advance width="525"/>
+  <advance width="563"/>
   <unicode hex="0144"/>
   <outline>
     <component base="n"/>
-    <component base="acutecomb" xOffset="195"/>
+    <component base="acutecomb" xOffset="214"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/naira.glif b/src/Cantarell-Light.ufo/glyphs/naira.glif
index 45e536f2..d6110a40 100644
--- a/src/Cantarell-Light.ufo/glyphs/naira.glif
+++ b/src/Cantarell-Light.ufo/glyphs/naira.glif
@@ -1,32 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="naira" format="2">
-  <advance width="831"/>
+  <advance width="580"/>
   <unicode hex="20A6"/>
   <outline>
     <contour>
-      <point x="661" y="423" type="line"/>
-      <point x="661" y="406" type="line"/>
-      <point x="746" y="406" type="line"/>
-      <point x="746" y="423" type="line"/>
+      <point x="118" y="0" type="line"/>
+      <point x="137" y="0" type="line"/>
+      <point x="137" y="674" type="line"/>
+      <point x="134" y="674" type="line"/>
+      <point x="440" y="0" type="line"/>
+      <point x="464" y="0" type="line"/>
+      <point x="464" y="694" type="line"/>
+      <point x="445" y="694" type="line"/>
+      <point x="445" y="20" type="line"/>
+      <point x="450" y="20" type="line"/>
+      <point x="144" y="694" type="line"/>
+      <point x="118" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="661" y="293" type="line"/>
-      <point x="661" y="276" type="line"/>
-      <point x="746" y="276" type="line"/>
-      <point x="746" y="293" type="line"/>
+      <point x="33" y="261" type="line"/>
+      <point x="127" y="261" type="line"/>
+      <point x="127" y="278" type="line"/>
+      <point x="33" y="278" type="line"/>
     </contour>
     <contour>
-      <point x="169" y="276" type="line"/>
-      <point x="169" y="293" type="line"/>
-      <point x="83" y="293" type="line"/>
-      <point x="83" y="276" type="line"/>
+      <point x="33" y="418" type="line"/>
+      <point x="127" y="418" type="line"/>
+      <point x="127" y="435" type="line"/>
+      <point x="33" y="435" type="line"/>
     </contour>
     <contour>
-      <point x="169" y="406" type="line"/>
-      <point x="169" y="423" type="line"/>
-      <point x="83" y="423" type="line"/>
-      <point x="83" y="406" type="line"/>
+      <point x="455" y="261" type="line"/>
+      <point x="549" y="261" type="line"/>
+      <point x="549" y="278" type="line"/>
+      <point x="455" y="278" type="line"/>
+    </contour>
+    <contour>
+      <point x="455" y="418" type="line"/>
+      <point x="549" y="418" type="line"/>
+      <point x="549" y="435" type="line"/>
+      <point x="455" y="435" type="line"/>
     </contour>
-    <component base="N" xOffset="51"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ncaron.glif b/src/Cantarell-Light.ufo/glyphs/ncaron.glif
index a3f943db..452654ec 100644
--- a/src/Cantarell-Light.ufo/glyphs/ncaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ncaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ncaron" format="2">
-  <advance width="525"/>
+  <advance width="563"/>
   <unicode hex="0148"/>
   <outline>
     <component base="n"/>
-    <component base="caroncomb" xOffset="79"/>
+    <component base="caroncomb" xOffset="98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ncommaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/ncommaaccent.glif
index 3482df2b..72c2a08b 100644
--- a/src/Cantarell-Light.ufo/glyphs/ncommaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ncommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ncommaaccent" format="2">
-  <advance width="525"/>
+  <advance width="563"/>
   <unicode hex="0146"/>
   <outline>
     <component base="n"/>
-    <component base="commaaccentcomb" xOffset="137"/>
+    <component base="commaaccentcomb" xOffset="156"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ndotaccent.glif b/src/Cantarell-Light.ufo/glyphs/ndotaccent.glif
index 08dbbf5c..c46d0da1 100644
--- a/src/Cantarell-Light.ufo/glyphs/ndotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ndotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ndotaccent" format="2">
-  <advance width="525"/>
+  <advance width="563"/>
   <unicode hex="1E45"/>
   <outline>
     <component base="n"/>
-    <component base="dotaccentcomb" xOffset="143"/>
+    <component base="dotaccentcomb" xOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ndotbelow.glif b/src/Cantarell-Light.ufo/glyphs/ndotbelow.glif
index 1847727c..2ae56ad9 100644
--- a/src/Cantarell-Light.ufo/glyphs/ndotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ndotbelow" format="2">
-  <advance width="525"/>
+  <advance width="563"/>
   <unicode hex="1E47"/>
   <outline>
     <component base="n"/>
-    <component base="dotbelowcomb" xOffset="146"/>
+    <component base="dotbelowcomb" xOffset="165"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/nine.dnom.glif b/src/Cantarell-Light.ufo/glyphs/nine.dnom.glif
index 5318a377..f98e0d14 100644
--- a/src/Cantarell-Light.ufo/glyphs/nine.dnom.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nine.dnom.glif
@@ -1,49 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine.dnom" format="2">
-  <advance width="432"/>
-  <note>
-nine
-</note>
+  <advance width="395"/>
   <outline>
     <contour>
-      <point x="203" y="479" type="curve" smooth="yes"/>
-      <point x="112" y="479"/>
-      <point x="50" y="419"/>
-      <point x="50" y="331" type="curve" smooth="yes"/>
-      <point x="50" y="245"/>
-      <point x="110" y="191"/>
-      <point x="198" y="191" type="curve" smooth="yes"/>
-      <point x="270" y="191"/>
-      <point x="326" y="226"/>
-      <point x="360" y="290" type="curve"/>
-      <point x="358" y="313" type="line"/>
-      <point x="327" y="247"/>
-      <point x="270" y="210"/>
-      <point x="202" y="210" type="curve" smooth="yes"/>
-      <point x="126" y="210"/>
-      <point x="72" y="257"/>
-      <point x="72" y="334" type="curve" smooth="yes"/>
-      <point x="72" y="409"/>
-      <point x="123" y="460"/>
-      <point x="200" y="460" type="curve" smooth="yes"/>
-      <point x="295" y="460"/>
-      <point x="350" y="384"/>
-      <point x="350" y="245" type="curve" smooth="yes"/>
-      <point x="350" y="96"/>
-      <point x="286" y="12"/>
-      <point x="170" y="12" type="curve" smooth="yes"/>
-      <point x="132" y="12"/>
-      <point x="94" y="21"/>
-      <point x="66" y="37" type="curve"/>
-      <point x="59" y="19" type="line"/>
-      <point x="88" y="3"/>
-      <point x="124" y="-7"/>
-      <point x="167" y="-7" type="curve" smooth="yes"/>
-      <point x="300" y="-7"/>
-      <point x="373" y="88"/>
-      <point x="373" y="248" type="curve" smooth="yes"/>
-      <point x="373" y="397"/>
-      <point x="309" y="479"/>
+      <point x="155" y="-6" type="curve" smooth="yes"/>
+      <point x="270" y="-6"/>
+      <point x="333" y="76"/>
+      <point x="333" y="224" type="curve" smooth="yes"/>
+      <point x="333" y="348"/>
+      <point x="279" y="422"/>
+      <point x="186" y="422" type="curve" smooth="yes"/>
+      <point x="109" y="422"/>
+      <point x="53" y="369"/>
+      <point x="53" y="291" type="curve" smooth="yes"/>
+      <point x="53" y="215"/>
+      <point x="105" y="167"/>
+      <point x="180" y="167" type="curve" smooth="yes"/>
+      <point x="244" y="167"/>
+      <point x="293" y="201"/>
+      <point x="316" y="263" type="curve"/>
+      <point x="313" y="284" type="line"/>
+      <point x="290" y="219"/>
+      <point x="246" y="186"/>
+      <point x="186" y="186" type="curve" smooth="yes"/>
+      <point x="121" y="186"/>
+      <point x="75" y="227"/>
+      <point x="75" y="294" type="curve" smooth="yes"/>
+      <point x="75" y="359"/>
+      <point x="120" y="403"/>
+      <point x="184" y="403" type="curve" smooth="yes"/>
+      <point x="264" y="403"/>
+      <point x="311" y="336"/>
+      <point x="311" y="221" type="curve" smooth="yes"/>
+      <point x="311" y="86"/>
+      <point x="258" y="14"/>
+      <point x="157" y="14" type="curve" smooth="yes"/>
+      <point x="125" y="14"/>
+      <point x="96" y="21"/>
+      <point x="70" y="35" type="curve"/>
+      <point x="62" y="17" type="line"/>
+      <point x="94" y="1"/>
+      <point x="121" y="-6"/>
     </contour>
   </outline>
   <lib>
@@ -51,11 +48,11 @@ nine
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>68</integer>
+        <integer>60</integer>
         <key>weight</key>
-        <integer>1</integer>
+        <integer>2</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>63</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/nine.glif b/src/Cantarell-Light.ufo/glyphs/nine.glif
index 3a48e78e..12e87baa 100644
--- a/src/Cantarell-Light.ufo/glyphs/nine.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nine.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine" format="2">
-  <advance width="585"/>
+  <advance width="583"/>
   <unicode hex="0039"/>
   <outline>
-    <component base="six" xScale="-1" yScale="-1" xOffset="598" yOffset="694"/>
+    <component base="six" xScale="-1" yScale="-1" xOffset="583" yOffset="694"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|six</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|six</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/nine.numr.glif b/src/Cantarell-Light.ufo/glyphs/nine.numr.glif
index 0e133e43..9dd89fe0 100644
--- a/src/Cantarell-Light.ufo/glyphs/nine.numr.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nine.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine.numr" format="2">
-  <advance width="432"/>
+  <advance width="395"/>
   <outline>
     <component base="nine.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/nine.osf.glif b/src/Cantarell-Light.ufo/glyphs/nine.osf.glif
index 884ca403..bfd18cb9 100644
--- a/src/Cantarell-Light.ufo/glyphs/nine.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nine.osf.glif
@@ -1,46 +1,54 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine.osf" format="2">
-  <advance width="585"/>
+  <advance width="578"/>
   <outline>
     <contour>
-      <point x="274" y="604" type="curve" smooth="yes"/>
-      <point x="154" y="604"/>
-      <point x="72" y="517"/>
-      <point x="72" y="388" type="curve" smooth="yes"/>
-      <point x="72" y="261"/>
-      <point x="152" y="184"/>
-      <point x="271" y="184" type="curve" smooth="yes"/>
-      <point x="368" y="184"/>
-      <point x="444" y="233"/>
-      <point x="490" y="324" type="curve"/>
-      <point x="490" y="355" type="line"/>
-      <point x="446" y="257"/>
-      <point x="369" y="202"/>
-      <point x="273" y="202" type="curve" smooth="yes"/>
-      <point x="167" y="202"/>
-      <point x="93" y="272"/>
-      <point x="93" y="391" type="curve" smooth="yes"/>
-      <point x="93" y="508"/>
-      <point x="165" y="586"/>
-      <point x="273" y="586" type="curve" smooth="yes"/>
-      <point x="405" y="586"/>
-      <point x="481" y="469"/>
-      <point x="481" y="272" type="curve" smooth="yes"/>
-      <point x="481" y="34"/>
-      <point x="394" y="-92"/>
-      <point x="230" y="-92" type="curve" smooth="yes"/>
-      <point x="179" y="-92"/>
-      <point x="129" y="-79"/>
-      <point x="91" y="-56" type="curve"/>
-      <point x="84" y="-73" type="line"/>
-      <point x="125" y="-97"/>
-      <point x="174" y="-110"/>
-      <point x="228" y="-110" type="curve" smooth="yes"/>
-      <point x="407" y="-110"/>
-      <point x="502" y="24"/>
-      <point x="502" y="275" type="curve" smooth="yes"/>
-      <point x="502" y="481"/>
-      <point x="418" y="604"/>
+      <point x="229" y="-110" type="curve" smooth="yes"/>
+      <point x="408" y="-110"/>
+      <point x="503" y="24"/>
+      <point x="503" y="275" type="curve" smooth="yes"/>
+      <point x="503" y="481"/>
+      <point x="419" y="604"/>
+      <point x="275" y="604" type="curve" smooth="yes"/>
+      <point x="155" y="604"/>
+      <point x="73" y="517"/>
+      <point x="73" y="388" type="curve" smooth="yes"/>
+      <point x="73" y="261"/>
+      <point x="153" y="184"/>
+      <point x="272" y="184" type="curve" smooth="yes"/>
+      <point x="369" y="184"/>
+      <point x="445" y="233"/>
+      <point x="491" y="324" type="curve"/>
+      <point x="491" y="355" type="line"/>
+      <point x="447" y="257"/>
+      <point x="370" y="202"/>
+      <point x="274" y="202" type="curve" smooth="yes"/>
+      <point x="168" y="202"/>
+      <point x="94" y="272"/>
+      <point x="94" y="391" type="curve" smooth="yes"/>
+      <point x="94" y="508"/>
+      <point x="166" y="586"/>
+      <point x="274" y="586" type="curve" smooth="yes"/>
+      <point x="406" y="586"/>
+      <point x="482" y="469"/>
+      <point x="482" y="272" type="curve" smooth="yes"/>
+      <point x="482" y="34"/>
+      <point x="395" y="-92"/>
+      <point x="231" y="-92" type="curve" smooth="yes"/>
+      <point x="180" y="-92"/>
+      <point x="130" y="-79"/>
+      <point x="92" y="-56" type="curve"/>
+      <point x="85" y="-73" type="line"/>
+      <point x="126" y="-97"/>
+      <point x="175" y="-110"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>nine</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>nine</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/nine.tf.glif b/src/Cantarell-Light.ufo/glyphs/nine.tf.glif
index 89afc181..a77f8c98 100644
--- a/src/Cantarell-Light.ufo/glyphs/nine.tf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nine.tf.glif
@@ -2,46 +2,7 @@
 <glyph name="nine.tf" format="2">
   <advance width="580"/>
   <outline>
-    <contour>
-      <point x="284" y="704" type="curve" smooth="yes"/>
-      <point x="165" y="704"/>
-      <point x="83" y="617"/>
-      <point x="83" y="488" type="curve" smooth="yes"/>
-      <point x="83" y="361"/>
-      <point x="163" y="284"/>
-      <point x="281" y="284" type="curve" smooth="yes"/>
-      <point x="377" y="284"/>
-      <point x="452" y="333"/>
-      <point x="498" y="424" type="curve"/>
-      <point x="498" y="455" type="line"/>
-      <point x="454" y="357"/>
-      <point x="378" y="302"/>
-      <point x="283" y="302" type="curve" smooth="yes"/>
-      <point x="178" y="302"/>
-      <point x="104" y="372"/>
-      <point x="104" y="491" type="curve" smooth="yes"/>
-      <point x="104" y="608"/>
-      <point x="176" y="686"/>
-      <point x="283" y="686" type="curve" smooth="yes"/>
-      <point x="413" y="686"/>
-      <point x="489" y="569"/>
-      <point x="489" y="372" type="curve" smooth="yes"/>
-      <point x="489" y="134"/>
-      <point x="402" y="8"/>
-      <point x="240" y="8" type="curve" smooth="yes"/>
-      <point x="188" y="8"/>
-      <point x="140" y="21"/>
-      <point x="102" y="44" type="curve"/>
-      <point x="95" y="27" type="line"/>
-      <point x="136" y="3"/>
-      <point x="184" y="-10"/>
-      <point x="238" y="-10" type="curve" smooth="yes"/>
-      <point x="415" y="-10"/>
-      <point x="510" y="124"/>
-      <point x="510" y="375" type="curve" smooth="yes"/>
-      <point x="510" y="581"/>
-      <point x="426" y="704"/>
-    </contour>
+    <component base="nine" xOffset="14"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/nineinferior.glif 
b/src/Cantarell-Light.ufo/glyphs/nineinferior.glif
index 038898bb..ed0ca826 100644
--- a/src/Cantarell-Light.ufo/glyphs/nineinferior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nineinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nineinferior" format="2">
-  <advance width="432"/>
+  <advance width="395"/>
   <unicode hex="2089"/>
   <outline>
     <component base="nine.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ninesuperior.glif 
b/src/Cantarell-Light.ufo/glyphs/ninesuperior.glif
index ebac63ba..bc2b4192 100644
--- a/src/Cantarell-Light.ufo/glyphs/ninesuperior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ninesuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ninesuperior" format="2">
-  <advance width="432"/>
+  <advance width="395"/>
   <unicode hex="2079"/>
   <outline>
     <component base="nine.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/nj.glif b/src/Cantarell-Light.ufo/glyphs/nj.glif
index b2b1f677..3a2a24f0 100644
--- a/src/Cantarell-Light.ufo/glyphs/nj.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nj.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nj" format="2">
-  <advance width="727"/>
+  <advance width="798"/>
   <unicode hex="01CC"/>
   <outline>
     <component base="n"/>
-    <component base="j" xOffset="525"/>
+    <component base="j" xOffset="563"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/nje-cy.glif b/src/Cantarell-Light.ufo/glyphs/nje-cy.glif
index 94732871..42fc7573 100644
--- a/src/Cantarell-Light.ufo/glyphs/nje-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nje-cy.glif
@@ -1,45 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nje-cy" format="2">
-  <advance width="805"/>
+  <advance width="839"/>
   <unicode hex="045A"/>
   <outline>
     <contour>
-      <point x="420" y="0" type="line"/>
-      <point x="441" y="0" type="line"/>
-      <point x="441" y="480" type="line"/>
-      <point x="420" y="480" type="line"/>
+      <point x="451" y="0" type="line"/>
+      <point x="603" y="0" type="line" smooth="yes"/>
+      <point x="716" y="0"/>
+      <point x="781" y="48"/>
+      <point x="781" y="135" type="curve" smooth="yes"/>
+      <point x="781" y="214"/>
+      <point x="725" y="262"/>
+      <point x="629" y="262" type="curve" smooth="yes"/>
+      <point x="454" y="262" type="line"/>
+      <point x="454" y="245" type="line"/>
+      <point x="622" y="245" type="line" smooth="yes"/>
+      <point x="708" y="245"/>
+      <point x="759" y="202"/>
+      <point x="759" y="131" type="curve" smooth="yes"/>
+      <point x="759" y="57"/>
+      <point x="706" y="17"/>
+      <point x="612" y="17" type="curve" smooth="yes"/>
+      <point x="451" y="17" type="line"/>
     </contour>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="109" y="0" type="line"/>
-      <point x="109" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="100" y="245" type="line"/>
-      <point x="428" y="245" type="line"/>
-      <point x="428" y="262" type="line"/>
-      <point x="100" y="262" type="line"/>
+      <point x="119" y="245" type="line"/>
+      <point x="447" y="245" type="line"/>
+      <point x="447" y="262" type="line"/>
+      <point x="119" y="262" type="line"/>
     </contour>
     <contour>
-      <point x="432" y="0" type="line"/>
-      <point x="584" y="0" type="line" smooth="yes"/>
-      <point x="695" y="0"/>
-      <point x="762" y="56"/>
-      <point x="762" y="150" type="curve" smooth="yes"/>
-      <point x="762" y="241"/>
-      <point x="701" y="301"/>
-      <point x="610" y="301" type="curve" smooth="yes"/>
-      <point x="435" y="301" type="line"/>
-      <point x="435" y="284" type="line"/>
-      <point x="603" y="284" type="line" smooth="yes"/>
-      <point x="684" y="284"/>
-      <point x="740" y="228"/>
-      <point x="740" y="145" type="curve" smooth="yes"/>
-      <point x="740" y="65"/>
-      <point x="685" y="17"/>
-      <point x="593" y="17" type="curve" smooth="yes"/>
-      <point x="432" y="17" type="line"/>
+      <point x="439" y="0" type="line"/>
+      <point x="460" y="0" type="line"/>
+      <point x="460" y="480" type="line"/>
+      <point x="439" y="480" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>softsign-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/nlinebelow.glif b/src/Cantarell-Light.ufo/glyphs/nlinebelow.glif
index 02f4c085..cc54a474 100644
--- a/src/Cantarell-Light.ufo/glyphs/nlinebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nlinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nlinebelow" format="2">
-  <advance width="525"/>
+  <advance width="563"/>
   <unicode hex="1E49"/>
   <outline>
     <component base="n"/>
-    <component base="macronbelowcomb" xOffset="16"/>
+    <component base="macronbelowcomb" xOffset="35"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/notequal.glif b/src/Cantarell-Light.ufo/glyphs/notequal.glif
index 28addd3c..199adc38 100644
--- a/src/Cantarell-Light.ufo/glyphs/notequal.glif
+++ b/src/Cantarell-Light.ufo/glyphs/notequal.glif
@@ -1,25 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="notequal" format="2">
-  <advance width="615"/>
+  <advance width="580"/>
   <unicode hex="2260"/>
   <outline>
     <contour>
-      <point x="95" y="442" type="line"/>
-      <point x="520" y="442" type="line"/>
-      <point x="520" y="459" type="line"/>
-      <point x="95" y="459" type="line"/>
+      <point x="182" y="76" type="line"/>
+      <point x="419" y="559" type="line"/>
+      <point x="406" y="568" type="line"/>
+      <point x="169" y="85" type="line"/>
     </contour>
     <contour>
-      <point x="194" y="86" type="line"/>
-      <point x="443" y="569" type="line"/>
-      <point x="430" y="578" type="line"/>
-      <point x="181" y="95" type="line"/>
+      <point x="60" y="193" type="line"/>
+      <point x="520" y="193" type="line"/>
+      <point x="520" y="210" type="line"/>
+      <point x="60" y="210" type="line"/>
     </contour>
     <contour>
-      <point x="95" y="202" type="line"/>
-      <point x="520" y="202" type="line"/>
-      <point x="520" y="219" type="line"/>
-      <point x="95" y="219" type="line"/>
+      <point x="60" y="436" type="line"/>
+      <point x="520" y="436" type="line"/>
+      <point x="520" y="453" type="line"/>
+      <point x="60" y="453" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minus</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/notidentical.glif 
b/src/Cantarell-Light.ufo/glyphs/notidentical.glif
index 2049f972..da6ac24d 100644
--- a/src/Cantarell-Light.ufo/glyphs/notidentical.glif
+++ b/src/Cantarell-Light.ufo/glyphs/notidentical.glif
@@ -1,31 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="notidentical" format="2">
-  <advance width="637"/>
+  <advance width="580"/>
   <unicode hex="2262"/>
   <outline>
     <contour>
-      <point x="176" y="58" type="line"/>
-      <point x="484" y="602" type="line"/>
-      <point x="471" y="611" type="line"/>
-      <point x="163" y="67" type="line"/>
+      <point x="159" y="63" type="line"/>
+      <point x="441" y="607" type="line"/>
+      <point x="429" y="616" type="line"/>
+      <point x="146" y="72" type="line"/>
     </contour>
     <contour>
-      <point x="106" y="497" type="line"/>
-      <point x="531" y="497" type="line"/>
-      <point x="531" y="514" type="line"/>
-      <point x="106" y="514" type="line"/>
+      <point x="60" y="158" type="line"/>
+      <point x="520" y="158" type="line"/>
+      <point x="520" y="175" type="line"/>
+      <point x="60" y="175" type="line"/>
     </contour>
     <contour>
-      <point x="106" y="153" type="line"/>
-      <point x="531" y="153" type="line"/>
-      <point x="531" y="170" type="line"/>
-      <point x="106" y="170" type="line"/>
+      <point x="60" y="330" type="line"/>
+      <point x="520" y="330" type="line"/>
+      <point x="520" y="347" type="line"/>
+      <point x="60" y="347" type="line"/>
     </contour>
     <contour>
-      <point x="106" y="325" type="line"/>
-      <point x="531" y="325" type="line"/>
-      <point x="531" y="342" type="line"/>
-      <point x="106" y="342" type="line"/>
+      <point x="60" y="502" type="line"/>
+      <point x="520" y="502" type="line"/>
+      <point x="520" y="519" type="line"/>
+      <point x="60" y="519" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minus</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ntilde.glif b/src/Cantarell-Light.ufo/glyphs/ntilde.glif
index 94a6f533..81e8eb83 100644
--- a/src/Cantarell-Light.ufo/glyphs/ntilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ntilde" format="2">
-  <advance width="525"/>
+  <advance width="563"/>
   <unicode hex="00F1"/>
   <outline>
     <component base="n"/>
-    <component base="tildecomb" xOffset="27"/>
+    <component base="tildecomb" xOffset="46"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/numbersign.glif b/src/Cantarell-Light.ufo/glyphs/numbersign.glif
index 77c14380..9b0d0820 100644
--- a/src/Cantarell-Light.ufo/glyphs/numbersign.glif
+++ b/src/Cantarell-Light.ufo/glyphs/numbersign.glif
@@ -1,31 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="numbersign" format="2">
-  <advance width="624"/>
+  <advance width="638"/>
   <unicode hex="0023"/>
   <outline>
     <contour>
-      <point x="418" y="0" type="line"/>
-      <point x="438" y="0" type="line"/>
-      <point x="438" y="694" type="line"/>
-      <point x="418" y="694" type="line"/>
+      <point x="425" y="0" type="line"/>
+      <point x="445" y="0" type="line"/>
+      <point x="444" y="694" type="line"/>
+      <point x="424" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="39" y="206" type="line"/>
-      <point x="585" y="206" type="line"/>
-      <point x="585" y="222" type="line"/>
-      <point x="39" y="222" type="line"/>
+      <point x="46" y="215" type="line"/>
+      <point x="592" y="215" type="line"/>
+      <point x="592" y="233" type="line"/>
+      <point x="46" y="233" type="line"/>
     </contour>
     <contour>
-      <point x="189" y="0" type="line"/>
-      <point x="209" y="0" type="line"/>
-      <point x="209" y="694" type="line"/>
-      <point x="189" y="694" type="line"/>
+      <point x="196" y="0" type="line"/>
+      <point x="216" y="0" type="line"/>
+      <point x="215" y="694" type="line"/>
+      <point x="195" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="39" y="476" type="line"/>
-      <point x="585" y="476" type="line"/>
-      <point x="585" y="492" type="line"/>
-      <point x="39" y="492" type="line"/>
+      <point x="46" y="479" type="line"/>
+      <point x="592" y="479" type="line"/>
+      <point x="592" y="497" type="line"/>
+      <point x="46" y="497" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/numero.glif b/src/Cantarell-Light.ufo/glyphs/numero.glif
index 58b8a79f..e3739c27 100644
--- a/src/Cantarell-Light.ufo/glyphs/numero.glif
+++ b/src/Cantarell-Light.ufo/glyphs/numero.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="numero" format="2">
-  <advance width="1279"/>
+  <advance width="1216"/>
   <unicode hex="2116"/>
   <outline>
-    <component base="N" xOffset="26"/>
-    <component base="_o.numero" xOffset="693"/>
+    <component base="N"/>
+    <component base="ordmasculine" xOffset="758"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
-        <integer>-1</integer>
         <integer>0</integer>
+        <integer>1</integer>
       </array>
     </dict>
   </lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/o-cy.glif b/src/Cantarell-Light.ufo/glyphs/o-cy.glif
index 5f3f47d6..a0ccb722 100644
--- a/src/Cantarell-Light.ufo/glyphs/o-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/o-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="o-cy" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="043E"/>
-  <anchor x="268" y="480" name="top"/>
   <outline>
     <component base="o"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/o.glif b/src/Cantarell-Light.ufo/glyphs/o.glif
index e9ce6b93..5c8716b7 100644
--- a/src/Cantarell-Light.ufo/glyphs/o.glif
+++ b/src/Cantarell-Light.ufo/glyphs/o.glif
@@ -1,43 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="o" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="006F"/>
-  <note>
-o
-</note>
-  <anchor x="269" y="0" name="bottom"/>
-  <anchor x="269" y="240" name="center"/>
-  <anchor x="353" y="10" name="ogonek"/>
-  <anchor x="259" y="480" name="top"/>
-  <anchor x="494" y="480" name="topright"/>
+  <anchor x="280" y="0" name="bottom"/>
+  <anchor x="280" y="240" name="center"/>
+  <anchor x="364" y="10" name="ogonek"/>
+  <anchor x="270" y="480" name="top"/>
+  <anchor x="505" y="480" name="topright"/>
   <outline>
     <contour>
-      <point x="268" y="-10" type="curve" smooth="yes"/>
-      <point x="393" y="-10"/>
-      <point x="478" y="90"/>
-      <point x="478" y="240" type="curve" smooth="yes"/>
-      <point x="478" y="389"/>
-      <point x="394" y="486"/>
-      <point x="270" y="486" type="curve" smooth="yes"/>
-      <point x="142" y="486"/>
-      <point x="57" y="386"/>
-      <point x="57" y="237" type="curve" smooth="yes"/>
-      <point x="57" y="89"/>
-      <point x="141" y="-10"/>
+      <point x="279" y="-10" type="curve" smooth="yes"/>
+      <point x="404" y="-10"/>
+      <point x="489" y="90"/>
+      <point x="489" y="240" type="curve" smooth="yes"/>
+      <point x="489" y="389"/>
+      <point x="405" y="486"/>
+      <point x="281" y="486" type="curve" smooth="yes"/>
+      <point x="153" y="486"/>
+      <point x="68" y="386"/>
+      <point x="68" y="237" type="curve" smooth="yes"/>
+      <point x="68" y="89"/>
+      <point x="152" y="-10"/>
     </contour>
     <contour>
-      <point x="270" y="8" type="curve" smooth="yes"/>
-      <point x="153" y="8"/>
-      <point x="78" y="101"/>
-      <point x="78" y="239" type="curve" smooth="yes"/>
-      <point x="78" y="374"/>
-      <point x="150" y="468"/>
-      <point x="265" y="468" type="curve" smooth="yes"/>
-      <point x="381" y="468"/>
-      <point x="457" y="378"/>
-      <point x="457" y="237" type="curve" smooth="yes"/>
-      <point x="457" y="97"/>
-      <point x="382" y="8"/>
+      <point x="281" y="8" type="curve" smooth="yes"/>
+      <point x="164" y="8"/>
+      <point x="89" y="101"/>
+      <point x="89" y="239" type="curve" smooth="yes"/>
+      <point x="89" y="374"/>
+      <point x="161" y="468"/>
+      <point x="276" y="468" type="curve" smooth="yes"/>
+      <point x="392" y="468"/>
+      <point x="468" y="378"/>
+      <point x="468" y="237" type="curve" smooth="yes"/>
+      <point x="468" y="97"/>
+      <point x="393" y="8"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/oacute.glif b/src/Cantarell-Light.ufo/glyphs/oacute.glif
index e97f7030..8c625784 100644
--- a/src/Cantarell-Light.ufo/glyphs/oacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oacute" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="00F3"/>
   <outline>
     <component base="o"/>
-    <component base="acutecomb" xOffset="192"/>
+    <component base="acutecomb" xOffset="203"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/obarred-cy.glif b/src/Cantarell-Light.ufo/glyphs/obarred-cy.glif
index 7dfa855a..13135520 100644
--- a/src/Cantarell-Light.ufo/glyphs/obarred-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/obarred-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="obarred-cy" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="04E9"/>
   <outline>
     <component base="o"/>
-    <component base="strokeshortcomb" xScale="1.71042" xOffset="-143" yOffset="-59"/>
+    <component base="strokeshortcomb" xScale="1.71042" xOffset="-132" yOffset="-59"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/obreve.glif b/src/Cantarell-Light.ufo/glyphs/obreve.glif
index 62d03472..3e5a4bda 100644
--- a/src/Cantarell-Light.ufo/glyphs/obreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/obreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="obreve" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="014F"/>
   <outline>
     <component base="o"/>
-    <component base="brevecomb" xOffset="73"/>
+    <component base="brevecomb" xOffset="84"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ocaron.glif b/src/Cantarell-Light.ufo/glyphs/ocaron.glif
index c1065ed8..ff995219 100644
--- a/src/Cantarell-Light.ufo/glyphs/ocaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ocaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocaron" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="01D2"/>
   <outline>
     <component base="o"/>
-    <component base="caroncomb" xOffset="76"/>
+    <component base="caroncomb" xOffset="87"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ocircumflex.glif b/src/Cantarell-Light.ufo/glyphs/ocircumflex.glif
index fbe33c31..1f7a2284 100644
--- a/src/Cantarell-Light.ufo/glyphs/ocircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ocircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflex" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="00F4"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb" xOffset="88"/>
+    <component base="circumflexcomb" xOffset="99"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ocircumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/ocircumflexacute.glif
index baeb5b19..458f2122 100644
--- a/src/Cantarell-Light.ufo/glyphs/ocircumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ocircumflexacute.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflexacute" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="1ED1"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb_acutecomb" xOffset="83"/>
+    <component base="circumflexcomb.loclVIET" xOffset="94"/>
+    <component base="acutecomb.loclVIET" xOffset="313" yOffset="74"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ocircumflexdotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/ocircumflexdotbelow.glif
index 4ed1314c..14e6c91a 100644
--- a/src/Cantarell-Light.ufo/glyphs/ocircumflexdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ocircumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflexdotbelow" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="1ED9"/>
   <outline>
     <component base="o"/>
-    <component base="dotbelowcomb" xOffset="149"/>
-    <component base="circumflexcomb" xOffset="88"/>
+    <component base="dotbelowcomb" xOffset="160"/>
+    <component base="circumflexcomb" xOffset="99"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ocircumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/ocircumflexgrave.glif
index 04e0012b..4f3567b2 100644
--- a/src/Cantarell-Light.ufo/glyphs/ocircumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ocircumflexgrave.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflexgrave" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="1ED3"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb_gravecomb" xOffset="83"/>
+    <component base="circumflexcomb.loclVIET" xOffset="94"/>
+    <component base="gravecomb.loclVIET" xOffset="209" yOffset="74"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ocircumflexhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/ocircumflexhookabove.glif
index 1f3bb609..fe66c21f 100644
--- a/src/Cantarell-Light.ufo/glyphs/ocircumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ocircumflexhookabove.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflexhookabove" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="1ED5"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb_hookabovecomb" xOffset="97"/>
+    <component base="circumflexcomb.loclVIET" xOffset="94"/>
+    <component base="hookabovecomb.loclVIET" xOffset="240" yOffset="74"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ocircumflextilde.glif 
b/src/Cantarell-Light.ufo/glyphs/ocircumflextilde.glif
index 537fcbb1..ce26aba0 100644
--- a/src/Cantarell-Light.ufo/glyphs/ocircumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ocircumflextilde.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflextilde" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="1ED7"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb_tildecomb" xOffset="44"/>
+    <component base="circumflexcomb.loclVIET" xOffset="94"/>
+    <component base="tildecomb.loclVIET" xOffset="43" yOffset="80"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>tildecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/odblgrave.glif b/src/Cantarell-Light.ufo/glyphs/odblgrave.glif
index 3d158a47..1c25306c 100644
--- a/src/Cantarell-Light.ufo/glyphs/odblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/odblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odblgrave" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="020D"/>
   <outline>
     <component base="o"/>
-    <component base="dblgravecomb" xOffset="7"/>
+    <component base="dblgravecomb" xOffset="18"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/odieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/odieresis-cy.glif
index 77a09b22..cc88b69b 100644
--- a/src/Cantarell-Light.ufo/glyphs/odieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/odieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odieresis-cy" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="04E7"/>
   <outline>
     <component base="o-cy"/>
-    <component base="dieresiscomb" xOffset="49"/>
+    <component base="dieresiscomb" xOffset="51"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/odieresis.glif b/src/Cantarell-Light.ufo/glyphs/odieresis.glif
index 78766f89..e3295cdb 100644
--- a/src/Cantarell-Light.ufo/glyphs/odieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/odieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odieresis" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="00F6"/>
   <outline>
     <component base="o"/>
-    <component base="dieresiscomb" xOffset="40"/>
+    <component base="dieresiscomb" xOffset="51"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/odieresismacron.glif 
b/src/Cantarell-Light.ufo/glyphs/odieresismacron.glif
index 29a9c81d..41f822c7 100644
--- a/src/Cantarell-Light.ufo/glyphs/odieresismacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/odieresismacron.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odieresismacron" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="022B"/>
   <outline>
     <component base="o"/>
-    <component base="dieresiscomb_macroncomb" xOffset="40"/>
+    <component base="dieresiscomb.loclVIET" xOffset="51"/>
+    <component base="macroncomb" xOffset="27" yOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/odotaccentmacron.glif 
b/src/Cantarell-Light.ufo/glyphs/odotaccentmacron.glif
index a75c079c..ca605c02 100644
--- a/src/Cantarell-Light.ufo/glyphs/odotaccentmacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/odotaccentmacron.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odotaccentmacron" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="0231"/>
   <outline>
     <component base="o"/>
-    <component base="dotaccentcomb_macroncomb" xOffset="-14"/>
+    <component base="dotaccentcomb.loclVIET" xOffset="151"/>
+    <component base="macroncomb" xOffset="27" yOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/odotbelow.glif b/src/Cantarell-Light.ufo/glyphs/odotbelow.glif
index 8d43064e..cfe3a3e5 100644
--- a/src/Cantarell-Light.ufo/glyphs/odotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/odotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odotbelow" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="1ECD"/>
   <outline>
     <component base="o"/>
-    <component base="dotbelowcomb" xOffset="149"/>
+    <component base="dotbelowcomb" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/oe.glif b/src/Cantarell-Light.ufo/glyphs/oe.glif
index ee059ae9..59e3e870 100644
--- a/src/Cantarell-Light.ufo/glyphs/oe.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oe.glif
@@ -1,70 +1,70 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oe" format="2">
-  <advance width="894"/>
+  <advance width="921"/>
   <unicode hex="0153"/>
-  <anchor x="449" y="0" name="bottom"/>
-  <anchor x="449" y="480" name="top"/>
+  <anchor x="460" y="0" name="bottom"/>
+  <anchor x="460" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="268" y="-10" type="curve" smooth="yes"/>
-      <point x="393" y="-10"/>
-      <point x="472" y="90"/>
-      <point x="472" y="240" type="curve" smooth="yes"/>
-      <point x="472" y="389"/>
-      <point x="394" y="486"/>
-      <point x="270" y="486" type="curve" smooth="yes"/>
-      <point x="142" y="486"/>
-      <point x="57" y="386"/>
-      <point x="57" y="237" type="curve" smooth="yes"/>
-      <point x="57" y="89"/>
-      <point x="141" y="-10"/>
+      <point x="279" y="-10" type="curve" smooth="yes"/>
+      <point x="404" y="-10"/>
+      <point x="483" y="90"/>
+      <point x="483" y="240" type="curve" smooth="yes"/>
+      <point x="483" y="389"/>
+      <point x="405" y="486"/>
+      <point x="281" y="486" type="curve" smooth="yes"/>
+      <point x="153" y="486"/>
+      <point x="68" y="386"/>
+      <point x="68" y="237" type="curve" smooth="yes"/>
+      <point x="68" y="89"/>
+      <point x="152" y="-10"/>
     </contour>
     <contour>
-      <point x="270" y="8" type="curve" smooth="yes"/>
-      <point x="153" y="8"/>
-      <point x="78" y="101"/>
-      <point x="78" y="239" type="curve" smooth="yes"/>
-      <point x="78" y="374"/>
-      <point x="150" y="468"/>
-      <point x="265" y="468" type="curve" smooth="yes"/>
-      <point x="381" y="468"/>
-      <point x="457" y="378"/>
-      <point x="457" y="237" type="curve" smooth="yes"/>
-      <point x="457" y="97"/>
-      <point x="382" y="8"/>
+      <point x="281" y="8" type="curve" smooth="yes"/>
+      <point x="164" y="8"/>
+      <point x="89" y="101"/>
+      <point x="89" y="239" type="curve" smooth="yes"/>
+      <point x="89" y="374"/>
+      <point x="161" y="468"/>
+      <point x="276" y="468" type="curve" smooth="yes"/>
+      <point x="392" y="468"/>
+      <point x="468" y="378"/>
+      <point x="468" y="237" type="curve" smooth="yes"/>
+      <point x="468" y="97"/>
+      <point x="393" y="8"/>
     </contour>
     <contour>
-      <point x="683" y="-10" type="curve" smooth="yes"/>
-      <point x="735" y="-10"/>
-      <point x="784" y="3"/>
-      <point x="824" y="30" type="curve"/>
-      <point x="819" y="44" type="line"/>
-      <point x="776" y="19"/>
-      <point x="731" y="6"/>
-      <point x="685" y="6" type="curve" smooth="yes"/>
-      <point x="558" y="6"/>
-      <point x="480" y="95"/>
-      <point x="480" y="241" type="curve" smooth="yes"/>
-      <point x="480" y="382"/>
-      <point x="547" y="468"/>
-      <point x="657" y="468" type="curve" smooth="yes"/>
-      <point x="761" y="468"/>
-      <point x="826" y="388"/>
-      <point x="826" y="261" type="curve"/>
-      <point x="468" y="261" type="line"/>
-      <point x="468" y="244" type="line"/>
-      <point x="846" y="244" type="line"/>
-      <point x="847" y="251"/>
-      <point x="847" y="256"/>
-      <point x="847" y="264" type="curve" smooth="yes"/>
-      <point x="847" y="396"/>
-      <point x="771" y="486"/>
-      <point x="659" y="486" type="curve" smooth="yes"/>
-      <point x="538" y="486"/>
-      <point x="461" y="387"/>
-      <point x="461" y="239" type="curve" smooth="yes"/>
-      <point x="461" y="87"/>
-      <point x="546" y="-10"/>
+      <point x="694" y="-10" type="curve" smooth="yes"/>
+      <point x="746" y="-10"/>
+      <point x="795" y="3"/>
+      <point x="835" y="30" type="curve"/>
+      <point x="830" y="44" type="line"/>
+      <point x="787" y="19"/>
+      <point x="742" y="6"/>
+      <point x="696" y="6" type="curve" smooth="yes"/>
+      <point x="569" y="6"/>
+      <point x="491" y="95"/>
+      <point x="491" y="241" type="curve" smooth="yes"/>
+      <point x="491" y="382"/>
+      <point x="558" y="468"/>
+      <point x="668" y="468" type="curve" smooth="yes"/>
+      <point x="772" y="468"/>
+      <point x="837" y="388"/>
+      <point x="837" y="261" type="curve"/>
+      <point x="479" y="261" type="line"/>
+      <point x="479" y="244" type="line"/>
+      <point x="857" y="244" type="line"/>
+      <point x="858" y="251"/>
+      <point x="858" y="256"/>
+      <point x="858" y="264" type="curve" smooth="yes"/>
+      <point x="858" y="396"/>
+      <point x="782" y="486"/>
+      <point x="670" y="486" type="curve" smooth="yes"/>
+      <point x="549" y="486"/>
+      <point x="472" y="387"/>
+      <point x="472" y="239" type="curve" smooth="yes"/>
+      <point x="472" y="87"/>
+      <point x="557" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/ogonek.glif b/src/Cantarell-Light.ufo/glyphs/ogonek.glif
index 401eb8b9..a7195add 100644
--- a/src/Cantarell-Light.ufo/glyphs/ogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ogonek.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ogonek" format="2">
-  <advance width="600"/>
+  <advance width="500"/>
   <unicode hex="02DB"/>
   <outline>
-    <component base="ogonekcomb"/>
+    <component base="ogonekcomb" xOffset="-74"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ograve.glif b/src/Cantarell-Light.ufo/glyphs/ograve.glif
index d56d80be..dc618d6d 100644
--- a/src/Cantarell-Light.ufo/glyphs/ograve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ograve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ograve" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="00F2"/>
   <outline>
     <component base="o"/>
-    <component base="gravecomb" xOffset="75"/>
+    <component base="gravecomb" xOffset="86"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ohookabove.glif b/src/Cantarell-Light.ufo/glyphs/ohookabove.glif
index 64c7039c..46f403a1 100644
--- a/src/Cantarell-Light.ufo/glyphs/ohookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ohookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohookabove" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="1ECF"/>
   <outline>
     <component base="o"/>
-    <component base="hookabovecomb" xOffset="107"/>
+    <component base="hookabovecomb" xOffset="118"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ohorn.glif b/src/Cantarell-Light.ufo/glyphs/ohorn.glif
index 05ec8d0d..dbf4b19a 100644
--- a/src/Cantarell-Light.ufo/glyphs/ohorn.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ohorn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohorn" format="2">
-  <advance width="587"/>
+  <advance width="609"/>
   <unicode hex="01A1"/>
   <outline>
     <component base="o"/>
-    <component base="horncomb" xOffset="362" yOffset="-2"/>
+    <component base="horncomb" xOffset="373" yOffset="-2"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/ohornacute.glif b/src/Cantarell-Light.ufo/glyphs/ohornacute.glif
index d9b8eae3..e1e39d16 100644
--- a/src/Cantarell-Light.ufo/glyphs/ohornacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ohornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohornacute" format="2">
-  <advance width="587"/>
+  <advance width="609"/>
   <unicode hex="1EDB"/>
   <outline>
     <component base="ohorn"/>
-    <component base="acutecomb" xOffset="192"/>
+    <component base="acutecomb" xOffset="203"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ohorndotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/ohorndotbelow.glif
index 984a6972..980050b8 100644
--- a/src/Cantarell-Light.ufo/glyphs/ohorndotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ohorndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohorndotbelow" format="2">
-  <advance width="587"/>
+  <advance width="609"/>
   <unicode hex="1EE3"/>
   <outline>
     <component base="ohorn"/>
-    <component base="dotbelowcomb" xOffset="149"/>
+    <component base="dotbelowcomb" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ohorngrave.glif b/src/Cantarell-Light.ufo/glyphs/ohorngrave.glif
index af437a80..17e49f09 100644
--- a/src/Cantarell-Light.ufo/glyphs/ohorngrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ohorngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohorngrave" format="2">
-  <advance width="587"/>
+  <advance width="609"/>
   <unicode hex="1EDD"/>
   <outline>
     <component base="ohorn"/>
-    <component base="gravecomb" xOffset="75"/>
+    <component base="gravecomb" xOffset="86"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ohornhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/ohornhookabove.glif
index d00e97bf..b1826461 100644
--- a/src/Cantarell-Light.ufo/glyphs/ohornhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ohornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohornhookabove" format="2">
-  <advance width="587"/>
+  <advance width="609"/>
   <unicode hex="1EDF"/>
   <outline>
     <component base="ohorn"/>
-    <component base="hookabovecomb" xOffset="107"/>
+    <component base="hookabovecomb" xOffset="118"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ohorntilde.glif b/src/Cantarell-Light.ufo/glyphs/ohorntilde.glif
index f0e1faa6..8d5a3450 100644
--- a/src/Cantarell-Light.ufo/glyphs/ohorntilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ohorntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohorntilde" format="2">
-  <advance width="587"/>
+  <advance width="609"/>
   <unicode hex="1EE1"/>
   <outline>
     <component base="ohorn"/>
-    <component base="tildecomb" xOffset="24"/>
+    <component base="tildecomb" xOffset="35"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ohungarumlaut.glif 
b/src/Cantarell-Light.ufo/glyphs/ohungarumlaut.glif
index 29018228..5a7b87a5 100644
--- a/src/Cantarell-Light.ufo/glyphs/ohungarumlaut.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ohungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohungarumlaut" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="0151"/>
   <outline>
     <component base="o"/>
-    <component base="hungarumlautcomb" xOffset="118"/>
+    <component base="hungarumlautcomb" xOffset="129"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/oinvertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/oinvertedbreve.glif
index c012d5ab..0a393c19 100644
--- a/src/Cantarell-Light.ufo/glyphs/oinvertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oinvertedbreve" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="020F"/>
   <outline>
     <component base="o"/>
-    <component base="breveinvertedcomb" xOffset="58"/>
+    <component base="breveinvertedcomb" xOffset="69"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omacron.glif b/src/Cantarell-Light.ufo/glyphs/omacron.glif
index 84e16d19..e4097f1e 100644
--- a/src/Cantarell-Light.ufo/glyphs/omacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omacron" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="014D"/>
   <outline>
     <component base="o"/>
-    <component base="macroncomb" xOffset="16"/>
+    <component base="macroncomb" xOffset="27"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omacronacute.glif 
b/src/Cantarell-Light.ufo/glyphs/omacronacute.glif
index a927e03d..6e86b509 100644
--- a/src/Cantarell-Light.ufo/glyphs/omacronacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omacronacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omacronacute" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="1E53"/>
   <outline>
     <component base="o"/>
-    <component base="macroncomb_acutecomb" xOffset="21"/>
+    <component base="macroncomb.loclVIET" xOffset="32"/>
+    <component base="acutecomb" xOffset="203" yOffset="69"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omacrongrave.glif 
b/src/Cantarell-Light.ufo/glyphs/omacrongrave.glif
index 427138b4..0083ba2a 100644
--- a/src/Cantarell-Light.ufo/glyphs/omacrongrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omacrongrave.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omacrongrave" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="1E51"/>
   <outline>
     <component base="o"/>
-    <component base="macroncomb_gravecomb" xOffset="21"/>
+    <component base="macroncomb.loclVIET" xOffset="32"/>
+    <component base="gravecomb" xOffset="86" yOffset="69"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/one.dnom.glif b/src/Cantarell-Light.ufo/glyphs/one.dnom.glif
index ce1cd8e8..8efb782b 100644
--- a/src/Cantarell-Light.ufo/glyphs/one.dnom.glif
+++ b/src/Cantarell-Light.ufo/glyphs/one.dnom.glif
@@ -1,25 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.dnom" format="2">
-  <advance width="276"/>
-  <note>
-one
-</note>
+  <advance width="230"/>
   <outline>
     <contour>
-      <point x="141" y="11" type="line"/>
-      <point x="162" y="11" type="line"/>
-      <point x="162" y="472" type="line"/>
-      <point x="150" y="472" type="line"/>
-      <point x="34" y="394" type="line"/>
-      <point x="42" y="380" type="line"/>
-      <point x="149" y="449" type="line"/>
-      <point x="141" y="455" type="line"/>
-    </contour>
-    <contour>
-      <point x="37" y="0" type="line"/>
-      <point x="256" y="0" type="line"/>
-      <point x="256" y="18" type="line"/>
-      <point x="37" y="18" type="line"/>
+      <point x="138" y="-2" type="line"/>
+      <point x="159" y="-2" type="line"/>
+      <point x="159" y="416" type="line"/>
+      <point x="146" y="416" type="line"/>
+      <point x="2" y="343" type="line"/>
+      <point x="10" y="328" type="line"/>
+      <point x="146" y="393" type="line"/>
+      <point x="138" y="399" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -27,11 +18,11 @@ one
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>68</integer>
+        <integer>60</integer>
         <key>weight</key>
-        <integer>1</integer>
+        <integer>2</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>63</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/one.glif b/src/Cantarell-Light.ufo/glyphs/one.glif
index a945596f..705de2fe 100644
--- a/src/Cantarell-Light.ufo/glyphs/one.glif
+++ b/src/Cantarell-Light.ufo/glyphs/one.glif
@@ -1,23 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one" format="2">
-  <advance width="379"/>
+  <advance width="420"/>
   <unicode hex="0031"/>
   <outline>
     <contour>
-      <point x="187" y="7" type="line"/>
-      <point x="207" y="7" type="line"/>
-      <point x="207" y="694" type="line"/>
-      <point x="195" y="694" type="line"/>
-      <point x="44" y="581" type="line"/>
-      <point x="52" y="569" type="line"/>
-      <point x="195" y="672" type="line"/>
-      <point x="187" y="677" type="line"/>
-    </contour>
-    <contour>
-      <point x="45" y="0" type="line"/>
-      <point x="344" y="0" type="line"/>
-      <point x="344" y="17" type="line"/>
-      <point x="45" y="17" type="line"/>
+      <point x="266" y="-2" type="line"/>
+      <point x="285" y="-2" type="line"/>
+      <point x="285" y="694" type="line"/>
+      <point x="273" y="694" type="line"/>
+      <point x="50" y="573" type="line"/>
+      <point x="57" y="560" type="line"/>
+      <point x="274" y="672" type="line"/>
+      <point x="266" y="677" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/one.numr.glif b/src/Cantarell-Light.ufo/glyphs/one.numr.glif
index 580548d8..03026a02 100644
--- a/src/Cantarell-Light.ufo/glyphs/one.numr.glif
+++ b/src/Cantarell-Light.ufo/glyphs/one.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.numr" format="2">
-  <advance width="276"/>
+  <advance width="230"/>
   <outline>
     <component base="one.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/one.osf.glif b/src/Cantarell-Light.ufo/glyphs/one.osf.glif
index f985b908..5a97460e 100644
--- a/src/Cantarell-Light.ufo/glyphs/one.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/one.osf.glif
@@ -1,22 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.osf" format="2">
-  <advance width="378"/>
+  <advance width="420"/>
   <outline>
     <contour>
-      <point x="191" y="8" type="line"/>
-      <point x="211" y="8" type="line"/>
-      <point x="211" y="594" type="line"/>
-      <point x="199" y="594" type="line"/>
-      <point x="48" y="497" type="line"/>
-      <point x="56" y="484" type="line"/>
-      <point x="199" y="572" type="line"/>
-      <point x="191" y="577" type="line"/>
-    </contour>
-    <contour>
-      <point x="49" y="0" type="line"/>
-      <point x="338" y="0" type="line"/>
-      <point x="338" y="17" type="line"/>
-      <point x="49" y="17" type="line"/>
+      <point x="266" y="-2" type="line"/>
+      <point x="285" y="-2" type="line"/>
+      <point x="285" y="594" type="line"/>
+      <point x="273" y="594" type="line"/>
+      <point x="50" y="473" type="line"/>
+      <point x="57" y="460" type="line"/>
+      <point x="274" y="572" type="line"/>
+      <point x="266" y="577" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>one</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>one</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/one.tf.glif b/src/Cantarell-Light.ufo/glyphs/one.tf.glif
index fad9666d..38dd72aa 100644
--- a/src/Cantarell-Light.ufo/glyphs/one.tf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/one.tf.glif
@@ -3,20 +3,20 @@
   <advance width="580"/>
   <outline>
     <contour>
-      <point x="297" y="7" type="line"/>
-      <point x="316" y="7" type="line"/>
-      <point x="316" y="694" type="line"/>
-      <point x="304" y="694" type="line"/>
-      <point x="91" y="581" type="line"/>
-      <point x="99" y="569" type="line"/>
-      <point x="305" y="672" type="line"/>
-      <point x="297" y="677" type="line"/>
+      <point x="302" y="7" type="line"/>
+      <point x="321" y="7" type="line"/>
+      <point x="321" y="694" type="line"/>
+      <point x="309" y="694" type="line"/>
+      <point x="77" y="575" type="line"/>
+      <point x="86" y="563" type="line"/>
+      <point x="310" y="672" type="line"/>
+      <point x="302" y="677" type="line"/>
     </contour>
     <contour>
-      <point x="90" y="0" type="line"/>
-      <point x="501" y="0" type="line"/>
-      <point x="501" y="17" type="line"/>
-      <point x="90" y="17" type="line"/>
+      <point x="87" y="0" type="line"/>
+      <point x="512" y="0" type="line"/>
+      <point x="512" y="17" type="line"/>
+      <point x="87" y="17" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/oneeighth.glif b/src/Cantarell-Light.ufo/glyphs/oneeighth.glif
index 1837afe0..68faf138 100644
--- a/src/Cantarell-Light.ufo/glyphs/oneeighth.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oneeighth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneeighth" format="2">
-  <advance width="1007"/>
+  <advance width="788"/>
   <unicode hex="215B"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="276"/>
-    <component base="eight.dnom" xOffset="576"/>
+    <component base="fraction" xOffset="230"/>
+    <component base="eight.dnom" xOffset="395"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/onefifth.glif b/src/Cantarell-Light.ufo/glyphs/onefifth.glif
index 4c873e63..48006bfc 100644
--- a/src/Cantarell-Light.ufo/glyphs/onefifth.glif
+++ b/src/Cantarell-Light.ufo/glyphs/onefifth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onefifth" format="2">
-  <advance width="976"/>
+  <advance width="762"/>
   <unicode hex="2155"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="276"/>
-    <component base="five.dnom" xOffset="576"/>
+    <component base="fraction" xOffset="230"/>
+    <component base="five.dnom" xOffset="395"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/onefraction.glif b/src/Cantarell-Light.ufo/glyphs/onefraction.glif
index 7f6f70d8..26f166b5 100644
--- a/src/Cantarell-Light.ufo/glyphs/onefraction.glif
+++ b/src/Cantarell-Light.ufo/glyphs/onefraction.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onefraction" format="2">
-  <advance width="576"/>
+  <advance width="395"/>
   <unicode hex="215F"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="276"/>
+    <component base="fraction" xOffset="230"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/onehalf.glif b/src/Cantarell-Light.ufo/glyphs/onehalf.glif
index 7cc64e0c..6becd0c5 100644
--- a/src/Cantarell-Light.ufo/glyphs/onehalf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/onehalf.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onehalf" format="2">
-  <advance width="946"/>
+  <advance width="735"/>
   <unicode hex="00BD"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="276"/>
-    <component base="two.dnom" xOffset="576"/>
+    <component base="fraction" xOffset="230"/>
+    <component base="two.dnom" xOffset="395"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/oneinferior.glif b/src/Cantarell-Light.ufo/glyphs/oneinferior.glif
index 5a894a8b..ee3137b8 100644
--- a/src/Cantarell-Light.ufo/glyphs/oneinferior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oneinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneinferior" format="2">
-  <advance width="276"/>
+  <advance width="230"/>
   <unicode hex="2081"/>
   <outline>
     <component base="one.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/oneninth.glif b/src/Cantarell-Light.ufo/glyphs/oneninth.glif
index ded1c94b..0b44d956 100644
--- a/src/Cantarell-Light.ufo/glyphs/oneninth.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oneninth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneninth" format="2">
-  <advance width="1008"/>
+  <advance width="790"/>
   <unicode hex="2151"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="276"/>
-    <component base="nine.dnom" xOffset="576"/>
+    <component base="fraction" xOffset="230"/>
+    <component base="nine.dnom" xOffset="395"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/onequarter.glif b/src/Cantarell-Light.ufo/glyphs/onequarter.glif
index 20796158..d7ed535d 100644
--- a/src/Cantarell-Light.ufo/glyphs/onequarter.glif
+++ b/src/Cantarell-Light.ufo/glyphs/onequarter.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onequarter" format="2">
-  <advance width="1001"/>
+  <advance width="774"/>
   <unicode hex="00BC"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="276"/>
-    <component base="four.dnom" xOffset="576"/>
+    <component base="fraction" xOffset="230"/>
+    <component base="four.dnom" xOffset="395"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/oneseventh.glif b/src/Cantarell-Light.ufo/glyphs/oneseventh.glif
index 4b3d61fb..84f62796 100644
--- a/src/Cantarell-Light.ufo/glyphs/oneseventh.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oneseventh.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneseventh" format="2">
-  <advance width="943"/>
+  <advance width="720"/>
   <unicode hex="2150"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="276"/>
-    <component base="seven.dnom" xOffset="576"/>
+    <component base="fraction" xOffset="230"/>
+    <component base="seven.dnom" xOffset="395"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/onesixth.glif b/src/Cantarell-Light.ufo/glyphs/onesixth.glif
index 66b1e88f..aab744d0 100644
--- a/src/Cantarell-Light.ufo/glyphs/onesixth.glif
+++ b/src/Cantarell-Light.ufo/glyphs/onesixth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onesixth" format="2">
-  <advance width="1008"/>
+  <advance width="790"/>
   <unicode hex="2159"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="276"/>
-    <component base="six.dnom" xOffset="576"/>
+    <component base="fraction" xOffset="230"/>
+    <component base="six.dnom" xOffset="395"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/onesuperior.glif b/src/Cantarell-Light.ufo/glyphs/onesuperior.glif
index 9d716a78..91f99ba8 100644
--- a/src/Cantarell-Light.ufo/glyphs/onesuperior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/onesuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onesuperior" format="2">
-  <advance width="276"/>
+  <advance width="230"/>
   <unicode hex="00B9"/>
   <outline>
     <component base="one.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/onetenth.glif b/src/Cantarell-Light.ufo/glyphs/onetenth.glif
index 952f09fb..2251a253 100644
--- a/src/Cantarell-Light.ufo/glyphs/onetenth.glif
+++ b/src/Cantarell-Light.ufo/glyphs/onetenth.glif
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onetenth" format="2">
-  <advance width="1301"/>
+  <advance width="1035"/>
   <unicode hex="2152"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="276"/>
-    <component base="one.dnom" xOffset="576"/>
-    <component base="zero.dnom" xOffset="852"/>
+    <component base="fraction" xOffset="230"/>
+    <component base="one.dnom" xOffset="395"/>
+    <component base="zero.dnom" xOffset="625"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/onethird.glif b/src/Cantarell-Light.ufo/glyphs/onethird.glif
index be1084bd..7477d671 100644
--- a/src/Cantarell-Light.ufo/glyphs/onethird.glif
+++ b/src/Cantarell-Light.ufo/glyphs/onethird.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onethird" format="2">
-  <advance width="990"/>
+  <advance width="767"/>
   <unicode hex="2153"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="276"/>
-    <component base="three.dnom" xOffset="576"/>
+    <component base="fraction" xOffset="230"/>
+    <component base="three.dnom" xOffset="395"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/oogonek.glif b/src/Cantarell-Light.ufo/glyphs/oogonek.glif
index b268107d..88d4391e 100644
--- a/src/Cantarell-Light.ufo/glyphs/oogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oogonek" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="01EB"/>
   <outline>
     <component base="o"/>
-    <component base="ogonekcomb.tall" xOffset="-48" yOffset="-1"/>
+    <component base="ogonekcomb.tall" xOffset="-37" yOffset="-1"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/ordfeminine.glif b/src/Cantarell-Light.ufo/glyphs/ordfeminine.glif
index ccbb27bb..7966a9ae 100644
--- a/src/Cantarell-Light.ufo/glyphs/ordfeminine.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ordfeminine.glif
@@ -1,48 +1,48 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ordfeminine" format="2">
-  <advance width="361"/>
+  <advance width="412"/>
   <unicode hex="00AA"/>
   <outline>
     <contour>
-      <point x="281" y="384" type="line"/>
-      <point x="296" y="384" type="line"/>
-      <point x="296" y="629" type="line" smooth="yes"/>
-      <point x="296" y="705"/>
-      <point x="251" y="749"/>
-      <point x="176" y="749" type="curve" smooth="yes"/>
-      <point x="139" y="749"/>
-      <point x="91" y="737"/>
-      <point x="52" y="717" type="curve"/>
-      <point x="57" y="704" type="line"/>
-      <point x="97" y="724"/>
-      <point x="139" y="733"/>
-      <point x="171" y="733" type="curve" smooth="yes"/>
-      <point x="239" y="733"/>
-      <point x="277" y="696"/>
-      <point x="277" y="626" type="curve" smooth="yes"/>
-      <point x="277" y="436" type="line"/>
+      <point x="304" y="384" type="line"/>
+      <point x="319" y="384" type="line"/>
+      <point x="319" y="629" type="line" smooth="yes"/>
+      <point x="319" y="705"/>
+      <point x="274" y="749"/>
+      <point x="199" y="749" type="curve" smooth="yes"/>
+      <point x="162" y="749"/>
+      <point x="114" y="737"/>
+      <point x="75" y="717" type="curve"/>
+      <point x="80" y="704" type="line"/>
+      <point x="120" y="724"/>
+      <point x="162" y="733"/>
+      <point x="194" y="733" type="curve" smooth="yes"/>
+      <point x="262" y="733"/>
+      <point x="300" y="696"/>
+      <point x="300" y="626" type="curve" smooth="yes"/>
+      <point x="300" y="436" type="line"/>
     </contour>
     <contour>
-      <point x="153" y="377" type="curve" smooth="yes"/>
-      <point x="206" y="377"/>
-      <point x="253" y="400"/>
-      <point x="287" y="441" type="curve"/>
-      <point x="285" y="454" type="line"/>
-      <point x="245" y="412"/>
-      <point x="203" y="393"/>
-      <point x="158" y="393" type="curve" smooth="yes"/>
-      <point x="98" y="393"/>
-      <point x="58" y="426"/>
-      <point x="58" y="476" type="curve" smooth="yes"/>
-      <point x="58" y="540"/>
-      <point x="125" y="568"/>
-      <point x="283" y="568" type="curve"/>
-      <point x="283" y="582" type="line"/>
-      <point x="117" y="582"/>
-      <point x="39" y="548"/>
-      <point x="39" y="473" type="curve" smooth="yes"/>
-      <point x="39" y="415"/>
-      <point x="84" y="377"/>
+      <point x="176" y="377" type="curve" smooth="yes"/>
+      <point x="229" y="377"/>
+      <point x="276" y="400"/>
+      <point x="310" y="441" type="curve"/>
+      <point x="308" y="454" type="line"/>
+      <point x="268" y="412"/>
+      <point x="226" y="393"/>
+      <point x="181" y="393" type="curve" smooth="yes"/>
+      <point x="121" y="393"/>
+      <point x="81" y="426"/>
+      <point x="81" y="476" type="curve" smooth="yes"/>
+      <point x="81" y="540"/>
+      <point x="148" y="568"/>
+      <point x="306" y="568" type="curve"/>
+      <point x="306" y="582" type="line"/>
+      <point x="140" y="582"/>
+      <point x="62" y="548"/>
+      <point x="62" y="473" type="curve" smooth="yes"/>
+      <point x="62" y="415"/>
+      <point x="107" y="377"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/ordmasculine.glif 
b/src/Cantarell-Light.ufo/glyphs/ordmasculine.glif
index b741e761..d9ea48f0 100644
--- a/src/Cantarell-Light.ufo/glyphs/ordmasculine.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ordmasculine.glif
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ordmasculine" format="2">
-  <advance width="412"/>
+  <advance width="458"/>
   <unicode hex="00BA"/>
   <outline>
     <contour>
-      <point x="206" y="377" type="curve" smooth="yes"/>
-      <point x="300" y="377"/>
-      <point x="365" y="452"/>
-      <point x="365" y="564" type="curve" smooth="yes"/>
-      <point x="365" y="676"/>
-      <point x="301" y="749"/>
-      <point x="208" y="749" type="curve" smooth="yes"/>
-      <point x="111" y="749"/>
-      <point x="47" y="673"/>
-      <point x="47" y="562" type="curve" smooth="yes"/>
-      <point x="47" y="451"/>
-      <point x="110" y="377"/>
+      <point x="229" y="377" type="curve" smooth="yes"/>
+      <point x="323" y="377"/>
+      <point x="388" y="452"/>
+      <point x="388" y="564" type="curve" smooth="yes"/>
+      <point x="388" y="676"/>
+      <point x="324" y="749"/>
+      <point x="231" y="749" type="curve" smooth="yes"/>
+      <point x="134" y="749"/>
+      <point x="70" y="673"/>
+      <point x="70" y="562" type="curve" smooth="yes"/>
+      <point x="70" y="451"/>
+      <point x="133" y="377"/>
     </contour>
     <contour>
-      <point x="208" y="393" type="curve" smooth="yes"/>
-      <point x="121" y="393"/>
-      <point x="66" y="462"/>
-      <point x="66" y="564" type="curve" smooth="yes"/>
-      <point x="66" y="663"/>
-      <point x="119" y="733"/>
-      <point x="204" y="733" type="curve" smooth="yes"/>
-      <point x="289" y="733"/>
-      <point x="346" y="666"/>
-      <point x="346" y="562" type="curve" smooth="yes"/>
-      <point x="346" y="459"/>
-      <point x="291" y="393"/>
+      <point x="231" y="393" type="curve" smooth="yes"/>
+      <point x="144" y="393"/>
+      <point x="89" y="462"/>
+      <point x="89" y="564" type="curve" smooth="yes"/>
+      <point x="89" y="663"/>
+      <point x="142" y="733"/>
+      <point x="227" y="733" type="curve" smooth="yes"/>
+      <point x="312" y="733"/>
+      <point x="369" y="666"/>
+      <point x="369" y="562" type="curve" smooth="yes"/>
+      <point x="369" y="459"/>
+      <point x="314" y="393"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/oslash.glif b/src/Cantarell-Light.ufo/glyphs/oslash.glif
index fb656b69..8d9f10b2 100644
--- a/src/Cantarell-Light.ufo/glyphs/oslash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oslash.glif
@@ -1,42 +1,50 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oslash" format="2">
-  <advance width="547"/>
+  <advance width="557"/>
   <unicode hex="00F8"/>
-  <anchor x="274" y="480" name="top"/>
+  <anchor x="279" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="274" y="-10" type="curve" smooth="yes"/>
-      <point x="399" y="-10"/>
-      <point x="484" y="90"/>
-      <point x="484" y="240" type="curve" smooth="yes"/>
-      <point x="484" y="389"/>
-      <point x="400" y="486"/>
-      <point x="276" y="486" type="curve" smooth="yes"/>
-      <point x="148" y="486"/>
-      <point x="63" y="386"/>
-      <point x="63" y="237" type="curve" smooth="yes"/>
-      <point x="63" y="89"/>
-      <point x="147" y="-10"/>
+      <point x="100" y="-42" type="line"/>
+      <point x="467" y="505" type="line"/>
+      <point x="456" y="513" type="line"/>
+      <point x="89" y="-34" type="line"/>
     </contour>
     <contour>
-      <point x="276" y="8" type="curve" smooth="yes"/>
-      <point x="159" y="8"/>
-      <point x="84" y="101"/>
-      <point x="84" y="239" type="curve" smooth="yes"/>
-      <point x="84" y="374"/>
-      <point x="156" y="468"/>
-      <point x="271" y="468" type="curve" smooth="yes"/>
-      <point x="387" y="468"/>
-      <point x="463" y="378"/>
-      <point x="463" y="237" type="curve" smooth="yes"/>
-      <point x="463" y="97"/>
-      <point x="388" y="8"/>
+      <point x="279" y="-10" type="curve" smooth="yes"/>
+      <point x="404" y="-10"/>
+      <point x="489" y="90"/>
+      <point x="489" y="240" type="curve" smooth="yes"/>
+      <point x="489" y="389"/>
+      <point x="405" y="486"/>
+      <point x="281" y="486" type="curve" smooth="yes"/>
+      <point x="153" y="486"/>
+      <point x="68" y="386"/>
+      <point x="68" y="237" type="curve" smooth="yes"/>
+      <point x="68" y="89"/>
+      <point x="152" y="-10"/>
     </contour>
     <contour>
-      <point x="95" y="-42" type="line"/>
-      <point x="462" y="505" type="line"/>
-      <point x="451" y="513" type="line"/>
-      <point x="84" y="-34" type="line"/>
+      <point x="281" y="8" type="curve" smooth="yes"/>
+      <point x="164" y="8"/>
+      <point x="89" y="101"/>
+      <point x="89" y="239" type="curve" smooth="yes"/>
+      <point x="89" y="374"/>
+      <point x="161" y="468"/>
+      <point x="276" y="468" type="curve" smooth="yes"/>
+      <point x="392" y="468"/>
+      <point x="468" y="378"/>
+      <point x="468" y="237" type="curve" smooth="yes"/>
+      <point x="468" y="97"/>
+      <point x="393" y="8"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/oslashacute.glif b/src/Cantarell-Light.ufo/glyphs/oslashacute.glif
index 1a47b1bc..76dbd309 100644
--- a/src/Cantarell-Light.ufo/glyphs/oslashacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oslashacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oslashacute" format="2">
-  <advance width="547"/>
+  <advance width="557"/>
   <unicode hex="01FF"/>
   <outline>
     <component base="oslash"/>
-    <component base="acutecomb" xOffset="207"/>
+    <component base="acutecomb" xOffset="212"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/otilde.glif b/src/Cantarell-Light.ufo/glyphs/otilde.glif
index df0ca567..8b9280d0 100644
--- a/src/Cantarell-Light.ufo/glyphs/otilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/otilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="otilde" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="00F5"/>
   <outline>
     <component base="o"/>
-    <component base="tildecomb" xOffset="24"/>
+    <component base="tildecomb" xOffset="35"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/otildeacute.glif b/src/Cantarell-Light.ufo/glyphs/otildeacute.glif
index 4fc02bde..51c9252e 100644
--- a/src/Cantarell-Light.ufo/glyphs/otildeacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/otildeacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="otildeacute" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="1E4D"/>
   <outline>
     <component base="o"/>
-    <component base="tildecomb_acutecomb" xOffset="24"/>
+    <component base="tildecomb" xOffset="35"/>
+    <component base="acutecomb" xOffset="203" yOffset="132"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/otildedieresis.glif 
b/src/Cantarell-Light.ufo/glyphs/otildedieresis.glif
index a27e40e3..568df75b 100644
--- a/src/Cantarell-Light.ufo/glyphs/otildedieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/otildedieresis.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="otildedieresis" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="1E4F"/>
   <outline>
     <component base="o"/>
-    <component base="tildecomb_dieresiscomb" xOffset="24"/>
+    <component base="tildecomb" xOffset="35"/>
+    <component base="dieresiscomb" xOffset="51" yOffset="132"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/otildemacron.glif 
b/src/Cantarell-Light.ufo/glyphs/otildemacron.glif
index 6feb3c00..70a3c202 100644
--- a/src/Cantarell-Light.ufo/glyphs/otildemacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/otildemacron.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="otildemacron" format="2">
-  <advance width="535"/>
+  <advance width="557"/>
   <unicode hex="022D"/>
   <outline>
     <component base="o"/>
-    <component base="tildecomb_macroncomb" xOffset="24"/>
+    <component base="tildecomb" xOffset="35"/>
+    <component base="macroncomb" xOffset="27" yOffset="132"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/p.glif b/src/Cantarell-Light.ufo/glyphs/p.glif
index 37010535..ac33836b 100644
--- a/src/Cantarell-Light.ufo/glyphs/p.glif
+++ b/src/Cantarell-Light.ufo/glyphs/p.glif
@@ -1,47 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="p" format="2">
-  <advance width="535"/>
+  <advance width="565"/>
   <unicode hex="0070"/>
-  <note>
-p
-</note>
-  <anchor x="259" y="0" name="bottom"/>
-  <anchor x="259" y="480" name="top"/>
+  <anchor x="278" y="0" name="bottom"/>
+  <anchor x="278" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="88" y="-217" type="line"/>
-      <point x="108" y="-217" type="line"/>
-      <point x="108" y="406" type="line"/>
-      <point x="103" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="287" y="-10" type="curve" smooth="yes"/>
+      <point x="412" y="-10"/>
+      <point x="497" y="90"/>
+      <point x="497" y="240" type="curve" smooth="yes"/>
+      <point x="497" y="389"/>
+      <point x="413" y="486"/>
+      <point x="289" y="486" type="curve" smooth="yes"/>
+      <point x="206" y="486"/>
+      <point x="146" y="444"/>
+      <point x="113" y="375" type="curve"/>
+      <point x="117" y="355" type="line"/>
+      <point x="147" y="425"/>
+      <point x="205" y="468"/>
+      <point x="284" y="468" type="curve" smooth="yes"/>
+      <point x="400" y="468"/>
+      <point x="476" y="378"/>
+      <point x="476" y="237" type="curve" smooth="yes"/>
+      <point x="476" y="97"/>
+      <point x="401" y="8"/>
+      <point x="289" y="8" type="curve" smooth="yes"/>
+      <point x="209" y="8"/>
+      <point x="148" y="53"/>
+      <point x="118" y="126" type="curve"/>
+      <point x="115" y="96" type="line"/>
+      <point x="148" y="29"/>
+      <point x="207" y="-10"/>
     </contour>
     <contour>
-      <point x="268" y="-10" type="curve" smooth="yes"/>
-      <point x="393" y="-10"/>
-      <point x="478" y="90"/>
-      <point x="478" y="240" type="curve" smooth="yes"/>
-      <point x="478" y="389"/>
-      <point x="394" y="486"/>
-      <point x="270" y="486" type="curve" smooth="yes"/>
-      <point x="187" y="486"/>
-      <point x="127" y="444"/>
-      <point x="94" y="375" type="curve"/>
-      <point x="98" y="355" type="line"/>
-      <point x="128" y="425"/>
-      <point x="186" y="468"/>
-      <point x="265" y="468" type="curve" smooth="yes"/>
-      <point x="381" y="468"/>
-      <point x="457" y="378"/>
-      <point x="457" y="237" type="curve" smooth="yes"/>
-      <point x="457" y="97"/>
-      <point x="382" y="8"/>
-      <point x="270" y="8" type="curve" smooth="yes"/>
-      <point x="190" y="8"/>
-      <point x="129" y="53"/>
-      <point x="99" y="126" type="curve"/>
-      <point x="96" y="96" type="line"/>
-      <point x="129" y="29"/>
-      <point x="188" y="-10"/>
+      <point x="107" y="-217" type="line"/>
+      <point x="127" y="-217" type="line"/>
+      <point x="127" y="406" type="line"/>
+      <point x="122" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/palochka-cy.glif b/src/Cantarell-Light.ufo/glyphs/palochka-cy.glif
index c0cf592a..99215010 100644
--- a/src/Cantarell-Light.ufo/glyphs/palochka-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/palochka-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="palochka-cy" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="04CF"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/paragraph.glif b/src/Cantarell-Light.ufo/glyphs/paragraph.glif
index 92caa569..ad5445a9 100644
--- a/src/Cantarell-Light.ufo/glyphs/paragraph.glif
+++ b/src/Cantarell-Light.ufo/glyphs/paragraph.glif
@@ -1,23 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="paragraph" format="2">
-  <advance width="678"/>
+  <advance width="626"/>
   <unicode hex="00B6"/>
   <outline>
     <contour>
-      <point x="309" y="-162" type="line"/>
-      <point x="328" y="-162" type="line"/>
-      <point x="328" y="677" type="line"/>
-      <point x="515" y="677" type="line"/>
-      <point x="515" y="-162" type="line"/>
-      <point x="534" y="-162" type="line"/>
-      <point x="534" y="694" type="line"/>
-      <point x="309" y="694" type="line" smooth="yes"/>
-      <point x="178" y="694"/>
-      <point x="90" y="615"/>
-      <point x="90" y="497" type="curve" smooth="yes"/>
-      <point x="90" y="375"/>
-      <point x="178" y="293"/>
-      <point x="309" y="293" type="curve"/>
+      <point x="278" y="-162" type="line"/>
+      <point x="297" y="-162" type="line"/>
+      <point x="297" y="677" type="line"/>
+      <point x="484" y="677" type="line"/>
+      <point x="484" y="-162" type="line"/>
+      <point x="503" y="-162" type="line"/>
+      <point x="503" y="694" type="line"/>
+      <point x="278" y="694" type="line" smooth="yes"/>
+      <point x="147" y="694"/>
+      <point x="59" y="615"/>
+      <point x="59" y="497" type="curve" smooth="yes"/>
+      <point x="59" y="375"/>
+      <point x="147" y="293"/>
+      <point x="278" y="293" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|P</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/parenleft.glif b/src/Cantarell-Light.ufo/glyphs/parenleft.glif
index d11247cf..32030ca3 100644
--- a/src/Cantarell-Light.ufo/glyphs/parenleft.glif
+++ b/src/Cantarell-Light.ufo/glyphs/parenleft.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="parenleft" format="2">
-  <advance width="261"/>
+  <advance width="298"/>
   <unicode hex="0028"/>
   <outline>
     <contour>
-      <point x="203" y="-168" type="curve"/>
-      <point x="219" y="-160" type="line"/>
-      <point x="117" y="10"/>
-      <point x="92" y="98"/>
-      <point x="92" y="301" type="curve" smooth="yes"/>
-      <point x="92" y="474"/>
-      <point x="117" y="560"/>
-      <point x="217" y="736" type="curve"/>
-      <point x="201" y="744" type="line"/>
-      <point x="105" y="579"/>
-      <point x="71" y="466"/>
-      <point x="71" y="297" type="curve" smooth="yes"/>
-      <point x="71" y="95"/>
-      <point x="106" y="-16"/>
+      <point x="224" y="-168" type="curve"/>
+      <point x="240" y="-158" type="line"/>
+      <point x="138" y="10"/>
+      <point x="113" y="100"/>
+      <point x="113" y="293" type="curve" smooth="yes"/>
+      <point x="113" y="473"/>
+      <point x="137" y="557"/>
+      <point x="238" y="734" type="curve"/>
+      <point x="222" y="744" type="line"/>
+      <point x="124" y="576"/>
+      <point x="92" y="465"/>
+      <point x="92" y="288" type="curve" smooth="yes"/>
+      <point x="92" y="102"/>
+      <point x="126" y="-16"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/parenright.glif b/src/Cantarell-Light.ufo/glyphs/parenright.glif
index 964b022c..5bd8eafa 100644
--- a/src/Cantarell-Light.ufo/glyphs/parenright.glif
+++ b/src/Cantarell-Light.ufo/glyphs/parenright.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="parenright" format="2">
-  <advance width="261"/>
+  <advance width="298"/>
   <unicode hex="0029"/>
   <outline>
-    <component base="parenleft" xScale="-1" xOffset="261"/>
+    <component base="parenleft" xScale="-1" xOffset="298"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|parenleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>parenleft</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/partialdiff.glif b/src/Cantarell-Light.ufo/glyphs/partialdiff.glif
index e523af9e..2a553a9d 100644
--- a/src/Cantarell-Light.ufo/glyphs/partialdiff.glif
+++ b/src/Cantarell-Light.ufo/glyphs/partialdiff.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="partialdiff" format="2">
-  <advance width="641"/>
+  <advance width="623"/>
   <unicode hex="2202"/>
   <outline>
     <contour>
-      <point x="290" y="-12" type="curve" smooth="yes"/>
-      <point x="437" y="-12"/>
-      <point x="529" y="133"/>
-      <point x="529" y="366" type="curve" smooth="yes"/>
-      <point x="529" y="582"/>
-      <point x="451" y="698"/>
-      <point x="310" y="698" type="curve" smooth="yes"/>
-      <point x="256" y="698"/>
-      <point x="198" y="681"/>
-      <point x="154" y="653" type="curve"/>
-      <point x="159" y="637" type="line"/>
-      <point x="202" y="664"/>
-      <point x="258" y="680"/>
-      <point x="308" y="680" type="curve" smooth="yes"/>
-      <point x="439" y="680"/>
-      <point x="509" y="572"/>
-      <point x="509" y="366" type="curve" smooth="yes"/>
-      <point x="509" y="143"/>
-      <point x="427" y="6"/>
-      <point x="293" y="6" type="curve" smooth="yes"/>
-      <point x="189" y="6"/>
-      <point x="116" y="88"/>
-      <point x="116" y="204" type="curve" smooth="yes"/>
-      <point x="116" y="323"/>
-      <point x="193" y="401"/>
-      <point x="311" y="401" type="curve" smooth="yes"/>
-      <point x="408" y="401"/>
-      <point x="483" y="347"/>
-      <point x="512" y="257" type="curve"/>
-      <point x="515" y="292" type="line"/>
-      <point x="483" y="372"/>
-      <point x="407" y="419"/>
-      <point x="313" y="419" type="curve" smooth="yes"/>
-      <point x="182" y="419"/>
-      <point x="95" y="332"/>
-      <point x="95" y="202" type="curve" smooth="yes"/>
-      <point x="95" y="76"/>
-      <point x="175" y="-12"/>
+      <point x="280" y="-12" type="curve" smooth="yes"/>
+      <point x="427" y="-12"/>
+      <point x="519" y="133"/>
+      <point x="519" y="366" type="curve" smooth="yes"/>
+      <point x="519" y="582"/>
+      <point x="441" y="698"/>
+      <point x="300" y="698" type="curve" smooth="yes"/>
+      <point x="246" y="698"/>
+      <point x="188" y="681"/>
+      <point x="144" y="653" type="curve"/>
+      <point x="149" y="637" type="line"/>
+      <point x="192" y="664"/>
+      <point x="248" y="680"/>
+      <point x="298" y="680" type="curve" smooth="yes"/>
+      <point x="429" y="680"/>
+      <point x="499" y="572"/>
+      <point x="499" y="366" type="curve" smooth="yes"/>
+      <point x="499" y="143"/>
+      <point x="417" y="6"/>
+      <point x="283" y="6" type="curve" smooth="yes"/>
+      <point x="179" y="6"/>
+      <point x="106" y="88"/>
+      <point x="106" y="204" type="curve" smooth="yes"/>
+      <point x="106" y="323"/>
+      <point x="183" y="401"/>
+      <point x="301" y="401" type="curve" smooth="yes"/>
+      <point x="398" y="401"/>
+      <point x="473" y="347"/>
+      <point x="502" y="257" type="curve"/>
+      <point x="505" y="292" type="line"/>
+      <point x="473" y="372"/>
+      <point x="397" y="419"/>
+      <point x="303" y="419" type="curve" smooth="yes"/>
+      <point x="172" y="419"/>
+      <point x="85" y="332"/>
+      <point x="85" y="202" type="curve" smooth="yes"/>
+      <point x="85" y="76"/>
+      <point x="165" y="-12"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/pe-cy.glif b/src/Cantarell-Light.ufo/glyphs/pe-cy.glif
index aade4904..41d80ace 100644
--- a/src/Cantarell-Light.ufo/glyphs/pe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/pe-cy.glif
@@ -1,18 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="pe-cy" format="2">
-  <advance width="530"/>
+  <advance width="568"/>
   <unicode hex="043F"/>
-  <anchor x="509" y="0" name="bottomright"/>
+  <anchor x="528" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="108" y="0" type="line"/>
-      <point x="108" y="463" type="line"/>
-      <point x="422" y="463" type="line"/>
-      <point x="422" y="0" type="line"/>
-      <point x="442" y="0" type="line"/>
-      <point x="442" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="127" y="0" type="line"/>
+      <point x="127" y="463" type="line"/>
+      <point x="441" y="463" type="line"/>
+      <point x="441" y="0" type="line"/>
+      <point x="461" y="0" type="line"/>
+      <point x="461" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -26,6 +26,10 @@
         <key>width</key>
         <integer>79</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/percent.glif b/src/Cantarell-Light.ufo/glyphs/percent.glif
index b3d1074c..f51c8abf 100644
--- a/src/Cantarell-Light.ufo/glyphs/percent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/percent.glif
@@ -1,69 +1,75 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="percent" format="2">
-  <advance width="964"/>
+  <advance width="944"/>
   <unicode hex="0025"/>
   <outline>
     <contour>
-      <point x="291" y="0" type="line"/>
-      <point x="307" y="0" type="line"/>
-      <point x="693" y="694" type="line"/>
-      <point x="670" y="694" type="line"/>
+      <point x="281" y="0" type="line"/>
+      <point x="297" y="0" type="line"/>
+      <point x="683" y="694" type="line"/>
+      <point x="660" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="237" y="264" type="curve" smooth="yes"/>
-      <point x="321" y="264"/>
-      <point x="376" y="351"/>
-      <point x="376" y="484" type="curve" smooth="yes"/>
-      <point x="376" y="616"/>
-      <point x="322" y="704"/>
-      <point x="240" y="704" type="curve" smooth="yes"/>
-      <point x="155" y="704"/>
-      <point x="100" y="616"/>
-      <point x="100" y="481" type="curve" smooth="yes"/>
-      <point x="100" y="350"/>
-      <point x="154" y="264"/>
+      <point x="227" y="264" type="curve" smooth="yes"/>
+      <point x="311" y="264"/>
+      <point x="366" y="351"/>
+      <point x="366" y="484" type="curve" smooth="yes"/>
+      <point x="366" y="616"/>
+      <point x="312" y="704"/>
+      <point x="230" y="704" type="curve" smooth="yes"/>
+      <point x="145" y="704"/>
+      <point x="90" y="616"/>
+      <point x="90" y="481" type="curve" smooth="yes"/>
+      <point x="90" y="350"/>
+      <point x="144" y="264"/>
     </contour>
     <contour>
-      <point x="240" y="280" type="curve" smooth="yes"/>
-      <point x="167" y="280"/>
-      <point x="119" y="361"/>
-      <point x="119" y="484" type="curve" smooth="yes"/>
-      <point x="119" y="607"/>
-      <point x="166" y="688"/>
-      <point x="238" y="688" type="curve" smooth="yes"/>
-      <point x="310" y="688"/>
-      <point x="357" y="605"/>
-      <point x="357" y="481" type="curve" smooth="yes"/>
-      <point x="357" y="360"/>
-      <point x="310" y="280"/>
+      <point x="230" y="280" type="curve" smooth="yes"/>
+      <point x="157" y="280"/>
+      <point x="109" y="361"/>
+      <point x="109" y="484" type="curve" smooth="yes"/>
+      <point x="109" y="607"/>
+      <point x="156" y="688"/>
+      <point x="228" y="688" type="curve" smooth="yes"/>
+      <point x="300" y="688"/>
+      <point x="347" y="605"/>
+      <point x="347" y="481" type="curve" smooth="yes"/>
+      <point x="347" y="360"/>
+      <point x="300" y="280"/>
     </contour>
     <contour>
-      <point x="725" y="-6" type="curve" smooth="yes"/>
-      <point x="809" y="-6"/>
-      <point x="864" y="81"/>
-      <point x="864" y="214" type="curve" smooth="yes"/>
-      <point x="864" y="346"/>
-      <point x="810" y="434"/>
-      <point x="728" y="434" type="curve" smooth="yes"/>
-      <point x="643" y="434"/>
-      <point x="588" y="346"/>
-      <point x="588" y="211" type="curve" smooth="yes"/>
-      <point x="588" y="80"/>
-      <point x="642" y="-6"/>
+      <point x="715" y="-6" type="curve" smooth="yes"/>
+      <point x="799" y="-6"/>
+      <point x="854" y="81"/>
+      <point x="854" y="214" type="curve" smooth="yes"/>
+      <point x="854" y="346"/>
+      <point x="800" y="434"/>
+      <point x="718" y="434" type="curve" smooth="yes"/>
+      <point x="633" y="434"/>
+      <point x="578" y="346"/>
+      <point x="578" y="211" type="curve" smooth="yes"/>
+      <point x="578" y="80"/>
+      <point x="632" y="-6"/>
     </contour>
     <contour>
-      <point x="728" y="10" type="curve" smooth="yes"/>
-      <point x="655" y="10"/>
-      <point x="607" y="91"/>
-      <point x="607" y="214" type="curve" smooth="yes"/>
-      <point x="607" y="337"/>
-      <point x="654" y="418"/>
-      <point x="726" y="418" type="curve" smooth="yes"/>
-      <point x="798" y="418"/>
-      <point x="845" y="335"/>
-      <point x="845" y="211" type="curve" smooth="yes"/>
-      <point x="845" y="90"/>
-      <point x="798" y="10"/>
+      <point x="718" y="10" type="curve" smooth="yes"/>
+      <point x="645" y="10"/>
+      <point x="597" y="91"/>
+      <point x="597" y="214" type="curve" smooth="yes"/>
+      <point x="597" y="337"/>
+      <point x="644" y="418"/>
+      <point x="716" y="418" type="curve" smooth="yes"/>
+      <point x="788" y="418"/>
+      <point x="835" y="335"/>
+      <point x="835" y="211" type="curve" smooth="yes"/>
+      <point x="835" y="90"/>
+      <point x="788" y="10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/periodcentered.glif 
b/src/Cantarell-Light.ufo/glyphs/periodcentered.glif
index 18e1c246..60923168 100644
--- a/src/Cantarell-Light.ufo/glyphs/periodcentered.glif
+++ b/src/Cantarell-Light.ufo/glyphs/periodcentered.glif
@@ -3,6 +3,14 @@
   <advance width="230"/>
   <unicode hex="00B7"/>
   <outline>
-    <component base="period" xOffset="1" yOffset="250"/>
+    <component base="period" yOffset="250"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>period</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>period</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/periodcentered.loclC_A_T_.case.glif 
b/src/Cantarell-Light.ufo/glyphs/periodcentered.loclC_A_T_.case.glif
index d7e5bc67..6115049e 100644
--- a/src/Cantarell-Light.ufo/glyphs/periodcentered.loclC_A_T_.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/periodcentered.loclC_A_T_.case.glif
@@ -2,6 +2,6 @@
 <glyph name="periodcentered.loclCAT.case" format="2">
   <anchor x="0" y="352" name="_periodcentered"/>
   <outline>
-    <component base="period" xOffset="-241" yOffset="338"/>
+    <component base="period" xOffset="-236" yOffset="338"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/periodcentered.loclC_A_T_.glif 
b/src/Cantarell-Light.ufo/glyphs/periodcentered.loclC_A_T_.glif
index 28dc0f54..425e4633 100644
--- a/src/Cantarell-Light.ufo/glyphs/periodcentered.loclC_A_T_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/periodcentered.loclC_A_T_.glif
@@ -3,18 +3,18 @@
   <anchor x="0" y="353" name="_periodcentered"/>
   <outline>
     <contour>
-      <point x="-17" y="331" type="curve" smooth="yes"/>
-      <point x="-3" y="331"/>
-      <point x="6" y="341"/>
-      <point x="6" y="354" type="curve" smooth="yes"/>
-      <point x="6" y="368"/>
-      <point x="-3" y="378"/>
-      <point x="-17" y="378" type="curve" smooth="yes"/>
-      <point x="-31" y="378"/>
-      <point x="-40" y="368"/>
-      <point x="-40" y="354" type="curve" smooth="yes"/>
-      <point x="-40" y="341"/>
-      <point x="-31" y="331"/>
+      <point x="5" y="331" type="curve" smooth="yes"/>
+      <point x="19" y="331"/>
+      <point x="28" y="341"/>
+      <point x="28" y="354" type="curve" smooth="yes"/>
+      <point x="28" y="368"/>
+      <point x="19" y="378"/>
+      <point x="5" y="378" type="curve" smooth="yes"/>
+      <point x="-9" y="378"/>
+      <point x="-18" y="368"/>
+      <point x="-18" y="354" type="curve" smooth="yes"/>
+      <point x="-18" y="341"/>
+      <point x="-9" y="331"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/perthousand.glif b/src/Cantarell-Light.ufo/glyphs/perthousand.glif
index e3b04230..06890e3c 100644
--- a/src/Cantarell-Light.ufo/glyphs/perthousand.glif
+++ b/src/Cantarell-Light.ufo/glyphs/perthousand.glif
@@ -1,69 +1,69 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="perthousand" format="2">
-  <advance width="1296"/>
+  <advance width="1287"/>
   <unicode hex="2030"/>
   <outline>
     <contour>
-      <point x="291" y="0" type="line"/>
-      <point x="307" y="0" type="line"/>
-      <point x="693" y="694" type="line"/>
-      <point x="670" y="694" type="line"/>
+      <point x="281" y="0" type="line"/>
+      <point x="297" y="0" type="line"/>
+      <point x="683" y="694" type="line"/>
+      <point x="660" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="237" y="264" type="curve" smooth="yes"/>
-      <point x="321" y="264"/>
-      <point x="376" y="351"/>
-      <point x="376" y="484" type="curve" smooth="yes"/>
-      <point x="376" y="616"/>
-      <point x="322" y="704"/>
-      <point x="240" y="704" type="curve" smooth="yes"/>
-      <point x="155" y="704"/>
-      <point x="100" y="616"/>
-      <point x="100" y="481" type="curve" smooth="yes"/>
-      <point x="100" y="350"/>
-      <point x="154" y="264"/>
+      <point x="227" y="264" type="curve" smooth="yes"/>
+      <point x="311" y="264"/>
+      <point x="366" y="351"/>
+      <point x="366" y="484" type="curve" smooth="yes"/>
+      <point x="366" y="616"/>
+      <point x="312" y="704"/>
+      <point x="230" y="704" type="curve" smooth="yes"/>
+      <point x="145" y="704"/>
+      <point x="90" y="616"/>
+      <point x="90" y="481" type="curve" smooth="yes"/>
+      <point x="90" y="350"/>
+      <point x="144" y="264"/>
     </contour>
     <contour>
-      <point x="240" y="280" type="curve" smooth="yes"/>
-      <point x="167" y="280"/>
-      <point x="119" y="361"/>
-      <point x="119" y="484" type="curve" smooth="yes"/>
-      <point x="119" y="607"/>
-      <point x="166" y="688"/>
-      <point x="238" y="688" type="curve" smooth="yes"/>
-      <point x="310" y="688"/>
-      <point x="357" y="605"/>
-      <point x="357" y="481" type="curve" smooth="yes"/>
-      <point x="357" y="360"/>
-      <point x="310" y="280"/>
+      <point x="230" y="280" type="curve" smooth="yes"/>
+      <point x="157" y="280"/>
+      <point x="109" y="361"/>
+      <point x="109" y="484" type="curve" smooth="yes"/>
+      <point x="109" y="607"/>
+      <point x="156" y="688"/>
+      <point x="228" y="688" type="curve" smooth="yes"/>
+      <point x="300" y="688"/>
+      <point x="347" y="605"/>
+      <point x="347" y="481" type="curve" smooth="yes"/>
+      <point x="347" y="360"/>
+      <point x="300" y="280"/>
     </contour>
     <contour>
-      <point x="725" y="-6" type="curve" smooth="yes"/>
-      <point x="809" y="-6"/>
-      <point x="864" y="81"/>
-      <point x="864" y="214" type="curve" smooth="yes"/>
-      <point x="864" y="346"/>
-      <point x="810" y="434"/>
-      <point x="728" y="434" type="curve" smooth="yes"/>
-      <point x="643" y="434"/>
-      <point x="588" y="346"/>
-      <point x="588" y="211" type="curve" smooth="yes"/>
-      <point x="588" y="80"/>
-      <point x="642" y="-6"/>
+      <point x="715" y="-6" type="curve" smooth="yes"/>
+      <point x="799" y="-6"/>
+      <point x="854" y="81"/>
+      <point x="854" y="214" type="curve" smooth="yes"/>
+      <point x="854" y="346"/>
+      <point x="800" y="434"/>
+      <point x="718" y="434" type="curve" smooth="yes"/>
+      <point x="633" y="434"/>
+      <point x="578" y="346"/>
+      <point x="578" y="211" type="curve" smooth="yes"/>
+      <point x="578" y="80"/>
+      <point x="632" y="-6"/>
     </contour>
     <contour>
-      <point x="728" y="10" type="curve" smooth="yes"/>
-      <point x="655" y="10"/>
-      <point x="607" y="91"/>
-      <point x="607" y="214" type="curve" smooth="yes"/>
-      <point x="607" y="337"/>
-      <point x="654" y="418"/>
-      <point x="726" y="418" type="curve" smooth="yes"/>
-      <point x="798" y="418"/>
-      <point x="845" y="335"/>
-      <point x="845" y="211" type="curve" smooth="yes"/>
-      <point x="845" y="90"/>
-      <point x="798" y="10"/>
+      <point x="718" y="10" type="curve" smooth="yes"/>
+      <point x="645" y="10"/>
+      <point x="597" y="91"/>
+      <point x="597" y="214" type="curve" smooth="yes"/>
+      <point x="597" y="337"/>
+      <point x="644" y="418"/>
+      <point x="716" y="418" type="curve" smooth="yes"/>
+      <point x="788" y="418"/>
+      <point x="835" y="335"/>
+      <point x="835" y="211" type="curve" smooth="yes"/>
+      <point x="835" y="90"/>
+      <point x="788" y="10"/>
     </contour>
     <contour>
       <point x="1058" y="-6" type="curve" smooth="yes"/>
@@ -94,4 +94,12 @@
       <point x="1131" y="10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>percent</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>percent</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/peseta.glif b/src/Cantarell-Light.ufo/glyphs/peseta.glif
index f5b96123..9cc267e3 100644
--- a/src/Cantarell-Light.ufo/glyphs/peseta.glif
+++ b/src/Cantarell-Light.ufo/glyphs/peseta.glif
@@ -1,20 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="peseta" format="2">
-  <advance width="722"/>
+  <advance width="580"/>
   <unicode hex="20A7"/>
   <outline>
     <contour>
-      <point x="543" y="473" type="line"/>
-      <point x="543" y="456" type="line"/>
-      <point x="648" y="456" type="line"/>
-      <point x="648" y="473" type="line"/>
+      <point x="130" y="0" type="line"/>
+      <point x="151" y="0" type="line"/>
+      <point x="151" y="268" type="line"/>
+      <point x="275" y="268" type="line" smooth="yes"/>
+      <point x="387" y="268"/>
+      <point x="462" y="354"/>
+      <point x="462" y="480" type="curve" smooth="yes"/>
+      <point x="462" y="607"/>
+      <point x="389" y="694"/>
+      <point x="280" y="694" type="curve" smooth="yes"/>
+      <point x="130" y="694" type="line"/>
+    </contour>
+    <contour>
+      <point x="45" y="456" type="line"/>
+      <point x="141" y="456" type="line"/>
+      <point x="141" y="473" type="line"/>
+      <point x="45" y="473" type="line"/>
     </contour>
     <contour>
-      <point x="169" y="456" type="line"/>
-      <point x="169" y="473" type="line"/>
-      <point x="74" y="473" type="line"/>
-      <point x="74" y="456" type="line"/>
+      <point x="151" y="286" type="line"/>
+      <point x="151" y="676" type="line"/>
+      <point x="275" y="676" type="line" smooth="yes"/>
+      <point x="374" y="676"/>
+      <point x="440" y="597"/>
+      <point x="440" y="475" type="curve" smooth="yes"/>
+      <point x="440" y="358"/>
+      <point x="380" y="286"/>
+      <point x="280" y="286" type="curve" smooth="yes"/>
+    </contour>
+    <contour>
+      <point x="449" y="456" type="line"/>
+      <point x="543" y="456" type="line"/>
+      <point x="543" y="473" type="line"/>
+      <point x="449" y="473" type="line"/>
     </contour>
-    <component base="P" xOffset="52"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/peso.glif b/src/Cantarell-Light.ufo/glyphs/peso.glif
index 1e523d8a..19a3033b 100644
--- a/src/Cantarell-Light.ufo/glyphs/peso.glif
+++ b/src/Cantarell-Light.ufo/glyphs/peso.glif
@@ -1,57 +1,61 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="peso" format="2">
-  <advance width="727"/>
+  <advance width="580"/>
   <unicode hex="20B1"/>
   <outline>
     <contour>
-      <point x="549" y="543" type="line"/>
-      <point x="549" y="526" type="line"/>
-      <point x="644" y="526" type="line"/>
-      <point x="644" y="543" type="line"/>
+      <point x="130" y="0" type="line"/>
+      <point x="151" y="0" type="line"/>
+      <point x="151" y="268" type="line"/>
+      <point x="275" y="268" type="line" smooth="yes"/>
+      <point x="387" y="268"/>
+      <point x="462" y="354"/>
+      <point x="462" y="480" type="curve" smooth="yes"/>
+      <point x="462" y="607"/>
+      <point x="389" y="694"/>
+      <point x="280" y="694" type="curve" smooth="yes"/>
+      <point x="130" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="188" y="526" type="line"/>
-      <point x="188" y="543" type="line"/>
-      <point x="83" y="543" type="line"/>
-      <point x="83" y="526" type="line"/>
+      <point x="45" y="391" type="line"/>
+      <point x="141" y="391" type="line"/>
+      <point x="141" y="408" type="line"/>
+      <point x="45" y="408" type="line"/>
     </contour>
     <contour>
-      <point x="549" y="404" type="line"/>
-      <point x="549" y="387" type="line"/>
-      <point x="644" y="387" type="line"/>
-      <point x="644" y="404" type="line"/>
+      <point x="45" y="548" type="line"/>
+      <point x="141" y="548" type="line"/>
+      <point x="141" y="565" type="line"/>
+      <point x="45" y="565" type="line"/>
     </contour>
     <contour>
-      <point x="188" y="387" type="line"/>
-      <point x="188" y="404" type="line"/>
-      <point x="83" y="404" type="line"/>
-      <point x="83" y="387" type="line"/>
+      <point x="151" y="286" type="line"/>
+      <point x="151" y="676" type="line"/>
+      <point x="275" y="676" type="line" smooth="yes"/>
+      <point x="374" y="676"/>
+      <point x="440" y="597"/>
+      <point x="440" y="475" type="curve" smooth="yes"/>
+      <point x="440" y="358"/>
+      <point x="380" y="286"/>
+      <point x="280" y="286" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="170" y="0" type="line"/>
-      <point x="191" y="0" type="line"/>
-      <point x="191" y="694" type="line"/>
-      <point x="170" y="694" type="line"/>
+      <point x="439" y="391" type="line"/>
+      <point x="533" y="391" type="line"/>
+      <point x="533" y="408" type="line"/>
+      <point x="439" y="408" type="line"/>
     </contour>
     <contour>
-      <point x="185" y="268" type="line"/>
-      <point x="346" y="268" type="line" smooth="yes"/>
-      <point x="482" y="268"/>
-      <point x="572" y="353"/>
-      <point x="572" y="480" type="curve" smooth="yes"/>
-      <point x="572" y="608"/>
-      <point x="484" y="694"/>
-      <point x="352" y="694" type="curve" smooth="yes"/>
-      <point x="185" y="694" type="line"/>
-      <point x="185" y="676" type="line"/>
-      <point x="346" y="676" type="line" smooth="yes"/>
-      <point x="468" y="676"/>
-      <point x="550" y="597"/>
-      <point x="550" y="475" type="curve" smooth="yes"/>
-      <point x="550" y="358"/>
-      <point x="476" y="286"/>
-      <point x="352" y="286" type="curve" smooth="yes"/>
-      <point x="185" y="286" type="line"/>
+      <point x="449" y="548" type="line"/>
+      <point x="533" y="548" type="line"/>
+      <point x="533" y="565" type="line"/>
+      <point x="449" y="565" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/pi.glif b/src/Cantarell-Light.ufo/glyphs/pi.glif
index 46ecc1b2..000a4af0 100644
--- a/src/Cantarell-Light.ufo/glyphs/pi.glif
+++ b/src/Cantarell-Light.ufo/glyphs/pi.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="pi" format="2">
-  <advance width="566"/>
+  <advance width="569"/>
   <unicode hex="03C0"/>
   <outline>
     <contour>
-      <point x="472" y="-10" type="curve" smooth="yes"/>
-      <point x="490" y="-10"/>
-      <point x="508" y="-5"/>
-      <point x="523" y="4" type="curve"/>
-      <point x="520" y="17" type="line"/>
-      <point x="506" y="11"/>
-      <point x="488" y="7"/>
-      <point x="474" y="7" type="curve" smooth="yes"/>
-      <point x="450" y="7"/>
-      <point x="434" y="30"/>
-      <point x="434" y="64" type="curve" smooth="yes"/>
-      <point x="434" y="471" type="line"/>
-      <point x="413" y="471" type="line"/>
-      <point x="413" y="64" type="line" smooth="yes"/>
-      <point x="413" y="20"/>
-      <point x="437" y="-10"/>
+      <point x="473" y="-10" type="curve" smooth="yes"/>
+      <point x="491" y="-10"/>
+      <point x="509" y="-5"/>
+      <point x="524" y="4" type="curve"/>
+      <point x="521" y="17" type="line"/>
+      <point x="507" y="11"/>
+      <point x="489" y="7"/>
+      <point x="475" y="7" type="curve" smooth="yes"/>
+      <point x="451" y="7"/>
+      <point x="435" y="30"/>
+      <point x="435" y="64" type="curve" smooth="yes"/>
+      <point x="435" y="471" type="line"/>
+      <point x="414" y="471" type="line"/>
+      <point x="414" y="64" type="line" smooth="yes"/>
+      <point x="414" y="20"/>
+      <point x="438" y="-10"/>
     </contour>
     <contour>
-      <point x="117" y="0" type="line"/>
-      <point x="138" y="0" type="line"/>
-      <point x="138" y="471" type="line"/>
-      <point x="117" y="471" type="line"/>
+      <point x="118" y="0" type="line"/>
+      <point x="139" y="0" type="line"/>
+      <point x="139" y="471" type="line"/>
+      <point x="118" y="471" type="line"/>
     </contour>
     <contour>
-      <point x="37" y="463" type="line"/>
-      <point x="512" y="463" type="line"/>
-      <point x="512" y="480" type="line"/>
-      <point x="37" y="480" type="line"/>
+      <point x="38" y="463" type="line"/>
+      <point x="513" y="463" type="line"/>
+      <point x="513" y="480" type="line"/>
+      <point x="38" y="480" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/plus.glif b/src/Cantarell-Light.ufo/glyphs/plus.glif
index 79a58d7b..fc73c6d5 100644
--- a/src/Cantarell-Light.ufo/glyphs/plus.glif
+++ b/src/Cantarell-Light.ufo/glyphs/plus.glif
@@ -1,19 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="plus" format="2">
-  <advance width="651"/>
+  <advance width="580"/>
   <unicode hex="002B"/>
   <outline>
     <contour>
-      <point x="319" y="62" type="line"/>
-      <point x="337" y="62" type="line"/>
-      <point x="337" y="588" type="line"/>
-      <point x="319" y="588" type="line"/>
+      <point x="282" y="101" type="line"/>
+      <point x="300" y="101" type="line"/>
+      <point x="300" y="561" type="line"/>
+      <point x="282" y="561" type="line"/>
     </contour>
     <contour>
-      <point x="81" y="322" type="line"/>
-      <point x="570" y="322" type="line"/>
-      <point x="570" y="339" type="line"/>
-      <point x="81" y="339" type="line"/>
+      <point x="60" y="322" type="line"/>
+      <point x="520" y="322" type="line"/>
+      <point x="520" y="339" type="line"/>
+      <point x="60" y="339" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minus</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/plusminus.glif b/src/Cantarell-Light.ufo/glyphs/plusminus.glif
index 0cce64a5..eaca35e6 100644
--- a/src/Cantarell-Light.ufo/glyphs/plusminus.glif
+++ b/src/Cantarell-Light.ufo/glyphs/plusminus.glif
@@ -1,25 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="plusminus" format="2">
-  <advance width="624"/>
+  <advance width="580"/>
   <unicode hex="00B1"/>
   <outline>
     <contour>
-      <point x="303" y="147" type="line"/>
-      <point x="322" y="147" type="line"/>
-      <point x="322" y="623" type="line"/>
-      <point x="303" y="623" type="line"/>
+      <point x="282" y="163" type="line"/>
+      <point x="300" y="163" type="line"/>
+      <point x="300" y="623" type="line"/>
+      <point x="282" y="623" type="line"/>
     </contour>
     <contour>
-      <point x="87" y="63" type="line"/>
-      <point x="537" y="63" type="line"/>
-      <point x="537" y="80" type="line"/>
-      <point x="87" y="80" type="line"/>
+      <point x="60" y="63" type="line"/>
+      <point x="520" y="63" type="line"/>
+      <point x="520" y="80" type="line"/>
+      <point x="60" y="80" type="line"/>
     </contour>
     <contour>
-      <point x="87" y="381" type="line"/>
-      <point x="537" y="381" type="line"/>
-      <point x="537" y="398" type="line"/>
-      <point x="87" y="398" type="line"/>
+      <point x="60" y="384" type="line"/>
+      <point x="520" y="384" type="line"/>
+      <point x="520" y="401" type="line"/>
+      <point x="60" y="401" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/primeR_eversed.glif 
b/src/Cantarell-Light.ufo/glyphs/primeR_eversed.glif
index 2da2c1d6..0d4b2d9c 100644
--- a/src/Cantarell-Light.ufo/glyphs/primeR_eversed.glif
+++ b/src/Cantarell-Light.ufo/glyphs/primeR_eversed.glif
@@ -1,11 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="primeReversed" format="2">
-  <advance width="232"/>
+  <advance width="276"/>
   <unicode hex="2035"/>
-  <note>
-uni2035
-</note>
   <outline>
-    <component base="quotesingle" xScale="-1" yxScale="-0.19201" xOffset="322"/>
+    <component base="quotesingle" xScale="-1" yxScale="-0.19201" xOffset="363"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/primemod.glif b/src/Cantarell-Light.ufo/glyphs/primemod.glif
index 847c5162..d9edae77 100644
--- a/src/Cantarell-Light.ufo/glyphs/primemod.glif
+++ b/src/Cantarell-Light.ufo/glyphs/primemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="primemod" format="2">
-  <advance width="321"/>
+  <advance width="146"/>
   <unicode hex="02B9"/>
   <outline>
-    <component base="minute"/>
+    <component base="minute" xOffset="-76"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/product.glif b/src/Cantarell-Light.ufo/glyphs/product.glif
index f5bcca10..2c32b42e 100644
--- a/src/Cantarell-Light.ufo/glyphs/product.glif
+++ b/src/Cantarell-Light.ufo/glyphs/product.glif
@@ -1,17 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="product" format="2">
-  <advance width="762"/>
+  <advance width="720"/>
   <unicode hex="220F"/>
   <outline>
     <contour>
-      <point x="144" y="-95" type="line"/>
-      <point x="164" y="-95" type="line"/>
-      <point x="164" y="676" type="line"/>
-      <point x="598" y="676" type="line"/>
-      <point x="598" y="-95" type="line"/>
-      <point x="618" y="-95" type="line"/>
-      <point x="618" y="694" type="line"/>
-      <point x="144" y="694" type="line"/>
+      <point x="123" y="-95" type="line"/>
+      <point x="143" y="-95" type="line"/>
+      <point x="143" y="676" type="line"/>
+      <point x="577" y="676" type="line"/>
+      <point x="577" y="-95" type="line"/>
+      <point x="597" y="-95" type="line"/>
+      <point x="597" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/punctuationspace.glif 
b/src/Cantarell-Light.ufo/glyphs/punctuationspace.glif
index 461e80f9..3b0452de 100644
--- a/src/Cantarell-Light.ufo/glyphs/punctuationspace.glif
+++ b/src/Cantarell-Light.ufo/glyphs/punctuationspace.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="punctuationspace" format="2">
-  <advance width="200"/>
+  <advance width="230"/>
   <unicode hex="2008"/>
   <outline>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
-      <string>space</string>
+      <string>period</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/q.glif b/src/Cantarell-Light.ufo/glyphs/q.glif
index 5e66adf7..e84b0e75 100644
--- a/src/Cantarell-Light.ufo/glyphs/q.glif
+++ b/src/Cantarell-Light.ufo/glyphs/q.glif
@@ -1,47 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="q" format="2">
-  <advance width="536"/>
+  <advance width="566"/>
   <unicode hex="0071"/>
-  <note>
-q
-</note>
-  <anchor x="278" y="0" name="bottom"/>
-  <anchor x="278" y="480" name="top"/>
+  <anchor x="289" y="0" name="bottom"/>
+  <anchor x="289" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="428" y="-217" type="line"/>
-      <point x="448" y="-217" type="line"/>
-      <point x="448" y="480" type="line"/>
-      <point x="433" y="480" type="line"/>
-      <point x="428" y="406" type="line"/>
+      <point x="279" y="-10" type="curve" smooth="yes"/>
+      <point x="350" y="-10"/>
+      <point x="407" y="23"/>
+      <point x="443" y="85" type="curve"/>
+      <point x="440" y="106" type="line"/>
+      <point x="408" y="44"/>
+      <point x="352" y="8"/>
+      <point x="281" y="8" type="curve" smooth="yes"/>
+      <point x="164" y="8"/>
+      <point x="89" y="101"/>
+      <point x="89" y="239" type="curve" smooth="yes"/>
+      <point x="89" y="374"/>
+      <point x="161" y="468"/>
+      <point x="276" y="468" type="curve" smooth="yes"/>
+      <point x="350" y="468"/>
+      <point x="408" y="431"/>
+      <point x="440" y="367" type="curve"/>
+      <point x="444" y="396" type="line"/>
+      <point x="410" y="454"/>
+      <point x="354" y="486"/>
+      <point x="281" y="486" type="curve" smooth="yes"/>
+      <point x="153" y="486"/>
+      <point x="68" y="386"/>
+      <point x="68" y="237" type="curve" smooth="yes"/>
+      <point x="68" y="89"/>
+      <point x="152" y="-10"/>
     </contour>
     <contour>
-      <point x="268" y="-10" type="curve" smooth="yes"/>
-      <point x="339" y="-10"/>
-      <point x="396" y="23"/>
-      <point x="432" y="85" type="curve"/>
-      <point x="429" y="106" type="line"/>
-      <point x="397" y="44"/>
-      <point x="341" y="8"/>
-      <point x="270" y="8" type="curve" smooth="yes"/>
-      <point x="153" y="8"/>
-      <point x="78" y="101"/>
-      <point x="78" y="239" type="curve" smooth="yes"/>
-      <point x="78" y="374"/>
-      <point x="150" y="468"/>
-      <point x="265" y="468" type="curve" smooth="yes"/>
-      <point x="339" y="468"/>
-      <point x="397" y="431"/>
-      <point x="429" y="367" type="curve"/>
-      <point x="433" y="396" type="line"/>
-      <point x="399" y="454"/>
-      <point x="343" y="486"/>
-      <point x="270" y="486" type="curve" smooth="yes"/>
-      <point x="142" y="486"/>
-      <point x="57" y="386"/>
-      <point x="57" y="237" type="curve" smooth="yes"/>
-      <point x="57" y="89"/>
-      <point x="141" y="-10"/>
+      <point x="439" y="-217" type="line"/>
+      <point x="459" y="-217" type="line"/>
+      <point x="459" y="480" type="line"/>
+      <point x="444" y="480" type="line"/>
+      <point x="439" y="406" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/qa-cy.glif b/src/Cantarell-Light.ufo/glyphs/qa-cy.glif
index 88081283..09a8a1c9 100644
--- a/src/Cantarell-Light.ufo/glyphs/qa-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/qa-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="qa-cy" format="2">
-  <advance width="536"/>
+  <advance width="566"/>
   <unicode hex="051B"/>
   <outline>
     <component base="q"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/question.glif b/src/Cantarell-Light.ufo/glyphs/question.glif
index e2fb0a8d..a0fdbb60 100644
--- a/src/Cantarell-Light.ufo/glyphs/question.glif
+++ b/src/Cantarell-Light.ufo/glyphs/question.glif
@@ -1,45 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="question" format="2">
-  <advance width="416"/>
+  <advance width="418"/>
   <unicode hex="003F"/>
   <outline>
     <contour>
-      <point x="183" y="145" type="line"/>
-      <point x="203" y="145" type="line"/>
-      <point x="203" y="218" type="line" smooth="yes"/>
-      <point x="203" y="377"/>
-      <point x="376" y="413"/>
-      <point x="376" y="549" type="curve" smooth="yes"/>
-      <point x="376" y="635"/>
-      <point x="306" y="704"/>
-      <point x="203" y="704" type="curve" smooth="yes"/>
-      <point x="144" y="704"/>
-      <point x="78" y="681"/>
-      <point x="29" y="644" type="curve"/>
-      <point x="34" y="628" type="line"/>
-      <point x="91" y="665"/>
-      <point x="148" y="685"/>
-      <point x="201" y="685" type="curve" smooth="yes"/>
-      <point x="296" y="685"/>
-      <point x="354" y="621"/>
-      <point x="354" y="547" type="curve" smooth="yes"/>
-      <point x="354" y="419"/>
-      <point x="183" y="386"/>
-      <point x="183" y="218" type="curve" smooth="yes"/>
+      <point x="170" y="145" type="line"/>
+      <point x="190" y="145" type="line"/>
+      <point x="190" y="218" type="line" smooth="yes"/>
+      <point x="190" y="377"/>
+      <point x="363" y="413"/>
+      <point x="363" y="549" type="curve" smooth="yes"/>
+      <point x="363" y="635"/>
+      <point x="293" y="704"/>
+      <point x="190" y="704" type="curve" smooth="yes"/>
+      <point x="131" y="704"/>
+      <point x="65" y="681"/>
+      <point x="16" y="644" type="curve"/>
+      <point x="21" y="628" type="line"/>
+      <point x="78" y="665"/>
+      <point x="135" y="685"/>
+      <point x="188" y="685" type="curve" smooth="yes"/>
+      <point x="283" y="685"/>
+      <point x="341" y="621"/>
+      <point x="341" y="547" type="curve" smooth="yes"/>
+      <point x="341" y="419"/>
+      <point x="170" y="386"/>
+      <point x="170" y="218" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="196" y="-10" type="curve" smooth="yes"/>
-      <point x="210" y="-10"/>
-      <point x="219" y="0"/>
-      <point x="219" y="13" type="curve" smooth="yes"/>
-      <point x="219" y="27"/>
-      <point x="210" y="37"/>
-      <point x="196" y="37" type="curve" smooth="yes"/>
-      <point x="182" y="37"/>
-      <point x="173" y="27"/>
-      <point x="173" y="13" type="curve" smooth="yes"/>
-      <point x="173" y="0"/>
-      <point x="182" y="-10"/>
+      <point x="180" y="-10" type="curve" smooth="yes"/>
+      <point x="194" y="-10"/>
+      <point x="203" y="0"/>
+      <point x="203" y="13" type="curve" smooth="yes"/>
+      <point x="203" y="27"/>
+      <point x="194" y="37"/>
+      <point x="180" y="37" type="curve" smooth="yes"/>
+      <point x="166" y="37"/>
+      <point x="157" y="27"/>
+      <point x="157" y="13" type="curve" smooth="yes"/>
+      <point x="157" y="0"/>
+      <point x="166" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/questiondown.glif 
b/src/Cantarell-Light.ufo/glyphs/questiondown.glif
index bbda435b..a60a5d62 100644
--- a/src/Cantarell-Light.ufo/glyphs/questiondown.glif
+++ b/src/Cantarell-Light.ufo/glyphs/questiondown.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="questiondown" format="2">
-  <advance width="367"/>
+  <advance width="418"/>
   <unicode hex="00BF"/>
   <outline>
-    <component base="question" xScale="-1" yScale="-1" xOffset="394" yOffset="479"/>
+    <component base="question" xScale="-1" yScale="-1" xOffset="418" yOffset="479"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|question</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|question</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/quotedbl.glif b/src/Cantarell-Light.ufo/glyphs/quotedbl.glif
index 3aaaf470..1beeac39 100644
--- a/src/Cantarell-Light.ufo/glyphs/quotedbl.glif
+++ b/src/Cantarell-Light.ufo/glyphs/quotedbl.glif
@@ -1,9 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotedbl" format="2">
-  <advance width="346"/>
+  <advance width="384"/>
   <unicode hex="0022"/>
   <outline>
     <component base="quotesingle"/>
     <component base="quotesingle" xOffset="150"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>quotesingle</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>quotesingle</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/quotedblbase.glif 
b/src/Cantarell-Light.ufo/glyphs/quotedblbase.glif
index 74cbee4e..2149cc03 100644
--- a/src/Cantarell-Light.ufo/glyphs/quotedblbase.glif
+++ b/src/Cantarell-Light.ufo/glyphs/quotedblbase.glif
@@ -1,13 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotedblbase" format="2">
-  <advance width="373"/>
+  <advance width="380"/>
   <unicode hex="201E"/>
   <outline>
-    <component base="_typoquote" xOffset="122"/>
-    <component base="_typoquote" xOffset="-18"/>
+    <component base="_typoquote" xOffset="127"/>
+    <component base="_typoquote" xOffset="-19"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>quoteright</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>quoteright</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Light.ufo/glyphs/quotedblleft.glif 
b/src/Cantarell-Light.ufo/glyphs/quotedblleft.glif
index d9ce42c7..5a97fb1f 100644
--- a/src/Cantarell-Light.ufo/glyphs/quotedblleft.glif
+++ b/src/Cantarell-Light.ufo/glyphs/quotedblleft.glif
@@ -1,9 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotedblleft" format="2">
-  <advance width="377"/>
+  <advance width="380"/>
   <unicode hex="201C"/>
   <outline>
     <component base="quoteleft" xOffset="146"/>
     <component base="quoteleft"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>quoteleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>quoteleft</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/quotedblright.glif 
b/src/Cantarell-Light.ufo/glyphs/quotedblright.glif
index 05abff0b..7c37817e 100644
--- a/src/Cantarell-Light.ufo/glyphs/quotedblright.glif
+++ b/src/Cantarell-Light.ufo/glyphs/quotedblright.glif
@@ -1,9 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotedblright" format="2">
-  <advance width="393"/>
+  <advance width="380"/>
   <unicode hex="201D"/>
   <outline>
-    <component base="quoteright" xOffset="140"/>
+    <component base="quoteright" xOffset="146"/>
     <component base="quoteright"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>quoteright</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>quoteright</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/quoteleft.glif b/src/Cantarell-Light.ufo/glyphs/quoteleft.glif
index 4780c756..aad8005d 100644
--- a/src/Cantarell-Light.ufo/glyphs/quoteleft.glif
+++ b/src/Cantarell-Light.ufo/glyphs/quoteleft.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quoteleft" format="2">
-  <advance width="231"/>
+  <advance width="234"/>
   <unicode hex="2018"/>
   <outline>
-    <component base="_typoquote" xScale="-1" yScale="-1" xOffset="251" yOffset="591"/>
+    <component base="_typoquote" xScale="-1" yScale="-1" xOffset="253" yOffset="591"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/quoteright.glif b/src/Cantarell-Light.ufo/glyphs/quoteright.glif
index 2df6f03a..c1577d13 100644
--- a/src/Cantarell-Light.ufo/glyphs/quoteright.glif
+++ b/src/Cantarell-Light.ufo/glyphs/quoteright.glif
@@ -1,12 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quoteright" format="2">
-  <advance width="233"/>
+  <advance width="234"/>
   <unicode hex="2019"/>
   <outline>
-    <component base="_typoquote" xOffset="-18" yOffset="636"/>
+    <component base="_typoquote" xOffset="-19" yOffset="636"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|quoteleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>quoteleft</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Light.ufo/glyphs/quotesinglbase.glif 
b/src/Cantarell-Light.ufo/glyphs/quotesinglbase.glif
index fab8431d..eafed353 100644
--- a/src/Cantarell-Light.ufo/glyphs/quotesinglbase.glif
+++ b/src/Cantarell-Light.ufo/glyphs/quotesinglbase.glif
@@ -1,12 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotesinglbase" format="2">
-  <advance width="233"/>
+  <advance width="234"/>
   <unicode hex="201A"/>
   <outline>
-    <component base="_typoquote" xOffset="-18"/>
+    <component base="_typoquote" xOffset="-19"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>quoteright</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>quoteleft</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Light.ufo/glyphs/quotesingle.glif b/src/Cantarell-Light.ufo/glyphs/quotesingle.glif
index e4dbf412..273f9f6d 100644
--- a/src/Cantarell-Light.ufo/glyphs/quotesingle.glif
+++ b/src/Cantarell-Light.ufo/glyphs/quotesingle.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotesingle" format="2">
-  <advance width="196"/>
+  <advance width="234"/>
   <unicode hex="0027"/>
   <outline>
     <contour>
-      <point x="90" y="432" type="line"/>
-      <point x="106" y="432" type="line"/>
-      <point x="110" y="694" type="line"/>
-      <point x="86" y="694" type="line"/>
+      <point x="109" y="432" type="line"/>
+      <point x="125" y="432" type="line"/>
+      <point x="129" y="694" type="line"/>
+      <point x="105" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/r.glif b/src/Cantarell-Light.ufo/glyphs/r.glif
index 7a958319..430f822d 100644
--- a/src/Cantarell-Light.ufo/glyphs/r.glif
+++ b/src/Cantarell-Light.ufo/glyphs/r.glif
@@ -1,35 +1,38 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="r" format="2">
-  <advance width="321"/>
+  <advance width="349"/>
   <unicode hex="0072"/>
-  <note>
-r
-</note>
-  <anchor x="97" y="0" name="bottom"/>
-  <anchor x="189" y="480" name="top"/>
+  <anchor x="116" y="0" name="bottom"/>
+  <anchor x="208" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="109" y="0" type="line"/>
-      <point x="109" y="378" type="line"/>
-      <point x="105" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="378" type="line"/>
+      <point x="124" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="101" y="365" type="line"/>
-      <point x="134" y="426"/>
-      <point x="190" y="462"/>
-      <point x="250" y="462" type="curve" smooth="yes"/>
-      <point x="267" y="462"/>
-      <point x="286" y="459"/>
-      <point x="302" y="453" type="curve"/>
-      <point x="308" y="469" type="line"/>
-      <point x="293" y="476"/>
-      <point x="273" y="480"/>
-      <point x="252" y="480" type="curve" smooth="yes"/>
-      <point x="187" y="480"/>
-      <point x="131" y="446"/>
-      <point x="101" y="388" type="curve"/>
+      <point x="120" y="365" type="line"/>
+      <point x="153" y="426"/>
+      <point x="209" y="462"/>
+      <point x="269" y="462" type="curve" smooth="yes"/>
+      <point x="286" y="462"/>
+      <point x="305" y="459"/>
+      <point x="321" y="453" type="curve"/>
+      <point x="327" y="469" type="line"/>
+      <point x="312" y="476"/>
+      <point x="292" y="480"/>
+      <point x="271" y="480" type="curve" smooth="yes"/>
+      <point x="206" y="480"/>
+      <point x="150" y="446"/>
+      <point x="120" y="388" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/racute.glif b/src/Cantarell-Light.ufo/glyphs/racute.glif
index 153db449..641c47ae 100644
--- a/src/Cantarell-Light.ufo/glyphs/racute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/racute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="racute" format="2">
-  <advance width="321"/>
+  <advance width="349"/>
   <unicode hex="0155"/>
   <outline>
     <component base="r"/>
-    <component base="acutecomb" xOffset="122"/>
+    <component base="acutecomb" xOffset="141"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/radical.glif b/src/Cantarell-Light.ufo/glyphs/radical.glif
index 19791145..69df88b1 100644
--- a/src/Cantarell-Light.ufo/glyphs/radical.glif
+++ b/src/Cantarell-Light.ufo/glyphs/radical.glif
@@ -1,18 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="radical" format="2">
-  <advance width="590"/>
+  <advance width="547"/>
   <unicode hex="221A"/>
   <outline>
     <contour>
-      <point x="341" y="-59" type="line"/>
-      <point x="360" y="-59" type="line"/>
-      <point x="501" y="739" type="line"/>
-      <point x="480" y="739" type="line"/>
-      <point x="348" y="-27" type="line"/>
-      <point x="228" y="276" type="line"/>
-      <point x="76" y="276" type="line"/>
-      <point x="76" y="259" type="line"/>
-      <point x="214" y="259" type="line"/>
+      <point x="311" y="-59" type="line"/>
+      <point x="330" y="-59" type="line"/>
+      <point x="471" y="739" type="line"/>
+      <point x="450" y="739" type="line"/>
+      <point x="318" y="-27" type="line"/>
+      <point x="198" y="276" type="line"/>
+      <point x="46" y="276" type="line"/>
+      <point x="46" y="259" type="line"/>
+      <point x="184" y="259" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ratio.glif b/src/Cantarell-Light.ufo/glyphs/ratio.glif
index 18194dfd..970f12a1 100644
--- a/src/Cantarell-Light.ufo/glyphs/ratio.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ratio.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ratio" format="2">
-  <advance width="314"/>
+  <advance width="230"/>
   <unicode hex="2236"/>
   <outline>
-    <component base="colon" xOffset="48" yOffset="100"/>
+    <component base="colon" yOffset="100"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>colon</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>colon</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/rcaron.glif b/src/Cantarell-Light.ufo/glyphs/rcaron.glif
index 12c1b84f..c0e07a5d 100644
--- a/src/Cantarell-Light.ufo/glyphs/rcaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rcaron" format="2">
-  <advance width="321"/>
+  <advance width="349"/>
   <unicode hex="0159"/>
   <outline>
     <component base="r"/>
-    <component base="caroncomb" xOffset="6"/>
+    <component base="caroncomb" xOffset="25"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/rcommaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/rcommaaccent.glif
index e0ad1678..91dbf731 100644
--- a/src/Cantarell-Light.ufo/glyphs/rcommaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rcommaaccent" format="2">
-  <advance width="321"/>
+  <advance width="349"/>
   <unicode hex="0157"/>
   <outline>
     <component base="r"/>
-    <component base="commaaccentcomb" xOffset="-32"/>
+    <component base="commaaccentcomb" xOffset="-13"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/rdblgrave.glif b/src/Cantarell-Light.ufo/glyphs/rdblgrave.glif
index 6314405e..e2dcab7e 100644
--- a/src/Cantarell-Light.ufo/glyphs/rdblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rdblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rdblgrave" format="2">
-  <advance width="321"/>
+  <advance width="349"/>
   <unicode hex="0211"/>
   <outline>
     <component base="r"/>
-    <component base="dblgravecomb" xOffset="-63"/>
+    <component base="dblgravecomb" xOffset="-44"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/rdotbelow.glif b/src/Cantarell-Light.ufo/glyphs/rdotbelow.glif
index b7808e01..d67ac648 100644
--- a/src/Cantarell-Light.ufo/glyphs/rdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rdotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rdotbelow" format="2">
-  <advance width="321"/>
+  <advance width="349"/>
   <unicode hex="1E5B"/>
   <outline>
     <component base="r"/>
-    <component base="dotbelowcomb" xOffset="-23"/>
+    <component base="dotbelowcomb" xOffset="-4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/registered.glif b/src/Cantarell-Light.ufo/glyphs/registered.glif
index 5e0016d6..187d4f25 100644
--- a/src/Cantarell-Light.ufo/glyphs/registered.glif
+++ b/src/Cantarell-Light.ufo/glyphs/registered.glif
@@ -1,67 +1,73 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="registered" format="2">
-  <advance width="675"/>
+  <advance width="661"/>
   <unicode hex="00AE"/>
   <outline>
     <contour>
-      <point x="336" y="279" type="curve" smooth="yes"/>
-      <point x="473" y="279"/>
-      <point x="565" y="373"/>
-      <point x="565" y="514" type="curve" smooth="yes"/>
-      <point x="565" y="655"/>
-      <point x="474" y="749"/>
-      <point x="338" y="749" type="curve" smooth="yes"/>
-      <point x="201" y="749"/>
-      <point x="110" y="654"/>
-      <point x="110" y="512" type="curve" smooth="yes"/>
-      <point x="110" y="372"/>
-      <point x="200" y="279"/>
+      <point x="329" y="279" type="curve" smooth="yes"/>
+      <point x="466" y="279"/>
+      <point x="558" y="373"/>
+      <point x="558" y="514" type="curve" smooth="yes"/>
+      <point x="558" y="655"/>
+      <point x="467" y="749"/>
+      <point x="331" y="749" type="curve" smooth="yes"/>
+      <point x="194" y="749"/>
+      <point x="103" y="654"/>
+      <point x="103" y="512" type="curve" smooth="yes"/>
+      <point x="103" y="372"/>
+      <point x="193" y="279"/>
     </contour>
     <contour>
-      <point x="339" y="297" type="curve" smooth="yes"/>
-      <point x="214" y="297"/>
-      <point x="131" y="384"/>
-      <point x="131" y="515" type="curve" smooth="yes"/>
-      <point x="131" y="645"/>
-      <point x="213" y="731"/>
-      <point x="335" y="731" type="curve" smooth="yes"/>
-      <point x="460" y="731"/>
-      <point x="544" y="643"/>
-      <point x="544" y="511" type="curve" smooth="yes"/>
-      <point x="544" y="383"/>
-      <point x="462" y="297"/>
+      <point x="251" y="380" type="line"/>
+      <point x="272" y="380" type="line"/>
+      <point x="272" y="658" type="line"/>
+      <point x="251" y="658" type="line"/>
     </contour>
     <contour>
-      <point x="258" y="380" type="line"/>
-      <point x="279" y="380" type="line"/>
-      <point x="279" y="658" type="line"/>
-      <point x="258" y="658" type="line"/>
+      <point x="415" y="380" type="line"/>
+      <point x="440" y="380" type="line"/>
+      <point x="365" y="509" type="line"/>
+      <point x="341" y="509" type="line"/>
     </contour>
     <contour>
-      <point x="271" y="497" type="line"/>
-      <point x="337" y="497" type="line" smooth="yes"/>
-      <point x="396" y="497"/>
-      <point x="432" y="528"/>
-      <point x="432" y="580" type="curve" smooth="yes"/>
-      <point x="432" y="628"/>
-      <point x="398" y="658"/>
-      <point x="340" y="658" type="curve" smooth="yes"/>
-      <point x="271" y="658" type="line"/>
-      <point x="271" y="640" type="line"/>
-      <point x="337" y="640" type="line" smooth="yes"/>
-      <point x="385" y="640"/>
-      <point x="411" y="617"/>
-      <point x="411" y="576" type="curve" smooth="yes"/>
-      <point x="411" y="537"/>
-      <point x="386" y="514"/>
-      <point x="340" y="514" type="curve" smooth="yes"/>
-      <point x="271" y="514" type="line"/>
+      <point x="332" y="297" type="curve" smooth="yes"/>
+      <point x="207" y="297"/>
+      <point x="124" y="384"/>
+      <point x="124" y="515" type="curve" smooth="yes"/>
+      <point x="124" y="645"/>
+      <point x="206" y="731"/>
+      <point x="328" y="731" type="curve" smooth="yes"/>
+      <point x="453" y="731"/>
+      <point x="537" y="643"/>
+      <point x="537" y="511" type="curve" smooth="yes"/>
+      <point x="537" y="383"/>
+      <point x="455" y="297"/>
     </contour>
     <contour>
-      <point x="422" y="380" type="line"/>
-      <point x="447" y="380" type="line"/>
-      <point x="372" y="509" type="line"/>
-      <point x="348" y="509" type="line"/>
+      <point x="264" y="497" type="line"/>
+      <point x="330" y="497" type="line" smooth="yes"/>
+      <point x="389" y="497"/>
+      <point x="425" y="528"/>
+      <point x="425" y="580" type="curve" smooth="yes"/>
+      <point x="425" y="628"/>
+      <point x="391" y="658"/>
+      <point x="333" y="658" type="curve" smooth="yes"/>
+      <point x="264" y="658" type="line"/>
+      <point x="264" y="640" type="line"/>
+      <point x="330" y="640" type="line" smooth="yes"/>
+      <point x="378" y="640"/>
+      <point x="404" y="617"/>
+      <point x="404" y="576" type="curve" smooth="yes"/>
+      <point x="404" y="537"/>
+      <point x="379" y="514"/>
+      <point x="333" y="514" type="curve" smooth="yes"/>
+      <point x="264" y="514" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/rightA_rrow.glif b/src/Cantarell-Light.ufo/glyphs/rightA_rrow.glif
index 08c90d96..1a2361be 100644
--- a/src/Cantarell-Light.ufo/glyphs/rightA_rrow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rightA_rrow.glif
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rightArrow" format="2">
-  <advance width="687"/>
+  <advance width="664"/>
   <unicode hex="2192"/>
-  <note>
-arrowright
-</note>
   <outline>
     <contour>
-      <point x="360" y="88" type="line"/>
-      <point x="606" y="330" type="line"/>
-      <point x="606" y="334" type="line"/>
-      <point x="362" y="571" type="line"/>
-      <point x="350" y="557" type="line"/>
-      <point x="572" y="340" type="line"/>
-      <point x="82" y="340" type="line"/>
-      <point x="82" y="323" type="line"/>
-      <point x="572" y="323" type="line"/>
-      <point x="348" y="101" type="line"/>
+      <point x="349" y="88" type="line"/>
+      <point x="595" y="330" type="line"/>
+      <point x="595" y="334" type="line"/>
+      <point x="351" y="571" type="line"/>
+      <point x="339" y="557" type="line"/>
+      <point x="561" y="340" type="line"/>
+      <point x="71" y="340" type="line"/>
+      <point x="71" y="323" type="line"/>
+      <point x="561" y="323" type="line"/>
+      <point x="337" y="101" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/rightanglebracket-math.glif 
b/src/Cantarell-Light.ufo/glyphs/rightanglebracket-math.glif
index f3395f2c..1b58781b 100644
--- a/src/Cantarell-Light.ufo/glyphs/rightanglebracket-math.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rightanglebracket-math.glif
@@ -1,16 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rightanglebracket-math" format="2">
-  <advance width="266"/>
+  <advance width="314"/>
   <unicode hex="27E9"/>
   <outline>
     <contour>
-      <point x="49" y="-10" type="line"/>
-      <point x="69" y="-10" type="line"/>
-      <point x="216" y="378" type="line"/>
-      <point x="72" y="739" type="line"/>
-      <point x="50" y="739" type="line"/>
-      <point x="201" y="369" type="line"/>
-      <point x="198" y="384" type="line"/>
+      <point x="62" y="-10" type="line"/>
+      <point x="83" y="-10" type="line"/>
+      <point x="250" y="378" type="line"/>
+      <point x="87" y="739" type="line"/>
+      <point x="63" y="739" type="line"/>
+      <point x="234" y="369" type="line"/>
+      <point x="231" y="384" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|leftanglebracket-math</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|leftanglebracket-math</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ring.glif b/src/Cantarell-Light.ufo/glyphs/ring.glif
index be09ba8b..8d239714 100644
--- a/src/Cantarell-Light.ufo/glyphs/ring.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ring.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ring" format="2">
-  <advance width="347"/>
+  <advance width="500"/>
   <unicode hex="02DA"/>
   <outline>
-    <component base="ringcomb" xOffset="-1"/>
+    <component base="ringcomb" xOffset="77"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ringhalfleft.glif 
b/src/Cantarell-Light.ufo/glyphs/ringhalfleft.glif
index 7ea559cc..44a7464b 100644
--- a/src/Cantarell-Light.ufo/glyphs/ringhalfleft.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ringhalfleft.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ringhalfleft" format="2">
-  <advance width="251"/>
+  <advance width="175"/>
   <unicode hex="02BF"/>
   <outline>
-    <component base="ringhalfright" xScale="-1" xOffset="251"/>
+    <component base="ringhalfright" xScale="-1" xOffset="175"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|ringhalfright</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|ringhalfright</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ringhalfright.glif 
b/src/Cantarell-Light.ufo/glyphs/ringhalfright.glif
index 469c33cb..bb9af36e 100644
--- a/src/Cantarell-Light.ufo/glyphs/ringhalfright.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ringhalfright.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ringhalfright" format="2">
-  <advance width="251"/>
+  <advance width="175"/>
   <unicode hex="02BE"/>
   <outline>
     <contour>
-      <point x="70" y="576" type="line"/>
-      <point x="129" y="576"/>
-      <point x="164" y="608"/>
-      <point x="164" y="663" type="curve" smooth="yes"/>
-      <point x="164" y="713"/>
-      <point x="129" y="743"/>
-      <point x="70" y="743" type="curve"/>
-      <point x="70" y="729" type="line"/>
-      <point x="117" y="729"/>
-      <point x="144" y="704"/>
-      <point x="144" y="660" type="curve" smooth="yes"/>
-      <point x="144" y="615"/>
-      <point x="116" y="589"/>
-      <point x="70" y="589" type="curve"/>
+      <point x="32" y="576" type="line"/>
+      <point x="91" y="576"/>
+      <point x="126" y="608"/>
+      <point x="126" y="663" type="curve" smooth="yes"/>
+      <point x="126" y="713"/>
+      <point x="91" y="743"/>
+      <point x="32" y="743" type="curve"/>
+      <point x="32" y="729" type="line"/>
+      <point x="79" y="729"/>
+      <point x="106" y="704"/>
+      <point x="106" y="660" type="curve" smooth="yes"/>
+      <point x="106" y="615"/>
+      <point x="78" y="589"/>
+      <point x="32" y="589" type="curve"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/rinvertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/rinvertedbreve.glif
index 09f1cd00..b26aeb3a 100644
--- a/src/Cantarell-Light.ufo/glyphs/rinvertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rinvertedbreve" format="2">
-  <advance width="321"/>
+  <advance width="349"/>
   <unicode hex="0213"/>
   <outline>
     <component base="r"/>
-    <component base="breveinvertedcomb" xOffset="-12"/>
+    <component base="breveinvertedcomb" xOffset="7"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/rlinebelow.glif b/src/Cantarell-Light.ufo/glyphs/rlinebelow.glif
index 43f6dc37..d82de550 100644
--- a/src/Cantarell-Light.ufo/glyphs/rlinebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rlinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rlinebelow" format="2">
-  <advance width="321"/>
+  <advance width="349"/>
   <unicode hex="1E5F"/>
   <outline>
     <component base="r"/>
-    <component base="macronbelowcomb.narrow" xOffset="-124"/>
+    <component base="macronbelowcomb.narrow" xOffset="-105"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ruble.glif b/src/Cantarell-Light.ufo/glyphs/ruble.glif
index 0c5b15cd..6cdbc9e1 100644
--- a/src/Cantarell-Light.ufo/glyphs/ruble.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ruble.glif
@@ -1,39 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ruble" format="2">
-  <advance width="696"/>
+  <advance width="580"/>
   <unicode hex="20BD"/>
   <outline>
     <contour>
-      <point x="204" y="0" type="line"/>
-      <point x="225" y="0" type="line"/>
-      <point x="225" y="694" type="line"/>
-      <point x="204" y="694" type="line"/>
+      <point x="65" y="279" type="line"/>
+      <point x="315" y="279" type="line" smooth="yes"/>
+      <point x="429" y="279"/>
+      <point x="507" y="363"/>
+      <point x="507" y="485" type="curve" smooth="yes"/>
+      <point x="507" y="609"/>
+      <point x="431" y="694"/>
+      <point x="320" y="694" type="curve" smooth="yes"/>
+      <point x="162" y="694" type="line"/>
+      <point x="162" y="676" type="line"/>
+      <point x="315" y="676" type="line" smooth="yes"/>
+      <point x="416" y="676"/>
+      <point x="485" y="597"/>
+      <point x="485" y="480" type="curve" smooth="yes"/>
+      <point x="485" y="367"/>
+      <point x="422" y="297"/>
+      <point x="320" y="297" type="curve" smooth="yes"/>
+      <point x="65" y="297" type="line"/>
     </contour>
     <contour>
-      <point x="84" y="122" type="line"/>
-      <point x="388" y="122" type="line"/>
-      <point x="388" y="139" type="line"/>
-      <point x="84" y="139" type="line"/>
+      <point x="65" y="122" type="line"/>
+      <point x="324" y="122" type="line"/>
+      <point x="324" y="139" type="line"/>
+      <point x="65" y="139" type="line"/>
     </contour>
     <contour>
-      <point x="84" y="268" type="line"/>
-      <point x="380" y="268" type="line" smooth="yes"/>
-      <point x="516" y="268"/>
-      <point x="606" y="353"/>
-      <point x="606" y="480" type="curve" smooth="yes"/>
-      <point x="606" y="608"/>
-      <point x="518" y="694"/>
-      <point x="386" y="694" type="curve" smooth="yes"/>
-      <point x="219" y="694" type="line"/>
-      <point x="219" y="676" type="line"/>
-      <point x="380" y="676" type="line" smooth="yes"/>
-      <point x="502" y="676"/>
-      <point x="584" y="597"/>
-      <point x="584" y="475" type="curve" smooth="yes"/>
-      <point x="584" y="358"/>
-      <point x="510" y="286"/>
-      <point x="386" y="286" type="curve" smooth="yes"/>
-      <point x="84" y="286" type="line"/>
+      <point x="148" y="0" type="line"/>
+      <point x="169" y="0" type="line"/>
+      <point x="169" y="694" type="line"/>
+      <point x="148" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/rupeeI_ndian.glif 
b/src/Cantarell-Light.ufo/glyphs/rupeeI_ndian.glif
index 63d6ef19..5534760b 100644
--- a/src/Cantarell-Light.ufo/glyphs/rupeeI_ndian.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rupeeI_ndian.glif
@@ -1,45 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rupeeIndian" format="2">
-  <advance width="643"/>
+  <advance width="580"/>
   <unicode hex="20B9"/>
   <outline>
     <contour>
-      <point x="90" y="304" type="line"/>
-      <point x="247" y="304" type="line" smooth="yes"/>
-      <point x="401" y="304"/>
-      <point x="485" y="378"/>
-      <point x="485" y="502" type="curve" smooth="yes"/>
-      <point x="485" y="623"/>
-      <point x="403" y="694"/>
-      <point x="251" y="694" type="curve" smooth="yes"/>
-      <point x="90" y="694" type="line"/>
-      <point x="90" y="676" type="line"/>
-      <point x="247" y="676" type="line" smooth="yes"/>
-      <point x="389" y="676"/>
-      <point x="463" y="612"/>
-      <point x="463" y="499" type="curve" smooth="yes"/>
-      <point x="463" y="387"/>
-      <point x="389" y="321"/>
-      <point x="253" y="321" type="curve" smooth="yes"/>
-      <point x="90" y="321" type="line"/>
+      <point x="59" y="302" type="line"/>
+      <point x="216" y="302" type="line" smooth="yes"/>
+      <point x="368" y="302"/>
+      <point x="454" y="374"/>
+      <point x="454" y="502" type="curve" smooth="yes"/>
+      <point x="454" y="625"/>
+      <point x="370" y="694"/>
+      <point x="220" y="694" type="curve" smooth="yes"/>
+      <point x="59" y="694" type="line"/>
+      <point x="59" y="676" type="line"/>
+      <point x="216" y="676" type="line" smooth="yes"/>
+      <point x="356" y="676"/>
+      <point x="432" y="614"/>
+      <point x="432" y="499" type="curve" smooth="yes"/>
+      <point x="432" y="384"/>
+      <point x="357" y="319"/>
+      <point x="222" y="319" type="curve" smooth="yes"/>
+      <point x="59" y="319" type="line"/>
     </contour>
     <contour>
-      <point x="491" y="0" type="line"/>
-      <point x="517" y="0" type="line"/>
-      <point x="332" y="317" type="line"/>
-      <point x="310" y="317" type="line"/>
+      <point x="470" y="0" type="line"/>
+      <point x="496" y="0" type="line"/>
+      <point x="281" y="315" type="line"/>
+      <point x="259" y="315" type="line"/>
     </contour>
     <contour>
-      <point x="90" y="488" type="line"/>
-      <point x="562" y="488" type="line"/>
-      <point x="562" y="505" type="line"/>
-      <point x="90" y="505" type="line"/>
+      <point x="59" y="489" type="line"/>
+      <point x="531" y="489" type="line"/>
+      <point x="531" y="505" type="line"/>
+      <point x="59" y="505" type="line"/>
     </contour>
     <contour>
-      <point x="90" y="677" type="line"/>
-      <point x="562" y="677" type="line"/>
-      <point x="562" y="694" type="line"/>
-      <point x="90" y="694" type="line"/>
+      <point x="59" y="677" type="line"/>
+      <point x="531" y="677" type="line"/>
+      <point x="531" y="694" type="line"/>
+      <point x="59" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/s.glif b/src/Cantarell-Light.ufo/glyphs/s.glif
index b910392d..dbf59b37 100644
--- a/src/Cantarell-Light.ufo/glyphs/s.glif
+++ b/src/Cantarell-Light.ufo/glyphs/s.glif
@@ -1,46 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="s" format="2">
-  <advance width="430"/>
+  <advance width="451"/>
   <unicode hex="0073"/>
-  <note>
-s
-</note>
-  <anchor x="207" y="0" name="bottom"/>
-  <anchor x="216" y="480" name="top"/>
+  <anchor x="218" y="0" name="bottom"/>
+  <anchor x="227" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="222" y="-10" type="curve" smooth="yes"/>
-      <point x="325" y="-10"/>
-      <point x="385" y="40"/>
-      <point x="385" y="118" type="curve" smooth="yes"/>
-      <point x="385" y="294"/>
-      <point x="77" y="208"/>
-      <point x="77" y="362" type="curve" smooth="yes"/>
-      <point x="77" y="429"/>
-      <point x="136" y="468"/>
-      <point x="224" y="468" type="curve" smooth="yes"/>
-      <point x="271" y="468"/>
-      <point x="321" y="457"/>
-      <point x="353" y="440" type="curve"/>
-      <point x="360" y="456" type="line"/>
-      <point x="329" y="474"/>
-      <point x="273" y="486"/>
-      <point x="224" y="486" type="curve" smooth="yes"/>
-      <point x="124" y="486"/>
-      <point x="56" y="437"/>
-      <point x="56" y="358" type="curve" smooth="yes"/>
-      <point x="56" y="189"/>
-      <point x="364" y="276"/>
-      <point x="364" y="115" type="curve" smooth="yes"/>
-      <point x="364" y="49"/>
-      <point x="313" y="8"/>
-      <point x="224" y="8" type="curve" smooth="yes"/>
-      <point x="170" y="8"/>
-      <point x="108" y="23"/>
-      <point x="52" y="50" type="curve"/>
-      <point x="45" y="33" type="line"/>
-      <point x="102" y="5"/>
-      <point x="166" y="-10"/>
+      <point x="233" y="-10" type="curve" smooth="yes"/>
+      <point x="336" y="-10"/>
+      <point x="396" y="40"/>
+      <point x="396" y="118" type="curve" smooth="yes"/>
+      <point x="396" y="294"/>
+      <point x="88" y="208"/>
+      <point x="88" y="362" type="curve" smooth="yes"/>
+      <point x="88" y="429"/>
+      <point x="147" y="468"/>
+      <point x="235" y="468" type="curve" smooth="yes"/>
+      <point x="282" y="468"/>
+      <point x="332" y="457"/>
+      <point x="364" y="440" type="curve"/>
+      <point x="371" y="456" type="line"/>
+      <point x="340" y="474"/>
+      <point x="284" y="486"/>
+      <point x="235" y="486" type="curve" smooth="yes"/>
+      <point x="135" y="486"/>
+      <point x="67" y="437"/>
+      <point x="67" y="358" type="curve" smooth="yes"/>
+      <point x="67" y="189"/>
+      <point x="375" y="276"/>
+      <point x="375" y="115" type="curve" smooth="yes"/>
+      <point x="375" y="49"/>
+      <point x="324" y="8"/>
+      <point x="235" y="8" type="curve" smooth="yes"/>
+      <point x="181" y="8"/>
+      <point x="119" y="23"/>
+      <point x="63" y="50" type="curve"/>
+      <point x="56" y="33" type="line"/>
+      <point x="113" y="5"/>
+      <point x="177" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sacute.glif b/src/Cantarell-Light.ufo/glyphs/sacute.glif
index 34268385..8ee095ae 100644
--- a/src/Cantarell-Light.ufo/glyphs/sacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sacute" format="2">
-  <advance width="430"/>
+  <advance width="451"/>
   <unicode hex="015B"/>
   <outline>
     <component base="s"/>
-    <component base="acutecomb" xOffset="149"/>
+    <component base="acutecomb" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sacutedotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/sacutedotaccent.glif
index 9c83f906..95554024 100644
--- a/src/Cantarell-Light.ufo/glyphs/sacutedotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sacutedotaccent.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sacutedotaccent" format="2">
-  <advance width="430"/>
+  <advance width="451"/>
   <unicode hex="1E65"/>
   <outline>
     <component base="s"/>
-    <component base="acutecomb_dotaccentcomb" xOffset="151"/>
+    <component base="acutecomb.loclVIET" xOffset="162"/>
+    <component base="dotaccentcomb.loclVIET" xOffset="74" yOffset="97"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_dot</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>dotaccentcomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/saltillo.glif b/src/Cantarell-Light.ufo/glyphs/saltillo.glif
index dbf9f51d..2a3ff964 100644
--- a/src/Cantarell-Light.ufo/glyphs/saltillo.glif
+++ b/src/Cantarell-Light.ufo/glyphs/saltillo.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="saltillo" format="2">
-  <advance width="115"/>
+  <advance width="238"/>
   <unicode hex="A78C"/>
   <outline>
-    <component base="quotesingle" yScale="1.40024" xOffset="-53" yOffset="-278"/>
+    <component base="quotesingle" yScale="1.40024" xOffset="2" yOffset="-278"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/scaron.glif b/src/Cantarell-Light.ufo/glyphs/scaron.glif
index baff8f8c..64255051 100644
--- a/src/Cantarell-Light.ufo/glyphs/scaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/scaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scaron" format="2">
-  <advance width="430"/>
+  <advance width="451"/>
   <unicode hex="0161"/>
   <outline>
     <component base="s"/>
-    <component base="caroncomb" xOffset="33"/>
+    <component base="caroncomb" xOffset="44"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/scarondotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/scarondotaccent.glif
index 132b76ce..7b2dfbdf 100644
--- a/src/Cantarell-Light.ufo/glyphs/scarondotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/scarondotaccent.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scarondotaccent" format="2">
-  <advance width="430"/>
+  <advance width="451"/>
   <unicode hex="1E67"/>
   <outline>
     <component base="s"/>
-    <component base="caroncomb_dotaccentcomb" xOffset="31"/>
+    <component base="caroncomb.loclVIET" xOffset="42"/>
+    <component base="dotaccentcomb.loclVIET" xOffset="108" yOffset="99"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/scedilla.glif b/src/Cantarell-Light.ufo/glyphs/scedilla.glif
index 729f1726..4124adf9 100644
--- a/src/Cantarell-Light.ufo/glyphs/scedilla.glif
+++ b/src/Cantarell-Light.ufo/glyphs/scedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scedilla" format="2">
-  <advance width="430"/>
+  <advance width="451"/>
   <unicode hex="015F"/>
   <outline>
     <component base="s"/>
-    <component base="cedillacomb" xOffset="82"/>
+    <component base="cedillacomb" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/schwa-cy.glif b/src/Cantarell-Light.ufo/glyphs/schwa-cy.glif
index 6614ef80..a211816a 100644
--- a/src/Cantarell-Light.ufo/glyphs/schwa-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/schwa-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="schwa-cy" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="04D9"/>
   <outline>
     <component base="schwa"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/schwa.glif b/src/Cantarell-Light.ufo/glyphs/schwa.glif
index 7013e79b..77e058ad 100644
--- a/src/Cantarell-Light.ufo/glyphs/schwa.glif
+++ b/src/Cantarell-Light.ufo/glyphs/schwa.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="schwa" format="2">
-  <advance width="493"/>
+  <advance width="520"/>
   <unicode hex="0259"/>
   <outline>
-    <component base="e" xScale="-1" yScale="-1" xOffset="493" yOffset="480"/>
+    <component base="e" xScale="-1" yScale="-1" xOffset="520" yOffset="480"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/scircumflex.glif b/src/Cantarell-Light.ufo/glyphs/scircumflex.glif
index 0565de84..443fc050 100644
--- a/src/Cantarell-Light.ufo/glyphs/scircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/scircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scircumflex" format="2">
-  <advance width="430"/>
+  <advance width="451"/>
   <unicode hex="015D"/>
   <outline>
     <component base="s"/>
-    <component base="circumflexcomb" xOffset="45"/>
+    <component base="circumflexcomb" xOffset="56"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/scommaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/scommaaccent.glif
index 7ee72789..03a32a65 100644
--- a/src/Cantarell-Light.ufo/glyphs/scommaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/scommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scommaaccent" format="2">
-  <advance width="430"/>
+  <advance width="451"/>
   <unicode hex="0219"/>
   <outline>
     <component base="s"/>
-    <component base="commaaccentcomb" xOffset="78"/>
+    <component base="commaaccentcomb" xOffset="89"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sdotaccent.glif b/src/Cantarell-Light.ufo/glyphs/sdotaccent.glif
index aeb59d7f..14a6f447 100644
--- a/src/Cantarell-Light.ufo/glyphs/sdotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sdotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sdotaccent" format="2">
-  <advance width="430"/>
+  <advance width="451"/>
   <unicode hex="1E61"/>
   <outline>
     <component base="s"/>
-    <component base="dotaccentcomb" xOffset="97"/>
+    <component base="dotaccentcomb" xOffset="108"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sdotbelow.glif b/src/Cantarell-Light.ufo/glyphs/sdotbelow.glif
index a727aef6..53d5d8d1 100644
--- a/src/Cantarell-Light.ufo/glyphs/sdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sdotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sdotbelow" format="2">
-  <advance width="430"/>
+  <advance width="451"/>
   <unicode hex="1E63"/>
   <outline>
     <component base="s"/>
-    <component base="dotbelowcomb" xOffset="87"/>
+    <component base="dotbelowcomb" xOffset="98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sdotbelowdotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/sdotbelowdotaccent.glif
index b01fc333..2f419d10 100644
--- a/src/Cantarell-Light.ufo/glyphs/sdotbelowdotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sdotbelowdotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sdotbelowdotaccent" format="2">
-  <advance width="430"/>
+  <advance width="451"/>
   <unicode hex="1E69"/>
   <outline>
     <component base="s"/>
-    <component base="dotbelowcomb" xScale="0.96154" yScale="0.96154" xOffset="92"/>
-    <component base="dotaccentcomb" xOffset="97"/>
+    <component base="dotbelowcomb" xScale="0.96154" yScale="0.96154" xOffset="103"/>
+    <component base="dotaccentcomb" xOffset="108"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/second.glif b/src/Cantarell-Light.ufo/glyphs/second.glif
index e5ff8d1f..6408b58e 100644
--- a/src/Cantarell-Light.ufo/glyphs/second.glif
+++ b/src/Cantarell-Light.ufo/glyphs/second.glif
@@ -1,12 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="second" format="2">
-  <advance width="488"/>
+  <advance width="478"/>
   <unicode hex="2033"/>
-  <note>
-second
-</note>
   <outline>
-    <component base="quotesingle" yxScale="0.19201" xOffset="-70"/>
-    <component base="quotesingle" yxScale="0.19201" xOffset="110"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="-76"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="104"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minute</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>minute</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/secondtonechinese.glif 
b/src/Cantarell-Light.ufo/glyphs/secondtonechinese.glif
index 96755e9f..dc284c5f 100644
--- a/src/Cantarell-Light.ufo/glyphs/secondtonechinese.glif
+++ b/src/Cantarell-Light.ufo/glyphs/secondtonechinese.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="secondtonechinese" format="2">
-  <advance width="242"/>
+  <advance width="150"/>
   <unicode hex="02CA"/>
   <outline>
-    <component base="acutecomb"/>
+    <component base="acutecomb" xOffset="-40"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/section.glif b/src/Cantarell-Light.ufo/glyphs/section.glif
index ed2817d8..8a712af1 100644
--- a/src/Cantarell-Light.ufo/glyphs/section.glif
+++ b/src/Cantarell-Light.ufo/glyphs/section.glif
@@ -1,63 +1,63 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="section" format="2">
-  <advance width="558"/>
+  <advance width="542"/>
   <unicode hex="00A7"/>
   <outline>
     <contour>
-      <point x="288" y="-60" type="curve" smooth="yes"/>
-      <point x="387" y="-60"/>
-      <point x="453" y="-12"/>
-      <point x="453" y="71" type="curve" smooth="yes"/>
-      <point x="453" y="257"/>
-      <point x="131" y="174"/>
-      <point x="131" y="333" type="curve" smooth="yes"/>
-      <point x="131" y="399"/>
-      <point x="188" y="444"/>
-      <point x="284" y="444" type="curve"/>
-      <point x="285" y="457" type="line"/>
-      <point x="176" y="457"/>
-      <point x="110" y="408"/>
-      <point x="110" y="330" type="curve" smooth="yes"/>
-      <point x="110" y="156"/>
-      <point x="432" y="238"/>
-      <point x="432" y="68" type="curve" smooth="yes"/>
-      <point x="432" y="-2"/>
-      <point x="376" y="-42"/>
-      <point x="290" y="-42" type="curve" smooth="yes"/>
-      <point x="231" y="-42"/>
-      <point x="168" y="-24"/>
-      <point x="112" y="4" type="curve"/>
-      <point x="105" y="-13" type="line"/>
-      <point x="159" y="-42"/>
-      <point x="228" y="-60"/>
+      <point x="281" y="-60" type="curve" smooth="yes"/>
+      <point x="380" y="-60"/>
+      <point x="446" y="-12"/>
+      <point x="446" y="71" type="curve" smooth="yes"/>
+      <point x="446" y="257"/>
+      <point x="124" y="174"/>
+      <point x="124" y="333" type="curve" smooth="yes"/>
+      <point x="124" y="399"/>
+      <point x="181" y="444"/>
+      <point x="277" y="444" type="curve"/>
+      <point x="278" y="457" type="line"/>
+      <point x="169" y="457"/>
+      <point x="103" y="408"/>
+      <point x="103" y="330" type="curve" smooth="yes"/>
+      <point x="103" y="156"/>
+      <point x="425" y="238"/>
+      <point x="425" y="68" type="curve" smooth="yes"/>
+      <point x="425" y="-2"/>
+      <point x="369" y="-42"/>
+      <point x="283" y="-42" type="curve" smooth="yes"/>
+      <point x="224" y="-42"/>
+      <point x="161" y="-24"/>
+      <point x="105" y="4" type="curve"/>
+      <point x="98" y="-13" type="line"/>
+      <point x="152" y="-42"/>
+      <point x="221" y="-60"/>
     </contour>
     <contour>
-      <point x="289" y="193" type="line"/>
-      <point x="387" y="193"/>
-      <point x="446" y="239"/>
-      <point x="446" y="316" type="curve" smooth="yes"/>
-      <point x="446" y="497"/>
-      <point x="133" y="421"/>
-      <point x="133" y="568" type="curve" smooth="yes"/>
-      <point x="133" y="634"/>
-      <point x="195" y="686"/>
-      <point x="286" y="686" type="curve" smooth="yes"/>
-      <point x="332" y="686"/>
-      <point x="384" y="673"/>
-      <point x="425" y="652" type="curve"/>
-      <point x="432" y="668" type="line"/>
-      <point x="389" y="691"/>
-      <point x="338" y="704"/>
-      <point x="289" y="704" type="curve" smooth="yes"/>
-      <point x="185" y="704"/>
-      <point x="112" y="646"/>
-      <point x="112" y="566" type="curve" smooth="yes"/>
-      <point x="112" y="402"/>
-      <point x="425" y="481"/>
-      <point x="425" y="315" type="curve" smooth="yes"/>
-      <point x="425" y="248"/>
-      <point x="375" y="206"/>
-      <point x="290" y="206" type="curve"/>
+      <point x="282" y="193" type="line"/>
+      <point x="380" y="193"/>
+      <point x="439" y="239"/>
+      <point x="439" y="316" type="curve" smooth="yes"/>
+      <point x="439" y="497"/>
+      <point x="126" y="421"/>
+      <point x="126" y="568" type="curve" smooth="yes"/>
+      <point x="126" y="634"/>
+      <point x="188" y="686"/>
+      <point x="279" y="686" type="curve" smooth="yes"/>
+      <point x="325" y="686"/>
+      <point x="377" y="673"/>
+      <point x="418" y="652" type="curve"/>
+      <point x="425" y="668" type="line"/>
+      <point x="382" y="691"/>
+      <point x="331" y="704"/>
+      <point x="282" y="704" type="curve" smooth="yes"/>
+      <point x="178" y="704"/>
+      <point x="105" y="646"/>
+      <point x="105" y="566" type="curve" smooth="yes"/>
+      <point x="105" y="402"/>
+      <point x="418" y="481"/>
+      <point x="418" y="315" type="curve" smooth="yes"/>
+      <point x="418" y="248"/>
+      <point x="368" y="206"/>
+      <point x="283" y="206" type="curve"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/semicolon.glif b/src/Cantarell-Light.ufo/glyphs/semicolon.glif
index 84afcc92..1e7bff44 100644
--- a/src/Cantarell-Light.ufo/glyphs/semicolon.glif
+++ b/src/Cantarell-Light.ufo/glyphs/semicolon.glif
@@ -3,8 +3,8 @@
   <advance width="230"/>
   <unicode hex="003B"/>
   <outline>
-    <component base="comma" xOffset="-4"/>
-    <component base="period" xOffset="-16" yOffset="440"/>
+    <component base="comma"/>
+    <component base="period" xOffset="8" yOffset="440"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/seven.dnom.glif b/src/Cantarell-Light.ufo/glyphs/seven.dnom.glif
index afdc93b3..cb0bd1cf 100644
--- a/src/Cantarell-Light.ufo/glyphs/seven.dnom.glif
+++ b/src/Cantarell-Light.ufo/glyphs/seven.dnom.glif
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven.dnom" format="2">
-  <advance width="367"/>
-  <note>
-seven
-</note>
+  <advance width="325"/>
   <outline>
     <contour>
-      <point x="101" y="0" type="line"/>
-      <point x="125" y="0" type="line"/>
-      <point x="340" y="460" type="line"/>
-      <point x="340" y="472" type="line"/>
-      <point x="20" y="472" type="line"/>
-      <point x="20" y="453" type="line"/>
-      <point x="322" y="453" type="line"/>
-      <point x="318" y="462" type="line"/>
+      <point x="89" y="0" type="line"/>
+      <point x="113" y="0" type="line"/>
+      <point x="296" y="405" type="line"/>
+      <point x="296" y="416" type="line"/>
+      <point x="21" y="416" type="line"/>
+      <point x="21" y="397" type="line"/>
+      <point x="277" y="397" type="line"/>
+      <point x="273" y="405" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -21,11 +18,11 @@ seven
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>68</integer>
+        <integer>60</integer>
         <key>weight</key>
-        <integer>1</integer>
+        <integer>2</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>63</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/seven.glif b/src/Cantarell-Light.ufo/glyphs/seven.glif
index efd890a0..881cbc0e 100644
--- a/src/Cantarell-Light.ufo/glyphs/seven.glif
+++ b/src/Cantarell-Light.ufo/glyphs/seven.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven" format="2">
-  <advance width="521"/>
+  <advance width="482"/>
   <unicode hex="0037"/>
   <outline>
     <contour>
-      <point x="157" y="0" type="line"/>
-      <point x="180" y="0" type="line"/>
-      <point x="471" y="682" type="line"/>
-      <point x="471" y="694" type="line"/>
-      <point x="44" y="694" type="line"/>
-      <point x="44" y="676" type="line"/>
-      <point x="454" y="676" type="line"/>
-      <point x="451" y="685" type="line"/>
+      <point x="135" y="0" type="line"/>
+      <point x="158" y="0" type="line"/>
+      <point x="449" y="682" type="line"/>
+      <point x="449" y="694" type="line"/>
+      <point x="22" y="694" type="line"/>
+      <point x="22" y="676" type="line"/>
+      <point x="432" y="676" type="line"/>
+      <point x="429" y="685" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/seven.numr.glif b/src/Cantarell-Light.ufo/glyphs/seven.numr.glif
index 73c45fb4..4ae89258 100644
--- a/src/Cantarell-Light.ufo/glyphs/seven.numr.glif
+++ b/src/Cantarell-Light.ufo/glyphs/seven.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven.numr" format="2">
-  <advance width="367"/>
+  <advance width="325"/>
   <outline>
     <component base="seven.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/seven.osf.glif b/src/Cantarell-Light.ufo/glyphs/seven.osf.glif
index 04381976..8bccd3ff 100644
--- a/src/Cantarell-Light.ufo/glyphs/seven.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/seven.osf.glif
@@ -1,16 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven.osf" format="2">
-  <advance width="521"/>
+  <advance width="482"/>
   <outline>
     <contour>
-      <point x="157" y="-100" type="line"/>
-      <point x="180" y="-100" type="line"/>
-      <point x="471" y="582" type="line"/>
-      <point x="471" y="594" type="line"/>
-      <point x="44" y="594" type="line"/>
-      <point x="44" y="576" type="line"/>
-      <point x="454" y="576" type="line"/>
-      <point x="451" y="585" type="line"/>
+      <point x="135" y="-100" type="line"/>
+      <point x="158" y="-100" type="line"/>
+      <point x="449" y="582" type="line"/>
+      <point x="449" y="594" type="line"/>
+      <point x="22" y="594" type="line"/>
+      <point x="22" y="576" type="line"/>
+      <point x="432" y="576" type="line"/>
+      <point x="429" y="585" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>seven</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>seven</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/seven.tf.glif b/src/Cantarell-Light.ufo/glyphs/seven.tf.glif
index aa8809de..64c28774 100644
--- a/src/Cantarell-Light.ufo/glyphs/seven.tf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/seven.tf.glif
@@ -3,14 +3,14 @@
   <advance width="580"/>
   <outline>
     <contour>
-      <point x="178" y="0" type="line"/>
-      <point x="201" y="0" type="line"/>
-      <point x="517" y="682" type="line"/>
-      <point x="517" y="694" type="line"/>
-      <point x="55" y="694" type="line"/>
-      <point x="55" y="676" type="line"/>
-      <point x="500" y="676" type="line"/>
-      <point x="498" y="685" type="line"/>
+      <point x="183" y="0" type="line"/>
+      <point x="206" y="0" type="line"/>
+      <point x="511" y="682" type="line"/>
+      <point x="511" y="694" type="line"/>
+      <point x="64" y="694" type="line"/>
+      <point x="64" y="676" type="line"/>
+      <point x="494" y="676" type="line"/>
+      <point x="491" y="685" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/seveneighths.glif 
b/src/Cantarell-Light.ufo/glyphs/seveneighths.glif
index 5391b9dd..8443f8dd 100644
--- a/src/Cantarell-Light.ufo/glyphs/seveneighths.glif
+++ b/src/Cantarell-Light.ufo/glyphs/seveneighths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seveneighths" format="2">
-  <advance width="1098"/>
+  <advance width="883"/>
   <unicode hex="215E"/>
   <outline>
     <component base="seven.numr"/>
-    <component base="fraction" xOffset="367"/>
-    <component base="eight.dnom" xOffset="667"/>
+    <component base="fraction" xOffset="325"/>
+    <component base="eight.dnom" xOffset="490"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/seveninferior.glif 
b/src/Cantarell-Light.ufo/glyphs/seveninferior.glif
index 6e2e0361..49090b58 100644
--- a/src/Cantarell-Light.ufo/glyphs/seveninferior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/seveninferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seveninferior" format="2">
-  <advance width="367"/>
+  <advance width="325"/>
   <unicode hex="2087"/>
   <outline>
     <component base="seven.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/sevensuperior.glif 
b/src/Cantarell-Light.ufo/glyphs/sevensuperior.glif
index 90fe4d4d..f5fa2de1 100644
--- a/src/Cantarell-Light.ufo/glyphs/sevensuperior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sevensuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sevensuperior" format="2">
-  <advance width="367"/>
+  <advance width="325"/>
   <unicode hex="2077"/>
   <outline>
     <component base="seven.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/sha-cy.glif b/src/Cantarell-Light.ufo/glyphs/sha-cy.glif
index a95fd7f4..3b8c748a 100644
--- a/src/Cantarell-Light.ufo/glyphs/sha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sha-cy.glif
@@ -1,23 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sha-cy" format="2">
-  <advance width="738"/>
+  <advance width="776"/>
   <unicode hex="0448"/>
+  <anchor x="700" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="650" y="0" type="line"/>
-      <point x="650" y="480" type="line"/>
-      <point x="629" y="480" type="line"/>
-      <point x="629" y="17" type="line"/>
-      <point x="109" y="17" type="line"/>
-      <point x="109" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="669" y="0" type="line"/>
+      <point x="669" y="480" type="line"/>
+      <point x="648" y="480" type="line"/>
+      <point x="648" y="17" type="line"/>
+      <point x="128" y="17" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="364" y="9" type="line"/>
-      <point x="385" y="9" type="line"/>
-      <point x="385" y="480" type="line"/>
-      <point x="364" y="480" type="line"/>
+      <point x="383" y="9" type="line"/>
+      <point x="404" y="9" type="line"/>
+      <point x="404" y="480" type="line"/>
+      <point x="383" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -29,6 +30,10 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/shcha-cy.glif b/src/Cantarell-Light.ufo/glyphs/shcha-cy.glif
index 46fa5e23..e14de5aa 100644
--- a/src/Cantarell-Light.ufo/glyphs/shcha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/shcha-cy.glif
@@ -1,30 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="shcha-cy" format="2">
-  <advance width="746"/>
+  <advance width="782"/>
   <unicode hex="0449"/>
   <outline>
-    <contour>
-      <point x="697" y="-121" type="line"/>
-      <point x="716" y="-121" type="line"/>
-      <point x="716" y="17" type="line"/>
-      <point x="109" y="17" type="line"/>
-      <point x="109" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
-      <point x="88" y="0" type="line"/>
-      <point x="697" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="365" y="9" type="line"/>
-      <point x="386" y="9" type="line"/>
-      <point x="386" y="480" type="line"/>
-      <point x="365" y="480" type="line"/>
-    </contour>
-    <contour>
-      <point x="631" y="9" type="line"/>
-      <point x="652" y="9" type="line"/>
-      <point x="652" y="480" type="line"/>
-      <point x="631" y="480" type="line"/>
-    </contour>
+    <component base="sha-cy"/>
+    <component base="descender-cy" xOffset="604"/>
   </outline>
   <lib>
     <dict>
@@ -35,6 +15,15 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>tse-cy</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>-1</integer>
+        <integer>0</integer>
+      </array>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/shha-cy.glif b/src/Cantarell-Light.ufo/glyphs/shha-cy.glif
index 4e28be9e..7bdc6463 100644
--- a/src/Cantarell-Light.ufo/glyphs/shha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/shha-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="shha-cy" format="2">
-  <advance width="525"/>
+  <advance width="563"/>
   <unicode hex="04BB"/>
   <outline>
     <component base="h"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/six.dnom.glif b/src/Cantarell-Light.ufo/glyphs/six.dnom.glif
index 605ff668..76a6e07b 100644
--- a/src/Cantarell-Light.ufo/glyphs/six.dnom.glif
+++ b/src/Cantarell-Light.ufo/glyphs/six.dnom.glif
@@ -1,49 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six.dnom" format="2">
-  <advance width="432"/>
-  <note>
-six
-</note>
+  <advance width="395"/>
   <outline>
     <contour>
-      <point x="229" y="-7" type="curve" smooth="yes"/>
-      <point x="320" y="-7"/>
-      <point x="382" y="53"/>
-      <point x="382" y="141" type="curve" smooth="yes"/>
-      <point x="382" y="227"/>
-      <point x="322" y="281"/>
-      <point x="234" y="281" type="curve" smooth="yes"/>
-      <point x="163" y="281"/>
-      <point x="105" y="246"/>
-      <point x="71" y="182" type="curve"/>
-      <point x="74" y="159" type="line"/>
-      <point x="105" y="225"/>
-      <point x="162" y="262"/>
-      <point x="230" y="262" type="curve" smooth="yes"/>
-      <point x="306" y="262"/>
-      <point x="360" y="215"/>
-      <point x="360" y="138" type="curve" smooth="yes"/>
-      <point x="360" y="62"/>
-      <point x="308" y="12"/>
-      <point x="231" y="12" type="curve" smooth="yes"/>
-      <point x="137" y="12"/>
-      <point x="82" y="87"/>
-      <point x="82" y="226" type="curve" smooth="yes"/>
-      <point x="82" y="374"/>
-      <point x="145" y="460"/>
-      <point x="261" y="460" type="curve" smooth="yes"/>
-      <point x="299" y="460"/>
-      <point x="338" y="451"/>
-      <point x="366" y="435" type="curve"/>
-      <point x="373" y="453" type="line"/>
-      <point x="344" y="469"/>
-      <point x="307" y="479"/>
-      <point x="264" y="479" type="curve" smooth="yes"/>
-      <point x="132" y="479"/>
-      <point x="59" y="384"/>
-      <point x="59" y="224" type="curve" smooth="yes"/>
-      <point x="59" y="74"/>
-      <point x="123" y="-7"/>
+      <point x="209" y="-6" type="curve" smooth="yes"/>
+      <point x="287" y="-6"/>
+      <point x="342" y="48"/>
+      <point x="342" y="126" type="curve" smooth="yes"/>
+      <point x="342" y="201"/>
+      <point x="290" y="250"/>
+      <point x="215" y="250" type="curve" smooth="yes"/>
+      <point x="152" y="250"/>
+      <point x="103" y="217"/>
+      <point x="79" y="153" type="curve"/>
+      <point x="82" y="133" type="line"/>
+      <point x="105" y="197"/>
+      <point x="149" y="230"/>
+      <point x="210" y="230" type="curve" smooth="yes"/>
+      <point x="274" y="230"/>
+      <point x="320" y="189"/>
+      <point x="320" y="123" type="curve" smooth="yes"/>
+      <point x="320" y="58"/>
+      <point x="276" y="14"/>
+      <point x="211" y="14" type="curve" smooth="yes"/>
+      <point x="131" y="14"/>
+      <point x="85" y="80"/>
+      <point x="85" y="196" type="curve" smooth="yes"/>
+      <point x="85" y="331"/>
+      <point x="138" y="402"/>
+      <point x="239" y="402" type="curve" smooth="yes"/>
+      <point x="269" y="402"/>
+      <point x="298" y="396"/>
+      <point x="326" y="381" type="curve"/>
+      <point x="333" y="399" type="line"/>
+      <point x="301" y="416"/>
+      <point x="271" y="422"/>
+      <point x="240" y="422" type="curve" smooth="yes"/>
+      <point x="125" y="422"/>
+      <point x="62" y="340"/>
+      <point x="62" y="193" type="curve" smooth="yes"/>
+      <point x="62" y="68"/>
+      <point x="117" y="-6"/>
     </contour>
   </outline>
   <lib>
@@ -51,11 +48,11 @@ six
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>68</integer>
+        <integer>60</integer>
         <key>weight</key>
-        <integer>1</integer>
+        <integer>2</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>63</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/six.glif b/src/Cantarell-Light.ufo/glyphs/six.glif
index b897efbb..5769311c 100644
--- a/src/Cantarell-Light.ufo/glyphs/six.glif
+++ b/src/Cantarell-Light.ufo/glyphs/six.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six" format="2">
-  <advance width="586"/>
+  <advance width="583"/>
   <unicode hex="0036"/>
   <outline>
     <contour>
-      <point x="312" y="-10" type="curve" smooth="yes"/>
-      <point x="432" y="-10"/>
-      <point x="514" y="77"/>
-      <point x="514" y="206" type="curve" smooth="yes"/>
-      <point x="514" y="333"/>
-      <point x="434" y="410"/>
-      <point x="315" y="410" type="curve" smooth="yes"/>
-      <point x="218" y="410"/>
-      <point x="142" y="361"/>
-      <point x="96" y="270" type="curve"/>
-      <point x="96" y="239" type="line"/>
-      <point x="140" y="337"/>
-      <point x="217" y="392"/>
-      <point x="313" y="392" type="curve" smooth="yes"/>
-      <point x="419" y="392"/>
-      <point x="493" y="322"/>
-      <point x="493" y="203" type="curve" smooth="yes"/>
-      <point x="493" y="86"/>
-      <point x="421" y="8"/>
-      <point x="313" y="8" type="curve" smooth="yes"/>
-      <point x="181" y="8"/>
-      <point x="105" y="125"/>
-      <point x="105" y="322" type="curve" smooth="yes"/>
-      <point x="105" y="560"/>
-      <point x="192" y="686"/>
-      <point x="356" y="686" type="curve" smooth="yes"/>
-      <point x="407" y="686"/>
-      <point x="457" y="673"/>
-      <point x="495" y="650" type="curve"/>
-      <point x="502" y="667" type="line"/>
-      <point x="461" y="691"/>
-      <point x="412" y="704"/>
-      <point x="358" y="704" type="curve" smooth="yes"/>
-      <point x="179" y="704"/>
-      <point x="84" y="570"/>
-      <point x="84" y="319" type="curve" smooth="yes"/>
-      <point x="84" y="113"/>
-      <point x="168" y="-10"/>
+      <point x="305" y="-10" type="curve" smooth="yes"/>
+      <point x="425" y="-10"/>
+      <point x="510" y="77"/>
+      <point x="510" y="206" type="curve" smooth="yes"/>
+      <point x="510" y="333"/>
+      <point x="427" y="412"/>
+      <point x="308" y="412" type="curve" smooth="yes"/>
+      <point x="206" y="412"/>
+      <point x="132" y="357"/>
+      <point x="91" y="250" type="curve"/>
+      <point x="91" y="219" type="line"/>
+      <point x="132" y="336"/>
+      <point x="204" y="394"/>
+      <point x="304" y="394" type="curve" smooth="yes"/>
+      <point x="411" y="394"/>
+      <point x="489" y="322"/>
+      <point x="489" y="203" type="curve" smooth="yes"/>
+      <point x="489" y="86"/>
+      <point x="414" y="8"/>
+      <point x="306" y="8" type="curve" smooth="yes"/>
+      <point x="173" y="8"/>
+      <point x="96" y="125"/>
+      <point x="96" y="322" type="curve" smooth="yes"/>
+      <point x="96" y="559"/>
+      <point x="184" y="686"/>
+      <point x="349" y="686" type="curve" smooth="yes"/>
+      <point x="400" y="686"/>
+      <point x="445" y="674"/>
+      <point x="486" y="650" type="curve"/>
+      <point x="493" y="667" type="line"/>
+      <point x="445" y="693"/>
+      <point x="402" y="704"/>
+      <point x="351" y="704" type="curve" smooth="yes"/>
+      <point x="171" y="704"/>
+      <point x="75" y="569"/>
+      <point x="75" y="319" type="curve" smooth="yes"/>
+      <point x="75" y="113"/>
+      <point x="160" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/six.numr.glif b/src/Cantarell-Light.ufo/glyphs/six.numr.glif
index 3f76dd02..82c8e826 100644
--- a/src/Cantarell-Light.ufo/glyphs/six.numr.glif
+++ b/src/Cantarell-Light.ufo/glyphs/six.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six.numr" format="2">
-  <advance width="432"/>
+  <advance width="395"/>
   <outline>
     <component base="six.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/six.osf.glif b/src/Cantarell-Light.ufo/glyphs/six.osf.glif
index 66285990..4d4b7fc8 100644
--- a/src/Cantarell-Light.ufo/glyphs/six.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/six.osf.glif
@@ -1,46 +1,54 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six.osf" format="2">
-  <advance width="586"/>
+  <advance width="578"/>
   <outline>
     <contour>
-      <point x="312" y="-10" type="curve" smooth="yes"/>
-      <point x="432" y="-10"/>
-      <point x="514" y="77"/>
-      <point x="514" y="206" type="curve" smooth="yes"/>
-      <point x="514" y="333"/>
-      <point x="434" y="410"/>
-      <point x="315" y="410" type="curve" smooth="yes"/>
-      <point x="218" y="410"/>
-      <point x="142" y="361"/>
-      <point x="96" y="270" type="curve"/>
-      <point x="96" y="239" type="line"/>
-      <point x="140" y="337"/>
-      <point x="217" y="392"/>
-      <point x="313" y="392" type="curve" smooth="yes"/>
-      <point x="419" y="392"/>
-      <point x="493" y="322"/>
-      <point x="493" y="203" type="curve" smooth="yes"/>
-      <point x="493" y="86"/>
-      <point x="421" y="8"/>
-      <point x="313" y="8" type="curve" smooth="yes"/>
-      <point x="181" y="8"/>
-      <point x="105" y="125"/>
-      <point x="105" y="322" type="curve" smooth="yes"/>
-      <point x="105" y="560"/>
-      <point x="192" y="686"/>
-      <point x="356" y="686" type="curve" smooth="yes"/>
-      <point x="407" y="686"/>
-      <point x="457" y="673"/>
-      <point x="495" y="650" type="curve"/>
-      <point x="502" y="667" type="line"/>
-      <point x="461" y="691"/>
-      <point x="412" y="704"/>
-      <point x="358" y="704" type="curve" smooth="yes"/>
-      <point x="179" y="704"/>
-      <point x="84" y="570"/>
-      <point x="84" y="319" type="curve" smooth="yes"/>
-      <point x="84" y="113"/>
-      <point x="168" y="-10"/>
+      <point x="303" y="-10" type="curve" smooth="yes"/>
+      <point x="423" y="-10"/>
+      <point x="505" y="77"/>
+      <point x="505" y="206" type="curve" smooth="yes"/>
+      <point x="505" y="333"/>
+      <point x="425" y="410"/>
+      <point x="306" y="410" type="curve" smooth="yes"/>
+      <point x="209" y="410"/>
+      <point x="133" y="361"/>
+      <point x="87" y="270" type="curve"/>
+      <point x="87" y="239" type="line"/>
+      <point x="131" y="337"/>
+      <point x="208" y="392"/>
+      <point x="304" y="392" type="curve" smooth="yes"/>
+      <point x="410" y="392"/>
+      <point x="484" y="322"/>
+      <point x="484" y="203" type="curve" smooth="yes"/>
+      <point x="484" y="86"/>
+      <point x="412" y="8"/>
+      <point x="304" y="8" type="curve" smooth="yes"/>
+      <point x="172" y="8"/>
+      <point x="96" y="125"/>
+      <point x="96" y="322" type="curve" smooth="yes"/>
+      <point x="96" y="560"/>
+      <point x="183" y="686"/>
+      <point x="347" y="686" type="curve" smooth="yes"/>
+      <point x="398" y="686"/>
+      <point x="448" y="673"/>
+      <point x="486" y="650" type="curve"/>
+      <point x="493" y="667" type="line"/>
+      <point x="452" y="691"/>
+      <point x="403" y="704"/>
+      <point x="349" y="704" type="curve" smooth="yes"/>
+      <point x="170" y="704"/>
+      <point x="75" y="570"/>
+      <point x="75" y="319" type="curve" smooth="yes"/>
+      <point x="75" y="113"/>
+      <point x="159" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>six</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>six</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/six.tf.glif b/src/Cantarell-Light.ufo/glyphs/six.tf.glif
index 1b662bd9..89b88907 100644
--- a/src/Cantarell-Light.ufo/glyphs/six.tf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/six.tf.glif
@@ -2,46 +2,7 @@
 <glyph name="six.tf" format="2">
   <advance width="580"/>
   <outline>
-    <contour>
-      <point x="309" y="-10" type="curve" smooth="yes"/>
-      <point x="428" y="-10"/>
-      <point x="509" y="77"/>
-      <point x="509" y="206" type="curve" smooth="yes"/>
-      <point x="509" y="333"/>
-      <point x="430" y="410"/>
-      <point x="312" y="410" type="curve" smooth="yes"/>
-      <point x="216" y="410"/>
-      <point x="141" y="361"/>
-      <point x="95" y="270" type="curve"/>
-      <point x="95" y="239" type="line"/>
-      <point x="139" y="337"/>
-      <point x="215" y="392"/>
-      <point x="310" y="392" type="curve" smooth="yes"/>
-      <point x="415" y="392"/>
-      <point x="488" y="322"/>
-      <point x="488" y="203" type="curve" smooth="yes"/>
-      <point x="488" y="86"/>
-      <point x="417" y="8"/>
-      <point x="310" y="8" type="curve" smooth="yes"/>
-      <point x="179" y="8"/>
-      <point x="104" y="126"/>
-      <point x="104" y="322" type="curve" smooth="yes"/>
-      <point x="104" y="559"/>
-      <point x="190" y="686"/>
-      <point x="353" y="686" type="curve" smooth="yes"/>
-      <point x="403" y="686"/>
-      <point x="453" y="673"/>
-      <point x="491" y="650" type="curve"/>
-      <point x="498" y="667" type="line"/>
-      <point x="457" y="691"/>
-      <point x="408" y="704"/>
-      <point x="355" y="704" type="curve" smooth="yes"/>
-      <point x="177" y="704"/>
-      <point x="83" y="569"/>
-      <point x="83" y="319" type="curve" smooth="yes"/>
-      <point x="83" y="114"/>
-      <point x="166" y="-10"/>
-    </contour>
+    <component base="six" xOffset="14"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/sixinferior.glif b/src/Cantarell-Light.ufo/glyphs/sixinferior.glif
index c0eb6cd4..b04aba1f 100644
--- a/src/Cantarell-Light.ufo/glyphs/sixinferior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sixinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sixinferior" format="2">
-  <advance width="432"/>
+  <advance width="395"/>
   <unicode hex="2086"/>
   <outline>
     <component base="six.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/sixsuperior.glif b/src/Cantarell-Light.ufo/glyphs/sixsuperior.glif
index 511c8c94..51bb9e94 100644
--- a/src/Cantarell-Light.ufo/glyphs/sixsuperior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sixsuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sixsuperior" format="2">
-  <advance width="432"/>
+  <advance width="395"/>
   <unicode hex="2076"/>
   <outline>
     <component base="six.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/slash.glif b/src/Cantarell-Light.ufo/glyphs/slash.glif
index 101adae9..ed812a9f 100644
--- a/src/Cantarell-Light.ufo/glyphs/slash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/slash.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="slash" format="2">
-  <advance width="293"/>
+  <advance width="303"/>
   <unicode hex="002F"/>
   <outline>
     <contour>
-      <point x="34" y="-115" type="line"/>
-      <point x="54" y="-115" type="line"/>
-      <point x="259" y="739" type="line"/>
-      <point x="237" y="739" type="line"/>
+      <point x="39" y="-115" type="line"/>
+      <point x="59" y="-115" type="line"/>
+      <point x="264" y="739" type="line"/>
+      <point x="242" y="739" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/softsign-cy.glif b/src/Cantarell-Light.ufo/glyphs/softsign-cy.glif
index 4d98b4e1..5a223bca 100644
--- a/src/Cantarell-Light.ufo/glyphs/softsign-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/softsign-cy.glif
@@ -1,29 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="softsign-cy" format="2">
-  <advance width="469"/>
+  <advance width="503"/>
   <unicode hex="044C"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="248" y="0" type="line" smooth="yes"/>
-      <point x="359" y="0"/>
-      <point x="426" y="56"/>
-      <point x="426" y="150" type="curve" smooth="yes"/>
-      <point x="426" y="241"/>
-      <point x="365" y="301"/>
-      <point x="274" y="301" type="curve" smooth="yes"/>
-      <point x="101" y="301" type="line"/>
-      <point x="101" y="284" type="line"/>
-      <point x="267" y="284" type="line" smooth="yes"/>
-      <point x="348" y="284"/>
-      <point x="404" y="228"/>
-      <point x="404" y="145" type="curve" smooth="yes"/>
-      <point x="404" y="65"/>
-      <point x="349" y="17"/>
-      <point x="257" y="17" type="curve" smooth="yes"/>
-      <point x="109" y="17" type="line"/>
-      <point x="109" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="267" y="0" type="line" smooth="yes"/>
+      <point x="378" y="0"/>
+      <point x="445" y="56"/>
+      <point x="445" y="150" type="curve" smooth="yes"/>
+      <point x="445" y="241"/>
+      <point x="384" y="301"/>
+      <point x="293" y="301" type="curve" smooth="yes"/>
+      <point x="120" y="301" type="line"/>
+      <point x="120" y="284" type="line"/>
+      <point x="286" y="284" type="line" smooth="yes"/>
+      <point x="367" y="284"/>
+      <point x="423" y="228"/>
+      <point x="423" y="145" type="curve" smooth="yes"/>
+      <point x="423" y="65"/>
+      <point x="368" y="17"/>
+      <point x="276" y="17" type="curve" smooth="yes"/>
+      <point x="128" y="17" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -35,6 +35,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/space.glif b/src/Cantarell-Light.ufo/glyphs/space.glif
index a9566f39..20e1be10 100644
--- a/src/Cantarell-Light.ufo/glyphs/space.glif
+++ b/src/Cantarell-Light.ufo/glyphs/space.glif
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="space" format="2">
-  <advance width="200"/>
+  <advance width="240"/>
   <unicode hex="0020"/>
-  <note>
-space
-</note>
+  <unicode hex="00A0"/>
   <outline>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sterling.glif b/src/Cantarell-Light.ufo/glyphs/sterling.glif
index bb181fa0..0c4cb353 100644
--- a/src/Cantarell-Light.ufo/glyphs/sterling.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sterling.glif
@@ -1,40 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sterling" format="2">
-  <advance width="607"/>
+  <advance width="580"/>
   <unicode hex="00A3"/>
   <outline>
     <contour>
-      <point x="78" y="0" type="line"/>
-      <point x="535" y="0" type="line"/>
-      <point x="535" y="17" type="line"/>
-      <point x="112" y="17" type="line"/>
-      <point x="160" y="38"/>
-      <point x="189" y="107"/>
-      <point x="189" y="201" type="curve" smooth="yes"/>
-      <point x="189" y="484" type="line" smooth="yes"/>
-      <point x="189" y="605"/>
-      <point x="262" y="685"/>
-      <point x="373" y="685" type="curve" smooth="yes"/>
-      <point x="405" y="685"/>
-      <point x="448" y="679"/>
-      <point x="493" y="665" type="curve"/>
-      <point x="499" y="681" type="line"/>
-      <point x="461" y="695"/>
-      <point x="414" y="704"/>
-      <point x="376" y="704" type="curve" smooth="yes"/>
-      <point x="251" y="704"/>
-      <point x="169" y="615"/>
-      <point x="169" y="481" type="curve" smooth="yes"/>
-      <point x="169" y="198" type="line" smooth="yes"/>
-      <point x="169" y="106"/>
-      <point x="135" y="38"/>
-      <point x="78" y="17" type="curve"/>
+      <point x="69" y="0" type="line"/>
+      <point x="516" y="0" type="line"/>
+      <point x="516" y="17" type="line"/>
+      <point x="103" y="17" type="line"/>
+      <point x="153" y="40"/>
+      <point x="188" y="116"/>
+      <point x="188" y="201" type="curve" smooth="yes"/>
+      <point x="188" y="484" type="line" smooth="yes"/>
+      <point x="188" y="614"/>
+      <point x="248" y="685"/>
+      <point x="358" y="685" type="curve" smooth="yes"/>
+      <point x="393" y="685"/>
+      <point x="434" y="678"/>
+      <point x="475" y="665" type="curve"/>
+      <point x="481" y="681" type="line"/>
+      <point x="441" y="696"/>
+      <point x="400" y="704"/>
+      <point x="361" y="704" type="curve" smooth="yes"/>
+      <point x="236" y="704"/>
+      <point x="168" y="625"/>
+      <point x="168" y="481" type="curve" smooth="yes"/>
+      <point x="168" y="198" type="line" smooth="yes"/>
+      <point x="168" y="113"/>
+      <point x="128" y="40"/>
+      <point x="69" y="17" type="curve"/>
     </contour>
     <contour>
-      <point x="86" y="340" type="line"/>
-      <point x="435" y="340" type="line"/>
-      <point x="435" y="357" type="line"/>
-      <point x="86" y="357" type="line"/>
+      <point x="77" y="340" type="line"/>
+      <point x="418" y="340" type="line"/>
+      <point x="418" y="357" type="line"/>
+      <point x="77" y="357" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/summation.glif b/src/Cantarell-Light.ufo/glyphs/summation.glif
index 6765d43d..939f9a77 100644
--- a/src/Cantarell-Light.ufo/glyphs/summation.glif
+++ b/src/Cantarell-Light.ufo/glyphs/summation.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="summation" format="2">
-  <advance width="642"/>
+  <advance width="616"/>
   <unicode hex="2211"/>
   <outline>
     <contour>
-      <point x="79" y="-95" type="line"/>
-      <point x="564" y="-95" type="line"/>
-      <point x="564" y="-78" type="line"/>
-      <point x="103" y="-78" type="line"/>
-      <point x="428" y="299" type="line"/>
-      <point x="106" y="675" type="line"/>
-      <point x="564" y="677" type="line"/>
-      <point x="564" y="694" type="line"/>
-      <point x="79" y="694" type="line"/>
-      <point x="79" y="680" type="line"/>
-      <point x="404" y="299" type="line"/>
-      <point x="79" y="-81" type="line"/>
+      <point x="66" y="-95" type="line"/>
+      <point x="551" y="-95" type="line"/>
+      <point x="551" y="-78" type="line"/>
+      <point x="90" y="-78" type="line"/>
+      <point x="415" y="299" type="line"/>
+      <point x="93" y="675" type="line"/>
+      <point x="551" y="677" type="line"/>
+      <point x="551" y="694" type="line"/>
+      <point x="66" y="694" type="line"/>
+      <point x="66" y="680" type="line"/>
+      <point x="391" y="299" type="line"/>
+      <point x="66" y="-81" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/t.glif b/src/Cantarell-Light.ufo/glyphs/t.glif
index 048a6204..adbde5d8 100644
--- a/src/Cantarell-Light.ufo/glyphs/t.glif
+++ b/src/Cantarell-Light.ufo/glyphs/t.glif
@@ -1,38 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="t" format="2">
-  <advance width="294"/>
+  <advance width="320"/>
   <unicode hex="0074"/>
-  <note>
-t
-</note>
-  <anchor x="169" y="0" name="bottom"/>
-  <anchor x="145" y="250" name="center"/>
-  <anchor x="103" y="617" name="top"/>
-  <anchor x="219" y="480" name="topright"/>
+  <anchor x="187" y="0" name="bottom"/>
+  <anchor x="163" y="250" name="center"/>
+  <anchor x="121" y="617" name="top"/>
+  <anchor x="237" y="480" name="topright"/>
   <outline>
     <contour>
-      <point x="197" y="-3" type="curve" smooth="yes"/>
-      <point x="221" y="-3"/>
-      <point x="245" y="3"/>
-      <point x="268" y="12" type="curve"/>
-      <point x="263" y="26" type="line"/>
-      <point x="242" y="18"/>
-      <point x="221" y="14"/>
-      <point x="203" y="14" type="curve" smooth="yes"/>
-      <point x="149" y="14"/>
-      <point x="113" y="51"/>
-      <point x="113" y="108" type="curve" smooth="yes"/>
-      <point x="113" y="617" type="line"/>
-      <point x="92" y="617" type="line"/>
-      <point x="92" y="103" type="line" smooth="yes"/>
-      <point x="92" y="38"/>
-      <point x="134" y="-3"/>
+      <point x="215" y="-3" type="curve" smooth="yes"/>
+      <point x="239" y="-3"/>
+      <point x="263" y="3"/>
+      <point x="286" y="12" type="curve"/>
+      <point x="281" y="26" type="line"/>
+      <point x="260" y="18"/>
+      <point x="239" y="14"/>
+      <point x="221" y="14" type="curve" smooth="yes"/>
+      <point x="167" y="14"/>
+      <point x="131" y="51"/>
+      <point x="131" y="108" type="curve" smooth="yes"/>
+      <point x="131" y="617" type="line"/>
+      <point x="110" y="617" type="line"/>
+      <point x="110" y="103" type="line" smooth="yes"/>
+      <point x="110" y="38"/>
+      <point x="152" y="-3"/>
     </contour>
     <contour>
-      <point x="29" y="463" type="line"/>
-      <point x="256" y="463" type="line"/>
-      <point x="256" y="480" type="line"/>
-      <point x="29" y="480" type="line"/>
+      <point x="47" y="463" type="line"/>
+      <point x="274" y="463" type="line"/>
+      <point x="274" y="480" type="line"/>
+      <point x="47" y="480" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tbar.glif b/src/Cantarell-Light.ufo/glyphs/tbar.glif
index 0679092b..ac29b929 100644
--- a/src/Cantarell-Light.ufo/glyphs/tbar.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tbar.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tbar" format="2">
-  <advance width="294"/>
+  <advance width="320"/>
   <unicode hex="0167"/>
   <outline>
     <component base="t"/>
-    <component base="strokeshortcomb" xOffset="-96" yOffset="-49"/>
+    <component base="strokeshortcomb" xOffset="-78" yOffset="-49"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tcaron.glif b/src/Cantarell-Light.ufo/glyphs/tcaron.glif
index b72f08d6..c74a26f0 100644
--- a/src/Cantarell-Light.ufo/glyphs/tcaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tcaron" format="2">
-  <advance width="294"/>
+  <advance width="320"/>
   <unicode hex="0165"/>
   <outline>
     <component base="t"/>
-    <component base="caroncomb.alt" xOffset="107"/>
+    <component base="caroncomb.alt" xOffset="125"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tcedilla.glif b/src/Cantarell-Light.ufo/glyphs/tcedilla.glif
index 26423367..631cd185 100644
--- a/src/Cantarell-Light.ufo/glyphs/tcedilla.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tcedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tcedilla" format="2">
-  <advance width="294"/>
+  <advance width="320"/>
   <unicode hex="0163"/>
   <outline>
     <component base="t"/>
-    <component base="cedillacomb" xOffset="44"/>
+    <component base="cedillacomb" xOffset="62"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tcommaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/tcommaaccent.glif
index 1e9dc655..65dbc462 100644
--- a/src/Cantarell-Light.ufo/glyphs/tcommaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tcommaaccent" format="2">
-  <advance width="294"/>
+  <advance width="320"/>
   <unicode hex="021B"/>
   <outline>
     <component base="t"/>
-    <component base="commaaccentcomb" xOffset="40"/>
+    <component base="commaaccentcomb" xOffset="58"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tdieresis.glif b/src/Cantarell-Light.ufo/glyphs/tdieresis.glif
index 873311cd..a8dbabc4 100644
--- a/src/Cantarell-Light.ufo/glyphs/tdieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tdieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tdieresis" format="2">
-  <advance width="294"/>
+  <advance width="320"/>
   <unicode hex="1E97"/>
   <outline>
     <component base="t"/>
-    <component base="dieresiscomb" xOffset="-116" yOffset="137"/>
+    <component base="dieresiscomb" xOffset="-98" yOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tdotbelow.glif b/src/Cantarell-Light.ufo/glyphs/tdotbelow.glif
index 1c797356..af005326 100644
--- a/src/Cantarell-Light.ufo/glyphs/tdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tdotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tdotbelow" format="2">
-  <advance width="294"/>
+  <advance width="320"/>
   <unicode hex="1E6D"/>
   <outline>
     <component base="t"/>
-    <component base="dotbelowcomb" xOffset="49"/>
+    <component base="dotbelowcomb" xOffset="67"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/te-cy.glif b/src/Cantarell-Light.ufo/glyphs/te-cy.glif
index d38ad9dc..da3576b5 100644
--- a/src/Cantarell-Light.ufo/glyphs/te-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/te-cy.glif
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="te-cy" format="2">
-  <advance width="435"/>
+  <advance width="443"/>
   <unicode hex="0442"/>
-  <anchor x="423" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="207" y="0" type="line"/>
-      <point x="228" y="0" type="line"/>
-      <point x="228" y="476" type="line"/>
-      <point x="207" y="476" type="line"/>
-    </contour>
-    <contour>
-      <point x="12" y="463" type="line"/>
-      <point x="423" y="463" type="line"/>
-      <point x="423" y="480" type="line"/>
-      <point x="12" y="480" type="line"/>
+      <point x="211" y="0" type="line"/>
+      <point x="232" y="0" type="line"/>
+      <point x="232" y="463" type="line"/>
+      <point x="427" y="463" type="line"/>
+      <point x="427" y="480" type="line"/>
+      <point x="16" y="480" type="line"/>
+      <point x="16" y="463" type="line"/>
+      <point x="211" y="463" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -26,6 +23,10 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|ge-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>ge-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tenge.glif b/src/Cantarell-Light.ufo/glyphs/tenge.glif
index a067c2d7..61b88f06 100644
--- a/src/Cantarell-Light.ufo/glyphs/tenge.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tenge.glif
@@ -1,7 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tenge" format="2">
-  <advance width="600"/>
+  <advance width="580"/>
   <unicode hex="20B8"/>
   <outline>
+    <contour>
+      <point x="280" y="0" type="line"/>
+      <point x="301" y="0" type="line"/>
+      <point x="300" y="520" type="line"/>
+      <point x="527" y="520" type="line"/>
+      <point x="527" y="537" type="line"/>
+      <point x="55" y="537" type="line"/>
+      <point x="55" y="520" type="line"/>
+      <point x="281" y="520" type="line"/>
+    </contour>
+    <contour>
+      <point x="54" y="677" type="line"/>
+      <point x="526" y="677" type="line"/>
+      <point x="526" y="694" type="line"/>
+      <point x="54" y="694" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/thorn.glif b/src/Cantarell-Light.ufo/glyphs/thorn.glif
index 5f84bdcc..3269ec25 100644
--- a/src/Cantarell-Light.ufo/glyphs/thorn.glif
+++ b/src/Cantarell-Light.ufo/glyphs/thorn.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="thorn" format="2">
-  <advance width="535"/>
+  <advance width="565"/>
   <unicode hex="00FE"/>
   <outline>
     <contour>
-      <point x="88" y="-217" type="line"/>
-      <point x="107" y="-217" type="line"/>
-      <point x="107" y="739" type="line"/>
-      <point x="88" y="739" type="line"/>
+      <point x="287" y="-10" type="curve" smooth="yes"/>
+      <point x="412" y="-10"/>
+      <point x="497" y="90"/>
+      <point x="497" y="240" type="curve" smooth="yes"/>
+      <point x="497" y="389"/>
+      <point x="413" y="486"/>
+      <point x="289" y="486" type="curve" smooth="yes"/>
+      <point x="206" y="486"/>
+      <point x="146" y="444"/>
+      <point x="113" y="375" type="curve"/>
+      <point x="117" y="355" type="line"/>
+      <point x="147" y="425"/>
+      <point x="205" y="468"/>
+      <point x="284" y="468" type="curve" smooth="yes"/>
+      <point x="400" y="468"/>
+      <point x="476" y="378"/>
+      <point x="476" y="237" type="curve" smooth="yes"/>
+      <point x="476" y="97"/>
+      <point x="401" y="8"/>
+      <point x="289" y="8" type="curve" smooth="yes"/>
+      <point x="209" y="8"/>
+      <point x="148" y="53"/>
+      <point x="118" y="126" type="curve"/>
+      <point x="115" y="96" type="line"/>
+      <point x="148" y="29"/>
+      <point x="207" y="-10"/>
     </contour>
     <contour>
-      <point x="268" y="-10" type="curve" smooth="yes"/>
-      <point x="393" y="-10"/>
-      <point x="478" y="90"/>
-      <point x="478" y="240" type="curve" smooth="yes"/>
-      <point x="478" y="389"/>
-      <point x="394" y="486"/>
-      <point x="270" y="486" type="curve" smooth="yes"/>
-      <point x="187" y="486"/>
-      <point x="127" y="444"/>
-      <point x="94" y="375" type="curve"/>
-      <point x="98" y="355" type="line"/>
-      <point x="128" y="425"/>
-      <point x="186" y="468"/>
-      <point x="265" y="468" type="curve" smooth="yes"/>
-      <point x="381" y="468"/>
-      <point x="457" y="378"/>
-      <point x="457" y="237" type="curve" smooth="yes"/>
-      <point x="457" y="97"/>
-      <point x="382" y="8"/>
-      <point x="270" y="8" type="curve" smooth="yes"/>
-      <point x="190" y="8"/>
-      <point x="129" y="53"/>
-      <point x="99" y="126" type="curve"/>
-      <point x="96" y="96" type="line"/>
-      <point x="129" y="29"/>
-      <point x="188" y="-10"/>
+      <point x="107" y="-217" type="line"/>
+      <point x="126" y="-217" type="line"/>
+      <point x="126" y="739" type="line"/>
+      <point x="107" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/three.dnom.glif b/src/Cantarell-Light.ufo/glyphs/three.dnom.glif
index 58b5d02e..fe873405 100644
--- a/src/Cantarell-Light.ufo/glyphs/three.dnom.glif
+++ b/src/Cantarell-Light.ufo/glyphs/three.dnom.glif
@@ -1,51 +1,50 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three.dnom" format="2">
-  <advance width="414"/>
-  <note>
-three
-</note>
+  <advance width="372"/>
   <outline>
     <contour>
-      <point x="192" y="-7" type="curve" smooth="yes"/>
-      <point x="297" y="-7"/>
-      <point x="364" y="42"/>
-      <point x="364" y="117" type="curve" smooth="yes"/>
-      <point x="364" y="187"/>
-      <point x="305" y="234"/>
-      <point x="197" y="244" type="curve"/>
-      <point x="197" y="240" type="line"/>
-      <point x="277" y="244"/>
-      <point x="336" y="290"/>
-      <point x="336" y="359" type="curve" smooth="yes"/>
-      <point x="336" y="429"/>
-      <point x="275" y="479"/>
-      <point x="186" y="479" type="curve" smooth="yes"/>
-      <point x="140" y="479"/>
-      <point x="90" y="466"/>
-      <point x="47" y="439" type="curve"/>
-      <point x="52" y="422" type="line"/>
-      <point x="96" y="447"/>
-      <point x="139" y="460"/>
-      <point x="182" y="460" type="curve" smooth="yes"/>
-      <point x="261" y="460"/>
-      <point x="314" y="419"/>
-      <point x="314" y="355" type="curve" smooth="yes"/>
-      <point x="314" y="285"/>
-      <point x="252" y="249"/>
-      <point x="133" y="249" type="curve"/>
-      <point x="133" y="231" type="line"/>
-      <point x="267" y="231"/>
-      <point x="343" y="189"/>
-      <point x="343" y="115" type="curve" smooth="yes"/>
-      <point x="343" y="51"/>
-      <point x="285" y="13"/>
-      <point x="194" y="13" type="curve" smooth="yes"/>
-      <point x="143" y="13"/>
-      <point x="86" y="25"/>
-      <point x="38" y="49" type="curve"/>
-      <point x="33" y="30" type="line"/>
-      <point x="80" y="6"/>
-      <point x="140" y="-7"/>
+      <point x="169" y="-6" type="curve" smooth="yes"/>
+      <point x="257" y="-6"/>
+      <point x="315" y="38"/>
+      <point x="315" y="106" type="curve" smooth="yes"/>
+      <point x="315" y="170"/>
+      <point x="262" y="213"/>
+      <point x="178" y="216" type="curve"/>
+      <point x="176" y="210" type="line"/>
+      <point x="248" y="214"/>
+      <point x="294" y="258"/>
+      <point x="294" y="316" type="curve" smooth="yes"/>
+      <point x="294" y="380"/>
+      <point x="241" y="422"/>
+      <point x="164" y="422" type="curve" smooth="yes"/>
+      <point x="122" y="422"/>
+      <point x="80" y="409"/>
+      <point x="46" y="387" type="curve"/>
+      <point x="52" y="370" type="line"/>
+      <point x="90" y="392"/>
+      <point x="125" y="402"/>
+      <point x="160" y="402" type="curve" smooth="yes"/>
+      <point x="226" y="402"/>
+      <point x="272" y="367"/>
+      <point x="272" y="314" type="curve" smooth="yes"/>
+      <point x="272" y="258"/>
+      <point x="221" y="221"/>
+      <point x="150" y="221" type="curve" smooth="yes"/>
+      <point x="119" y="221" type="line"/>
+      <point x="119" y="202" type="line"/>
+      <point x="157" y="202" type="line" smooth="yes"/>
+      <point x="239" y="202"/>
+      <point x="293" y="164"/>
+      <point x="293" y="104" type="curve" smooth="yes"/>
+      <point x="293" y="48"/>
+      <point x="245" y="14"/>
+      <point x="170" y="14" type="curve" smooth="yes"/>
+      <point x="129" y="14"/>
+      <point x="80" y="25"/>
+      <point x="40" y="46" type="curve"/>
+      <point x="35" y="27" type="line"/>
+      <point x="73" y="6"/>
+      <point x="125" y="-6"/>
     </contour>
   </outline>
   <lib>
@@ -53,11 +52,11 @@ three
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>68</integer>
+        <integer>60</integer>
         <key>weight</key>
-        <integer>1</integer>
+        <integer>2</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>63</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/three.glif b/src/Cantarell-Light.ufo/glyphs/three.glif
index 0d0e22a0..87f81e94 100644
--- a/src/Cantarell-Light.ufo/glyphs/three.glif
+++ b/src/Cantarell-Light.ufo/glyphs/three.glif
@@ -1,51 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three" format="2">
-  <advance width="566"/>
+  <advance width="548"/>
   <unicode hex="0033"/>
   <outline>
     <contour>
-      <point x="268" y="-10" type="curve" smooth="yes"/>
-      <point x="407" y="-10"/>
-      <point x="496" y="60"/>
-      <point x="496" y="170" type="curve" smooth="yes"/>
-      <point x="496" y="280"/>
-      <point x="411" y="350"/>
-      <point x="267" y="360" type="curve"/>
-      <point x="267" y="352" type="line"/>
-      <point x="382" y="359"/>
-      <point x="458" y="429"/>
-      <point x="458" y="528" type="curve" smooth="yes"/>
-      <point x="458" y="632"/>
-      <point x="376" y="704"/>
-      <point x="257" y="704" type="curve" smooth="yes"/>
-      <point x="191" y="704"/>
-      <point x="126" y="683"/>
-      <point x="72" y="645" type="curve"/>
-      <point x="77" y="629" type="line"/>
-      <point x="139" y="668"/>
-      <point x="195" y="686"/>
-      <point x="253" y="686" type="curve" smooth="yes"/>
-      <point x="363" y="686"/>
-      <point x="437" y="624"/>
-      <point x="437" y="524" type="curve" smooth="yes"/>
-      <point x="437" y="418"/>
-      <point x="356" y="361"/>
-      <point x="207" y="361" type="curve" smooth="yes"/>
-      <point x="188" y="361" type="line"/>
-      <point x="188" y="344" type="line"/>
-      <point x="207" y="344" type="line" smooth="yes"/>
-      <point x="378" y="344"/>
-      <point x="476" y="280"/>
-      <point x="476" y="168" type="curve" smooth="yes"/>
-      <point x="476" y="69"/>
-      <point x="397" y="9"/>
-      <point x="269" y="9" type="curve" smooth="yes"/>
-      <point x="197" y="9"/>
-      <point x="119" y="29"/>
-      <point x="58" y="63" type="curve"/>
-      <point x="53" y="45" type="line"/>
-      <point x="112" y="11"/>
-      <point x="193" y="-10"/>
+      <point x="254" y="-10" type="curve" smooth="yes"/>
+      <point x="389" y="-10"/>
+      <point x="477" y="60"/>
+      <point x="477" y="172" type="curve" smooth="yes"/>
+      <point x="477" y="282"/>
+      <point x="391" y="352"/>
+      <point x="253" y="357" type="curve"/>
+      <point x="253" y="349" type="line"/>
+      <point x="368" y="356"/>
+      <point x="444" y="429"/>
+      <point x="444" y="529" type="curve" smooth="yes"/>
+      <point x="444" y="634"/>
+      <point x="363" y="704"/>
+      <point x="243" y="704" type="curve" smooth="yes"/>
+      <point x="179" y="704"/>
+      <point x="115" y="683"/>
+      <point x="63" y="645" type="curve"/>
+      <point x="68" y="629" type="line"/>
+      <point x="128" y="668"/>
+      <point x="182" y="686"/>
+      <point x="239" y="686" type="curve" smooth="yes"/>
+      <point x="349" y="686"/>
+      <point x="423" y="622"/>
+      <point x="423" y="527" type="curve" smooth="yes"/>
+      <point x="423" y="427"/>
+      <point x="342" y="361"/>
+      <point x="224" y="361" type="curve" smooth="yes"/>
+      <point x="176" y="361" type="line"/>
+      <point x="176" y="344" type="line"/>
+      <point x="234" y="344" type="line" smooth="yes"/>
+      <point x="370" y="344"/>
+      <point x="457" y="276"/>
+      <point x="457" y="170" type="curve" smooth="yes"/>
+      <point x="457" y="69"/>
+      <point x="379" y="9"/>
+      <point x="255" y="9" type="curve" smooth="yes"/>
+      <point x="185" y="9"/>
+      <point x="109" y="29"/>
+      <point x="49" y="63" type="curve"/>
+      <point x="44" y="45" type="line"/>
+      <point x="102" y="11"/>
+      <point x="181" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/three.numr.glif b/src/Cantarell-Light.ufo/glyphs/three.numr.glif
index 38104d72..52858e7b 100644
--- a/src/Cantarell-Light.ufo/glyphs/three.numr.glif
+++ b/src/Cantarell-Light.ufo/glyphs/three.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three.numr" format="2">
-  <advance width="414"/>
+  <advance width="372"/>
   <outline>
     <component base="three.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/three.osf.glif b/src/Cantarell-Light.ufo/glyphs/three.osf.glif
index ce239bfc..a1953adc 100644
--- a/src/Cantarell-Light.ufo/glyphs/three.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/three.osf.glif
@@ -1,48 +1,56 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three.osf" format="2">
-  <advance width="566"/>
+  <advance width="558"/>
   <outline>
     <contour>
-      <point x="268" y="-110" type="curve" smooth="yes"/>
-      <point x="407" y="-110"/>
-      <point x="496" y="-40"/>
-      <point x="496" y="70" type="curve" smooth="yes"/>
-      <point x="496" y="175"/>
-      <point x="416" y="240"/>
-      <point x="267" y="256" type="curve"/>
-      <point x="267" y="252" type="line"/>
-      <point x="382" y="259"/>
-      <point x="458" y="329"/>
-      <point x="458" y="428" type="curve" smooth="yes"/>
-      <point x="458" y="532"/>
-      <point x="376" y="604"/>
-      <point x="257" y="604" type="curve" smooth="yes"/>
-      <point x="191" y="604"/>
-      <point x="126" y="583"/>
-      <point x="72" y="545" type="curve"/>
-      <point x="77" y="529" type="line"/>
-      <point x="139" y="568"/>
-      <point x="195" y="586"/>
-      <point x="253" y="586" type="curve" smooth="yes"/>
-      <point x="363" y="586"/>
-      <point x="437" y="524"/>
-      <point x="437" y="424" type="curve" smooth="yes"/>
-      <point x="437" y="316"/>
-      <point x="353" y="261"/>
-      <point x="188" y="261" type="curve"/>
-      <point x="188" y="244" type="line"/>
-      <point x="373" y="244"/>
-      <point x="476" y="181"/>
-      <point x="476" y="68" type="curve" smooth="yes"/>
-      <point x="476" y="-31"/>
-      <point x="397" y="-91"/>
-      <point x="269" y="-91" type="curve" smooth="yes"/>
-      <point x="197" y="-91"/>
-      <point x="119" y="-71"/>
-      <point x="58" y="-37" type="curve"/>
-      <point x="53" y="-55" type="line"/>
-      <point x="112" y="-89"/>
-      <point x="193" y="-110"/>
+      <point x="259" y="-110" type="curve" smooth="yes"/>
+      <point x="398" y="-110"/>
+      <point x="487" y="-40"/>
+      <point x="487" y="70" type="curve" smooth="yes"/>
+      <point x="487" y="175"/>
+      <point x="407" y="240"/>
+      <point x="258" y="256" type="curve"/>
+      <point x="258" y="252" type="line"/>
+      <point x="373" y="259"/>
+      <point x="449" y="329"/>
+      <point x="449" y="428" type="curve" smooth="yes"/>
+      <point x="449" y="532"/>
+      <point x="367" y="604"/>
+      <point x="248" y="604" type="curve" smooth="yes"/>
+      <point x="182" y="604"/>
+      <point x="117" y="583"/>
+      <point x="63" y="545" type="curve"/>
+      <point x="68" y="529" type="line"/>
+      <point x="130" y="568"/>
+      <point x="186" y="586"/>
+      <point x="244" y="586" type="curve" smooth="yes"/>
+      <point x="354" y="586"/>
+      <point x="428" y="524"/>
+      <point x="428" y="424" type="curve" smooth="yes"/>
+      <point x="428" y="316"/>
+      <point x="344" y="261"/>
+      <point x="179" y="261" type="curve"/>
+      <point x="179" y="244" type="line"/>
+      <point x="364" y="244"/>
+      <point x="467" y="181"/>
+      <point x="467" y="68" type="curve" smooth="yes"/>
+      <point x="467" y="-31"/>
+      <point x="388" y="-91"/>
+      <point x="260" y="-91" type="curve" smooth="yes"/>
+      <point x="188" y="-91"/>
+      <point x="110" y="-71"/>
+      <point x="49" y="-37" type="curve"/>
+      <point x="44" y="-55" type="line"/>
+      <point x="103" y="-89"/>
+      <point x="184" y="-110"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>three</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>three</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/three.tf.glif b/src/Cantarell-Light.ufo/glyphs/three.tf.glif
index bff0c828..adf3d93c 100644
--- a/src/Cantarell-Light.ufo/glyphs/three.tf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/three.tf.glif
@@ -2,48 +2,7 @@
 <glyph name="three.tf" format="2">
   <advance width="580"/>
   <outline>
-    <contour>
-      <point x="275" y="-10" type="curve" smooth="yes"/>
-      <point x="416" y="-10"/>
-      <point x="507" y="60"/>
-      <point x="507" y="170" type="curve" smooth="yes"/>
-      <point x="507" y="274"/>
-      <point x="426" y="340"/>
-      <point x="274" y="356" type="curve"/>
-      <point x="274" y="352" type="line"/>
-      <point x="391" y="359"/>
-      <point x="469" y="429"/>
-      <point x="469" y="528" type="curve" smooth="yes"/>
-      <point x="469" y="632"/>
-      <point x="385" y="704"/>
-      <point x="264" y="704" type="curve" smooth="yes"/>
-      <point x="198" y="704"/>
-      <point x="130" y="683"/>
-      <point x="75" y="645" type="curve"/>
-      <point x="80" y="629" type="line"/>
-      <point x="144" y="668"/>
-      <point x="201" y="686"/>
-      <point x="260" y="686" type="curve" smooth="yes"/>
-      <point x="372" y="686"/>
-      <point x="448" y="624"/>
-      <point x="448" y="524" type="curve" smooth="yes"/>
-      <point x="448" y="416"/>
-      <point x="362" y="361"/>
-      <point x="194" y="361" type="curve"/>
-      <point x="194" y="344" type="line"/>
-      <point x="382" y="344"/>
-      <point x="487" y="281"/>
-      <point x="487" y="168" type="curve" smooth="yes"/>
-      <point x="487" y="69"/>
-      <point x="406" y="9"/>
-      <point x="276" y="9" type="curve" smooth="yes"/>
-      <point x="202" y="9"/>
-      <point x="123" y="29"/>
-      <point x="61" y="63" type="curve"/>
-      <point x="56" y="45" type="line"/>
-      <point x="116" y="11"/>
-      <point x="199" y="-10"/>
-    </contour>
+    <component base="three" xOffset="30"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/threeeighths.glif 
b/src/Cantarell-Light.ufo/glyphs/threeeighths.glif
index 8ecb2d55..14c5a74e 100644
--- a/src/Cantarell-Light.ufo/glyphs/threeeighths.glif
+++ b/src/Cantarell-Light.ufo/glyphs/threeeighths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="threeeighths" format="2">
-  <advance width="1145"/>
+  <advance width="930"/>
   <unicode hex="215C"/>
   <outline>
     <component base="three.numr"/>
-    <component base="fraction" xOffset="414"/>
-    <component base="eight.dnom" xOffset="714"/>
+    <component base="fraction" xOffset="372"/>
+    <component base="eight.dnom" xOffset="537"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/threefifths.glif b/src/Cantarell-Light.ufo/glyphs/threefifths.glif
index f74283b5..5fdb3658 100644
--- a/src/Cantarell-Light.ufo/glyphs/threefifths.glif
+++ b/src/Cantarell-Light.ufo/glyphs/threefifths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="threefifths" format="2">
-  <advance width="1114"/>
+  <advance width="904"/>
   <unicode hex="2157"/>
   <outline>
     <component base="three.numr"/>
-    <component base="fraction" xOffset="414"/>
-    <component base="five.dnom" xOffset="714"/>
+    <component base="fraction" xOffset="372"/>
+    <component base="five.dnom" xOffset="537"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/threeinferior.glif 
b/src/Cantarell-Light.ufo/glyphs/threeinferior.glif
index cbbeb541..9d909af7 100644
--- a/src/Cantarell-Light.ufo/glyphs/threeinferior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/threeinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="threeinferior" format="2">
-  <advance width="414"/>
+  <advance width="372"/>
   <unicode hex="2083"/>
   <outline>
     <component base="three.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/threequarters.glif 
b/src/Cantarell-Light.ufo/glyphs/threequarters.glif
index 73a4e14c..1f27ff5b 100644
--- a/src/Cantarell-Light.ufo/glyphs/threequarters.glif
+++ b/src/Cantarell-Light.ufo/glyphs/threequarters.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="threequarters" format="2">
-  <advance width="1139"/>
+  <advance width="916"/>
   <unicode hex="00BE"/>
   <outline>
     <component base="three.numr"/>
-    <component base="fraction" xOffset="414"/>
-    <component base="four.dnom" xOffset="714"/>
+    <component base="fraction" xOffset="372"/>
+    <component base="four.dnom" xOffset="537"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/threesuperior.glif 
b/src/Cantarell-Light.ufo/glyphs/threesuperior.glif
index 24205c39..41b76487 100644
--- a/src/Cantarell-Light.ufo/glyphs/threesuperior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/threesuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="threesuperior" format="2">
-  <advance width="414"/>
+  <advance width="372"/>
   <unicode hex="00B3"/>
   <outline>
     <component base="three.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/tilde.glif b/src/Cantarell-Light.ufo/glyphs/tilde.glif
index 1af6d334..c95faf79 100644
--- a/src/Cantarell-Light.ufo/glyphs/tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tilde.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tilde" format="2">
-  <advance width="482"/>
+  <advance width="500"/>
   <unicode hex="02DC"/>
   <outline>
-    <component base="tildecomb" xOffset="-18"/>
+    <component base="tildecomb" xOffset="12"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tlinebelow.glif b/src/Cantarell-Light.ufo/glyphs/tlinebelow.glif
index 0f87da0f..61b96ff3 100644
--- a/src/Cantarell-Light.ufo/glyphs/tlinebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tlinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tlinebelow" format="2">
-  <advance width="294"/>
+  <advance width="320"/>
   <unicode hex="1E6F"/>
   <outline>
     <component base="t"/>
-    <component base="macronbelowcomb" xOffset="-81"/>
+    <component base="macronbelowcomb" xOffset="-63"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/trademark.glif b/src/Cantarell-Light.ufo/glyphs/trademark.glif
index b1409404..6e3da90e 100644
--- a/src/Cantarell-Light.ufo/glyphs/trademark.glif
+++ b/src/Cantarell-Light.ufo/glyphs/trademark.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="trademark" format="2">
-  <advance width="793"/>
+  <advance width="775"/>
   <unicode hex="2122"/>
   <outline>
     <contour>
-      <point x="189" y="382" type="line"/>
-      <point x="207" y="382" type="line"/>
-      <point x="207" y="690" type="line"/>
-      <point x="189" y="690" type="line"/>
+      <point x="346" y="382" type="line"/>
+      <point x="363" y="382" type="line"/>
+      <point x="363" y="674" type="line"/>
+      <point x="359" y="674" type="line"/>
+      <point x="486" y="431" type="line"/>
+      <point x="500" y="431" type="line"/>
+      <point x="623" y="674" type="line"/>
+      <point x="618" y="674" type="line"/>
+      <point x="618" y="382" type="line"/>
+      <point x="636" y="382" type="line"/>
+      <point x="636" y="694" type="line"/>
+      <point x="616" y="694" type="line"/>
+      <point x="491" y="446" type="line"/>
+      <point x="496" y="446" type="line"/>
+      <point x="367" y="694" type="line"/>
+      <point x="346" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="80" y="679" type="line"/>
-      <point x="316" y="679" type="line"/>
-      <point x="316" y="694" type="line"/>
-      <point x="80" y="694" type="line"/>
+      <point x="176" y="382" type="line"/>
+      <point x="194" y="382" type="line"/>
+      <point x="194" y="690" type="line"/>
+      <point x="176" y="690" type="line"/>
     </contour>
     <contour>
-      <point x="359" y="382" type="line"/>
-      <point x="376" y="382" type="line"/>
-      <point x="376" y="674" type="line"/>
-      <point x="372" y="674" type="line"/>
-      <point x="499" y="431" type="line"/>
-      <point x="513" y="431" type="line"/>
-      <point x="636" y="674" type="line"/>
-      <point x="631" y="674" type="line"/>
-      <point x="631" y="382" type="line"/>
-      <point x="649" y="382" type="line"/>
-      <point x="649" y="694" type="line"/>
-      <point x="629" y="694" type="line"/>
-      <point x="504" y="446" type="line"/>
-      <point x="509" y="446" type="line"/>
-      <point x="380" y="694" type="line"/>
-      <point x="359" y="694" type="line"/>
+      <point x="67" y="679" type="line"/>
+      <point x="303" y="679" type="line"/>
+      <point x="303" y="694" type="line"/>
+      <point x="67" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tripleprime.glif b/src/Cantarell-Light.ufo/glyphs/tripleprime.glif
index 54c0ae95..bcaf34a1 100644
--- a/src/Cantarell-Light.ufo/glyphs/tripleprime.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tripleprime.glif
@@ -1,13 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tripleprime" format="2">
-  <advance width="552"/>
+  <advance width="596"/>
   <unicode hex="2034"/>
-  <note>
-uni2034
-</note>
   <outline>
-    <component base="quotesingle" yxScale="0.19201" xOffset="-90"/>
-    <component base="quotesingle" yxScale="0.19201" xOffset="70"/>
-    <component base="quotesingle" yxScale="0.19201" xOffset="230"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="-87"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="73"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="233"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tse-cy.glif b/src/Cantarell-Light.ufo/glyphs/tse-cy.glif
index e73e10a0..60825ae2 100644
--- a/src/Cantarell-Light.ufo/glyphs/tse-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tse-cy.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tse-cy" format="2">
-  <advance width="525"/>
+  <advance width="545"/>
   <unicode hex="0446"/>
   <outline>
     <contour>
-      <point x="461" y="-121" type="line"/>
-      <point x="480" y="-121" type="line"/>
-      <point x="480" y="17" type="line"/>
-      <point x="109" y="17" type="line"/>
-      <point x="109" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
-      <point x="88" y="0" type="line"/>
-      <point x="461" y="0" type="line"/>
+      <point x="475" y="-121" type="line"/>
+      <point x="494" y="-121" type="line"/>
+      <point x="494" y="17" type="line"/>
+      <point x="128" y="17" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="475" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="393" y="9" type="line"/>
-      <point x="413" y="9" type="line"/>
-      <point x="413" y="480" type="line"/>
-      <point x="393" y="480" type="line"/>
+      <point x="412" y="9" type="line"/>
+      <point x="432" y="9" type="line"/>
+      <point x="432" y="480" type="line"/>
+      <point x="412" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -29,6 +29,10 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>de-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tshe-cy.glif b/src/Cantarell-Light.ufo/glyphs/tshe-cy.glif
index fa4221ed..bf7f34e2 100644
--- a/src/Cantarell-Light.ufo/glyphs/tshe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tshe-cy.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tshe-cy" format="2">
-  <advance width="525"/>
+  <advance width="563"/>
   <unicode hex="045B"/>
-  <anchor x="436" y="0" name="bottom"/>
+  <anchor x="455" y="0" name="bottom"/>
   <outline>
     <component base="hbar"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/tugrik.glif b/src/Cantarell-Light.ufo/glyphs/tugrik.glif
index f5d41ab5..5ee6808a 100644
--- a/src/Cantarell-Light.ufo/glyphs/tugrik.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tugrik.glif
@@ -1,7 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tugrik" format="2">
-  <advance width="600"/>
+  <advance width="580"/>
   <unicode hex="20AE"/>
   <outline>
+    <contour>
+      <point x="280" y="0" type="line"/>
+      <point x="301" y="0" type="line"/>
+      <point x="301" y="676" type="line"/>
+      <point x="496" y="676" type="line"/>
+      <point x="496" y="694" type="line"/>
+      <point x="85" y="694" type="line"/>
+      <point x="85" y="676" type="line"/>
+      <point x="280" y="676" type="line"/>
+    </contour>
+    <contour>
+      <point x="157" y="190" type="line"/>
+      <point x="436" y="317" type="line"/>
+      <point x="428" y="333" type="line"/>
+      <point x="149" y="205" type="line"/>
+    </contour>
+    <contour>
+      <point x="143" y="339" type="line"/>
+      <point x="442" y="476" type="line"/>
+      <point x="434" y="492" type="line"/>
+      <point x="135" y="354" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/two.dnom.glif b/src/Cantarell-Light.ufo/glyphs/two.dnom.glif
index da895054..9cec4b11 100644
--- a/src/Cantarell-Light.ufo/glyphs/two.dnom.glif
+++ b/src/Cantarell-Light.ufo/glyphs/two.dnom.glif
@@ -1,35 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two.dnom" format="2">
-  <advance width="370"/>
-  <note>
-two
-</note>
+  <advance width="340"/>
   <outline>
     <contour>
-      <point x="33" y="0" type="line"/>
-      <point x="330" y="0" type="line"/>
-      <point x="330" y="18" type="line"/>
-      <point x="55" y="18" type="line"/>
-      <point x="58" y="11" type="line"/>
-      <point x="266" y="205"/>
-      <point x="311" y="275"/>
-      <point x="311" y="346" type="curve" smooth="yes"/>
-      <point x="311" y="428"/>
-      <point x="255" y="479"/>
-      <point x="166" y="479" type="curve" smooth="yes"/>
-      <point x="111" y="479"/>
-      <point x="64" y="459"/>
-      <point x="32" y="427" type="curve"/>
-      <point x="40" y="413" type="line"/>
-      <point x="77" y="444"/>
-      <point x="117" y="460"/>
-      <point x="162" y="460" type="curve" smooth="yes"/>
-      <point x="238" y="460"/>
-      <point x="289" y="415"/>
-      <point x="289" y="343" type="curve" smooth="yes"/>
-      <point x="289" y="275"/>
-      <point x="244" y="209"/>
-      <point x="33" y="11" type="curve"/>
+      <point x="37" y="0" type="line"/>
+      <point x="296" y="0" type="line"/>
+      <point x="296" y="19" type="line"/>
+      <point x="60" y="19" type="line"/>
+      <point x="63" y="12" type="line"/>
+      <point x="240" y="180"/>
+      <point x="278" y="241"/>
+      <point x="278" y="305" type="curve" smooth="yes"/>
+      <point x="278" y="378"/>
+      <point x="229" y="422"/>
+      <point x="153" y="422" type="curve" smooth="yes"/>
+      <point x="105" y="422"/>
+      <point x="65" y="406"/>
+      <point x="35" y="377" type="curve"/>
+      <point x="43" y="361" type="line"/>
+      <point x="75" y="389"/>
+      <point x="111" y="402"/>
+      <point x="149" y="402" type="curve" smooth="yes"/>
+      <point x="213" y="402"/>
+      <point x="256" y="364"/>
+      <point x="256" y="302" type="curve" smooth="yes"/>
+      <point x="256" y="243"/>
+      <point x="216" y="183"/>
+      <point x="37" y="13" type="curve"/>
     </contour>
   </outline>
   <lib>
@@ -37,11 +34,11 @@ two
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>68</integer>
+        <integer>60</integer>
         <key>weight</key>
-        <integer>1</integer>
+        <integer>2</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>63</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/two.glif b/src/Cantarell-Light.ufo/glyphs/two.glif
index ee7f0fd8..3a35d271 100644
--- a/src/Cantarell-Light.ufo/glyphs/two.glif
+++ b/src/Cantarell-Light.ufo/glyphs/two.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two" format="2">
-  <advance width="508"/>
+  <advance width="518"/>
   <unicode hex="0032"/>
   <outline>
     <contour>
-      <point x="53" y="0" type="line"/>
-      <point x="449" y="0" type="line"/>
-      <point x="449" y="17" type="line"/>
-      <point x="73" y="17" type="line"/>
-      <point x="77" y="10" type="line"/>
-      <point x="367" y="310"/>
-      <point x="423" y="406"/>
-      <point x="423" y="509" type="curve" smooth="yes"/>
-      <point x="423" y="630"/>
-      <point x="348" y="704"/>
-      <point x="230" y="704" type="curve" smooth="yes"/>
-      <point x="159" y="704"/>
-      <point x="98" y="678"/>
-      <point x="53" y="629" type="curve"/>
-      <point x="62" y="616" type="line"/>
-      <point x="111" y="663"/>
-      <point x="164" y="686"/>
-      <point x="226" y="686" type="curve" smooth="yes"/>
-      <point x="333" y="686"/>
-      <point x="402" y="617"/>
-      <point x="402" y="507" type="curve" smooth="yes"/>
-      <point x="402" y="407"/>
-      <point x="345" y="311"/>
-      <point x="53" y="8" type="curve"/>
+      <point x="55" y="0" type="line"/>
+      <point x="458" y="0" type="line"/>
+      <point x="458" y="17" type="line"/>
+      <point x="75" y="17" type="line"/>
+      <point x="79" y="10" type="line"/>
+      <point x="373" y="310"/>
+      <point x="429" y="406"/>
+      <point x="429" y="509" type="curve" smooth="yes"/>
+      <point x="429" y="630"/>
+      <point x="353" y="704"/>
+      <point x="234" y="704" type="curve" smooth="yes"/>
+      <point x="162" y="704"/>
+      <point x="101" y="678"/>
+      <point x="55" y="629" type="curve"/>
+      <point x="64" y="616" type="line"/>
+      <point x="114" y="663"/>
+      <point x="168" y="686"/>
+      <point x="230" y="686" type="curve" smooth="yes"/>
+      <point x="338" y="686"/>
+      <point x="409" y="617"/>
+      <point x="409" y="507" type="curve" smooth="yes"/>
+      <point x="409" y="407"/>
+      <point x="351" y="311"/>
+      <point x="55" y="8" type="curve"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/two.numr.glif b/src/Cantarell-Light.ufo/glyphs/two.numr.glif
index 86b3a482..44537b6c 100644
--- a/src/Cantarell-Light.ufo/glyphs/two.numr.glif
+++ b/src/Cantarell-Light.ufo/glyphs/two.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two.numr" format="2">
-  <advance width="370"/>
+  <advance width="340"/>
   <outline>
     <component base="two.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/two.osf.glif b/src/Cantarell-Light.ufo/glyphs/two.osf.glif
index 0a2b21b3..0bd5138b 100644
--- a/src/Cantarell-Light.ufo/glyphs/two.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/two.osf.glif
@@ -1,32 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two.osf" format="2">
-  <advance width="508"/>
+  <advance width="511"/>
   <outline>
     <contour>
-      <point x="53" y="0" type="line"/>
-      <point x="449" y="0" type="line"/>
-      <point x="449" y="17" type="line"/>
-      <point x="73" y="17" type="line"/>
-      <point x="77" y="10" type="line"/>
-      <point x="367" y="264"/>
-      <point x="423" y="347"/>
-      <point x="423" y="437" type="curve" smooth="yes"/>
-      <point x="423" y="540"/>
-      <point x="348" y="604"/>
-      <point x="230" y="604" type="curve" smooth="yes"/>
-      <point x="161" y="604"/>
-      <point x="100" y="583"/>
-      <point x="53" y="539" type="curve"/>
-      <point x="62" y="526" type="line"/>
-      <point x="111" y="566"/>
-      <point x="164" y="586"/>
-      <point x="226" y="586" type="curve" smooth="yes"/>
-      <point x="333" y="586"/>
-      <point x="402" y="527"/>
-      <point x="402" y="434" type="curve" smooth="yes"/>
-      <point x="402" y="348"/>
-      <point x="345" y="266"/>
-      <point x="53" y="9" type="curve"/>
+      <point x="55" y="0" type="line"/>
+      <point x="451" y="0" type="line"/>
+      <point x="451" y="17" type="line"/>
+      <point x="75" y="17" type="line"/>
+      <point x="79" y="10" type="line"/>
+      <point x="369" y="264"/>
+      <point x="425" y="347"/>
+      <point x="425" y="437" type="curve" smooth="yes"/>
+      <point x="425" y="540"/>
+      <point x="350" y="604"/>
+      <point x="232" y="604" type="curve" smooth="yes"/>
+      <point x="163" y="604"/>
+      <point x="102" y="583"/>
+      <point x="55" y="539" type="curve"/>
+      <point x="64" y="526" type="line"/>
+      <point x="113" y="566"/>
+      <point x="166" y="586"/>
+      <point x="228" y="586" type="curve" smooth="yes"/>
+      <point x="335" y="586"/>
+      <point x="404" y="527"/>
+      <point x="404" y="434" type="curve" smooth="yes"/>
+      <point x="404" y="348"/>
+      <point x="347" y="266"/>
+      <point x="55" y="9" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>two</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>two</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/two.tf.glif b/src/Cantarell-Light.ufo/glyphs/two.tf.glif
index 8fd0b2ff..808c6d03 100644
--- a/src/Cantarell-Light.ufo/glyphs/two.tf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/two.tf.glif
@@ -2,32 +2,7 @@
 <glyph name="two.tf" format="2">
   <advance width="580"/>
   <outline>
-    <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="506" y="0" type="line"/>
-      <point x="506" y="17" type="line"/>
-      <point x="87" y="17" type="line"/>
-      <point x="91" y="10" type="line"/>
-      <point x="416" y="310"/>
-      <point x="477" y="407"/>
-      <point x="477" y="509" type="curve" smooth="yes"/>
-      <point x="477" y="630"/>
-      <point x="394" y="704"/>
-      <point x="263" y="704" type="curve" smooth="yes"/>
-      <point x="185" y="704"/>
-      <point x="117" y="678"/>
-      <point x="67" y="629" type="curve"/>
-      <point x="77" y="616" type="line"/>
-      <point x="131" y="663"/>
-      <point x="191" y="686"/>
-      <point x="259" y="686" type="curve" smooth="yes"/>
-      <point x="379" y="686"/>
-      <point x="456" y="617"/>
-      <point x="456" y="507" type="curve" smooth="yes"/>
-      <point x="456" y="408"/>
-      <point x="394" y="311"/>
-      <point x="67" y="8" type="curve"/>
-    </contour>
+    <component base="two" xOffset="52"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/twofifths.glif b/src/Cantarell-Light.ufo/glyphs/twofifths.glif
index 0b2e9af5..246dfe8f 100644
--- a/src/Cantarell-Light.ufo/glyphs/twofifths.glif
+++ b/src/Cantarell-Light.ufo/glyphs/twofifths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="twofifths" format="2">
-  <advance width="1070"/>
+  <advance width="872"/>
   <unicode hex="2156"/>
   <outline>
     <component base="two.numr"/>
-    <component base="fraction" xOffset="370"/>
-    <component base="five.dnom" xOffset="670"/>
+    <component base="fraction" xOffset="340"/>
+    <component base="five.dnom" xOffset="505"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/twoinferior.glif b/src/Cantarell-Light.ufo/glyphs/twoinferior.glif
index 1c4934e5..831bbaaa 100644
--- a/src/Cantarell-Light.ufo/glyphs/twoinferior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/twoinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="twoinferior" format="2">
-  <advance width="370"/>
+  <advance width="340"/>
   <unicode hex="2082"/>
   <outline>
     <component base="two.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/twosuperior.glif b/src/Cantarell-Light.ufo/glyphs/twosuperior.glif
index 43cc0ccb..c858409e 100644
--- a/src/Cantarell-Light.ufo/glyphs/twosuperior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/twosuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="twosuperior" format="2">
-  <advance width="370"/>
+  <advance width="340"/>
   <unicode hex="00B2"/>
   <outline>
     <component base="two.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/twothirds.glif b/src/Cantarell-Light.ufo/glyphs/twothirds.glif
index 95e3d97f..2591f4eb 100644
--- a/src/Cantarell-Light.ufo/glyphs/twothirds.glif
+++ b/src/Cantarell-Light.ufo/glyphs/twothirds.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="twothirds" format="2">
-  <advance width="1084"/>
+  <advance width="877"/>
   <unicode hex="2154"/>
   <outline>
     <component base="two.numr"/>
-    <component base="fraction" xOffset="370"/>
-    <component base="three.dnom" xOffset="670"/>
+    <component base="fraction" xOffset="340"/>
+    <component base="three.dnom" xOffset="505"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/u-cy.glif b/src/Cantarell-Light.ufo/glyphs/u-cy.glif
index 6ba700ff..77b2de34 100644
--- a/src/Cantarell-Light.ufo/glyphs/u-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/u-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="u-cy" format="2">
-  <advance width="453"/>
+  <advance width="463"/>
   <unicode hex="0443"/>
-  <anchor x="227" y="480" name="top"/>
   <outline>
     <component base="y"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/u.glif b/src/Cantarell-Light.ufo/glyphs/u.glif
index 6f0a678b..5fa2568b 100644
--- a/src/Cantarell-Light.ufo/glyphs/u.glif
+++ b/src/Cantarell-Light.ufo/glyphs/u.glif
@@ -1,39 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="u" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="0075"/>
-  <note>
-u
-</note>
-  <anchor x="249" y="0" name="bottom"/>
-  <anchor x="424" y="10" name="ogonek"/>
-  <anchor x="249" y="480" name="top"/>
-  <anchor x="490" y="480" name="topright"/>
+  <anchor x="267" y="0" name="bottom"/>
+  <anchor x="442" y="10" name="ogonek"/>
+  <anchor x="267" y="480" name="top"/>
+  <anchor x="508" y="480" name="topright"/>
   <outline>
     <contour>
-      <point x="430" y="480" type="line"/>
-      <point x="409" y="480" type="line"/>
-      <point x="409" y="76" type="line"/>
-      <point x="413" y="0" type="line"/>
-      <point x="430" y="0" type="line"/>
+      <point x="259" y="-6" type="curve" smooth="yes"/>
+      <point x="326" y="-6"/>
+      <point x="396" y="25"/>
+      <point x="445" y="76" type="curve"/>
+      <point x="436" y="87" type="line"/>
+      <point x="390" y="40"/>
+      <point x="324" y="12"/>
+      <point x="263" y="12" type="curve" smooth="yes"/>
+      <point x="174" y="12"/>
+      <point x="119" y="69"/>
+      <point x="119" y="166" type="curve" smooth="yes"/>
+      <point x="119" y="480" type="line"/>
+      <point x="98" y="480" type="line"/>
+      <point x="98" y="166" type="line" smooth="yes"/>
+      <point x="98" y="57"/>
+      <point x="161" y="-6"/>
     </contour>
     <contour>
-      <point x="101" y="480" type="line"/>
-      <point x="80" y="480" type="line"/>
-      <point x="80" y="166" type="line" smooth="yes"/>
-      <point x="80" y="57"/>
-      <point x="143" y="-6"/>
-      <point x="241" y="-6" type="curve" smooth="yes"/>
-      <point x="308" y="-6"/>
-      <point x="378" y="25"/>
-      <point x="427" y="76" type="curve"/>
-      <point x="418" y="87" type="line"/>
-      <point x="372" y="40"/>
-      <point x="306" y="12"/>
-      <point x="245" y="12" type="curve" smooth="yes"/>
-      <point x="156" y="12"/>
-      <point x="101" y="69"/>
-      <point x="101" y="166" type="curve" smooth="yes"/>
+      <point x="431" y="0" type="line"/>
+      <point x="448" y="0" type="line"/>
+      <point x="448" y="480" type="line"/>
+      <point x="427" y="480" type="line"/>
+      <point x="427" y="76" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uacute.glif b/src/Cantarell-Light.ufo/glyphs/uacute.glif
index 0ed674c7..f4c14291 100644
--- a/src/Cantarell-Light.ufo/glyphs/uacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uacute" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="00FA"/>
   <outline>
     <component base="u"/>
-    <component base="acutecomb" xOffset="182"/>
+    <component base="acutecomb" xOffset="200"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ubreve.glif b/src/Cantarell-Light.ufo/glyphs/ubreve.glif
index 2be22919..5c995de3 100644
--- a/src/Cantarell-Light.ufo/glyphs/ubreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ubreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ubreve" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="016D"/>
   <outline>
     <component base="u"/>
-    <component base="brevecomb" xOffset="63"/>
+    <component base="brevecomb" xOffset="81"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ucaron.glif b/src/Cantarell-Light.ufo/glyphs/ucaron.glif
index b566e7e8..24649dba 100644
--- a/src/Cantarell-Light.ufo/glyphs/ucaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ucaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ucaron" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="01D4"/>
   <outline>
     <component base="u"/>
-    <component base="caroncomb" xOffset="66"/>
+    <component base="caroncomb" xOffset="84"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ucircumflex.glif b/src/Cantarell-Light.ufo/glyphs/ucircumflex.glif
index 2ba41531..785041e8 100644
--- a/src/Cantarell-Light.ufo/glyphs/ucircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ucircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ucircumflex" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="00FB"/>
   <outline>
     <component base="u"/>
-    <component base="circumflexcomb" xOffset="78"/>
+    <component base="circumflexcomb" xOffset="96"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udblgrave.glif b/src/Cantarell-Light.ufo/glyphs/udblgrave.glif
index a5a46e23..38db5461 100644
--- a/src/Cantarell-Light.ufo/glyphs/udblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udblgrave" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="0215"/>
   <outline>
     <component base="u"/>
-    <component base="dblgravecomb" xOffset="-3"/>
+    <component base="dblgravecomb" xOffset="15"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/udieresis-cy.glif
index 6fb4817d..68108733 100644
--- a/src/Cantarell-Light.ufo/glyphs/udieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresis-cy" format="2">
-  <advance width="453"/>
+  <advance width="463"/>
   <unicode hex="04F1"/>
   <outline>
     <component base="u-cy"/>
-    <component base="dieresiscomb" xOffset="8"/>
+    <component base="dieresiscomb" xOffset="1"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udieresis.glif b/src/Cantarell-Light.ufo/glyphs/udieresis.glif
index 96112fdb..bfbbfb7b 100644
--- a/src/Cantarell-Light.ufo/glyphs/udieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresis" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="00FC"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb" xOffset="30"/>
+    <component base="dieresiscomb" xOffset="48"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udieresisacute.glif 
b/src/Cantarell-Light.ufo/glyphs/udieresisacute.glif
index 79808769..30a35ef8 100644
--- a/src/Cantarell-Light.ufo/glyphs/udieresisacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udieresisacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresisacute" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="01D8"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_acutecomb" xOffset="30"/>
+    <component base="dieresiscomb.loclVIET" xOffset="48"/>
+    <component base="acutecomb" xOffset="200" yOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udieresiscaron.glif 
b/src/Cantarell-Light.ufo/glyphs/udieresiscaron.glif
index e244244b..5db93963 100644
--- a/src/Cantarell-Light.ufo/glyphs/udieresiscaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udieresiscaron.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresiscaron" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="01DA"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_caroncomb" xOffset="30"/>
+    <component base="dieresiscomb.loclVIET" xOffset="48"/>
+    <component base="caroncomb" xOffset="84" yOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udieresisgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/udieresisgrave.glif
index 9a3c579f..51f408ed 100644
--- a/src/Cantarell-Light.ufo/glyphs/udieresisgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udieresisgrave.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresisgrave" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="01DC"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_gravecomb" xOffset="30"/>
+    <component base="dieresiscomb.loclVIET" xOffset="48"/>
+    <component base="gravecomb" xOffset="83" yOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udieresismacron.glif 
b/src/Cantarell-Light.ufo/glyphs/udieresismacron.glif
index 4ae0447e..976d52f3 100644
--- a/src/Cantarell-Light.ufo/glyphs/udieresismacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udieresismacron.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresismacron" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="01D6"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_macroncomb" xOffset="30"/>
+    <component base="dieresiscomb.loclVIET" xOffset="48"/>
+    <component base="macroncomb" xOffset="24" yOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udotbelow.glif b/src/Cantarell-Light.ufo/glyphs/udotbelow.glif
index 7677fbb8..826f3283 100644
--- a/src/Cantarell-Light.ufo/glyphs/udotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udotbelow" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="1EE5"/>
   <outline>
     <component base="u"/>
-    <component base="dotbelowcomb" xOffset="129"/>
+    <component base="dotbelowcomb" xOffset="147"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ugrave.glif b/src/Cantarell-Light.ufo/glyphs/ugrave.glif
index fbd43578..16f0d844 100644
--- a/src/Cantarell-Light.ufo/glyphs/ugrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ugrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ugrave" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="00F9"/>
   <outline>
     <component base="u"/>
-    <component base="gravecomb" xOffset="65"/>
+    <component base="gravecomb" xOffset="83"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhookabove.glif b/src/Cantarell-Light.ufo/glyphs/uhookabove.glif
index 9dbf6992..b8c05932 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhookabove" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="1EE7"/>
   <outline>
     <component base="u"/>
-    <component base="hookabovecomb" xOffset="97"/>
+    <component base="hookabovecomb" xOffset="115"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhorn.glif b/src/Cantarell-Light.ufo/glyphs/uhorn.glif
index 2cea3abb..cd9857b7 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhorn.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhorn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorn" format="2">
-  <advance width="582"/>
+  <advance width="619"/>
   <unicode hex="01B0"/>
   <outline>
     <component base="u"/>
-    <component base="horncomb" xOffset="358" yOffset="-2"/>
+    <component base="horncomb" xOffset="376" yOffset="-2"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhornacute.glif b/src/Cantarell-Light.ufo/glyphs/uhornacute.glif
index bf6ef458..d90c8f4d 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhornacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhornacute" format="2">
-  <advance width="582"/>
+  <advance width="619"/>
   <unicode hex="1EE9"/>
   <outline>
     <component base="uhorn"/>
-    <component base="acutecomb" xOffset="182"/>
+    <component base="acutecomb" xOffset="200"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhorndotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/uhorndotbelow.glif
index ad6871f5..0d683126 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhorndotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhorndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorndotbelow" format="2">
-  <advance width="582"/>
+  <advance width="619"/>
   <unicode hex="1EF1"/>
   <outline>
     <component base="uhorn"/>
-    <component base="dotbelowcomb" xOffset="129"/>
+    <component base="dotbelowcomb" xOffset="147"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhorngrave.glif b/src/Cantarell-Light.ufo/glyphs/uhorngrave.glif
index fdc0c1fa..134a7a3c 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhorngrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhorngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorngrave" format="2">
-  <advance width="582"/>
+  <advance width="619"/>
   <unicode hex="1EEB"/>
   <outline>
     <component base="uhorn"/>
-    <component base="gravecomb" xOffset="65"/>
+    <component base="gravecomb" xOffset="83"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhornhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/uhornhookabove.glif
index fa96dbf7..10aa9971 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhornhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhornhookabove" format="2">
-  <advance width="582"/>
+  <advance width="619"/>
   <unicode hex="1EED"/>
   <outline>
     <component base="uhorn"/>
-    <component base="hookabovecomb" xOffset="97"/>
+    <component base="hookabovecomb" xOffset="115"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhorntilde.glif b/src/Cantarell-Light.ufo/glyphs/uhorntilde.glif
index 7acef24d..a59a17d8 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhorntilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhorntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorntilde" format="2">
-  <advance width="582"/>
+  <advance width="619"/>
   <unicode hex="1EEF"/>
   <outline>
     <component base="uhorn"/>
-    <component base="tildecomb" xOffset="14"/>
+    <component base="tildecomb" xOffset="32"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhungarumlaut-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/uhungarumlaut-cy.glif
index 86ba5169..ea3a3e7f 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhungarumlaut-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhungarumlaut-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhungarumlaut-cy" format="2">
-  <advance width="453"/>
+  <advance width="463"/>
   <unicode hex="04F3"/>
   <outline>
     <component base="u-cy"/>
-    <component base="hungarumlautcomb" xOffset="86"/>
+    <component base="hungarumlautcomb" xOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhungarumlaut.glif 
b/src/Cantarell-Light.ufo/glyphs/uhungarumlaut.glif
index f42e18ee..cf88c342 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhungarumlaut.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhungarumlaut" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="0171"/>
   <outline>
     <component base="u"/>
-    <component base="hungarumlautcomb" xOffset="108"/>
+    <component base="hungarumlautcomb" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uinvertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/uinvertedbreve.glif
index eb90302d..68463764 100644
--- a/src/Cantarell-Light.ufo/glyphs/uinvertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uinvertedbreve" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="0217"/>
   <outline>
     <component base="u"/>
-    <component base="breveinvertedcomb" xOffset="48"/>
+    <component base="breveinvertedcomb" xOffset="66"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/umacron-cy.glif b/src/Cantarell-Light.ufo/glyphs/umacron-cy.glif
index d658f7ed..b0113baf 100644
--- a/src/Cantarell-Light.ufo/glyphs/umacron-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/umacron-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="umacron-cy" format="2">
-  <advance width="453"/>
+  <advance width="463"/>
   <unicode hex="04EF"/>
   <outline>
     <component base="u-cy"/>
-    <component base="macroncomb" xOffset="-16"/>
+    <component base="macroncomb" xOffset="-23"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/umacron.glif b/src/Cantarell-Light.ufo/glyphs/umacron.glif
index e063b8a4..4de509e7 100644
--- a/src/Cantarell-Light.ufo/glyphs/umacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/umacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="umacron" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="016B"/>
   <outline>
     <component base="u"/>
-    <component base="macroncomb" xOffset="6"/>
+    <component base="macroncomb" xOffset="24"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/umacrondieresis.glif 
b/src/Cantarell-Light.ufo/glyphs/umacrondieresis.glif
index 4bdb97df..e0223a17 100644
--- a/src/Cantarell-Light.ufo/glyphs/umacrondieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/umacrondieresis.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="umacrondieresis" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="1E7B"/>
   <outline>
     <component base="u"/>
-    <component base="macroncomb_dieresiscomb" xOffset="-14"/>
+    <component base="macroncomb.loclVIET" xOffset="29"/>
+    <component base="dieresiscomb" xOffset="48" yOffset="69"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/underscore.glif b/src/Cantarell-Light.ufo/glyphs/underscore.glif
index c71fec7b..60563069 100644
--- a/src/Cantarell-Light.ufo/glyphs/underscore.glif
+++ b/src/Cantarell-Light.ufo/glyphs/underscore.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="underscore" format="2">
-  <advance width="620"/>
+  <advance width="500"/>
   <unicode hex="005F"/>
   <outline>
     <contour>
-      <point x="96" y="-17" type="line"/>
-      <point x="524" y="-17" type="line"/>
-      <point x="524" y="0" type="line"/>
-      <point x="96" y="0" type="line"/>
+      <point x="-10" y="-67" type="line"/>
+      <point x="510" y="-67" type="line"/>
+      <point x="510" y="-50" type="line"/>
+      <point x="-10" y="-50" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uogonek.glif b/src/Cantarell-Light.ufo/glyphs/uogonek.glif
index 370d3b58..7d061599 100644
--- a/src/Cantarell-Light.ufo/glyphs/uogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uogonek" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="0173"/>
   <outline>
     <component base="u"/>
-    <component base="ogonekcomb" xOffset="23"/>
+    <component base="ogonekcomb" xOffset="41"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upA_rrow.glif b/src/Cantarell-Light.ufo/glyphs/upA_rrow.glif
index ae74668e..8f890b00 100644
--- a/src/Cantarell-Light.ufo/glyphs/upA_rrow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upA_rrow.glif
@@ -1,22 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upArrow" format="2">
-  <advance width="640"/>
+  <advance width="616"/>
   <unicode hex="2191"/>
-  <note>
-arrowup
-</note>
   <outline>
     <contour>
-      <point x="311" y="44" type="line"/>
-      <point x="330" y="44" type="line"/>
-      <point x="330" y="561" type="line"/>
-      <point x="547" y="326" type="line"/>
-      <point x="561" y="339" type="line"/>
-      <point x="322" y="598" type="line"/>
-      <point x="319" y="598" type="line"/>
-      <point x="79" y="337" type="line"/>
-      <point x="92" y="324" type="line"/>
-      <point x="311" y="562" type="line"/>
+      <point x="299" y="44" type="line"/>
+      <point x="318" y="44" type="line"/>
+      <point x="318" y="561" type="line"/>
+      <point x="535" y="326" type="line"/>
+      <point x="549" y="339" type="line"/>
+      <point x="310" y="598" type="line"/>
+      <point x="307" y="598" type="line"/>
+      <point x="67" y="337" type="line"/>
+      <point x="80" y="324" type="line"/>
+      <point x="299" y="562" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uring.glif b/src/Cantarell-Light.ufo/glyphs/uring.glif
index f3c8df5e..c06e3ea9 100644
--- a/src/Cantarell-Light.ufo/glyphs/uring.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uring" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="016F"/>
   <outline>
     <component base="u"/>
-    <component base="ringcomb" xOffset="75"/>
+    <component base="ringcomb" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ushort-cy.glif b/src/Cantarell-Light.ufo/glyphs/ushort-cy.glif
index a007ee12..06245e62 100644
--- a/src/Cantarell-Light.ufo/glyphs/ushort-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ushort-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ushort-cy" format="2">
-  <advance width="453"/>
+  <advance width="463"/>
   <unicode hex="045E"/>
   <outline>
     <component base="u-cy"/>
-    <component base="brevecomb-cy" xOffset="30"/>
+    <component base="brevecomb-cy" xOffset="23"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ustraight-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/ustraight-cy.glif
index fdc5a9a1..11851d61 100644
--- a/src/Cantarell-Light.ufo/glyphs/ustraight-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ustraight-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ustraight-cy" format="2">
-  <advance width="453"/>
+  <advance width="463"/>
   <unicode hex="04AF"/>
   <anchor x="228" y="-6" name="center"/>
   <outline>
@@ -12,4 +12,12 @@
     </contour>
     <component base="v"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>v</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>v</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ustraightstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/ustraightstroke-cy.glif
index 1e964b39..b149732b 100644
--- a/src/Cantarell-Light.ufo/glyphs/ustraightstroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ustraightstroke-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ustraightstroke-cy" format="2">
-  <advance width="453"/>
+  <advance width="463"/>
   <unicode hex="04B1"/>
   <outline>
     <component base="ustraight-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/utilde.glif b/src/Cantarell-Light.ufo/glyphs/utilde.glif
index 7ad25a48..b4c8ebde 100644
--- a/src/Cantarell-Light.ufo/glyphs/utilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/utilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="utilde" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="0169"/>
   <outline>
     <component base="u"/>
-    <component base="tildecomb" xOffset="14"/>
+    <component base="tildecomb" xOffset="32"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/utildeacute.glif b/src/Cantarell-Light.ufo/glyphs/utildeacute.glif
index a9999bdf..65266c76 100644
--- a/src/Cantarell-Light.ufo/glyphs/utildeacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/utildeacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="utildeacute" format="2">
-  <advance width="518"/>
+  <advance width="555"/>
   <unicode hex="1E79"/>
   <outline>
     <component base="u"/>
-    <component base="tildecomb_acutecomb" xOffset="14"/>
+    <component base="tildecomb" xOffset="32"/>
+    <component base="acutecomb" xOffset="200" yOffset="132"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/v.glif b/src/Cantarell-Light.ufo/glyphs/v.glif
index 5da6bb52..a6ba6ec8 100644
--- a/src/Cantarell-Light.ufo/glyphs/v.glif
+++ b/src/Cantarell-Light.ufo/glyphs/v.glif
@@ -1,22 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="v" format="2">
-  <advance width="453"/>
+  <advance width="463"/>
   <unicode hex="0076"/>
-  <note>
-v
-</note>
-  <anchor x="227" y="0" name="bottom"/>
-  <anchor x="227" y="480" name="top"/>
+  <anchor x="232" y="0" name="bottom"/>
+  <anchor x="232" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="219" y="0" type="line"/>
-      <point x="237" y="0" type="line"/>
-      <point x="426" y="480" type="line"/>
-      <point x="405" y="480" type="line"/>
-      <point x="224" y="14" type="line"/>
-      <point x="233" y="14" type="line"/>
-      <point x="50" y="480" type="line"/>
-      <point x="27" y="480" type="line"/>
+      <point x="224" y="0" type="line"/>
+      <point x="242" y="0" type="line"/>
+      <point x="431" y="480" type="line"/>
+      <point x="410" y="480" type="line"/>
+      <point x="229" y="14" type="line"/>
+      <point x="238" y="14" type="line"/>
+      <point x="55" y="480" type="line"/>
+      <point x="32" y="480" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ve-cy.glif b/src/Cantarell-Light.ufo/glyphs/ve-cy.glif
index 3e7bca42..fe9ab3c0 100644
--- a/src/Cantarell-Light.ufo/glyphs/ve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ve-cy.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ve-cy" format="2">
-  <advance width="490"/>
+  <advance width="527"/>
   <unicode hex="0432"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="249" y="0" type="line" smooth="yes"/>
-      <point x="366" y="0"/>
-      <point x="432" y="48"/>
-      <point x="432" y="130" type="curve" smooth="yes"/>
-      <point x="432" y="209"/>
-      <point x="370" y="261"/>
-      <point x="276" y="261" type="curve" smooth="yes"/>
-      <point x="102" y="261" type="line"/>
-      <point x="102" y="244" type="line"/>
-      <point x="268" y="244" type="line" smooth="yes"/>
-      <point x="355" y="244"/>
-      <point x="411" y="198"/>
-      <point x="411" y="126" type="curve" smooth="yes"/>
-      <point x="411" y="55"/>
-      <point x="356" y="17"/>
-      <point x="258" y="17" type="curve" smooth="yes"/>
-      <point x="108" y="17" type="line"/>
-      <point x="108" y="463" type="line"/>
-      <point x="247" y="463" type="line" smooth="yes"/>
-      <point x="343" y="463"/>
-      <point x="396" y="426"/>
-      <point x="396" y="358" type="curve" smooth="yes"/>
-      <point x="396" y="306"/>
-      <point x="360" y="268"/>
-      <point x="298" y="254" type="curve"/>
-      <point x="325" y="252" type="line"/>
-      <point x="380" y="262"/>
-      <point x="417" y="307"/>
-      <point x="417" y="365" type="curve" smooth="yes"/>
-      <point x="417" y="439"/>
-      <point x="355" y="480"/>
-      <point x="247" y="480" type="curve" smooth="yes"/>
-      <point x="88" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="268" y="0" type="line" smooth="yes"/>
+      <point x="385" y="0"/>
+      <point x="451" y="48"/>
+      <point x="451" y="130" type="curve" smooth="yes"/>
+      <point x="451" y="209"/>
+      <point x="389" y="261"/>
+      <point x="295" y="261" type="curve" smooth="yes"/>
+      <point x="121" y="261" type="line"/>
+      <point x="121" y="244" type="line"/>
+      <point x="287" y="244" type="line" smooth="yes"/>
+      <point x="374" y="244"/>
+      <point x="430" y="198"/>
+      <point x="430" y="126" type="curve" smooth="yes"/>
+      <point x="430" y="55"/>
+      <point x="375" y="17"/>
+      <point x="277" y="17" type="curve" smooth="yes"/>
+      <point x="127" y="17" type="line"/>
+      <point x="127" y="463" type="line"/>
+      <point x="266" y="463" type="line" smooth="yes"/>
+      <point x="362" y="463"/>
+      <point x="415" y="426"/>
+      <point x="415" y="358" type="curve" smooth="yes"/>
+      <point x="415" y="306"/>
+      <point x="379" y="268"/>
+      <point x="317" y="254" type="curve"/>
+      <point x="344" y="252" type="line"/>
+      <point x="399" y="262"/>
+      <point x="436" y="307"/>
+      <point x="436" y="365" type="curve" smooth="yes"/>
+      <point x="436" y="439"/>
+      <point x="374" y="480"/>
+      <point x="266" y="480" type="curve" smooth="yes"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -49,6 +49,8 @@
         <key>width</key>
         <integer>82</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/verticallineabovecomb.glif 
b/src/Cantarell-Light.ufo/glyphs/verticallineabovecomb.glif
index 2693f009..19df39fd 100644
--- a/src/Cantarell-Light.ufo/glyphs/verticallineabovecomb.glif
+++ b/src/Cantarell-Light.ufo/glyphs/verticallineabovecomb.glif
@@ -5,10 +5,10 @@
   <anchor x="110" y="750" name="top"/>
   <outline>
     <contour>
-      <point x="119" y="745" type="line"/>
-      <point x="101" y="745" type="line"/>
       <point x="103" y="561" type="line"/>
       <point x="117" y="561" type="line"/>
+      <point x="119" y="745" type="line"/>
+      <point x="101" y="745" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/verticallinelowmod.glif 
b/src/Cantarell-Light.ufo/glyphs/verticallinelowmod.glif
index a2b884d5..2f05d8c7 100644
--- a/src/Cantarell-Light.ufo/glyphs/verticallinelowmod.glif
+++ b/src/Cantarell-Light.ufo/glyphs/verticallinelowmod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="verticallinelowmod" format="2">
-  <advance width="220"/>
+  <advance width="142"/>
   <unicode hex="02CC"/>
   <outline>
-    <component base="verticallinebelowcomb"/>
+    <component base="verticallinebelowcomb" xOffset="-39"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/verticallinemod.glif 
b/src/Cantarell-Light.ufo/glyphs/verticallinemod.glif
index 8cf16a09..1362999b 100644
--- a/src/Cantarell-Light.ufo/glyphs/verticallinemod.glif
+++ b/src/Cantarell-Light.ufo/glyphs/verticallinemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="verticallinemod" format="2">
-  <advance width="220"/>
+  <advance width="142"/>
   <unicode hex="02C8"/>
   <outline>
-    <component base="verticallineabovecomb"/>
+    <component base="verticallineabovecomb" xOffset="-39"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/w.glif b/src/Cantarell-Light.ufo/glyphs/w.glif
index 7751f861..f7fb18f0 100644
--- a/src/Cantarell-Light.ufo/glyphs/w.glif
+++ b/src/Cantarell-Light.ufo/glyphs/w.glif
@@ -1,30 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="w" format="2">
-  <advance width="750"/>
+  <advance width="760"/>
   <unicode hex="0077"/>
-  <note>
-w
-</note>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="480" name="top"/>
+  <anchor x="384" y="0" name="bottom"/>
+  <anchor x="384" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="203" y="0" type="line"/>
-      <point x="218" y="0" type="line"/>
-      <point x="379" y="459" type="line"/>
-      <point x="372" y="459" type="line"/>
-      <point x="537" y="0" type="line"/>
-      <point x="551" y="0" type="line"/>
-      <point x="721" y="480" type="line"/>
-      <point x="700" y="480" type="line"/>
-      <point x="542" y="25" type="line"/>
-      <point x="548" y="25" type="line"/>
-      <point x="386" y="479" type="line"/>
-      <point x="366" y="479" type="line"/>
-      <point x="209" y="25" type="line"/>
-      <point x="214" y="25" type="line"/>
-      <point x="50" y="480" type="line"/>
-      <point x="28" y="480" type="line"/>
+      <point x="200" y="0" type="line"/>
+      <point x="215" y="0" type="line"/>
+      <point x="383" y="459" type="line"/>
+      <point x="376" y="459" type="line"/>
+      <point x="554" y="0" type="line"/>
+      <point x="568" y="0" type="line"/>
+      <point x="725" y="480" type="line"/>
+      <point x="704" y="480" type="line"/>
+      <point x="559" y="25" type="line"/>
+      <point x="565" y="25" type="line"/>
+      <point x="390" y="479" type="line"/>
+      <point x="370" y="479" type="line"/>
+      <point x="206" y="25" type="line"/>
+      <point x="211" y="25" type="line"/>
+      <point x="57" y="480" type="line"/>
+      <point x="35" y="480" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/wacute.glif b/src/Cantarell-Light.ufo/glyphs/wacute.glif
index 0d2891c9..7049c237 100644
--- a/src/Cantarell-Light.ufo/glyphs/wacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/wacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wacute" format="2">
-  <advance width="750"/>
+  <advance width="760"/>
   <unicode hex="1E83"/>
   <outline>
     <component base="w"/>
-    <component base="acutecomb" xOffset="310"/>
+    <component base="acutecomb" xOffset="317"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/wcircumflex.glif b/src/Cantarell-Light.ufo/glyphs/wcircumflex.glif
index b772f451..7a0dbf99 100644
--- a/src/Cantarell-Light.ufo/glyphs/wcircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/wcircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wcircumflex" format="2">
-  <advance width="750"/>
+  <advance width="760"/>
   <unicode hex="0175"/>
   <outline>
     <component base="w"/>
-    <component base="circumflexcomb" xOffset="206"/>
+    <component base="circumflexcomb" xOffset="213"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/wdieresis.glif b/src/Cantarell-Light.ufo/glyphs/wdieresis.glif
index bbcca8c6..3ccb6ef4 100644
--- a/src/Cantarell-Light.ufo/glyphs/wdieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/wdieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wdieresis" format="2">
-  <advance width="750"/>
+  <advance width="760"/>
   <unicode hex="1E85"/>
   <outline>
     <component base="w"/>
-    <component base="dieresiscomb" xOffset="158"/>
+    <component base="dieresiscomb" xOffset="165"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/we-cy.glif b/src/Cantarell-Light.ufo/glyphs/we-cy.glif
index 670001c8..38d78c1c 100644
--- a/src/Cantarell-Light.ufo/glyphs/we-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/we-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="we-cy" format="2">
-  <advance width="750"/>
+  <advance width="760"/>
   <unicode hex="051D"/>
   <outline>
     <component base="w"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/wgrave.glif b/src/Cantarell-Light.ufo/glyphs/wgrave.glif
index 50e32963..37d61141 100644
--- a/src/Cantarell-Light.ufo/glyphs/wgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/wgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wgrave" format="2">
-  <advance width="750"/>
+  <advance width="760"/>
   <unicode hex="1E81"/>
   <outline>
     <component base="w"/>
-    <component base="gravecomb" xOffset="193"/>
+    <component base="gravecomb" xOffset="200"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/whiteC_ircle.glif 
b/src/Cantarell-Light.ufo/glyphs/whiteC_ircle.glif
index 7b46f87a..daf1891d 100644
--- a/src/Cantarell-Light.ufo/glyphs/whiteC_ircle.glif
+++ b/src/Cantarell-Light.ufo/glyphs/whiteC_ircle.glif
@@ -2,9 +2,6 @@
 <glyph name="whiteCircle" format="2">
   <advance width="662"/>
   <unicode hex="25CB"/>
-  <note>
-circle
-</note>
   <outline>
     <contour>
       <point x="329" y="109" type="curve" smooth="yes"/>
@@ -35,4 +32,12 @@ circle
       <point x="461" y="127"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>blackCircle</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>blackCircle</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/won.glif b/src/Cantarell-Light.ufo/glyphs/won.glif
index 0362b973..3e565506 100644
--- a/src/Cantarell-Light.ufo/glyphs/won.glif
+++ b/src/Cantarell-Light.ufo/glyphs/won.glif
@@ -1,32 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="won" format="2">
-  <advance width="1124"/>
+  <advance width="580"/>
   <unicode hex="20A9"/>
   <outline>
     <contour>
-      <point x="95" y="274" type="line"/>
-      <point x="257" y="274" type="line"/>
-      <point x="257" y="291" type="line"/>
-      <point x="95" y="291" type="line"/>
+      <point x="150" y="0" type="line"/>
+      <point x="164" y="0" type="line"/>
+      <point x="295" y="662" type="line"/>
+      <point x="285" y="662" type="line"/>
+      <point x="417" y="0" type="line"/>
+      <point x="432" y="0" type="line"/>
+      <point x="550" y="694" type="line"/>
+      <point x="532" y="694" type="line"/>
+      <point x="422" y="32" type="line"/>
+      <point x="429" y="32" type="line"/>
+      <point x="298" y="683" type="line"/>
+      <point x="283" y="683" type="line"/>
+      <point x="154" y="32" type="line"/>
+      <point x="161" y="32" type="line"/>
+      <point x="49" y="694" type="line"/>
+      <point x="29" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="95" y="414" type="line"/>
-      <point x="584" y="414" type="line"/>
-      <point x="584" y="431" type="line"/>
-      <point x="95" y="431" type="line"/>
+      <point x="5" y="261" type="line"/>
+      <point x="112" y="261" type="line"/>
+      <point x="112" y="278" type="line"/>
+      <point x="5" y="278" type="line"/>
     </contour>
     <contour>
-      <point x="1035" y="274" type="line"/>
-      <point x="1035" y="291" type="line"/>
-      <point x="883" y="291" type="line"/>
-      <point x="883" y="274" type="line"/>
+      <point x="5" y="418" type="line"/>
+      <point x="575" y="418" type="line"/>
+      <point x="575" y="433" type="line"/>
+      <point x="5" y="433" type="line"/>
     </contour>
     <contour>
-      <point x="1035" y="414" type="line"/>
-      <point x="1035" y="431" type="line"/>
-      <point x="557" y="431" type="line"/>
-      <point x="557" y="414" type="line"/>
+      <point x="468" y="261" type="line"/>
+      <point x="575" y="261" type="line"/>
+      <point x="575" y="278" type="line"/>
+      <point x="468" y="278" type="line"/>
     </contour>
-    <component base="W" xOffset="60"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/x.glif b/src/Cantarell-Light.ufo/glyphs/x.glif
index ce485bea..9f554104 100644
--- a/src/Cantarell-Light.ufo/glyphs/x.glif
+++ b/src/Cantarell-Light.ufo/glyphs/x.glif
@@ -1,28 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="x" format="2">
-  <advance width="437"/>
+  <advance width="446"/>
   <unicode hex="0078"/>
-  <note>
-x
-</note>
-  <anchor x="219" y="0" name="bottom"/>
-  <anchor x="217" y="480" name="top"/>
+  <anchor x="224" y="0" name="bottom"/>
+  <anchor x="222" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="30" y="0" type="line"/>
-      <point x="52" y="0" type="line"/>
-      <point x="222" y="238" type="line"/>
-      <point x="412" y="480" type="line"/>
-      <point x="390" y="480" type="line"/>
-      <point x="212" y="251" type="line"/>
+      <point x="35" y="0" type="line"/>
+      <point x="57" y="0" type="line"/>
+      <point x="227" y="238" type="line"/>
+      <point x="417" y="480" type="line"/>
+      <point x="395" y="480" type="line"/>
+      <point x="217" y="251" type="line"/>
     </contour>
     <contour>
-      <point x="375" y="0" type="line"/>
-      <point x="399" y="0" type="line"/>
-      <point x="222" y="250" type="line"/>
-      <point x="51" y="480" type="line"/>
-      <point x="27" y="480" type="line"/>
-      <point x="210" y="235" type="line"/>
+      <point x="380" y="0" type="line"/>
+      <point x="404" y="0" type="line"/>
+      <point x="227" y="250" type="line"/>
+      <point x="56" y="480" type="line"/>
+      <point x="32" y="480" type="line"/>
+      <point x="215" y="235" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/y.glif b/src/Cantarell-Light.ufo/glyphs/y.glif
index ec1091a4..8b681cff 100644
--- a/src/Cantarell-Light.ufo/glyphs/y.glif
+++ b/src/Cantarell-Light.ufo/glyphs/y.glif
@@ -1,28 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="y" format="2">
-  <advance width="453"/>
+  <advance width="463"/>
   <unicode hex="0079"/>
-  <note>
-y
-</note>
-  <anchor x="333" y="0" name="bottom"/>
-  <anchor x="215" y="480" name="top"/>
+  <anchor x="338" y="0" name="bottom"/>
+  <anchor x="220" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="219" y="0" type="line"/>
-      <point x="237" y="0" type="line"/>
-      <point x="426" y="480" type="line"/>
-      <point x="405" y="480" type="line"/>
-      <point x="224" y="14" type="line"/>
-      <point x="233" y="14" type="line"/>
-      <point x="50" y="480" type="line"/>
-      <point x="27" y="480" type="line"/>
-    </contour>
-    <contour>
-      <point x="135" y="-217" type="line"/>
-      <point x="158" y="-217" type="line"/>
-      <point x="237" y="0" type="line"/>
-      <point x="219" y="0" type="line"/>
+      <point x="140" y="-217" type="line"/>
+      <point x="163" y="-217" type="line"/>
+      <point x="242" y="0" type="line"/>
+      <point x="431" y="480" type="line"/>
+      <point x="410" y="480" type="line"/>
+      <point x="230" y="18" type="line"/>
+      <point x="236" y="18" type="line"/>
+      <point x="55" y="480" type="line"/>
+      <point x="32" y="480" type="line"/>
+      <point x="224" y="0" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>v</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>v</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/yacute.glif b/src/Cantarell-Light.ufo/glyphs/yacute.glif
index f23818ff..dd24cd8a 100644
--- a/src/Cantarell-Light.ufo/glyphs/yacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yacute" format="2">
-  <advance width="453"/>
+  <advance width="463"/>
   <unicode hex="00FD"/>
   <outline>
     <component base="y"/>
-    <component base="acutecomb" xOffset="148"/>
+    <component base="acutecomb" xOffset="153"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/yat-cy.glif b/src/Cantarell-Light.ufo/glyphs/yat-cy.glif
index c776f369..1d4e7996 100644
--- a/src/Cantarell-Light.ufo/glyphs/yat-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yat-cy.glif
@@ -1,35 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yat-cy" format="2">
-  <advance width="473"/>
+  <advance width="507"/>
   <unicode hex="0463"/>
   <outline>
     <contour>
-      <point x="93" y="0" type="line"/>
-      <point x="252" y="0" type="line" smooth="yes"/>
-      <point x="363" y="0"/>
-      <point x="430" y="56"/>
-      <point x="430" y="150" type="curve" smooth="yes"/>
-      <point x="430" y="241"/>
-      <point x="369" y="301"/>
-      <point x="278" y="301" type="curve" smooth="yes"/>
-      <point x="105" y="301" type="line"/>
-      <point x="105" y="284" type="line"/>
-      <point x="271" y="284" type="line" smooth="yes"/>
-      <point x="352" y="284"/>
-      <point x="408" y="228"/>
-      <point x="408" y="145" type="curve" smooth="yes"/>
-      <point x="408" y="65"/>
-      <point x="353" y="17"/>
-      <point x="261" y="17" type="curve" smooth="yes"/>
-      <point x="113" y="17" type="line"/>
-      <point x="113" y="739" type="line"/>
-      <point x="93" y="739" type="line"/>
+      <point x="112" y="0" type="line"/>
+      <point x="271" y="0" type="line" smooth="yes"/>
+      <point x="382" y="0"/>
+      <point x="449" y="56"/>
+      <point x="449" y="150" type="curve" smooth="yes"/>
+      <point x="449" y="241"/>
+      <point x="388" y="301"/>
+      <point x="297" y="301" type="curve" smooth="yes"/>
+      <point x="124" y="301" type="line"/>
+      <point x="124" y="284" type="line"/>
+      <point x="290" y="284" type="line" smooth="yes"/>
+      <point x="371" y="284"/>
+      <point x="427" y="228"/>
+      <point x="427" y="145" type="curve" smooth="yes"/>
+      <point x="427" y="65"/>
+      <point x="372" y="17"/>
+      <point x="280" y="17" type="curve" smooth="yes"/>
+      <point x="132" y="17" type="line"/>
+      <point x="132" y="739" type="line"/>
+      <point x="112" y="739" type="line"/>
     </contour>
     <contour>
-      <point x="23" y="479" type="line"/>
-      <point x="260" y="479" type="line"/>
-      <point x="260" y="496" type="line"/>
-      <point x="23" y="496" type="line"/>
+      <point x="42" y="479" type="line"/>
+      <point x="279" y="479" type="line"/>
+      <point x="279" y="496" type="line"/>
+      <point x="42" y="496" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>softsign-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ycircumflex.glif b/src/Cantarell-Light.ufo/glyphs/ycircumflex.glif
index c4f58ee2..cd16abce 100644
--- a/src/Cantarell-Light.ufo/glyphs/ycircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ycircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ycircumflex" format="2">
-  <advance width="453"/>
+  <advance width="463"/>
   <unicode hex="0177"/>
   <outline>
     <component base="y"/>
-    <component base="circumflexcomb" xOffset="44"/>
+    <component base="circumflexcomb" xOffset="49"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ydieresis.glif b/src/Cantarell-Light.ufo/glyphs/ydieresis.glif
index 986c6737..15465512 100644
--- a/src/Cantarell-Light.ufo/glyphs/ydieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ydieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ydieresis" format="2">
-  <advance width="453"/>
+  <advance width="463"/>
   <unicode hex="00FF"/>
   <outline>
     <component base="y"/>
-    <component base="dieresiscomb" xOffset="-4"/>
+    <component base="dieresiscomb" xOffset="1"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ydotaccent.glif b/src/Cantarell-Light.ufo/glyphs/ydotaccent.glif
index 62a5a6d5..143e50b4 100644
--- a/src/Cantarell-Light.ufo/glyphs/ydotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ydotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ydotaccent" format="2">
-  <advance width="453"/>
+  <advance width="463"/>
   <unicode hex="1E8F"/>
   <outline>
     <component base="y"/>
-    <component base="dotaccentcomb" xOffset="96"/>
+    <component base="dotaccentcomb" xOffset="101"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ydotbelow.glif b/src/Cantarell-Light.ufo/glyphs/ydotbelow.glif
index c9640881..ab38b327 100644
--- a/src/Cantarell-Light.ufo/glyphs/ydotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ydotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ydotbelow" format="2">
-  <advance width="453"/>
+  <advance width="463"/>
   <unicode hex="1EF5"/>
   <outline>
     <component base="y"/>
-    <component base="dotbelowcomb" xOffset="213"/>
+    <component base="dotbelowcomb" xOffset="218"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/yen.glif b/src/Cantarell-Light.ufo/glyphs/yen.glif
index 6dab97fa..22155dcb 100644
--- a/src/Cantarell-Light.ufo/glyphs/yen.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yen.glif
@@ -1,31 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yen" format="2">
-  <advance width="643"/>
+  <advance width="580"/>
   <unicode hex="00A5"/>
   <outline>
+    <contour>
+      <point x="280" y="0" type="line"/>
+      <point x="301" y="0" type="line"/>
+      <point x="301" y="333" type="line"/>
+      <point x="498" y="694" type="line"/>
+      <point x="475" y="694" type="line"/>
+      <point x="288" y="344" type="line"/>
+      <point x="296" y="344" type="line"/>
+      <point x="108" y="694" type="line"/>
+      <point x="82" y="694" type="line"/>
+      <point x="280" y="333" type="line"/>
+    </contour>
     <contour>
       <point x="112" y="170" type="line"/>
-      <point x="532" y="170" type="line"/>
-      <point x="532" y="187" type="line"/>
+      <point x="470" y="170" type="line"/>
+      <point x="470" y="187" type="line"/>
       <point x="112" y="187" type="line"/>
     </contour>
     <contour>
       <point x="112" y="327" type="line"/>
-      <point x="532" y="327" type="line"/>
-      <point x="532" y="344" type="line"/>
+      <point x="470" y="327" type="line"/>
+      <point x="470" y="344" type="line"/>
       <point x="112" y="344" type="line"/>
     </contour>
-    <contour>
-      <point x="311" y="0" type="line"/>
-      <point x="332" y="0" type="line"/>
-      <point x="332" y="333" type="line"/>
-      <point x="564" y="694" type="line"/>
-      <point x="541" y="694" type="line"/>
-      <point x="319" y="344" type="line"/>
-      <point x="327" y="344" type="line"/>
-      <point x="104" y="694" type="line"/>
-      <point x="78" y="694" type="line"/>
-      <point x="311" y="333" type="line"/>
-    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/yeru-cy.glif b/src/Cantarell-Light.ufo/glyphs/yeru-cy.glif
index ed2436bd..3ab1c79c 100644
--- a/src/Cantarell-Light.ufo/glyphs/yeru-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yeru-cy.glif
@@ -1,36 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yeru-cy" format="2">
-  <advance width="633"/>
+  <advance width="666"/>
   <unicode hex="044B"/>
-  <anchor x="317" y="480" name="top"/>
+  <anchor x="336" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="524" y="0" type="line"/>
-      <point x="545" y="0" type="line"/>
-      <point x="545" y="480" type="line"/>
-      <point x="524" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="265" y="0" type="line" smooth="yes"/>
+      <point x="377" y="0"/>
+      <point x="444" y="56"/>
+      <point x="444" y="150" type="curve" smooth="yes"/>
+      <point x="444" y="241"/>
+      <point x="383" y="301"/>
+      <point x="292" y="301" type="curve" smooth="yes"/>
+      <point x="120" y="301" type="line"/>
+      <point x="120" y="284" type="line"/>
+      <point x="284" y="284" type="line" smooth="yes"/>
+      <point x="366" y="284"/>
+      <point x="422" y="228"/>
+      <point x="422" y="145" type="curve" smooth="yes"/>
+      <point x="422" y="65"/>
+      <point x="367" y="17"/>
+      <point x="274" y="17" type="curve" smooth="yes"/>
+      <point x="128" y="17" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="249" y="0" type="line" smooth="yes"/>
-      <point x="361" y="0"/>
-      <point x="428" y="56"/>
-      <point x="428" y="150" type="curve" smooth="yes"/>
-      <point x="428" y="241"/>
-      <point x="367" y="301"/>
-      <point x="276" y="301" type="curve" smooth="yes"/>
-      <point x="101" y="301" type="line"/>
-      <point x="101" y="284" type="line"/>
-      <point x="268" y="284" type="line" smooth="yes"/>
-      <point x="350" y="284"/>
-      <point x="406" y="228"/>
-      <point x="406" y="145" type="curve" smooth="yes"/>
-      <point x="406" y="65"/>
-      <point x="351" y="17"/>
-      <point x="258" y="17" type="curve" smooth="yes"/>
-      <point x="109" y="17" type="line"/>
-      <point x="109" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="538" y="0" type="line"/>
+      <point x="559" y="0" type="line"/>
+      <point x="559" y="480" type="line"/>
+      <point x="538" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -42,6 +42,10 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/yerudieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/yerudieresis-cy.glif
index d9efd595..6303b5b0 100644
--- a/src/Cantarell-Light.ufo/glyphs/yerudieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yerudieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yerudieresis-cy" format="2">
-  <advance width="633"/>
+  <advance width="666"/>
   <unicode hex="04F9"/>
   <outline>
     <component base="yeru-cy"/>
-    <component base="dieresiscomb" xOffset="98"/>
+    <component base="dieresiscomb" xOffset="117"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ygrave.glif b/src/Cantarell-Light.ufo/glyphs/ygrave.glif
index 9db80058..381995fa 100644
--- a/src/Cantarell-Light.ufo/glyphs/ygrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ygrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ygrave" format="2">
-  <advance width="453"/>
+  <advance width="463"/>
   <unicode hex="1EF3"/>
   <outline>
     <component base="y"/>
-    <component base="gravecomb" xOffset="31"/>
+    <component base="gravecomb" xOffset="36"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/yhookabove.glif b/src/Cantarell-Light.ufo/glyphs/yhookabove.glif
index f3ec032a..470d80be 100644
--- a/src/Cantarell-Light.ufo/glyphs/yhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yhookabove" format="2">
-  <advance width="453"/>
+  <advance width="463"/>
   <unicode hex="1EF7"/>
   <outline>
     <component base="y"/>
-    <component base="hookabovecomb" xOffset="63"/>
+    <component base="hookabovecomb" xOffset="68"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/yi-cy.glif b/src/Cantarell-Light.ufo/glyphs/yi-cy.glif
index e3c2f6cd..d86c62bb 100644
--- a/src/Cantarell-Light.ufo/glyphs/yi-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yi-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yi-cy" format="2">
-  <advance width="201"/>
+  <advance width="235"/>
   <unicode hex="0457"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb" xOffset="-117"/>
+    <component base="dieresiscomb" xOffset="-100"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ymacron.glif b/src/Cantarell-Light.ufo/glyphs/ymacron.glif
index de8ee5e6..d361ab02 100644
--- a/src/Cantarell-Light.ufo/glyphs/ymacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ymacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ymacron" format="2">
-  <advance width="453"/>
+  <advance width="463"/>
   <unicode hex="0233"/>
   <outline>
     <component base="y"/>
-    <component base="macroncomb" xOffset="-28"/>
+    <component base="macroncomb" xOffset="-23"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ytilde.glif b/src/Cantarell-Light.ufo/glyphs/ytilde.glif
index fbbac1ff..5daec636 100644
--- a/src/Cantarell-Light.ufo/glyphs/ytilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ytilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ytilde" format="2">
-  <advance width="453"/>
+  <advance width="463"/>
   <unicode hex="1EF9"/>
   <outline>
     <component base="y"/>
-    <component base="tildecomb" xOffset="-20"/>
+    <component base="tildecomb" xOffset="-15"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/yusbig-cy.glif b/src/Cantarell-Light.ufo/glyphs/yusbig-cy.glif
index a0a9dc13..e35313eb 100644
--- a/src/Cantarell-Light.ufo/glyphs/yusbig-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yusbig-cy.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yusbig-cy" format="2">
-  <advance width="584"/>
+  <advance width="614"/>
   <unicode hex="046B"/>
   <outline>
     <contour>
-      <point x="270" y="269" type="line"/>
-      <point x="292" y="269" type="line"/>
-      <point x="96" y="469" type="line"/>
-      <point x="94" y="464" type="line"/>
-      <point x="489" y="464" type="line"/>
-      <point x="487" y="469" type="line"/>
-      <point x="289" y="270" type="line"/>
-      <point x="310" y="270" type="line"/>
-      <point x="506" y="462" type="line"/>
-      <point x="506" y="480" type="line"/>
-      <point x="77" y="480" type="line"/>
-      <point x="77" y="462" type="line"/>
+      <point x="55" y="0" type="curve"/>
+      <point x="74" y="0" type="line"/>
+      <point x="74" y="174"/>
+      <point x="146" y="254"/>
+      <point x="304" y="254" type="curve" smooth="yes"/>
+      <point x="466" y="254"/>
+      <point x="540" y="174"/>
+      <point x="540" y="0" type="curve"/>
+      <point x="559" y="0" type="line"/>
+      <point x="559" y="187"/>
+      <point x="480" y="272"/>
+      <point x="309" y="272" type="curve" smooth="yes"/>
+      <point x="135" y="272"/>
+      <point x="55" y="187"/>
     </contour>
     <contour>
-      <point x="301" y="259" type="line"/>
-      <point x="281" y="259" type="line"/>
-      <point x="281" y="0" type="line"/>
-      <point x="301" y="0" type="line"/>
+      <point x="296" y="0" type="line"/>
+      <point x="316" y="0" type="line"/>
+      <point x="316" y="259" type="line"/>
+      <point x="296" y="259" type="line"/>
     </contour>
     <contour>
-      <point x="59" y="0" type="line"/>
-      <point x="59" y="174"/>
-      <point x="131" y="254"/>
-      <point x="289" y="254" type="curve" smooth="yes"/>
-      <point x="451" y="254"/>
-      <point x="525" y="174"/>
-      <point x="525" y="0" type="curve"/>
-      <point x="544" y="0" type="line"/>
-      <point x="544" y="187"/>
-      <point x="465" y="272"/>
-      <point x="294" y="272" type="curve" smooth="yes"/>
-      <point x="120" y="272"/>
-      <point x="40" y="187"/>
-      <point x="40" y="0" type="curve"/>
+      <point x="285" y="269" type="line"/>
+      <point x="307" y="269" type="line"/>
+      <point x="111" y="469" type="line"/>
+      <point x="109" y="464" type="line"/>
+      <point x="504" y="464" type="line"/>
+      <point x="502" y="469" type="line"/>
+      <point x="304" y="270" type="line"/>
+      <point x="325" y="270" type="line"/>
+      <point x="521" y="462" type="line"/>
+      <point x="521" y="480" type="line"/>
+      <point x="92" y="480" type="line"/>
+      <point x="92" y="462" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -49,6 +49,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/z.glif b/src/Cantarell-Light.ufo/glyphs/z.glif
index 8c83c311..ecafbb93 100644
--- a/src/Cantarell-Light.ufo/glyphs/z.glif
+++ b/src/Cantarell-Light.ufo/glyphs/z.glif
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="z" format="2">
-  <advance width="414"/>
+  <advance width="451"/>
   <unicode hex="007A"/>
-  <note>
-z
-</note>
-  <anchor x="207" y="0" name="bottom"/>
-  <anchor x="207" y="480" name="top"/>
+  <anchor x="225" y="0" name="bottom"/>
+  <anchor x="225" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="31" y="0" type="line"/>
-      <point x="386" y="0" type="line"/>
-      <point x="386" y="17" type="line"/>
-      <point x="50" y="17" type="line"/>
-      <point x="52" y="13" type="line"/>
-      <point x="376" y="464" type="line"/>
-      <point x="376" y="480" type="line"/>
-      <point x="31" y="480" type="line"/>
-      <point x="31" y="463" type="line"/>
-      <point x="357" y="463" type="line"/>
-      <point x="355" y="467" type="line"/>
-      <point x="31" y="15" type="line"/>
+      <point x="49" y="0" type="line"/>
+      <point x="404" y="0" type="line"/>
+      <point x="404" y="17" type="line"/>
+      <point x="68" y="17" type="line"/>
+      <point x="70" y="13" type="line"/>
+      <point x="394" y="464" type="line"/>
+      <point x="394" y="480" type="line"/>
+      <point x="49" y="480" type="line"/>
+      <point x="49" y="463" type="line"/>
+      <point x="375" y="463" type="line"/>
+      <point x="373" y="467" type="line"/>
+      <point x="49" y="15" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zacute.glif b/src/Cantarell-Light.ufo/glyphs/zacute.glif
index ef746b92..b13ba5d7 100644
--- a/src/Cantarell-Light.ufo/glyphs/zacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zacute" format="2">
-  <advance width="414"/>
+  <advance width="451"/>
   <unicode hex="017A"/>
   <outline>
     <component base="z"/>
-    <component base="acutecomb" xOffset="140"/>
+    <component base="acutecomb" xOffset="158"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zcaron.glif b/src/Cantarell-Light.ufo/glyphs/zcaron.glif
index fe205dd2..9c844db2 100644
--- a/src/Cantarell-Light.ufo/glyphs/zcaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zcaron" format="2">
-  <advance width="414"/>
+  <advance width="451"/>
   <unicode hex="017E"/>
   <outline>
     <component base="z"/>
-    <component base="caroncomb" xOffset="24"/>
+    <component base="caroncomb" xOffset="42"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zdotaccent.glif b/src/Cantarell-Light.ufo/glyphs/zdotaccent.glif
index fd1cd175..bc543d10 100644
--- a/src/Cantarell-Light.ufo/glyphs/zdotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zdotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zdotaccent" format="2">
-  <advance width="414"/>
+  <advance width="451"/>
   <unicode hex="017C"/>
   <outline>
     <component base="z"/>
-    <component base="dotaccentcomb" xOffset="88"/>
+    <component base="dotaccentcomb" xOffset="106"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zdotbelow.glif b/src/Cantarell-Light.ufo/glyphs/zdotbelow.glif
index 00b6cfeb..f65b81f6 100644
--- a/src/Cantarell-Light.ufo/glyphs/zdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zdotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zdotbelow" format="2">
-  <advance width="414"/>
+  <advance width="451"/>
   <unicode hex="1E93"/>
   <outline>
     <component base="z"/>
-    <component base="dotbelowcomb" xOffset="87"/>
+    <component base="dotbelowcomb" xOffset="105"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ze-cy.glif b/src/Cantarell-Light.ufo/glyphs/ze-cy.glif
index 9ddbb63e..afc6e770 100644
--- a/src/Cantarell-Light.ufo/glyphs/ze-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ze-cy.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ze-cy" format="2">
-  <advance width="447"/>
+  <advance width="479"/>
   <unicode hex="0437"/>
-  <anchor x="223" y="0" name="bottom"/>
-  <anchor x="223" y="480" name="top"/>
+  <anchor x="237" y="0" name="bottom"/>
+  <anchor x="237" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="205" y="-7" type="curve" smooth="yes"/>
-      <point x="315" y="-7"/>
-      <point x="387" y="43"/>
-      <point x="387" y="127" type="curve" smooth="yes"/>
-      <point x="387" y="205"/>
-      <point x="324" y="256"/>
-      <point x="233" y="257" type="curve"/>
-      <point x="242" y="253" type="line"/>
-      <point x="326" y="253"/>
-      <point x="375" y="296"/>
-      <point x="375" y="366" type="curve" smooth="yes"/>
-      <point x="375" y="443"/>
-      <point x="310" y="490"/>
-      <point x="204" y="490" type="curve" smooth="yes"/>
-      <point x="145" y="490"/>
-      <point x="91" y="476"/>
-      <point x="47" y="449" type="curve"/>
-      <point x="52" y="433" type="line"/>
-      <point x="100" y="459"/>
-      <point x="148" y="472"/>
-      <point x="199" y="472" type="curve" smooth="yes"/>
-      <point x="295" y="472"/>
-      <point x="355" y="429"/>
-      <point x="355" y="361" type="curve" smooth="yes"/>
-      <point x="355" y="299"/>
-      <point x="303" y="261"/>
-      <point x="218" y="261" type="curve" smooth="yes"/>
-      <point x="129" y="261" type="line"/>
-      <point x="129" y="244" type="line"/>
-      <point x="210" y="244" type="line" smooth="yes"/>
-      <point x="304" y="244"/>
-      <point x="367" y="198"/>
-      <point x="367" y="124" type="curve" smooth="yes"/>
-      <point x="367" y="53"/>
-      <point x="305" y="12"/>
-      <point x="206" y="12" type="curve" smooth="yes"/>
-      <point x="148" y="12"/>
-      <point x="84" y="26"/>
-      <point x="37" y="49" type="curve"/>
-      <point x="32" y="31" type="line"/>
-      <point x="81" y="8"/>
-      <point x="140" y="-7"/>
+      <point x="219" y="-7" type="curve" smooth="yes"/>
+      <point x="329" y="-7"/>
+      <point x="401" y="43"/>
+      <point x="401" y="127" type="curve" smooth="yes"/>
+      <point x="401" y="205"/>
+      <point x="338" y="256"/>
+      <point x="247" y="257" type="curve"/>
+      <point x="256" y="253" type="line"/>
+      <point x="340" y="253"/>
+      <point x="389" y="296"/>
+      <point x="389" y="366" type="curve" smooth="yes"/>
+      <point x="389" y="443"/>
+      <point x="324" y="490"/>
+      <point x="218" y="490" type="curve" smooth="yes"/>
+      <point x="159" y="490"/>
+      <point x="105" y="476"/>
+      <point x="61" y="449" type="curve"/>
+      <point x="66" y="433" type="line"/>
+      <point x="114" y="459"/>
+      <point x="162" y="472"/>
+      <point x="213" y="472" type="curve" smooth="yes"/>
+      <point x="309" y="472"/>
+      <point x="369" y="429"/>
+      <point x="369" y="361" type="curve" smooth="yes"/>
+      <point x="369" y="299"/>
+      <point x="317" y="261"/>
+      <point x="232" y="261" type="curve" smooth="yes"/>
+      <point x="143" y="261" type="line"/>
+      <point x="143" y="244" type="line"/>
+      <point x="224" y="244" type="line" smooth="yes"/>
+      <point x="318" y="244"/>
+      <point x="381" y="198"/>
+      <point x="381" y="124" type="curve" smooth="yes"/>
+      <point x="381" y="53"/>
+      <point x="319" y="12"/>
+      <point x="220" y="12" type="curve" smooth="yes"/>
+      <point x="162" y="12"/>
+      <point x="98" y="26"/>
+      <point x="51" y="49" type="curve"/>
+      <point x="46" y="31" type="line"/>
+      <point x="95" y="8"/>
+      <point x="154" y="-7"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/zedescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/zedescender-cy.glif
index 4f8772f2..785d52b9 100644
--- a/src/Cantarell-Light.ufo/glyphs/zedescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zedescender-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zedescender-cy" format="2">
-  <advance width="447"/>
+  <advance width="479"/>
   <unicode hex="0499"/>
   <outline>
     <component base="ze-cy"/>
-    <component base="cedillacomb" xOffset="98"/>
+    <component base="cedillacomb" xOffset="112"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zedieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/zedieresis-cy.glif
index bc4e9eab..4841b2ea 100644
--- a/src/Cantarell-Light.ufo/glyphs/zedieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zedieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zedieresis-cy" format="2">
-  <advance width="447"/>
+  <advance width="479"/>
   <unicode hex="04DF"/>
   <outline>
     <component base="ze-cy"/>
-    <component base="dieresiscomb" xOffset="4"/>
+    <component base="dieresiscomb" xOffset="18"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.dnom.glif b/src/Cantarell-Light.ufo/glyphs/zero.dnom.glif
index fb89e1db..14391829 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.dnom.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.dnom.glif
@@ -1,38 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.dnom" format="2">
-  <advance width="449"/>
-  <note>
-zero
-</note>
-  <anchor x="230" y="238" name="slash"/>
+  <advance width="410"/>
+  <anchor x="209" y="210" name="slash"/>
   <outline>
     <contour>
-      <point x="224" y="-7" type="curve" smooth="yes"/>
-      <point x="323" y="-7"/>
-      <point x="389" y="88"/>
-      <point x="389" y="234" type="curve" smooth="yes"/>
-      <point x="389" y="380"/>
-      <point x="324" y="476"/>
-      <point x="226" y="476" type="curve" smooth="yes"/>
-      <point x="127" y="476"/>
-      <point x="60" y="380"/>
-      <point x="60" y="233" type="curve" smooth="yes"/>
-      <point x="60" y="88"/>
-      <point x="125" y="-7"/>
+      <point x="204" y="-6" type="curve" smooth="yes"/>
+      <point x="291" y="-6"/>
+      <point x="347" y="79"/>
+      <point x="347" y="207" type="curve" smooth="yes"/>
+      <point x="347" y="336"/>
+      <point x="291" y="420"/>
+      <point x="207" y="420" type="curve" smooth="yes"/>
+      <point x="120" y="420"/>
+      <point x="63" y="335"/>
+      <point x="63" y="204" type="curve" smooth="yes"/>
+      <point x="63" y="77"/>
+      <point x="119" y="-6"/>
     </contour>
     <contour>
-      <point x="226" y="12" type="curve" smooth="yes"/>
-      <point x="140" y="12"/>
-      <point x="82" y="100"/>
-      <point x="82" y="235" type="curve" smooth="yes"/>
-      <point x="82" y="367"/>
-      <point x="138" y="457"/>
-      <point x="224" y="457" type="curve" smooth="yes"/>
-      <point x="310" y="457"/>
-      <point x="366" y="367"/>
-      <point x="366" y="233" type="curve" smooth="yes"/>
-      <point x="366" y="98"/>
-      <point x="310" y="12"/>
+      <point x="207" y="14" type="curve" smooth="yes"/>
+      <point x="134" y="14"/>
+      <point x="86" y="91"/>
+      <point x="86" y="207" type="curve" smooth="yes"/>
+      <point x="86" y="323"/>
+      <point x="133" y="401"/>
+      <point x="205" y="401" type="curve" smooth="yes"/>
+      <point x="277" y="401"/>
+      <point x="324" y="322"/>
+      <point x="324" y="204" type="curve" smooth="yes"/>
+      <point x="324" y="89"/>
+      <point x="277" y="14"/>
     </contour>
   </outline>
   <lib>
@@ -40,11 +37,11 @@ zero
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>68</integer>
+        <integer>60</integer>
         <key>weight</key>
-        <integer>1</integer>
+        <integer>2</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>63</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.glif b/src/Cantarell-Light.ufo/glyphs/zero.glif
index 71a7d13d..9807ecb6 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.glif
@@ -1,36 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero" format="2">
-  <advance width="601"/>
+  <advance width="600"/>
   <unicode hex="0030"/>
   <anchor x="309" y="350" name="slash"/>
   <outline>
     <contour>
-      <point x="300" y="-10" type="curve" smooth="yes"/>
-      <point x="431" y="-10"/>
-      <point x="518" y="131"/>
-      <point x="518" y="343" type="curve" smooth="yes"/>
-      <point x="518" y="556"/>
-      <point x="432" y="699"/>
+      <point x="299" y="-10" type="curve" smooth="yes"/>
+      <point x="432" y="-10"/>
+      <point x="520" y="132"/>
+      <point x="520" y="343" type="curve" smooth="yes"/>
+      <point x="520" y="556"/>
+      <point x="433" y="699"/>
       <point x="304" y="699" type="curve" smooth="yes"/>
-      <point x="171" y="699"/>
-      <point x="83" y="555"/>
-      <point x="83" y="340" type="curve" smooth="yes"/>
-      <point x="83" y="130"/>
-      <point x="170" y="-10"/>
+      <point x="169" y="699"/>
+      <point x="80" y="554"/>
+      <point x="80" y="340" type="curve" smooth="yes"/>
+      <point x="80" y="131"/>
+      <point x="168" y="-10"/>
     </contour>
     <contour>
       <point x="303" y="8" type="curve" smooth="yes"/>
-      <point x="184" y="8"/>
-      <point x="104" y="142"/>
-      <point x="104" y="343" type="curve" smooth="yes"/>
-      <point x="104" y="546"/>
-      <point x="183" y="681"/>
+      <point x="182" y="8"/>
+      <point x="101" y="143"/>
+      <point x="101" y="343" type="curve" smooth="yes"/>
+      <point x="101" y="545"/>
+      <point x="181" y="681"/>
       <point x="301" y="681" type="curve" smooth="yes"/>
-      <point x="419" y="681"/>
-      <point x="497" y="544"/>
-      <point x="497" y="340" type="curve" smooth="yes"/>
-      <point x="497" y="141"/>
-      <point x="419" y="8"/>
+      <point x="420" y="681"/>
+      <point x="499" y="544"/>
+      <point x="499" y="340" type="curve" smooth="yes"/>
+      <point x="499" y="142"/>
+      <point x="420" y="8"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.numr.glif b/src/Cantarell-Light.ufo/glyphs/zero.numr.glif
index 584427ba..1e5c0a72 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.numr.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.numr" format="2">
-  <advance width="449"/>
+  <advance width="410"/>
   <outline>
     <component base="zero.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.osf.glif b/src/Cantarell-Light.ufo/glyphs/zero.osf.glif
index 813daac2..632474c2 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.osf.glif
@@ -1,35 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.osf" format="2">
-  <advance width="601"/>
-  <anchor x="309" y="300" name="slash"/>
+  <advance width="595"/>
+  <anchor x="306" y="300" name="slash"/>
   <outline>
     <contour>
-      <point x="300" y="-9" type="curve" smooth="yes"/>
-      <point x="431" y="-9"/>
-      <point x="518" y="112"/>
-      <point x="518" y="294" type="curve" smooth="yes"/>
-      <point x="518" y="477"/>
-      <point x="432" y="599"/>
-      <point x="304" y="599" type="curve" smooth="yes"/>
-      <point x="171" y="599"/>
-      <point x="83" y="476"/>
-      <point x="83" y="291" type="curve" smooth="yes"/>
-      <point x="83" y="111"/>
-      <point x="170" y="-9"/>
+      <point x="297" y="-9" type="curve" smooth="yes"/>
+      <point x="428" y="-9"/>
+      <point x="515" y="112"/>
+      <point x="515" y="294" type="curve" smooth="yes"/>
+      <point x="515" y="477"/>
+      <point x="429" y="599"/>
+      <point x="301" y="599" type="curve" smooth="yes"/>
+      <point x="168" y="599"/>
+      <point x="80" y="476"/>
+      <point x="80" y="291" type="curve" smooth="yes"/>
+      <point x="80" y="111"/>
+      <point x="167" y="-9"/>
     </contour>
     <contour>
-      <point x="303" y="9" type="curve" smooth="yes"/>
-      <point x="184" y="9"/>
-      <point x="104" y="123"/>
-      <point x="104" y="294" type="curve" smooth="yes"/>
-      <point x="104" y="466"/>
-      <point x="183" y="581"/>
-      <point x="301" y="581" type="curve" smooth="yes"/>
-      <point x="419" y="581"/>
-      <point x="497" y="465"/>
-      <point x="497" y="291" type="curve" smooth="yes"/>
-      <point x="497" y="122"/>
-      <point x="419" y="9"/>
+      <point x="300" y="9" type="curve" smooth="yes"/>
+      <point x="181" y="9"/>
+      <point x="101" y="123"/>
+      <point x="101" y="294" type="curve" smooth="yes"/>
+      <point x="101" y="466"/>
+      <point x="180" y="581"/>
+      <point x="298" y="581" type="curve" smooth="yes"/>
+      <point x="416" y="581"/>
+      <point x="494" y="465"/>
+      <point x="494" y="291" type="curve" smooth="yes"/>
+      <point x="494" y="122"/>
+      <point x="416" y="9"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>zero</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>zero</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.osf.zero.glif 
b/src/Cantarell-Light.ufo/glyphs/zero.osf.zero.glif
index 50d6f4b4..32f1a053 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.osf.zero.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.osf.zero.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.osf.zero" format="2">
-  <advance width="601"/>
+  <advance width="595"/>
   <outline>
     <component base="zero.osf"/>
-    <component base="_slash.zero.osf" xOffset="86" yOffset="49"/>
+    <component base="_slash.zero.osf" xOffset="83" yOffset="49"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.tf.glif b/src/Cantarell-Light.ufo/glyphs/zero.tf.glif
index 8d3a203c..ec661a49 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.tf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.tf.glif
@@ -1,36 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.tf" format="2">
   <advance width="580"/>
-  <anchor x="298" y="350" name="slash"/>
   <outline>
-    <contour>
-      <point x="290" y="-10" type="curve" smooth="yes"/>
-      <point x="417" y="-10"/>
-      <point x="501" y="132"/>
-      <point x="501" y="343" type="curve" smooth="yes"/>
-      <point x="501" y="555"/>
-      <point x="418" y="699"/>
-      <point x="294" y="699" type="curve" smooth="yes"/>
-      <point x="164" y="699"/>
-      <point x="79" y="554"/>
-      <point x="79" y="340" type="curve" smooth="yes"/>
-      <point x="79" y="130"/>
-      <point x="164" y="-10"/>
-    </contour>
-    <contour>
-      <point x="293" y="8" type="curve" smooth="yes"/>
-      <point x="177" y="8"/>
-      <point x="100" y="143"/>
-      <point x="100" y="343" type="curve" smooth="yes"/>
-      <point x="100" y="545"/>
-      <point x="176" y="681"/>
-      <point x="291" y="681" type="curve" smooth="yes"/>
-      <point x="405" y="681"/>
-      <point x="480" y="543"/>
-      <point x="480" y="340" type="curve" smooth="yes"/>
-      <point x="480" y="142"/>
-      <point x="405" y="8"/>
-    </contour>
+    <component base="zero" xOffset="8"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.tf.zero.glif 
b/src/Cantarell-Light.ufo/glyphs/zero.tf.zero.glif
index 4e4a748f..2d9ea7aa 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.tf.zero.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.tf.zero.glif
@@ -3,7 +3,7 @@
   <advance width="580"/>
   <outline>
     <component base="zero.tf"/>
-    <component base="_slash.zero" xOffset="75" yOffset="109"/>
+    <component base="_slash.zero" xOffset="94" yOffset="109"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.zero.glif b/src/Cantarell-Light.ufo/glyphs/zero.zero.glif
index 6e4b9a66..c2d25d10 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.zero.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.zero.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.zero" format="2">
-  <advance width="601"/>
+  <advance width="600"/>
   <outline>
     <component base="zero"/>
     <component base="_slash.zero" xOffset="86" yOffset="109"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/zeroinferior.glif 
b/src/Cantarell-Light.ufo/glyphs/zeroinferior.glif
index 52fc1b33..7d63e602 100644
--- a/src/Cantarell-Light.ufo/glyphs/zeroinferior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zeroinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zeroinferior" format="2">
-  <advance width="449"/>
+  <advance width="410"/>
   <unicode hex="2080"/>
   <outline>
     <component base="zero.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/zerosuperior.glif 
b/src/Cantarell-Light.ufo/glyphs/zerosuperior.glif
index 1b4eb7ee..5b76803f 100644
--- a/src/Cantarell-Light.ufo/glyphs/zerosuperior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zerosuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zerosuperior" format="2">
-  <advance width="449"/>
+  <advance width="410"/>
   <unicode hex="2070"/>
   <outline>
     <component base="zero.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/zerothird.glif b/src/Cantarell-Light.ufo/glyphs/zerothird.glif
index 98f9af8e..47ac3676 100644
--- a/src/Cantarell-Light.ufo/glyphs/zerothird.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zerothird.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zerothird" format="2">
-  <advance width="1163"/>
+  <advance width="947"/>
   <unicode hex="2189"/>
   <outline>
     <component base="zero.numr"/>
-    <component base="fraction" xOffset="449"/>
-    <component base="three.dnom" xOffset="749"/>
+    <component base="fraction" xOffset="410"/>
+    <component base="three.dnom" xOffset="575"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/zhe-cy.glif b/src/Cantarell-Light.ufo/glyphs/zhe-cy.glif
index d7cd4de1..81436718 100644
--- a/src/Cantarell-Light.ufo/glyphs/zhe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zhe-cy.glif
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zhe-cy" format="2">
-  <advance width="689"/>
+  <advance width="727"/>
   <unicode hex="0436"/>
-  <anchor x="681" y="0" name="bottomright"/>
-  <anchor x="345" y="480" name="top"/>
+  <anchor x="700" y="0" name="bottomright"/>
+  <anchor x="364" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="642" y="0" type="line"/>
-      <point x="668" y="0" type="line"/>
-      <point x="492" y="259" type="line"/>
-      <point x="492" y="251" type="line"/>
-      <point x="658" y="480" type="line"/>
-      <point x="632" y="480" type="line"/>
-      <point x="472" y="254" type="line"/>
+      <point x="40" y="0" type="line"/>
+      <point x="65" y="0" type="line"/>
+      <point x="236" y="255" type="line"/>
+      <point x="77" y="480" type="line"/>
+      <point x="50" y="480" type="line"/>
+      <point x="216" y="251" type="line"/>
+      <point x="215" y="258" type="line"/>
     </contour>
     <contour>
-      <point x="21" y="0" type="line"/>
-      <point x="46" y="0" type="line"/>
-      <point x="217" y="255" type="line"/>
-      <point x="58" y="480" type="line"/>
-      <point x="31" y="480" type="line"/>
-      <point x="197" y="251" type="line"/>
-      <point x="196" y="258" type="line"/>
+      <point x="353" y="0" type="line"/>
+      <point x="374" y="0" type="line"/>
+      <point x="374" y="480" type="line"/>
+      <point x="353" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="196" y="246" type="line"/>
-      <point x="486" y="246" type="line"/>
-      <point x="486" y="263" type="line"/>
-      <point x="196" y="263" type="line"/>
+      <point x="215" y="246" type="line"/>
+      <point x="505" y="246" type="line"/>
+      <point x="505" y="263" type="line"/>
+      <point x="215" y="263" type="line"/>
     </contour>
     <contour>
-      <point x="334" y="0" type="line"/>
-      <point x="355" y="0" type="line"/>
-      <point x="355" y="480" type="line"/>
-      <point x="334" y="480" type="line"/>
+      <point x="661" y="0" type="line"/>
+      <point x="687" y="0" type="line"/>
+      <point x="511" y="259" type="line"/>
+      <point x="511" y="251" type="line"/>
+      <point x="677" y="480" type="line"/>
+      <point x="651" y="480" type="line"/>
+      <point x="491" y="254" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -45,6 +45,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zhebreve-cy.glif b/src/Cantarell-Light.ufo/glyphs/zhebreve-cy.glif
index eca4c36b..b3b7ee41 100644
--- a/src/Cantarell-Light.ufo/glyphs/zhebreve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zhebreve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zhebreve-cy" format="2">
-  <advance width="689"/>
+  <advance width="727"/>
   <unicode hex="04C2"/>
   <outline>
     <component base="zhe-cy"/>
-    <component base="brevecomb-cy" xOffset="148"/>
+    <component base="brevecomb-cy" xOffset="167"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zhedescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/zhedescender-cy.glif
index 63b9e9b8..1c4601f5 100644
--- a/src/Cantarell-Light.ufo/glyphs/zhedescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zhedescender-cy.glif
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zhedescender-cy" format="2">
-  <advance width="733"/>
+  <advance width="727"/>
   <unicode hex="0497"/>
   <outline>
     <component base="zhe-cy"/>
-    <component base="descender-cy" xOffset="585"/>
+    <component base="descender-cy" xOffset="604"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>zhe-cy</string>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>0</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>zhe-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zhedieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/zhedieresis-cy.glif
index 4e305bef..4a7616d5 100644
--- a/src/Cantarell-Light.ufo/glyphs/zhedieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zhedieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zhedieresis-cy" format="2">
-  <advance width="689"/>
+  <advance width="727"/>
   <unicode hex="04DD"/>
   <outline>
     <component base="zhe-cy"/>
-    <component base="dieresiscomb" xOffset="126"/>
+    <component base="dieresiscomb" xOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/layercontents.plist b/src/Cantarell-Light.ufo/layercontents.plist
index b6bbd64d..ec4750d1 100644
--- a/src/Cantarell-Light.ufo/layercontents.plist
+++ b/src/Cantarell-Light.ufo/layercontents.plist
@@ -10,5 +10,37 @@
       <string>Template</string>
       <string>glyphs.T_emplate</string>
     </array>
+    <array>
+      <string>Outline</string>
+      <string>glyphs.O_utline</string>
+    </array>
+    <array>
+      <string>Wavy</string>
+      <string>glyphs.W_avy</string>
+    </array>
+    <array>
+      <string>Final Bent</string>
+      <string>glyphs.F_inal B_ent</string>
+    </array>
+    <array>
+      <string>Steeper</string>
+      <string>glyphs.S_teeper</string>
+    </array>
+    <array>
+      <string>Slanted</string>
+      <string>glyphs.S_lanted</string>
+    </array>
+    <array>
+      <string>May 5 19, 13:08</string>
+      <string>glyphs.M_ay 5 19, 13_08</string>
+    </array>
+    <array>
+      <string>Jun 8 19, 20:55</string>
+      <string>glyphs.J_un 8 19, 20_55</string>
+    </array>
+    <array>
+      <string>Jun 8 19, 20:47</string>
+      <string>glyphs.J_un 8 19, 20_47</string>
+    </array>
   </array>
 </plist>
diff --git a/src/Cantarell-Light.ufo/lib.plist b/src/Cantarell-Light.ufo/lib.plist
index 7a4688c7..71790d26 100644
--- a/src/Cantarell-Light.ufo/lib.plist
+++ b/src/Cantarell-Light.ufo/lib.plist
@@ -360,7 +360,6 @@
           <string>acutecomb</string>
           <string>acutecomb.case</string>
           <string>acutecomb.loclVIET</string>
-          <string>acutecomb_dotaccentcomb</string>
           <string>adblgrave</string>
           <string>adieresis</string>
           <string>adieresis-cy</string>
@@ -385,14 +384,6 @@
           <string>brevecomb-cy.case</string>
           <string>brevecomb.case</string>
           <string>brevecomb.loclVIET</string>
-          <string>brevecomb_acutecomb</string>
-          <string>brevecomb_acutecomb.case</string>
-          <string>brevecomb_gravecomb</string>
-          <string>brevecomb_gravecomb.case</string>
-          <string>brevecomb_hookabovecomb</string>
-          <string>brevecomb_hookabovecomb.case</string>
-          <string>brevecomb_tildecomb</string>
-          <string>brevecomb_tildecomb.case</string>
           <string>breveinvertedcomb</string>
           <string>breveinvertedcomb.case</string>
           <string>c</string>
@@ -402,7 +393,6 @@
           <string>caroncomb.alt</string>
           <string>caroncomb.case</string>
           <string>caroncomb.loclVIET</string>
-          <string>caroncomb_dotaccentcomb</string>
           <string>ccaron</string>
           <string>ccedilla</string>
           <string>ccedillaacute</string>
@@ -418,14 +408,6 @@
           <string>circumflexcomb</string>
           <string>circumflexcomb.case</string>
           <string>circumflexcomb.loclVIET</string>
-          <string>circumflexcomb_acutecomb</string>
-          <string>circumflexcomb_acutecomb.case</string>
-          <string>circumflexcomb_gravecomb</string>
-          <string>circumflexcomb_gravecomb.case</string>
-          <string>circumflexcomb_hookabovecomb</string>
-          <string>circumflexcomb_hookabovecomb.case</string>
-          <string>circumflexcomb_tildecomb</string>
-          <string>circumflexcomb_tildecomb.case</string>
           <string>commaaccentcomb</string>
           <string>commaturnedabovecomb</string>
           <string>commaturnedmod</string>
@@ -443,16 +425,11 @@
           <string>dieresiscomb</string>
           <string>dieresiscomb.case</string>
           <string>dieresiscomb.loclVIET</string>
-          <string>dieresiscomb_acutecomb</string>
-          <string>dieresiscomb_caroncomb</string>
-          <string>dieresiscomb_gravecomb</string>
-          <string>dieresiscomb_macroncomb</string>
           <string>dje-cy</string>
           <string>dlinebelow</string>
           <string>dotaccentcomb</string>
           <string>dotaccentcomb.case</string>
           <string>dotaccentcomb.loclVIET</string>
-          <string>dotaccentcomb_macroncomb</string>
           <string>dotbelowcomb</string>
           <string>doubleprimemod</string>
           <string>dze-cy</string>
@@ -574,6 +551,7 @@
           <string>kgreenlandic</string>
           <string>kje-cy</string>
           <string>l</string>
+          <string>l.ss01</string>
           <string>lacute</string>
           <string>lcaron</string>
           <string>lcommaaccent</string>
@@ -589,9 +567,6 @@
           <string>macroncomb.loclVIET</string>
           <string>macroncomb.narrow</string>
           <string>macroncomb.narrow.case</string>
-          <string>macroncomb_acutecomb</string>
-          <string>macroncomb_dieresiscomb</string>
-          <string>macroncomb_gravecomb</string>
           <string>mdotbelow</string>
           <string>n</string>
           <string>nacute</string>
@@ -706,9 +681,6 @@
           <string>tildecomb</string>
           <string>tildecomb.case</string>
           <string>tildecomb.loclVIET</string>
-          <string>tildecomb_acutecomb</string>
-          <string>tildecomb_dieresiscomb</string>
-          <string>tildecomb_macroncomb</string>
           <string>tlinebelow</string>
           <string>tse-cy</string>
           <string>tshe-cy</string>
@@ -791,7 +763,7 @@
         <key>name</key>
         <string>propagateAnchors</string>
         <key>pre</key>
-        <true/>
+        <integer>1</integer>
       </dict>
     </array>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.Schwa</key>
@@ -874,14 +846,6 @@
         <string>eight.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.eight.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>eight.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.el-cy</key>
     <dict>
       <key>RMXScaler</key>
@@ -930,14 +894,6 @@
         <string>five.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.five.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>five.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.four.dnom</key>
     <dict>
       <key>RMXScaler</key>
@@ -954,14 +910,6 @@
         <string>four.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.four.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>four.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.ge-cy</key>
     <dict>
       <key>RMXScaler</key>
@@ -1058,20 +1006,12 @@
         <string>nine.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.nine.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>nine</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.one.dnom</key>
     <dict>
       <key>RMXScaler</key>
       <dict>
         <key>source</key>
-        <string>one.lf</string>
+        <string>one</string>
       </dict>
     </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.one.tf</key>
@@ -1082,14 +1022,6 @@
         <string>one.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.one.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>one.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.ordfeminine</key>
     <dict>
       <key>RMXScaler</key>
@@ -1130,14 +1062,6 @@
         <string>seven.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.seven.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>seven.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.sha-cy</key>
     <dict>
       <key>RMXScaler</key>
@@ -1170,14 +1094,6 @@
         <string>six.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.six.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>six</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.softsign-cy</key>
     <dict>
       <key>RMXScaler</key>
@@ -1210,14 +1126,6 @@
         <string>three.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.three.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>three.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.tildecomb.loclVIET</key>
     <dict>
       <key>RMXScaler</key>
@@ -1250,14 +1158,6 @@
         <string>two.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.two.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>two.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.ve-cy</key>
     <dict>
       <key>RMXScaler</key>
@@ -1306,14 +1206,6 @@
         <string>zero.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.zero.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>zero.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.zhe-cy</key>
     <dict>
       <key>RMXScaler</key>
@@ -1323,7 +1215,7 @@
       </dict>
     </dict>
     <key>com.schriftgestaltung.appVersion</key>
-    <string>1230</string>
+    <string>1271</string>
     <key>com.schriftgestaltung.customParameter.GSFont.Family Alignment Zones</key>
     <array>
       <string>{739, 10}</string>
@@ -1333,7 +1225,7 @@
       <string>{-217, -12}</string>
     </array>
     <key>com.schriftgestaltung.customParameter.GSFont.disablesAutomaticAlignment</key>
-    <true/>
+    <false/>
     <key>com.schriftgestaltung.customParameter.GSFont.disablesLastChange</key>
     <true/>
     <key>com.schriftgestaltung.customParameter.GSFont.useNiceNames</key>
@@ -1349,7 +1241,7 @@
     <key>com.schriftgestaltung.customParameter.GSFontMaster.iconName</key>
     <string></string>
     <key>com.schriftgestaltung.customParameter.GSFontMaster.paramArea</key>
-    <string>420</string>
+    <string>510</string>
     <key>com.schriftgestaltung.customParameter.GSFontMaster.paramDepth</key>
     <string>16</string>
     <key>com.schriftgestaltung.customParameter.GSFontMaster.paramOver</key>
@@ -1863,9 +1755,7 @@
       <string>zcaron</string>
       <string>zdotaccent</string>
       <string>zdotbelow</string>
-      <string>f_f</string>
-      <string>f_f_i</string>
-      <string>f_f_l</string>
+      <string>l.ss01</string>
       <string>fi</string>
       <string>fl</string>
       <string>ordfeminine</string>
@@ -2063,6 +1953,7 @@
       <string>seven</string>
       <string>eight</string>
       <string>nine</string>
+      <string>zero.zero</string>
       <string>zero.osf</string>
       <string>one.osf</string>
       <string>two.osf</string>
@@ -2085,18 +1976,6 @@
       <string>eight.tf</string>
       <string>nine.tf</string>
       <string>zero.tf.zero</string>
-      <string>zero.tosf</string>
-      <string>one.tosf</string>
-      <string>two.tosf</string>
-      <string>three.tosf</string>
-      <string>four.tosf</string>
-      <string>five.tosf</string>
-      <string>six.tosf</string>
-      <string>seven.tosf</string>
-      <string>eight.tosf</string>
-      <string>nine.tosf</string>
-      <string>zero.tosf.zero</string>
-      <string>zero.zero</string>
       <string>zeroinferior</string>
       <string>oneinferior</string>
       <string>twoinferior</string>
@@ -2182,13 +2061,9 @@
       <string>bracketleft</string>
       <string>bracketright</string>
       <string>hyphen</string>
-      <string>softhyphen</string>
       <string>endash</string>
       <string>emdash</string>
       <string>figuredash</string>
-      <string>horizontalbar</string>
-      <string>hyphentwo</string>
-      <string>nonbreakinghyphen</string>
       <string>underscore</string>
       <string>quotesinglbase</string>
       <string>quotedblbase</string>
@@ -2206,9 +2081,7 @@
       <string>quotesingle</string>
       <string>leftanglebracket-math</string>
       <string>rightanglebracket-math</string>
-      <string>emquad</string>
       <string>emspace</string>
-      <string>enquad</string>
       <string>enspace</string>
       <string>figurespace</string>
       <string>fourperemspace</string>
@@ -2216,7 +2089,6 @@
       <string>punctuationspace</string>
       <string>sixperemspace</string>
       <string>space</string>
-      <string>nbspace</string>
       <string>thinspace</string>
       <string>threeperemspace</string>
       <string>zerowidthspace</string>
@@ -2230,6 +2102,7 @@
       <string>florin</string>
       <string>franc</string>
       <string>guarani</string>
+      <string>hryvnia</string>
       <string>kip</string>
       <string>lira</string>
       <string>liraTurkish</string>
@@ -2240,11 +2113,10 @@
       <string>ruble</string>
       <string>rupeeIndian</string>
       <string>sterling</string>
-      <string>won</string>
-      <string>yen</string>
-      <string>hryvnia</string>
       <string>tenge</string>
       <string>tugrik</string>
+      <string>won</string>
+      <string>yen</string>
       <string>bulletoperator</string>
       <string>commercialMinusSign</string>
       <string>divisionslash</string>
@@ -2262,8 +2134,8 @@
       <string>lessequal</string>
       <string>plusminus</string>
       <string>approxequal</string>
-      <string>logicalnot</string>
       <string>asciitilde</string>
+      <string>logicalnot</string>
       <string>asciicircum</string>
       <string>emptyset</string>
       <string>infinity</string>
@@ -2278,24 +2150,6 @@
       <string>percent</string>
       <string>perthousand</string>
       <string>ratio</string>
-      <string>bulletoperator.tf</string>
-      <string>commercialMinusSign.tf</string>
-      <string>divisionslash.tf</string>
-      <string>equivalence.tf</string>
-      <string>notidentical.tf</string>
-      <string>plus.tf</string>
-      <string>minus.tf</string>
-      <string>multiply.tf</string>
-      <string>divide.tf</string>
-      <string>equal.tf</string>
-      <string>notequal.tf</string>
-      <string>greater.tf</string>
-      <string>less.tf</string>
-      <string>greaterequal.tf</string>
-      <string>lessequal.tf</string>
-      <string>plusminus.tf</string>
-      <string>approxequal.tf</string>
-      <string>logicalnot.tf</string>
       <string>upArrow</string>
       <string>rightArrow</string>
       <string>downArrow</string>
@@ -2333,31 +2187,18 @@
       <string>verticallinelowmod</string>
       <string>verticallinemod</string>
       <string>dieresiscomb</string>
-      <string>dieresiscomb_gravecomb</string>
-      <string>dieresiscomb_acutecomb</string>
-      <string>dieresiscomb_caroncomb</string>
-      <string>dieresiscomb_macroncomb</string>
       <string>dotaccentcomb</string>
-      <string>dotaccentcomb_macroncomb</string>
       <string>gravecomb</string>
       <string>acutecomb</string>
-      <string>acutecomb_dotaccentcomb</string>
       <string>hungarumlautcomb</string>
       <string>caroncomb.alt</string>
       <string>circumflexcomb</string>
       <string>caroncomb</string>
-      <string>caroncomb_dotaccentcomb</string>
       <string>brevecomb</string>
       <string>ringcomb</string>
       <string>ringcomb_acutecomb</string>
       <string>tildecomb</string>
-      <string>tildecomb_dieresiscomb</string>
-      <string>tildecomb_acutecomb</string>
-      <string>tildecomb_macroncomb</string>
       <string>macroncomb</string>
-      <string>macroncomb_dieresiscomb</string>
-      <string>macroncomb_gravecomb</string>
-      <string>macroncomb_acutecomb</string>
       <string>hookabovecomb</string>
       <string>verticallineabovecomb</string>
       <string>dblgravecomb</string>
@@ -2376,19 +2217,19 @@
       <string>strokelongcomb</string>
       <string>slashshortcomb</string>
       <string>slashlongcomb</string>
-      <string>acute</string>
-      <string>breve</string>
-      <string>caron</string>
-      <string>cedilla</string>
-      <string>circumflex</string>
       <string>dieresis</string>
       <string>dotaccent</string>
       <string>grave</string>
+      <string>acute</string>
       <string>hungarumlaut</string>
-      <string>macron</string>
-      <string>ogonek</string>
+      <string>circumflex</string>
+      <string>caron</string>
+      <string>breve</string>
       <string>ring</string>
       <string>tilde</string>
+      <string>macron</string>
+      <string>cedilla</string>
+      <string>ogonek</string>
       <string>dieresiscomb.case</string>
       <string>dotaccentcomb.case</string>
       <string>gravecomb.case</string>
@@ -2428,28 +2269,11 @@
       <string>brevecomb-cy.case</string>
       <string>descender-cy.case</string>
       <string>descender-cy.strait</string>
-      <string>brevecomb_acutecomb</string>
-      <string>brevecomb_gravecomb</string>
-      <string>brevecomb_hookabovecomb</string>
-      <string>brevecomb_tildecomb</string>
-      <string>circumflexcomb_acutecomb</string>
-      <string>circumflexcomb_gravecomb</string>
-      <string>circumflexcomb_hookabovecomb</string>
-      <string>circumflexcomb_tildecomb</string>
-      <string>brevecomb_acutecomb.case</string>
-      <string>brevecomb_gravecomb.case</string>
-      <string>brevecomb_hookabovecomb.case</string>
-      <string>brevecomb_tildecomb.case</string>
-      <string>circumflexcomb_acutecomb.case</string>
-      <string>circumflexcomb_gravecomb.case</string>
-      <string>circumflexcomb_hookabovecomb.case</string>
-      <string>circumflexcomb_tildecomb.case</string>
       <string>_descenderreversed-cy</string>
       <string>_bar-cy</string>
       <string>_descender-cy.case.straight</string>
       <string>_descenderreverse-cy.case</string>
       <string>_bottomhook</string>
-      <string>_o.numero</string>
       <string>_slash.zero</string>
       <string>_typoquote</string>
       <string>_commaaccent</string>
@@ -2918,8 +2742,6 @@
       <string>uni1EA9</string>
       <key>acircumflextilde</key>
       <string>uni1EAB</string>
-      <key>acutecomb_dotaccentcomb</key>
-      <string>uni03010307</string>
       <key>adblgrave</key>
       <string>uni0201</string>
       <key>adieresis-cy</key>
@@ -2952,29 +2774,11 @@
       <string>uni0306.case</string>
       <key>brevecomb.loclVIET</key>
       <string>uni0306.loclVIET</string>
-      <key>brevecomb_acutecomb</key>
-      <string>uni03060301</string>
-      <key>brevecomb_acutecomb.case</key>
-      <string>uni03060301.case</string>
-      <key>brevecomb_gravecomb</key>
-      <string>uni03060300</string>
-      <key>brevecomb_gravecomb.case</key>
-      <string>uni03060300.case</string>
-      <key>brevecomb_hookabovecomb</key>
-      <string>uni03060309</string>
-      <key>brevecomb_hookabovecomb.case</key>
-      <string>uni03060309.case</string>
-      <key>brevecomb_tildecomb</key>
-      <string>uni03060303</string>
-      <key>brevecomb_tildecomb.case</key>
-      <string>uni03060303.case</string>
       <key>breveinvertedcomb</key>
       <string>uni0311</string>
       <key>breveinvertedcomb.case</key>
       <string>uni0311.case</string>
       <key>bulletoperator</key>
-      <string>uni2219</string>
-      <key>bulletoperator.tf</key>
       <string>uni2219.tf</string>
       <key>caroncomb</key>
       <string>uni030C</string>
@@ -2984,8 +2788,6 @@
       <string>uni030C.case</string>
       <key>caroncomb.loclVIET</key>
       <string>uni030C.loclVIET</string>
-      <key>caroncomb_dotaccentcomb</key>
-      <string>uni030C0307</string>
       <key>ccedillaacute</key>
       <string>uni1E09</string>
       <key>cedi</key>
@@ -3008,22 +2810,6 @@
       <string>uni0302.case</string>
       <key>circumflexcomb.loclVIET</key>
       <string>uni0302.loclVIET</string>
-      <key>circumflexcomb_acutecomb</key>
-      <string>uni03020301</string>
-      <key>circumflexcomb_acutecomb.case</key>
-      <string>uni03020301.case</string>
-      <key>circumflexcomb_gravecomb</key>
-      <string>uni03020300</string>
-      <key>circumflexcomb_gravecomb.case</key>
-      <string>uni03020300.case</string>
-      <key>circumflexcomb_hookabovecomb</key>
-      <string>uni03020309</string>
-      <key>circumflexcomb_hookabovecomb.case</key>
-      <string>uni03020309.case</string>
-      <key>circumflexcomb_tildecomb</key>
-      <string>uni03020303</string>
-      <key>circumflexcomb_tildecomb.case</key>
-      <string>uni03020303.case</string>
       <key>colonsign</key>
       <string>colonmonetary</string>
       <key>commaaccentcomb</key>
@@ -3033,8 +2819,6 @@
       <key>commaturnedmod</key>
       <string>uni02BB</string>
       <key>commercialMinusSign</key>
-      <string>uni2052</string>
-      <key>commercialMinusSign.tf</key>
       <string>uni2052.tf</string>
       <key>dblgravecomb</key>
       <string>uni030F</string>
@@ -3058,17 +2842,7 @@
       <string>uni0308.case</string>
       <key>dieresiscomb.loclVIET</key>
       <string>uni0308.loclVIET</string>
-      <key>dieresiscomb_acutecomb</key>
-      <string>uni03080301</string>
-      <key>dieresiscomb_caroncomb</key>
-      <string>uni0308030C</string>
-      <key>dieresiscomb_gravecomb</key>
-      <string>uni03080300</string>
-      <key>dieresiscomb_macroncomb</key>
-      <string>uni03080304</string>
       <key>divisionslash</key>
-      <string>uni2215</string>
-      <key>divisionslash.tf</key>
       <string>uni2215.tf</string>
       <key>dje-cy</key>
       <string>uni0452</string>
@@ -3080,8 +2854,6 @@
       <string>uni0307.case</string>
       <key>dotaccentcomb.loclVIET</key>
       <string>uni0307.loclVIET</string>
-      <key>dotaccentcomb_macroncomb</key>
-      <string>uni03070304</string>
       <key>doubleprimemod</key>
       <string>uni02BA</string>
       <key>downArrow</key>
@@ -3128,8 +2900,6 @@
       <string>uni1E17</string>
       <key>emacrongrave</key>
       <string>uni1E15</string>
-      <key>emquad</key>
-      <string>uni2001</string>
       <key>emspace</key>
       <string>uni2003</string>
       <key>en-cy</key>
@@ -3138,8 +2908,6 @@
       <string>uni04A3</string>
       <key>enghe-cy</key>
       <string>uni04A5</string>
-      <key>enquad</key>
-      <string>uni2000</string>
       <key>enspace</key>
       <string>uni2002</string>
       <key>er-cy</key>
@@ -3210,8 +2978,6 @@
       <string>uni1E2B</string>
       <key>hdotbelow</key>
       <string>uni1E25</string>
-      <key>horizontalbar</key>
-      <string>uni2015</string>
       <key>horncomb</key>
       <string>uni031B</string>
       <key>hryvnia</key>
@@ -3220,8 +2986,6 @@
       <string>uni030B</string>
       <key>hungarumlautcomb.case</key>
       <string>uni030B.case</string>
-      <key>hyphentwo</key>
-      <string>uni2010</string>
       <key>i-cy</key>
       <string>uni0456</string>
       <key>ia-cy</key>
@@ -3320,12 +3084,6 @@
       <string>uni0304.narrow</string>
       <key>macroncomb.narrow.case</key>
       <string>uni0304.narrow.case</string>
-      <key>macroncomb_acutecomb</key>
-      <string>uni03040301</string>
-      <key>macroncomb_dieresiscomb</key>
-      <string>uni03040308</string>
-      <key>macroncomb_gravecomb</key>
-      <string>uni03040300</string>
       <key>manat</key>
       <string>uni20BC</string>
       <key>mdotbelow</key>
@@ -3334,8 +3092,6 @@
       <string>uni00B5</string>
       <key>naira</key>
       <string>uni20A6</string>
-      <key>nbspace</key>
-      <string>uni00A0</string>
       <key>ncommaaccent</key>
       <string>uni0146</string>
       <key>ndotaccent</key>
@@ -3352,11 +3108,7 @@
       <string>uni045A</string>
       <key>nlinebelow</key>
       <string>uni1E49</string>
-      <key>nonbreakinghyphen</key>
-      <string>uni2011</string>
       <key>notidentical</key>
-      <string>uni2262</string>
-      <key>notidentical.tf</key>
       <string>uni2262.tf</string>
       <key>numero</key>
       <string>uni2116</string>
@@ -3528,8 +3280,6 @@
       <string>uni0337</string>
       <key>slashshortcomb.case</key>
       <string>uni0337.case</string>
-      <key>softhyphen</key>
-      <string>uni00AD</string>
       <key>softsign-cy</key>
       <string>uni044C</string>
       <key>strokelongcomb</key>
@@ -3560,10 +3310,6 @@
       <string>uni2004</string>
       <key>threesuperior</key>
       <string>uni00B3</string>
-      <key>tildecomb_dieresiscomb</key>
-      <string>uni03030308</string>
-      <key>tildecomb_macroncomb</key>
-      <string>uni03030304</string>
       <key>tlinebelow</key>
       <string>uni1E6F</string>
       <key>tripleprime</key>
@@ -3700,13 +3446,9 @@
       <string>_descender-cy.case.straight</string>
       <string>_descenderreverse-cy.case</string>
       <string>_descenderreversed-cy</string>
-      <string>_o.numero</string>
       <string>_slash.zero</string>
       <string>_slash.zero.osf</string>
       <string>_typoquote</string>
-      <string>hryvnia</string>
-      <string>tenge</string>
-      <string>tugrik</string>
     </array>
   </dict>
 </plist>
diff --git a/src/Cantarell-Regular.ufo/features.fea b/src/Cantarell-Regular.ufo/features.fea
index 07a3eaaf..81c2a25c 100644
--- a/src/Cantarell-Regular.ufo/features.fea
+++ b/src/Cantarell-Regular.ufo/features.fea
@@ -4,25 +4,25 @@
 # Prefix: Languagesystems
 # automatic
 languagesystem DFLT dflt;
+
 languagesystem latn dflt;
-languagesystem cyrl dflt;
-languagesystem latn NLD;
-languagesystem latn CAT;
 languagesystem latn ROM;
 languagesystem latn MOL;
 languagesystem latn KAZ;
+languagesystem latn TAT;
 languagesystem latn TRK;
 languagesystem latn CRT;
 languagesystem latn AZE;
-languagesystem cyrl TAT;
+languagesystem latn NLD;
+languagesystem latn CAT;
 
 
 # Prefix: GDEF
 table GDEF {
   GlyphClassDef
-    [A Aacute Abreve Abreveacute Abrevedotbelow Abrevegrave Abrevehookabove Abrevetilde Acaron Acircumflex 
Acircumflexacute Acircumflexdotbelow Acircumflexgrave Acircumflexhookabove Acircumflextilde Adblgrave 
Adieresis Adotbelow Agrave Ahookabove Ainvertedbreve Amacron Aogonek Aring Aringacute Atilde AE AEacute B C 
Cacute Ccaron Ccedilla Ccedillaacute Ccircumflex Cdotaccent D Eth Dcaron Dcroat Ddotbelow Dlinebelow E Eacute 
Ebreve Ecaron Ecedillabreve Ecircumflex Ecircumflexacute Ecircumflexdotbelow Ecircumflexgrave 
Ecircumflexhookabove Ecircumflextilde Edblgrave Edieresis Edotaccent Edotbelow Egrave Ehookabove 
Einvertedbreve Emacron Emacronacute Emacrongrave Eogonek Etilde F G Gbreve Gcaron Gcircumflex Gcommaaccent 
Gdotaccent Gmacron H Hbar Hbrevebelow Hcircumflex Hdotbelow I Iacute Ibreve Icaron Icircumflex Idblgrave 
Idieresis Idieresisacute Idotaccent Idotbelow Igrave Ihookabove Iinvertedbreve Imacron Iogonek Itilde J 
Jacute Jcircumflex K Kacute Kcommaaccent L Lacute Lcaro
 n Lcomma
 accent Ldotbelow Llinebelow Lslash M Mdotbelow N Nacute Ncaron Ncommaaccent Ndotaccent Ndotbelow Nlinebelow 
Ntilde O Oacute Obreve Ocaron Ocircumflex Ocircumflexacute Ocircumflexdotbelow Ocircumflexgrave 
Ocircumflexhookabove Ocircumflextilde Odblgrave Odieresis Odieresismacron Odotaccentmacron Odotbelow Ograve 
Ohookabove Ohorn Ohornacute Ohorndotbelow Ohorngrave Ohornhookabove Ohorntilde Ohungarumlaut Oinvertedbreve 
Omacron Omacronacute Omacrongrave Oogonek Oslash Oslashacute Otilde Otildeacute Otildedieresis Otildemacron 
OE P Q R Racute Rcaron Rcommaaccent Rdblgrave Rdotbelow Rinvertedbreve Rlinebelow S Sacute Sacutedotaccent 
Scaron Scarondotaccent Scedilla Scircumflex Scommaaccent Sdotaccent Sdotbelow Sdotbelowdotaccent Schwa T Tbar 
Tcaron Tcedilla Tcommaaccent Tdotbelow Tlinebelow U Uacute Ubreve Ucaron Ucircumflex Udblgrave Udieresis 
Udieresisacute Udieresiscaron Udieresisgrave Udieresismacron Udotbelow Ugrave Uhookabove Uhorn Uhornacute 
Uhorndotbelow Uhorngrave Uhornhoo
 kabove U
 horntilde Uhungarumlaut Uinvertedbreve Umacron Umacrondieresis Uogonek Uring Utilde Utildeacute V W Wacute 
Wcircumflex Wdieresis Wgrave X Y Yacute Ycircumflex Ydieresis Ydotaccent Ydotbelow Ygrave Yhookabove Ymacron 
Ytilde Z Zacute Zcaron Zdotaccent Zdotbelow a aacute abreve abreveacute abrevedotbelow abrevegrave 
abrevehookabove abrevetilde acaron acircumflex acircumflexacute acircumflexdotbelow acircumflexgrave 
acircumflexhookabove acircumflextilde adblgrave adieresis adotbelow agrave ahookabove ainvertedbreve amacron 
aogonek aring aringacute atilde ae aeacute b c cacute ccaron ccedilla ccedillaacute ccircumflex cdotaccent d 
dcaron dcroat ddotbelow dlinebelow e eacute ebreve ecaron ecedillabreve ecircumflex ecircumflexacute 
ecircumflexdotbelow ecircumflexgrave ecircumflexhookabove ecircumflextilde edblgrave edieresis edotaccent 
edotbelow egrave ehookabove einvertedbreve emacron emacronacute emacrongrave eogonek etilde schwa f g gbreve 
gcaron gcircumflex gcommaaccent gdotacc
 ent gmac
 ron h hbar hbrevebelow hcircumflex hdotbelow i idotless iacute ibreve icaron icircumflex idblgrave idieresis 
idieresisacute idotaccent idotbelow igrave ihookabove iinvertedbreve imacron iogonek itilde j jdotless jacute 
jcircumflex k kacute kcommaaccent l lacute lcaron lcommaaccent ldotbelow llinebelow lslash m mdotbelow n 
nacute ncaron ncommaaccent ndotaccent ndotbelow nlinebelow ntilde o oacute obreve ocaron ocircumflex 
ocircumflexacute ocircumflexdotbelow ocircumflexgrave ocircumflexhookabove ocircumflextilde odblgrave 
odieresis odieresismacron odotaccentmacron odotbelow ograve ohookabove ohorn ohornacute ohorndotbelow 
ohorngrave ohornhookabove ohorntilde ohungarumlaut oinvertedbreve omacron omacronacute omacrongrave oogonek 
oslash oslashacute otilde otildeacute otildedieresis otildemacron oe p q r racute rcaron rcommaaccent 
rdblgrave rdotbelow rinvertedbreve rlinebelow s sacute sacutedotaccent scaron scarondotaccent scedilla 
scircumflex scommaaccent sdotaccent sdotbelow s
 dotbelow
 dotaccent t tbar tcaron tcedilla tcommaaccent tdieresis tdotbelow tlinebelow u uacute ubreve ucaron 
ucircumflex udblgrave udieresis udieresisacute udieresiscaron udieresisgrave udieresismacron udotbelow ugrave 
uhookabove uhorn uhornacute uhorndotbelow uhorngrave uhornhookabove uhorntilde uhungarumlaut uinvertedbreve 
umacron umacrondieresis uogonek uring utilde utildeacute v w wacute wcircumflex wdieresis wgrave x y yacute 
ycircumflex ydieresis ydotaccent ydotbelow ygrave yhookabove ymacron ytilde z zacute zcaron zdotaccent 
zdotbelow A-cy Ve-cy Ge-cy Gje-cy Ie-cy Iegrave-cy Io-cy Zhe-cy Ze-cy Ii-cy Iishort-cy Iigrave-cy Ka-cy 
Kje-cy Em-cy En-cy O-cy Pe-cy Er-cy Es-cy Te-cy U-cy Ushort-cy Ha-cy Che-cy Hardsign-cy Yeru-cy Dze-cy 
Ereversed-cy I-cy Yi-cy Je-cy Iu-cy Ia-cy Fita-cy Zhedescender-cy Zedescender-cy Kadescender-cy 
Endescender-cy Esdescender-cy Ustraight-cy Ustraightstroke-cy Hadescender-cy Chedescender-cy Palochka-cy 
Zhebreve-cy Chekhakassian-cy Abreve-cy Adieresis-cy 
 Aie-cy I
 ebreve-cy Schwa-cy Zhedieresis-cy Zedieresis-cy Imacron-cy Idieresis-cy Odieresis-cy Obarred-cy Umacron-cy 
Udieresis-cy Uhungarumlaut-cy Chedieresis-cy Gedescender-cy Yerudieresis-cy Qa-cy We-cy a-cy ge-cy gje-cy 
ie-cy iegrave-cy io-cy zhe-cy ze-cy ii-cy iishort-cy iigrave-cy ka-cy kje-cy en-cy o-cy pe-cy er-cy es-cy 
te-cy u-cy ushort-cy ha-cy che-cy yeru-cy dze-cy e-cy ereversed-cy i-cy yi-cy je-cy tshe-cy iu-cy ia-cy 
dje-cy fita-cy zhedescender-cy zedescender-cy kadescender-cy endescender-cy esdescender-cy ustraight-cy 
ustraightstroke-cy hadescender-cy chedescender-cy shha-cy palochka-cy zhebreve-cy chekhakassian-cy abreve-cy 
adieresis-cy aie-cy iebreve-cy schwa-cy zhedieresis-cy zedieresis-cy imacron-cy idieresis-cy odieresis-cy 
obarred-cy umacron-cy udieresis-cy uhungarumlaut-cy chedieresis-cy gedescender-cy yerudieresis-cy qa-cy 
we-cy], # Base
+    [A Aacute Abreve Abreveacute Abrevedotbelow Abrevegrave Abrevehookabove Abrevetilde Acaron Acircumflex 
Acircumflexacute Acircumflexdotbelow Acircumflexgrave Acircumflexhookabove Acircumflextilde Adblgrave 
Adieresis Adotbelow Agrave Ahookabove Ainvertedbreve Amacron Aogonek Aring Aringacute Atilde AE AEacute B C 
Cacute Ccaron Ccedilla Ccedillaacute Ccircumflex Cdotaccent D Eth Dcaron Dcroat Ddotbelow Dlinebelow E Eacute 
Ebreve Ecaron Ecedillabreve Ecircumflex Ecircumflexacute Ecircumflexdotbelow Ecircumflexgrave 
Ecircumflexhookabove Ecircumflextilde Edblgrave Edieresis Edotaccent Edotbelow Egrave Ehookabove 
Einvertedbreve Emacron Emacronacute Emacrongrave Eogonek Etilde F G Gbreve Gcaron Gcircumflex Gcommaaccent 
Gdotaccent Gmacron H Hbar Hbrevebelow Hcircumflex Hdotbelow I Iacute Ibreve Icaron Icircumflex Idblgrave 
Idieresis Idieresisacute Idotaccent Idotbelow Igrave Ihookabove Iinvertedbreve Imacron Iogonek Itilde J 
Jacute Jcircumflex K Kacute Kcommaaccent L Lacute Lcaro
 n Lcomma
 accent Ldotbelow Llinebelow Lslash M Mdotbelow N Nacute Ncaron Ncommaaccent Ndotaccent Ndotbelow Nlinebelow 
Ntilde O Oacute Obreve Ocaron Ocircumflex Ocircumflexacute Ocircumflexdotbelow Ocircumflexgrave 
Ocircumflexhookabove Ocircumflextilde Odblgrave Odieresis Odieresismacron Odotaccentmacron Odotbelow Ograve 
Ohookabove Ohorn Ohornacute Ohorndotbelow Ohorngrave Ohornhookabove Ohorntilde Ohungarumlaut Oinvertedbreve 
Omacron Omacronacute Omacrongrave Oogonek Oslash Oslashacute Otilde Otildeacute Otildedieresis Otildemacron 
OE P Q R Racute Rcaron Rcommaaccent Rdblgrave Rdotbelow Rinvertedbreve Rlinebelow S Sacute Sacutedotaccent 
Scaron Scarondotaccent Scedilla Scircumflex Scommaaccent Sdotaccent Sdotbelow Sdotbelowdotaccent Schwa T Tbar 
Tcaron Tcedilla Tcommaaccent Tdotbelow Tlinebelow U Uacute Ubreve Ucaron Ucircumflex Udblgrave Udieresis 
Udieresisacute Udieresiscaron Udieresisgrave Udieresismacron Udotbelow Ugrave Uhookabove Uhorn Uhornacute 
Uhorndotbelow Uhorngrave Uhornhoo
 kabove U
 horntilde Uhungarumlaut Uinvertedbreve Umacron Umacrondieresis Uogonek Uring Utilde Utildeacute V W Wacute 
Wcircumflex Wdieresis Wgrave X Y Yacute Ycircumflex Ydieresis Ydotaccent Ydotbelow Ygrave Yhookabove Ymacron 
Ytilde Z Zacute Zcaron Zdotaccent Zdotbelow a aacute abreve abreveacute abrevedotbelow abrevegrave 
abrevehookabove abrevetilde acaron acircumflex acircumflexacute acircumflexdotbelow acircumflexgrave 
acircumflexhookabove acircumflextilde adblgrave adieresis adotbelow agrave ahookabove ainvertedbreve amacron 
aogonek aring aringacute atilde ae aeacute b c cacute ccaron ccedilla ccedillaacute ccircumflex cdotaccent d 
dcaron dcroat ddotbelow dlinebelow e eacute ebreve ecaron ecedillabreve ecircumflex ecircumflexacute 
ecircumflexdotbelow ecircumflexgrave ecircumflexhookabove ecircumflextilde edblgrave edieresis edotaccent 
edotbelow egrave ehookabove einvertedbreve emacron emacronacute emacrongrave eogonek etilde schwa f g gbreve 
gcaron gcircumflex gcommaaccent gdotacc
 ent gmac
 ron h hbar hbrevebelow hcircumflex hdotbelow i idotless iacute ibreve icaron icircumflex idblgrave idieresis 
idieresisacute idotaccent idotbelow igrave ihookabove iinvertedbreve imacron iogonek itilde j jdotless jacute 
jcircumflex k kacute kcommaaccent l lacute lcaron lcommaaccent ldotbelow llinebelow lslash m mdotbelow n 
nacute ncaron ncommaaccent ndotaccent ndotbelow nlinebelow ntilde o oacute obreve ocaron ocircumflex 
ocircumflexacute ocircumflexdotbelow ocircumflexgrave ocircumflexhookabove ocircumflextilde odblgrave 
odieresis odieresismacron odotaccentmacron odotbelow ograve ohookabove ohorn ohornacute ohorndotbelow 
ohorngrave ohornhookabove ohorntilde ohungarumlaut oinvertedbreve omacron omacronacute omacrongrave oogonek 
oslash oslashacute otilde otildeacute otildedieresis otildemacron oe p q r racute rcaron rcommaaccent 
rdblgrave rdotbelow rinvertedbreve rlinebelow s sacute sacutedotaccent scaron scarondotaccent scedilla 
scircumflex scommaaccent sdotaccent sdotbelow s
 dotbelow
 dotaccent t tbar tcaron tcedilla tcommaaccent tdieresis tdotbelow tlinebelow u uacute ubreve ucaron 
ucircumflex udblgrave udieresis udieresisacute udieresiscaron udieresisgrave udieresismacron udotbelow ugrave 
uhookabove uhorn uhornacute uhorndotbelow uhorngrave uhornhookabove uhorntilde uhungarumlaut uinvertedbreve 
umacron umacrondieresis uogonek uring utilde utildeacute v w wacute wcircumflex wdieresis wgrave x y yacute 
ycircumflex ydieresis ydotaccent ydotbelow ygrave yhookabove ymacron ytilde z zacute zcaron zdotaccent 
zdotbelow l.ss01 A-cy Ve-cy Ge-cy Gje-cy Ie-cy Iegrave-cy Io-cy Zhe-cy Ze-cy Ii-cy Iishort-cy Iigrave-cy 
Ka-cy Kje-cy Em-cy En-cy O-cy Pe-cy Er-cy Es-cy Te-cy U-cy Ushort-cy Ha-cy Che-cy Sha-cy Shcha-cy Hardsign-cy 
Yeru-cy Dze-cy Ereversed-cy I-cy Yi-cy Je-cy Iu-cy Ia-cy Fita-cy Zhedescender-cy Zedescender-cy 
Kadescender-cy Endescender-cy Esdescender-cy Ustraight-cy Ustraightstroke-cy Hadescender-cy Chedescender-cy 
Palochka-cy Zhebreve-cy Chekhakassian-cy 
 Abreve-c
 y Adieresis-cy Aie-cy Iebreve-cy Schwa-cy Zhedieresis-cy Zedieresis-cy Imacron-cy Idieresis-cy Odieresis-cy 
Obarred-cy Umacron-cy Udieresis-cy Uhungarumlaut-cy Chedieresis-cy Gedescender-cy Yerudieresis-cy Qa-cy We-cy 
a-cy ge-cy gje-cy ie-cy iegrave-cy io-cy zhe-cy ze-cy ii-cy iishort-cy iigrave-cy ka-cy kje-cy en-cy o-cy 
pe-cy er-cy es-cy u-cy ushort-cy ha-cy che-cy sha-cy shcha-cy yeru-cy dze-cy e-cy ereversed-cy i-cy yi-cy 
je-cy tshe-cy iu-cy ia-cy dje-cy fita-cy zhedescender-cy zedescender-cy kadescender-cy endescender-cy 
esdescender-cy ustraight-cy ustraightstroke-cy hadescender-cy chedescender-cy shha-cy palochka-cy zhebreve-cy 
chekhakassian-cy abreve-cy adieresis-cy aie-cy iebreve-cy schwa-cy zhedieresis-cy zedieresis-cy imacron-cy 
idieresis-cy odieresis-cy obarred-cy umacron-cy udieresis-cy uhungarumlaut-cy chedieresis-cy gedescender-cy 
yerudieresis-cy qa-cy we-cy], # Base
     , # Liga
-    [dieresiscomb dieresiscomb_gravecomb dieresiscomb_acutecomb dieresiscomb_caroncomb 
dieresiscomb_macroncomb dotaccentcomb dotaccentcomb_macroncomb gravecomb acutecomb acutecomb_dotaccentcomb 
hungarumlautcomb caroncomb.alt circumflexcomb caroncomb caroncomb_dotaccentcomb brevecomb ringcomb 
ringcomb_acutecomb tildecomb tildecomb_dieresiscomb tildecomb_acutecomb tildecomb_macroncomb macroncomb 
macroncomb_dieresiscomb macroncomb_gravecomb macroncomb_acutecomb hookabovecomb verticallineabovecomb 
dblgravecomb breveinvertedcomb commaturnedabovecomb horncomb dotbelowcomb dieresisbelowcomb commaaccentcomb 
cedillacomb ogonekcomb verticallinebelowcomb brevebelowcomb macronbelowcomb strokeshortcomb strokelongcomb 
slashshortcomb slashlongcomb dieresiscomb.case dotaccentcomb.case gravecomb.case acutecomb.case 
hungarumlautcomb.case circumflexcomb.case caroncomb.case brevecomb.case ringcomb.case ringcomb_acutecomb.case 
tildecomb.case macroncomb.case hookabovecomb.case dblgravecomb.case b
 reveinve
 rtedcomb.case strokeshortcomb.case slashshortcomb.case slashlongcomb.case macroncomb.narrow.case 
ogonekcomb.tall.case dieresiscomb.loclVIET dotaccentcomb.loclVIET gravecomb.loclVIET acutecomb.loclVIET 
circumflexcomb.loclVIET caroncomb.loclVIET brevecomb.loclVIET tildecomb.loclVIET macroncomb.loclVIET 
hookabovecomb.loclVIET macroncomb.narrow ogonekcomb.narrow macronbelowcomb.narrow ogonekcomb.tall 
brevecomb-cy descender-cy brevecomb-cy.case descender-cy.case descender-cy.strait brevecomb_acutecomb 
brevecomb_gravecomb brevecomb_hookabovecomb brevecomb_tildecomb circumflexcomb_acutecomb 
circumflexcomb_gravecomb circumflexcomb_hookabovecomb circumflexcomb_tildecomb brevecomb_acutecomb.case 
brevecomb_gravecomb.case brevecomb_hookabovecomb.case brevecomb_tildecomb.case circumflexcomb_acutecomb.case 
circumflexcomb_gravecomb.case circumflexcomb_hookabovecomb.case circumflexcomb_tildecomb.case], # Mark
+    [dieresiscomb dotaccentcomb gravecomb acutecomb hungarumlautcomb caroncomb.alt circumflexcomb caroncomb 
brevecomb ringcomb ringcomb_acutecomb tildecomb macroncomb hookabovecomb verticallineabovecomb dblgravecomb 
breveinvertedcomb commaturnedabovecomb horncomb dotbelowcomb dieresisbelowcomb commaaccentcomb cedillacomb 
ogonekcomb verticallinebelowcomb brevebelowcomb macronbelowcomb strokeshortcomb strokelongcomb slashshortcomb 
slashlongcomb dieresiscomb.case dotaccentcomb.case gravecomb.case acutecomb.case hungarumlautcomb.case 
circumflexcomb.case caroncomb.case brevecomb.case ringcomb.case ringcomb_acutecomb.case tildecomb.case 
macroncomb.case hookabovecomb.case dblgravecomb.case breveinvertedcomb.case strokeshortcomb.case 
slashshortcomb.case slashlongcomb.case macroncomb.narrow.case ogonekcomb.tall.case dieresiscomb.loclVIET 
dotaccentcomb.loclVIET gravecomb.loclVIET acutecomb.loclVIET circumflexcomb.loclVIET caroncomb.loclVIET 
brevecomb.loclVIET tildecomb.loclVIET macron
 comb.loc
 lVIET hookabovecomb.loclVIET macroncomb.narrow ogonekcomb.narrow macronbelowcomb.narrow ogonekcomb.tall 
brevecomb-cy descender-cy brevecomb-cy.case descender-cy.case descender-cy.strait], # Mark
     ;
 } GDEF;
 
@@ -43,6 +43,8 @@ feature tnum;
 feature onum;
 feature case;
 feature zero;
+feature salt;
+feature ss01;
 
 } aalt;
 
@@ -53,8 +55,8 @@ lookup ccmp_Other_1 {
        @CombiningNonTopAccents = [brevebelowcomb cedillacomb dieresisbelowcomb dotbelowcomb macronbelowcomb 
ogonekcomb verticallinebelowcomb horncomb slashlongcomb slashshortcomb strokelongcomb strokeshortcomb];
        sub [i j]' @CombiningTopAccents by [idotless jdotless];
        sub [i j]' @CombiningNonTopAccents @CombiningTopAccents by [idotless jdotless];
-       @Markscomb = [dieresiscomb dotaccentcomb gravecomb acutecomb hungarumlautcomb circumflexcomb 
caroncomb brevecomb ringcomb ringcomb_acutecomb tildecomb macroncomb hookabovecomb dblgravecomb 
breveinvertedcomb strokeshortcomb slashshortcomb slashlongcomb macroncomb.narrow ogonekcomb.tall brevecomb-cy 
descender-cy brevecomb_acutecomb brevecomb_gravecomb brevecomb_hookabovecomb brevecomb_tildecomb 
circumflexcomb_acutecomb circumflexcomb_gravecomb circumflexcomb_hookabovecomb circumflexcomb_tildecomb];
-       @MarkscombCase = [dieresiscomb.case dotaccentcomb.case gravecomb.case acutecomb.case 
hungarumlautcomb.case circumflexcomb.case caroncomb.case brevecomb.case ringcomb.case ringcomb_acutecomb.case 
tildecomb.case macroncomb.case hookabovecomb.case dblgravecomb.case breveinvertedcomb.case 
strokeshortcomb.case slashshortcomb.case slashlongcomb.case macroncomb.narrow.case ogonekcomb.tall.case 
brevecomb-cy.case descender-cy.case brevecomb_acutecomb.case brevecomb_gravecomb.case 
brevecomb_hookabovecomb.case brevecomb_tildecomb.case circumflexcomb_acutecomb.case 
circumflexcomb_gravecomb.case circumflexcomb_hookabovecomb.case circumflexcomb_tildecomb.case];
+       @Markscomb = [dieresiscomb dotaccentcomb gravecomb acutecomb hungarumlautcomb circumflexcomb 
caroncomb brevecomb ringcomb ringcomb_acutecomb tildecomb macroncomb hookabovecomb dblgravecomb 
breveinvertedcomb strokeshortcomb slashshortcomb slashlongcomb macroncomb.narrow ogonekcomb.tall brevecomb-cy 
descender-cy];
+       @MarkscombCase = [dieresiscomb.case dotaccentcomb.case gravecomb.case acutecomb.case 
hungarumlautcomb.case circumflexcomb.case caroncomb.case brevecomb.case ringcomb.case ringcomb_acutecomb.case 
tildecomb.case macroncomb.case hookabovecomb.case dblgravecomb.case breveinvertedcomb.case 
strokeshortcomb.case slashshortcomb.case slashlongcomb.case macroncomb.narrow.case ogonekcomb.tall.case 
brevecomb-cy.case descender-cy.case];
        sub @Markscomb @Markscomb' by @MarkscombCase;
        sub @Uppercase @Markscomb' by @MarkscombCase;
 } ccmp_Other_1;
@@ -66,79 +68,47 @@ lookup ccmp_Other_2 {
 
 lookup ccmp_Other_3 {
        lookupflag 0;
-       sub acutecomb dotaccentcomb by acutecomb_dotaccentcomb;
-       sub caroncomb dotaccentcomb by caroncomb_dotaccentcomb;
-       sub dieresiscomb acutecomb by dieresiscomb_acutecomb;
-       sub dieresiscomb caroncomb by dieresiscomb_caroncomb;
-       sub dieresiscomb gravecomb by dieresiscomb_gravecomb;
-       sub dieresiscomb macroncomb by dieresiscomb_macroncomb;
-       sub dotaccentcomb macroncomb by dotaccentcomb_macroncomb;
-       sub macroncomb acutecomb by macroncomb_acutecomb;
-       sub macroncomb dieresiscomb by macroncomb_dieresiscomb;
-       sub macroncomb gravecomb by macroncomb_gravecomb;
        sub ringcomb acutecomb by ringcomb_acutecomb;
        sub ringcomb.case acutecomb.case by ringcomb_acutecomb.case;
-       sub tildecomb acutecomb by tildecomb_acutecomb;
-       sub tildecomb dieresiscomb by tildecomb_dieresiscomb;
-       sub tildecomb macroncomb by tildecomb_macroncomb;
 } ccmp_Other_3;
 
-lookup ccmp_latn_1 {
-       lookupflag 0;
-       sub brevecomb acutecomb by brevecomb_acutecomb;
-       sub brevecomb.case acutecomb.case by brevecomb_acutecomb.case;
-       sub brevecomb gravecomb by brevecomb_gravecomb;
-       sub brevecomb.case gravecomb.case by brevecomb_gravecomb.case;
-       sub brevecomb hookabovecomb by brevecomb_hookabovecomb;
-       sub brevecomb.case hookabovecomb.case by brevecomb_hookabovecomb.case;
-       sub brevecomb tildecomb by brevecomb_tildecomb;
-       sub brevecomb.case tildecomb.case by brevecomb_tildecomb.case;
-       sub circumflexcomb acutecomb by circumflexcomb_acutecomb;
-       sub circumflexcomb.case acutecomb.case by circumflexcomb_acutecomb.case;
-       sub circumflexcomb gravecomb by circumflexcomb_gravecomb;
-       sub circumflexcomb.case gravecomb.case by circumflexcomb_gravecomb.case;
-       sub circumflexcomb hookabovecomb by circumflexcomb_hookabovecomb;
-       sub circumflexcomb.case hookabovecomb.case by circumflexcomb_hookabovecomb.case;
-       sub circumflexcomb tildecomb by circumflexcomb_tildecomb;
-       sub circumflexcomb.case tildecomb.case by circumflexcomb_tildecomb.case;
-} ccmp_latn_1;
-
-script latn;
-lookup ccmp_latn_1;
-
 } ccmp;
 
 feature locl {
 # automatic
-script latn;
-language NLD;
-sub iacute j' by jacute;
-sub Iacute J' by Jacute;
-language CAT;
-sub l periodcentered' l by periodcentered.loclCAT;
-sub L periodcentered' L by periodcentered.loclCAT.case;
-language ROM;
-sub Scedilla by Scommaaccent;
-sub scedilla by scommaaccent;
-sub Tcedilla by Tcommaaccent;
-sub tcedilla by tcommaaccent;
-language MOL;
-sub Scedilla by Scommaaccent;
-sub scedilla by scommaaccent;
-sub Tcedilla by Tcommaaccent;
-sub tcedilla by tcommaaccent;
-language KAZ;
-sub i by idotaccent;
-language TRK;
-sub i by idotaccent;
-language CRT;
-sub i by idotaccent;
-language AZE;
-sub i by idotaccent;
-
-script cyrl;
-language TAT;
-sub i by idotaccent;
+lookup locl_latn_0 {
+       script latn;
+       language ROM;
+       sub Scedilla by Scommaaccent;
+       sub scedilla by scommaaccent;
+       sub Tcedilla by Tcommaaccent;
+       sub tcedilla by tcommaaccent;
+       language MOL;
+       sub Scedilla by Scommaaccent;
+       sub scedilla by scommaaccent;
+       sub Tcedilla by Tcommaaccent;
+       sub tcedilla by tcommaaccent;
+       language KAZ;
+       sub i by idotaccent;
+       language TAT;
+       sub i by idotaccent;
+       language TRK;
+       sub i by idotaccent;
+       language CRT;
+       sub i by idotaccent;
+       language AZE;
+       sub i by idotaccent;
+} locl_latn_0;
+
+lookup locl_latn_1 {
+       script latn;
+       language NLD;
+       sub iacute j' by jacute;
+       sub Iacute J' by Jacute;
+       language CAT;
+       sub l periodcentered' l by periodcentered.loclCAT;
+       sub L periodcentered' L by periodcentered.loclCAT.case;
+} locl_latn_1;
 
 } locl;
 
@@ -267,34 +237,6 @@ sub six.tf by six;
 sub seven.tf by seven;
 sub eight.tf by eight;
 sub nine.tf by nine;
-sub bulletoperator.tf by bulletoperator;
-sub commercialMinusSign.tf by commercialMinusSign;
-sub divisionslash.tf by divisionslash;
-sub equivalence.tf by equivalence;
-sub notidentical.tf by notidentical;
-sub plus.tf by plus;
-sub minus.tf by minus;
-sub multiply.tf by multiply;
-sub divide.tf by divide;
-sub equal.tf by equal;
-sub notequal.tf by notequal;
-sub greater.tf by greater;
-sub less.tf by less;
-sub greaterequal.tf by greaterequal;
-sub lessequal.tf by lessequal;
-sub plusminus.tf by plusminus;
-sub approxequal.tf by approxequal;
-sub logicalnot.tf by logicalnot;
-sub zero.tosf by zero.osf;
-sub one.tosf by one.osf;
-sub two.tosf by two.osf;
-sub three.tosf by three.osf;
-sub four.tosf by four.osf;
-sub five.tosf by five.osf;
-sub six.tosf by six.osf;
-sub seven.tosf by seven.osf;
-sub eight.tosf by eight.osf;
-sub nine.tosf by nine.osf;
 
 } pnum;
 
@@ -310,49 +252,11 @@ sub six by six.tf;
 sub seven by seven.tf;
 sub eight by eight.tf;
 sub nine by nine.tf;
-sub bulletoperator by bulletoperator.tf;
-sub commercialMinusSign by commercialMinusSign.tf;
-sub divisionslash by divisionslash.tf;
-sub equivalence by equivalence.tf;
-sub notidentical by notidentical.tf;
-sub plus by plus.tf;
-sub minus by minus.tf;
-sub multiply by multiply.tf;
-sub divide by divide.tf;
-sub equal by equal.tf;
-sub notequal by notequal.tf;
-sub greater by greater.tf;
-sub less by less.tf;
-sub greaterequal by greaterequal.tf;
-sub lessequal by lessequal.tf;
-sub plusminus by plusminus.tf;
-sub approxequal by approxequal.tf;
-sub logicalnot by logicalnot.tf;
-sub zero.osf by zero.tosf;
-sub one.osf by one.tosf;
-sub two.osf by two.tosf;
-sub three.osf by three.tosf;
-sub four.osf by four.tosf;
-sub five.osf by five.tosf;
-sub six.osf by six.tosf;
-sub seven.osf by seven.tosf;
-sub eight.osf by eight.tosf;
-sub nine.osf by nine.tosf;
 
 } tnum;
 
 feature onum {
 # automatic
-sub zero.tf by zero.tosf;
-sub one.tf by one.tosf;
-sub two.tf by two.tosf;
-sub three.tf by three.tosf;
-sub four.tf by four.tosf;
-sub five.tf by five.tosf;
-sub six.tf by six.tosf;
-sub seven.tf by seven.tosf;
-sub eight.tf by eight.tosf;
-sub nine.tf by nine.tosf;
 sub zero by zero.osf;
 sub one by one.osf;
 sub two by two.osf;
@@ -391,22 +295,12 @@ sub macroncomb.narrow by macroncomb.narrow.case;
 sub ogonekcomb.tall by ogonekcomb.tall.case;
 sub brevecomb-cy by brevecomb-cy.case;
 sub descender-cy by descender-cy.case;
-sub brevecomb_acutecomb by brevecomb_acutecomb.case;
-sub brevecomb_gravecomb by brevecomb_gravecomb.case;
-sub brevecomb_hookabovecomb by brevecomb_hookabovecomb.case;
-sub brevecomb_tildecomb by brevecomb_tildecomb.case;
-sub circumflexcomb_acutecomb by circumflexcomb_acutecomb.case;
-sub circumflexcomb_gravecomb by circumflexcomb_gravecomb.case;
-sub circumflexcomb_hookabovecomb by circumflexcomb_hookabovecomb.case;
-sub circumflexcomb_tildecomb by circumflexcomb_tildecomb.case;
 
 } case;
 
 feature liga {
 # automatic
-sub f f i by f_f_i;
-sub f f l by f_f_l;
-sub f f by f_f;
+lookupflag IgnoreMarks;
 sub f i by fi;
 sub f l by fl;
 
@@ -414,9 +308,20 @@ sub f l by fl;
 
 feature zero {
 # automatic
+sub zero by zero.zero;
 sub zero.osf by zero.osf.zero;
 sub zero.tf by zero.tf.zero;
-sub zero.tosf by zero.tosf.zero;
-sub zero by zero.zero;
 
 } zero;
+
+feature salt {
+# automatic
+sub l by l.ss01;
+
+} salt;
+
+feature ss01 {
+# automatic
+sub l by l.ss01;
+
+} ss01;
diff --git a/src/Cantarell-Regular.ufo/fontinfo.plist b/src/Cantarell-Regular.ufo/fontinfo.plist
index 03b2b5ce..849eb654 100644
--- a/src/Cantarell-Regular.ufo/fontinfo.plist
+++ b/src/Cantarell-Regular.ufo/fontinfo.plist
@@ -12,8 +12,6 @@
     <integer>-217</integer>
     <key>familyName</key>
     <string>Cantarell</string>
-    <key>guidelines</key>
-    <array/>
     <key>italicAngle</key>
     <integer>0</integer>
     <key>openTypeGaspRangeRecords</key>
@@ -51,14 +49,12 @@
       <integer>0</integer>
       <integer>0</integer>
     </array>
-    <key>openTypeOS2Selection</key>
-    <array>
-      <integer>7</integer>
-    </array>
     <key>openTypeOS2Type</key>
     <array/>
     <key>openTypeOS2VendorID</key>
     <string>ABAT</string>
+    <key>postscriptBlueFuzz</key>
+    <integer>1</integer>
     <key>postscriptBlueScale</key>
     <real>0.0625</real>
     <key>postscriptBlueValues</key>
@@ -72,10 +68,6 @@
       <integer>739</integer>
       <integer>749</integer>
     </array>
-    <key>postscriptFamilyBlues</key>
-    <array/>
-    <key>postscriptFamilyOtherBlues</key>
-    <array/>
     <key>postscriptOtherBlues</key>
     <array>
       <integer>-227</integer>
@@ -100,7 +92,7 @@
     <key>versionMajor</key>
     <integer>0</integer>
     <key>versionMinor</key>
-    <integer>111</integer>
+    <integer>200</integer>
     <key>xHeight</key>
     <integer>482</integer>
   </dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs.F_inal B_ent/be-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs.F_inal B_ent/be-cy.glif
new file mode 100644
index 00000000..7a4b7074
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.F_inal B_ent/be-cy.glif  
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="be-cy" format="2">
+  <advance width="557"/>
+  <unicode hex="0431"/>
+  <outline>
+    <contour>
+      <point x="291" y="-10" type="curve" smooth="yes"/>
+      <point x="424" y="-10"/>
+      <point x="507" y="91"/>
+      <point x="507" y="234" type="curve" smooth="yes"/>
+      <point x="507" y="371"/>
+      <point x="430" y="454"/>
+      <point x="318" y="454" type="curve" smooth="yes"/>
+      <point x="223" y="454"/>
+      <point x="148" y="394"/>
+      <point x="104" y="286" type="curve"/>
+      <point x="126" y="243" type="line"/>
+      <point x="158" y="332"/>
+      <point x="217" y="382"/>
+      <point x="289" y="382" type="curve" smooth="yes"/>
+      <point x="365" y="382"/>
+      <point x="423" y="327"/>
+      <point x="423" y="220" type="curve" smooth="yes"/>
+      <point x="423" y="125"/>
+      <point x="377" y="63"/>
+      <point x="297" y="63" type="curve" smooth="yes"/>
+      <point x="202" y="63"/>
+      <point x="142" y="152"/>
+      <point x="142" y="361" type="curve" smooth="yes"/>
+      <point x="142" y="537"/>
+      <point x="180" y="598"/>
+      <point x="319" y="634" type="curve" smooth="yes"/>
+      <point x="362" y="645"/>
+      <point x="406" y="647"/>
+      <point x="449" y="668" type="curve"/>
+      <point x="431" y="739" type="line"/>
+      <point x="388" y="717"/>
+      <point x="346" y="716"/>
+      <point x="303" y="704" type="curve" smooth="yes"/>
+      <point x="127" y="656"/>
+      <point x="61" y="558"/>
+      <point x="61" y="346" type="curve" smooth="yes"/>
+      <point x="61" y="103"/>
+      <point x="150" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.F_inal B_ent/contents.plist 
b/src/Cantarell-Regular.ufo/glyphs.F_inal B_ent/contents.plist
new file mode 100644
index 00000000..1ae1e5b4
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.F_inal B_ent/contents.plist      
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>be-cy</key>
+    <string>be-cy.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.F_inal B_ent/layerinfo.plist 
b/src/Cantarell-Regular.ufo/glyphs.F_inal B_ent/layerinfo.plist
new file mode 100644
index 00000000..dae5398e
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.F_inal B_ent/layerinfo.plist     
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>64C01C6D-4425-4C5A-A047-519EF981E9DC</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.be-cy</key>
+      <integer>4</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/contents.plist 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/contents.plist
new file mode 100644
index 00000000..8b006235
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/contents.plist  
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>eight.tf</key>
+    <string>eight.tf.glif</string>
+    <key>five.tf</key>
+    <string>five.tf.glif</string>
+    <key>four.tf</key>
+    <string>four.tf.glif</string>
+    <key>nine.tf</key>
+    <string>nine.tf.glif</string>
+    <key>seven.tf</key>
+    <string>seven.tf.glif</string>
+    <key>six.tf</key>
+    <string>six.tf.glif</string>
+    <key>three.tf</key>
+    <string>three.tf.glif</string>
+    <key>two.tf</key>
+    <string>two.tf.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/eight.tf.glif 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/eight.tf.glif
new file mode 100644
index 00000000..822c9e9c
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/eight.tf.glif   
@@ -0,0 +1,61 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="eight.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="292" y="-10" type="curve" smooth="yes"/>
+      <point x="435" y="-10"/>
+      <point x="528" y="63"/>
+      <point x="528" y="176" type="curve" smooth="yes"/>
+      <point x="528" y="401"/>
+      <point x="162" y="359"/>
+      <point x="162" y="534" type="curve" smooth="yes"/>
+      <point x="162" y="595"/>
+      <point x="208" y="633"/>
+      <point x="283" y="633" type="curve" smooth="yes"/>
+      <point x="364" y="633"/>
+      <point x="419" y="589"/>
+      <point x="419" y="523" type="curve" smooth="yes"/>
+      <point x="419" y="459"/>
+      <point x="366" y="402"/>
+      <point x="287" y="387" type="curve"/>
+      <point x="350" y="356" type="line"/>
+      <point x="442" y="384"/>
+      <point x="498" y="454"/>
+      <point x="498" y="537" type="curve" smooth="yes"/>
+      <point x="498" y="637"/>
+      <point x="416" y="704"/>
+      <point x="294" y="704" type="curve" smooth="yes"/>
+      <point x="165" y="704"/>
+      <point x="79" y="631"/>
+      <point x="79" y="521" type="curve" smooth="yes"/>
+      <point x="79" y="290"/>
+      <point x="444" y="344"/>
+      <point x="444" y="169" type="curve" smooth="yes"/>
+      <point x="444" y="102"/>
+      <point x="394" y="63"/>
+      <point x="306" y="63" type="curve" smooth="yes"/>
+      <point x="207" y="63"/>
+      <point x="141" y="112"/>
+      <point x="141" y="185" type="curve" smooth="yes"/>
+      <point x="141" y="257"/>
+      <point x="202" y="315"/>
+      <point x="291" y="328" type="curve"/>
+      <point x="238" y="361" type="line"/>
+      <point x="128" y="346"/>
+      <point x="56" y="270"/>
+      <point x="56" y="174" type="curve" smooth="yes"/>
+      <point x="56" y="64"/>
+      <point x="151" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/five.tf.glif 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/five.tf.glif
new file mode 100644
index 00000000..7cf33f80
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/five.tf.glif    
@@ -0,0 +1,48 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="five.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="259" y="-10" type="curve" smooth="yes"/>
+      <point x="418" y="-10"/>
+      <point x="524" y="77"/>
+      <point x="524" y="215" type="curve" smooth="yes"/>
+      <point x="524" y="346"/>
+      <point x="428" y="427"/>
+      <point x="269" y="427" type="curve" smooth="yes"/>
+      <point x="233" y="427"/>
+      <point x="193" y="423"/>
+      <point x="153" y="415" type="curve"/>
+      <point x="173" y="389" type="line"/>
+      <point x="184" y="622" type="line"/>
+      <point x="490" y="622" type="line"/>
+      <point x="490" y="694" type="line"/>
+      <point x="109" y="694" type="line"/>
+      <point x="92" y="338" type="line"/>
+      <point x="144" y="349"/>
+      <point x="201" y="355"/>
+      <point x="241" y="355" type="curve" smooth="yes"/>
+      <point x="366" y="355"/>
+      <point x="439" y="298"/>
+      <point x="439" y="205" type="curve" smooth="yes"/>
+      <point x="439" y="116"/>
+      <point x="372" y="63"/>
+      <point x="267" y="63" type="curve" smooth="yes"/>
+      <point x="206" y="63"/>
+      <point x="138" y="79"/>
+      <point x="82" y="107" type="curve"/>
+      <point x="58" y="42" type="line"/>
+      <point x="122" y="9"/>
+      <point x="189" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/four.tf.glif 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/four.tf.glif
new file mode 100644
index 00000000..d5428851
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/four.tf.glif    
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="four.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="356" y="-10" type="line"/>
+      <point x="433" y="-10" type="line"/>
+      <point x="433" y="694" type="line"/>
+      <point x="358" y="694" type="line"/>
+      <point x="24" y="206" type="line"/>
+      <point x="24" y="164" type="line"/>
+      <point x="556" y="164" type="line"/>
+      <point x="556" y="232" type="line"/>
+      <point x="108" y="232" type="line"/>
+      <point x="104" y="214" type="line"/>
+      <point x="356" y="584" type="line"/>
+      <point x="356" y="567" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/layerinfo.plist 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/layerinfo.plist
new file mode 100644
index 00000000..e7699aff
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/layerinfo.plist 
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>12737D36-A4E9-462A-BFB1-BEC6DC631A3E</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.eight.tf</key>
+      <integer>4</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.five.tf</key>
+      <integer>4</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.four.tf</key>
+      <integer>4</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.nine.tf</key>
+      <integer>4</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.seven.tf</key>
+      <integer>4</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.six.tf</key>
+      <integer>4</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.three.tf</key>
+      <integer>4</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.two.tf</key>
+      <integer>4</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs/nine.tosf.glif b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 
20_47/nine.tf.glif
similarity index 97%
rename from src/Cantarell-Regular.ufo/glyphs/nine.tosf.glif
rename to src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/nine.tf.glif
index 7ef71450..60ef501f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/nine.tosf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/nine.tf.glif    
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<glyph name="nine.tosf" format="2">
+<glyph name="nine.tf" format="2">
   <advance width="580"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/seven.tf.glif 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/seven.tf.glif
new file mode 100644
index 00000000..946e0aa7
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/seven.tf.glif   
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="seven.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="142" y="0" type="line"/>
+      <point x="229" y="0" type="line"/>
+      <point x="531" y="654" type="line"/>
+      <point x="531" y="694" type="line"/>
+      <point x="46" y="694" type="line"/>
+      <point x="46" y="622" type="line"/>
+      <point x="466" y="622" type="line"/>
+      <point x="445" y="652" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/six.tosf.glif b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 
20_47/six.tf.glif
similarity index 95%
rename from src/Cantarell-Regular.ufo/glyphs/six.tosf.glif
rename to src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/six.tf.glif
index 28995950..3b3d7de2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/six.tosf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/six.tf.glif     
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<glyph name="six.tosf" format="2">
+<glyph name="six.tf" format="2">
   <advance width="580"/>
   <outline>
     <contour>
@@ -49,8 +49,6 @@
       <dict>
         <key>monoWidth</key>
         <integer>580</integer>
-        <key>weight</key>
-        <integer>-4</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/three.tf.glif 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/three.tf.glif
new file mode 100644
index 00000000..0a4628fd
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/three.tf.glif   
@@ -0,0 +1,57 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="three.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="266" y="-10" type="curve" smooth="yes"/>
+      <point x="418" y="-10"/>
+      <point x="523" y="68"/>
+      <point x="523" y="182" type="curve" smooth="yes"/>
+      <point x="523" y="283"/>
+      <point x="442" y="361"/>
+      <point x="321" y="373" type="curve"/>
+      <point x="320" y="358" type="line"/>
+      <point x="418" y="361"/>
+      <point x="485" y="437"/>
+      <point x="485" y="527" type="curve" smooth="yes"/>
+      <point x="485" y="632"/>
+      <point x="397" y="704"/>
+      <point x="271" y="704" type="curve" smooth="yes"/>
+      <point x="201" y="704"/>
+      <point x="126" y="683"/>
+      <point x="63" y="647" type="curve"/>
+      <point x="82" y="586" type="line"/>
+      <point x="142" y="614"/>
+      <point x="203" y="631"/>
+      <point x="254" y="631" type="curve" smooth="yes"/>
+      <point x="342" y="631"/>
+      <point x="400" y="585"/>
+      <point x="400" y="514" type="curve" smooth="yes"/>
+      <point x="400" y="432"/>
+      <point x="323" y="386"/>
+      <point x="182" y="386" type="curve"/>
+      <point x="182" y="318" type="line"/>
+      <point x="344" y="318"/>
+      <point x="438" y="265"/>
+      <point x="438" y="175" type="curve" smooth="yes"/>
+      <point x="438" y="105"/>
+      <point x="377" y="63"/>
+      <point x="274" y="63" type="curve" smooth="yes"/>
+      <point x="208" y="63"/>
+      <point x="131" y="80"/>
+      <point x="68" y="111" type="curve"/>
+      <point x="49" y="44" type="line"/>
+      <point x="115" y="10"/>
+      <point x="192" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/two.tf.glif 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/two.tf.glif
new file mode 100644
index 00000000..cf06229d
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/two.tf.glif     
@@ -0,0 +1,41 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="two.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="64" y="0" type="line"/>
+      <point x="522" y="0" type="line"/>
+      <point x="522" y="72" type="line"/>
+      <point x="149" y="72" type="line"/>
+      <point x="156" y="48" type="line"/>
+      <point x="399" y="266"/>
+      <point x="492" y="383"/>
+      <point x="492" y="510" type="curve" smooth="yes"/>
+      <point x="492" y="630"/>
+      <point x="408" y="704"/>
+      <point x="272" y="704" type="curve" smooth="yes"/>
+      <point x="187" y="704"/>
+      <point x="105" y="674"/>
+      <point x="52" y="625" type="curve"/>
+      <point x="77" y="567" type="line"/>
+      <point x="129" y="607"/>
+      <point x="196" y="631"/>
+      <point x="256" y="631" type="curve" smooth="yes"/>
+      <point x="348" y="631"/>
+      <point x="407" y="579"/>
+      <point x="407" y="496" type="curve" smooth="yes"/>
+      <point x="407" y="397"/>
+      <point x="326" y="291"/>
+      <point x="64" y="55" type="curve"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_55/contents.plist 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_55/contents.plist
new file mode 100644
index 00000000..7b74aabe
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_55/contents.plist  
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>zero.tf</key>
+    <string>zero.tf.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_55/layerinfo.plist 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_55/layerinfo.plist
new file mode 100644
index 00000000..d0d8cb2e
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_55/layerinfo.plist 
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>78D59FBE-C6F3-42A5-B1A3-A34A164DA1F5</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.zero.tf</key>
+      <integer>3</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_55/zero.tf.glif 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_55/zero.tf.glif
new file mode 100644
index 00000000..1bbc25aa
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_55/zero.tf.glif    
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="zero.tf" format="2">
+  <advance width="580"/>
+  <anchor x="290" y="350" name="slash"/>
+  <outline>
+    <contour>
+      <point x="287" y="-10" type="curve" smooth="yes"/>
+      <point x="433" y="-10"/>
+      <point x="521" y="125"/>
+      <point x="521" y="352" type="curve" smooth="yes"/>
+      <point x="521" y="572"/>
+      <point x="436" y="704"/>
+      <point x="294" y="704" type="curve" smooth="yes"/>
+      <point x="146" y="704"/>
+      <point x="57" y="570"/>
+      <point x="57" y="342" type="curve" smooth="yes"/>
+      <point x="57" y="122"/>
+      <point x="143" y="-10"/>
+    </contour>
+    <contour>
+      <point x="293" y="62" type="curve" smooth="yes"/>
+      <point x="198" y="62"/>
+      <point x="141" y="170"/>
+      <point x="141" y="352" type="curve" smooth="yes"/>
+      <point x="141" y="527"/>
+      <point x="196" y="632"/>
+      <point x="288" y="632" type="curve" smooth="yes"/>
+      <point x="381" y="632"/>
+      <point x="437" y="524"/>
+      <point x="437" y="342" type="curve" smooth="yes"/>
+      <point x="437" y="167"/>
+      <point x="384" y="62"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/contents.plist 
b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/contents.plist
new file mode 100644
index 00000000..6bc8bbc7
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/contents.plist  
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>eight</key>
+    <string>eight.glif</string>
+    <key>five</key>
+    <string>five.glif</string>
+    <key>four</key>
+    <string>four.glif</string>
+    <key>nine</key>
+    <string>nine.glif</string>
+    <key>one</key>
+    <string>one.glif</string>
+    <key>seven</key>
+    <string>seven.glif</string>
+    <key>three</key>
+    <string>three.glif</string>
+    <key>two</key>
+    <string>two.glif</string>
+    <key>zero</key>
+    <string>zero.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/eight.glif 
b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/eight.glif
new file mode 100644
index 00000000..6233aea8
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/eight.glif      
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="eight" format="2">
+  <advance width="595"/>
+  <unicode hex="0038"/>
+  <outline>
+    <contour>
+      <point x="299" y="-10" type="curve" smooth="yes"/>
+      <point x="445" y="-10"/>
+      <point x="540" y="63"/>
+      <point x="540" y="176" type="curve" smooth="yes"/>
+      <point x="540" y="401"/>
+      <point x="165" y="359"/>
+      <point x="165" y="534" type="curve" smooth="yes"/>
+      <point x="165" y="595"/>
+      <point x="212" y="633"/>
+      <point x="289" y="633" type="curve" smooth="yes"/>
+      <point x="373" y="633"/>
+      <point x="430" y="589"/>
+      <point x="430" y="523" type="curve" smooth="yes"/>
+      <point x="430" y="458"/>
+      <point x="375" y="402"/>
+      <point x="294" y="387" type="curve"/>
+      <point x="357" y="356" type="line"/>
+      <point x="451" y="384"/>
+      <point x="509" y="453"/>
+      <point x="509" y="537" type="curve" smooth="yes"/>
+      <point x="509" y="637"/>
+      <point x="426" y="704"/>
+      <point x="301" y="704" type="curve" smooth="yes"/>
+      <point x="169" y="704"/>
+      <point x="82" y="631"/>
+      <point x="82" y="521" type="curve" smooth="yes"/>
+      <point x="82" y="290"/>
+      <point x="455" y="344"/>
+      <point x="455" y="169" type="curve" smooth="yes"/>
+      <point x="455" y="102"/>
+      <point x="404" y="63"/>
+      <point x="313" y="63" type="curve" smooth="yes"/>
+      <point x="211" y="63"/>
+      <point x="143" y="112"/>
+      <point x="143" y="185" type="curve" smooth="yes"/>
+      <point x="143" y="257"/>
+      <point x="206" y="315"/>
+      <point x="298" y="328" type="curve"/>
+      <point x="244" y="361" type="line"/>
+      <point x="132" y="346"/>
+      <point x="58" y="271"/>
+      <point x="58" y="174" type="curve" smooth="yes"/>
+      <point x="58" y="64"/>
+      <point x="154" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/five.glif 
b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/five.glif
new file mode 100644
index 00000000..24900aaf
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/five.glif       
@@ -0,0 +1,40 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="five" format="2">
+  <advance width="565"/>
+  <unicode hex="0035"/>
+  <outline>
+    <contour>
+      <point x="251" y="-10" type="curve" smooth="yes"/>
+      <point x="407" y="-10"/>
+      <point x="510" y="77"/>
+      <point x="510" y="215" type="curve" smooth="yes"/>
+      <point x="510" y="346"/>
+      <point x="417" y="427"/>
+      <point x="261" y="427" type="curve" smooth="yes"/>
+      <point x="226" y="427"/>
+      <point x="188" y="423"/>
+      <point x="150" y="415" type="curve"/>
+      <point x="169" y="389" type="line"/>
+      <point x="180" y="622" type="line"/>
+      <point x="477" y="622" type="line"/>
+      <point x="477" y="694" type="line"/>
+      <point x="105" y="694" type="line"/>
+      <point x="88" y="338" type="line"/>
+      <point x="139" y="349"/>
+      <point x="194" y="355"/>
+      <point x="233" y="355" type="curve" smooth="yes"/>
+      <point x="355" y="355"/>
+      <point x="425" y="298"/>
+      <point x="425" y="205" type="curve" smooth="yes"/>
+      <point x="425" y="116"/>
+      <point x="361" y="63"/>
+      <point x="259" y="63" type="curve" smooth="yes"/>
+      <point x="199" y="63"/>
+      <point x="134" y="79"/>
+      <point x="79" y="107" type="curve"/>
+      <point x="55" y="42" type="line"/>
+      <point x="118" y="9"/>
+      <point x="182" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/four.glif 
b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/four.glif
new file mode 100644
index 00000000..caf32a39
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/four.glif       
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="four" format="2">
+  <advance width="619"/>
+  <unicode hex="0034"/>
+  <outline>
+    <contour>
+      <point x="377" y="-10" type="line"/>
+      <point x="455" y="-10" type="line"/>
+      <point x="455" y="694" type="line"/>
+      <point x="379" y="694" type="line"/>
+      <point x="38" y="206" type="line"/>
+      <point x="38" y="164" type="line"/>
+      <point x="580" y="164" type="line"/>
+      <point x="580" y="232" type="line"/>
+      <point x="124" y="232" type="line"/>
+      <point x="119" y="214" type="line"/>
+      <point x="377" y="584" type="line"/>
+      <point x="377" y="567" type="line"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist 
b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist
new file mode 100644
index 00000000..e1a994f2
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist 
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>356F3976-BCAD-4414-8114-6303B2A3CA74</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.eight</key>
+      <integer>4</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.five</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.four</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.nine</key>
+      <integer>4</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.one</key>
+      <integer>4</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.seven</key>
+      <integer>4</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.three</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.two</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.zero</key>
+      <integer>3</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs/f_f_l.glif b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 
13_08/nine.glif
similarity index 53%
rename from src/Cantarell-Bold.ufo/glyphs/f_f_l.glif
rename to src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/nine.glif
index 46660f7e..c9f08e83 100644
--- a/src/Cantarell-Bold.ufo/glyphs/f_f_l.glif
+++ b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/nine.glif       
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<glyph name="f_f_l" format="2">
-  <advance width="1076"/>
+<glyph name="nine" format="2">
+  <advance width="598"/>
+  <unicode hex="0039"/>
   <outline>
-    <component base="f_f"/>
-    <component base="l" xOffset="766"/>
+    <component base="six" xScale="-1" yScale="-1" xOffset="597" yOffset="694"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>f</string>
+      <string>=|six</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
-      <string>l</string>
+      <string>=|six</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/one.glif 
b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/one.glif
new file mode 100644
index 00000000..c42cc877
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/one.glif        
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="one" format="2">
+  <advance width="451"/>
+  <unicode hex="0031"/>
+  <outline>
+    <contour>
+      <point x="198" y="55" type="line"/>
+      <point x="282" y="55" type="line"/>
+      <point x="282" y="694" type="line"/>
+      <point x="231" y="694" type="line"/>
+      <point x="42" y="571" type="line"/>
+      <point x="73" y="515" type="line"/>
+      <point x="228" y="610" type="line"/>
+      <point x="198" y="635" type="line"/>
+    </contour>
+    <contour>
+      <point x="61" y="0" type="line"/>
+      <point x="416" y="0" type="line"/>
+      <point x="416" y="71" type="line"/>
+      <point x="61" y="71" type="line"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/seven.glif 
b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/seven.glif
new file mode 100644
index 00000000..a0e5709d
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/seven.glif      
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="seven" format="2">
+  <advance width="537"/>
+  <unicode hex="0037"/>
+  <outline>
+    <contour>
+      <point x="125" y="0" type="line"/>
+      <point x="212" y="0" type="line"/>
+      <point x="500" y="654" type="line"/>
+      <point x="500" y="694" type="line"/>
+      <point x="35" y="694" type="line"/>
+      <point x="35" y="622" type="line"/>
+      <point x="435" y="622" type="line"/>
+      <point x="414" y="652" type="line"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/three.glif 
b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/three.glif
new file mode 100644
index 00000000..95208bb1
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/three.glif      
@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="three" format="2">
+  <advance width="574"/>
+  <unicode hex="0033"/>
+  <outline>
+    <contour>
+      <point x="262" y="-10" type="curve" smooth="yes"/>
+      <point x="415" y="-10"/>
+      <point x="520" y="68"/>
+      <point x="520" y="183" type="curve" smooth="yes"/>
+      <point x="520" y="285"/>
+      <point x="438" y="361"/>
+      <point x="317" y="373" type="curve"/>
+      <point x="316" y="358" type="line"/>
+      <point x="414" y="361"/>
+      <point x="482" y="436"/>
+      <point x="482" y="527" type="curve" smooth="yes"/>
+      <point x="482" y="632"/>
+      <point x="394" y="704"/>
+      <point x="267" y="704" type="curve" smooth="yes"/>
+      <point x="197" y="704"/>
+      <point x="121" y="683"/>
+      <point x="58" y="647" type="curve"/>
+      <point x="77" y="586" type="line"/>
+      <point x="137" y="614"/>
+      <point x="199" y="631"/>
+      <point x="250" y="631" type="curve" smooth="yes"/>
+      <point x="339" y="631"/>
+      <point x="397" y="585"/>
+      <point x="397" y="514" type="curve" smooth="yes"/>
+      <point x="397" y="436"/>
+      <point x="329" y="388"/>
+      <point x="218" y="388" type="curve" smooth="yes"/>
+      <point x="178" y="388" type="line"/>
+      <point x="178" y="316" type="line"/>
+      <point x="216" y="316" type="line" smooth="yes"/>
+      <point x="349" y="316"/>
+      <point x="435" y="261"/>
+      <point x="435" y="176" type="curve" smooth="yes"/>
+      <point x="435" y="105"/>
+      <point x="374" y="63"/>
+      <point x="270" y="63" type="curve" smooth="yes"/>
+      <point x="204" y="63"/>
+      <point x="126" y="80"/>
+      <point x="63" y="111" type="curve"/>
+      <point x="44" y="44" type="line"/>
+      <point x="110" y="10"/>
+      <point x="187" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/two.glif 
b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/two.glif
new file mode 100644
index 00000000..2807520f
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/two.glif        
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="two" format="2">
+  <advance width="539"/>
+  <unicode hex="0032"/>
+  <outline>
+    <contour>
+      <point x="55" y="0" type="line"/>
+      <point x="490" y="0" type="line"/>
+      <point x="490" y="72" type="line"/>
+      <point x="140" y="72" type="line"/>
+      <point x="147" y="48" type="line"/>
+      <point x="371" y="266"/>
+      <point x="461" y="383"/>
+      <point x="461" y="510" type="curve" smooth="yes"/>
+      <point x="461" y="630"/>
+      <point x="382" y="704"/>
+      <point x="253" y="704" type="curve" smooth="yes"/>
+      <point x="172" y="704"/>
+      <point x="93" y="674"/>
+      <point x="43" y="625" type="curve"/>
+      <point x="68" y="567" type="line"/>
+      <point x="117" y="607"/>
+      <point x="180" y="631"/>
+      <point x="237" y="631" type="curve" smooth="yes"/>
+      <point x="322" y="631"/>
+      <point x="376" y="579"/>
+      <point x="376" y="496" type="curve" smooth="yes"/>
+      <point x="376" y="396"/>
+      <point x="298" y="291"/>
+      <point x="55" y="55" type="curve"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/zero.glif 
b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/zero.glif
new file mode 100644
index 00000000..55729f2c
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/zero.glif       
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="zero" format="2">
+  <advance width="631"/>
+  <unicode hex="0030"/>
+  <anchor x="316" y="350" name="slash"/>
+  <outline>
+    <contour>
+      <point x="313" y="-10" type="curve" smooth="yes"/>
+      <point x="471" y="-10"/>
+      <point x="565" y="125"/>
+      <point x="565" y="352" type="curve" smooth="yes"/>
+      <point x="565" y="573"/>
+      <point x="474" y="704"/>
+      <point x="321" y="704" type="curve" smooth="yes"/>
+      <point x="161" y="704"/>
+      <point x="66" y="570"/>
+      <point x="66" y="342" type="curve" smooth="yes"/>
+      <point x="66" y="121"/>
+      <point x="158" y="-10"/>
+    </contour>
+    <contour>
+      <point x="320" y="62" type="curve" smooth="yes"/>
+      <point x="214" y="62"/>
+      <point x="151" y="170"/>
+      <point x="151" y="352" type="curve" smooth="yes"/>
+      <point x="151" y="528"/>
+      <point x="212" y="632"/>
+      <point x="314" y="632" type="curve" smooth="yes"/>
+      <point x="418" y="632"/>
+      <point x="480" y="524"/>
+      <point x="480" y="342" type="curve" smooth="yes"/>
+      <point x="480" y="166"/>
+      <point x="421" y="62"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 18_34/contents.plist 
b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 18_34/contents.plist
new file mode 100644
index 00000000..bbfa3e7f
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 18_34/contents.plist  
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>six</key>
+    <string>six.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 18_34/layerinfo.plist 
b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 18_34/layerinfo.plist
new file mode 100644
index 00000000..5868e401
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 18_34/layerinfo.plist 
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>3EF3DB61-A7B2-4A4B-8391-2A58E7C4D230</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.six</key>
+      <integer>2</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 18_34/six.glif 
b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 18_34/six.glif
new file mode 100644
index 00000000..6f6af3ab
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 18_34/six.glif        
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="six" format="2">
+  <advance width="597"/>
+  <unicode hex="0036"/>
+  <outline>
+    <contour>
+      <point x="313" y="-10" type="curve" smooth="yes"/>
+      <point x="445" y="-10"/>
+      <point x="538" y="80"/>
+      <point x="538" y="213" type="curve" smooth="yes"/>
+      <point x="538" y="338"/>
+      <point x="456" y="424"/>
+      <point x="336" y="424" type="curve" smooth="yes"/>
+      <point x="235" y="424"/>
+      <point x="155" y="364"/>
+      <point x="109" y="256" type="curve"/>
+      <point x="131" y="213" type="line"/>
+      <point x="165" y="302"/>
+      <point x="228" y="352"/>
+      <point x="307" y="352" type="curve" smooth="yes"/>
+      <point x="394" y="352"/>
+      <point x="453" y="291"/>
+      <point x="453" y="199" type="curve" smooth="yes"/>
+      <point x="453" y="115"/>
+      <point x="404" y="63"/>
+      <point x="323" y="63" type="curve" smooth="yes"/>
+      <point x="214" y="63"/>
+      <point x="154" y="159"/>
+      <point x="154" y="334" type="curve" smooth="yes"/>
+      <point x="154" y="535"/>
+      <point x="231" y="631"/>
+      <point x="360" y="631" type="curve" smooth="yes"/>
+      <point x="411" y="631"/>
+      <point x="467" y="618"/>
+      <point x="504" y="595" type="curve"/>
+      <point x="528" y="660" type="line"/>
+      <point x="493" y="687"/>
+      <point x="434" y="704"/>
+      <point x="369" y="704" type="curve" smooth="yes"/>
+      <point x="180" y="704"/>
+      <point x="64" y="567"/>
+      <point x="64" y="328" type="curve" smooth="yes"/>
+      <point x="64" y="110"/>
+      <point x="161" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.O_utline/S_hcha-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs.O_utline/S_hcha-cy.glif
new file mode 100644
index 00000000..08e5342c
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.O_utline/S_hcha-cy.glif
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="Shcha-cy" format="2">
+  <advance width="1021"/>
+  <unicode hex="0429"/>
+  <outline>
+    <contour>
+      <point x="917" y="-178" type="line"/>
+      <point x="993" y="-178" type="line"/>
+      <point x="993" y="71" type="line"/>
+      <point x="174" y="71" type="line"/>
+      <point x="174" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="917" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="458" y="30" type="line"/>
+      <point x="540" y="30" type="line"/>
+      <point x="540" y="694" type="line"/>
+      <point x="458" y="694" type="line"/>
+    </contour>
+    <contour>
+      <point x="824" y="30" type="line"/>
+      <point x="906" y="30" type="line"/>
+      <point x="906" y="694" type="line"/>
+      <point x="824" y="694" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Tse-cy</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.O_utline/contents.plist 
b/src/Cantarell-Regular.ufo/glyphs.O_utline/contents.plist
new file mode 100644
index 00000000..99caaef1
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.O_utline/contents.plist
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>Shcha-cy</key>
+    <string>S_hcha-cy.glif</string>
+    <key>shcha-cy</key>
+    <string>shcha-cy.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.O_utline/layerinfo.plist 
b/src/Cantarell-Regular.ufo/glyphs.O_utline/layerinfo.plist
new file mode 100644
index 00000000..6443fefa
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.O_utline/layerinfo.plist
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>C75345F8-91F9-4FA9-88A3-6EE91922D2A5</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.Shcha-cy</key>
+      <integer>4</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.shcha-cy</key>
+      <integer>3</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.O_utline/shcha-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs.O_utline/shcha-cy.glif
new file mode 100644
index 00000000..0f768059
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.O_utline/shcha-cy.glif
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="shcha-cy" format="2">
+  <advance width="821"/>
+  <unicode hex="0449"/>
+  <outline>
+    <contour>
+      <point x="718" y="-126" type="line"/>
+      <point x="793" y="-126" type="line"/>
+      <point x="793" y="66" type="line"/>
+      <point x="163" y="66" type="line"/>
+      <point x="163" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
+      <point x="83" y="0" type="line"/>
+      <point x="718" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="365" y="32" type="line"/>
+      <point x="444" y="32" type="line"/>
+      <point x="444" y="482" type="line"/>
+      <point x="365" y="482" type="line"/>
+    </contour>
+    <contour>
+      <point x="646" y="32" type="line"/>
+      <point x="726" y="32" type="line"/>
+      <point x="726" y="482" type="line"/>
+      <point x="646" y="482" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>height</key>
+        <integer>70</integer>
+        <key>width</key>
+        <integer>80</integer>
+      </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>tse-cy</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.S_lanted/contents.plist 
b/src/Cantarell-Regular.ufo/glyphs.S_lanted/contents.plist
new file mode 100644
index 00000000..71cd4196
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.S_lanted/contents.plist
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>el-cy</key>
+    <string>el-cy.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.S_lanted/el-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs.S_lanted/el-cy.glif
new file mode 100644
index 00000000..d259a074
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.S_lanted/el-cy.glif
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="el-cy" format="2">
+  <advance width="562"/>
+  <unicode hex="043B"/>
+  <outline>
+    <contour>
+      <point x="78" y="-10" type="curve" smooth="yes"/>
+      <point x="144" y="-10"/>
+      <point x="184" y="45"/>
+      <point x="198" y="138" type="curve" smooth="yes"/>
+      <point x="240" y="415" type="line"/>
+      <point x="399" y="415" type="line"/>
+      <point x="399" y="0" type="line"/>
+      <point x="479" y="0" type="line"/>
+      <point x="479" y="482" type="line"/>
+      <point x="172" y="482" type="line"/>
+      <point x="129" y="181" type="line" smooth="yes"/>
+      <point x="116" y="92"/>
+      <point x="103" y="61"/>
+      <point x="67" y="61" type="curve" smooth="yes"/>
+      <point x="53" y="61"/>
+      <point x="36" y="66"/>
+      <point x="17" y="74" type="curve"/>
+      <point x="0" y="14" type="line"/>
+      <point x="24" y="-2"/>
+      <point x="51" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>height</key>
+        <integer>70</integer>
+        <key>width</key>
+        <integer>80</integer>
+      </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.S_lanted/layerinfo.plist 
b/src/Cantarell-Regular.ufo/glyphs.S_lanted/layerinfo.plist
new file mode 100644
index 00000000..63f9e8fe
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.S_lanted/layerinfo.plist
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>F439CE3F-8CA8-45F8-9F41-A8211A59B6AA</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.el-cy</key>
+      <integer>2</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.S_teeper/be-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs.S_teeper/be-cy.glif
new file mode 100644
index 00000000..b8811fc2
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.S_teeper/be-cy.glif
@@ -0,0 +1,43 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="be-cy" format="2">
+  <advance width="557"/>
+  <unicode hex="0431"/>
+  <outline>
+    <contour>
+      <point x="291" y="-10" type="curve" smooth="yes"/>
+      <point x="424" y="-10"/>
+      <point x="507" y="91"/>
+      <point x="507" y="234" type="curve" smooth="yes"/>
+      <point x="507" y="371"/>
+      <point x="430" y="454"/>
+      <point x="318" y="454" type="curve" smooth="yes"/>
+      <point x="223" y="454"/>
+      <point x="148" y="394"/>
+      <point x="104" y="286" type="curve"/>
+      <point x="126" y="243" type="line"/>
+      <point x="158" y="332"/>
+      <point x="217" y="382"/>
+      <point x="289" y="382" type="curve" smooth="yes"/>
+      <point x="365" y="382"/>
+      <point x="423" y="327"/>
+      <point x="423" y="220" type="curve" smooth="yes"/>
+      <point x="423" y="125"/>
+      <point x="377" y="63"/>
+      <point x="297" y="63" type="curve" smooth="yes"/>
+      <point x="202" y="63"/>
+      <point x="142" y="152"/>
+      <point x="142" y="361" type="curve" smooth="yes"/>
+      <point x="142" y="537"/>
+      <point x="180" y="598"/>
+      <point x="319" y="634" type="curve" smooth="yes"/>
+      <point x="449" y="668" type="line"/>
+      <point x="431" y="739" type="line"/>
+      <point x="303" y="704" type="line" smooth="yes"/>
+      <point x="127" y="656"/>
+      <point x="61" y="558"/>
+      <point x="61" y="346" type="curve" smooth="yes"/>
+      <point x="61" y="103"/>
+      <point x="150" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.S_teeper/contents.plist 
b/src/Cantarell-Regular.ufo/glyphs.S_teeper/contents.plist
new file mode 100644
index 00000000..1ae1e5b4
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.S_teeper/contents.plist
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>be-cy</key>
+    <string>be-cy.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.S_teeper/layerinfo.plist 
b/src/Cantarell-Regular.ufo/glyphs.S_teeper/layerinfo.plist
new file mode 100644
index 00000000..ee9eb624
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.S_teeper/layerinfo.plist
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>A9DA48A1-3ECC-41ED-A4D4-0F6B1AB2FF56</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.be-cy</key>
+      <integer>8</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.T_emplate/florin.glif 
b/src/Cantarell-Regular.ufo/glyphs.T_emplate/florin.glif
index a653e1f1..ff3aeeda 100644
--- a/src/Cantarell-Regular.ufo/glyphs.T_emplate/florin.glif
+++ b/src/Cantarell-Regular.ufo/glyphs.T_emplate/florin.glif
@@ -8,6 +8,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>0</integer>
diff --git a/src/Cantarell-Regular.ufo/glyphs.W_avy/be-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs.W_avy/be-cy.glif
new file mode 100644
index 00000000..167b32cb
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.W_avy/be-cy.glif
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="be-cy" format="2">
+  <advance width="557"/>
+  <unicode hex="0431"/>
+  <outline>
+    <contour>
+      <point x="291" y="-10" type="curve" smooth="yes"/>
+      <point x="424" y="-10"/>
+      <point x="507" y="91"/>
+      <point x="507" y="234" type="curve" smooth="yes"/>
+      <point x="507" y="371"/>
+      <point x="430" y="454"/>
+      <point x="318" y="454" type="curve" smooth="yes"/>
+      <point x="223" y="454"/>
+      <point x="148" y="394"/>
+      <point x="104" y="286" type="curve"/>
+      <point x="126" y="243" type="line"/>
+      <point x="158" y="332"/>
+      <point x="217" y="382"/>
+      <point x="289" y="382" type="curve" smooth="yes"/>
+      <point x="365" y="382"/>
+      <point x="423" y="327"/>
+      <point x="423" y="220" type="curve" smooth="yes"/>
+      <point x="423" y="125"/>
+      <point x="377" y="63"/>
+      <point x="297" y="63" type="curve" smooth="yes"/>
+      <point x="202" y="63"/>
+      <point x="142" y="152"/>
+      <point x="142" y="361" type="curve" smooth="yes"/>
+      <point x="142" y="538"/>
+      <point x="175" y="603"/>
+      <point x="313" y="622" type="curve" smooth="yes"/>
+      <point x="386" y="632"/>
+      <point x="440" y="654"/>
+      <point x="462" y="683" type="curve"/>
+      <point x="436" y="746" type="line"/>
+      <point x="408" y="721"/>
+      <point x="359" y="702"/>
+      <point x="303" y="694" type="curve" smooth="yes"/>
+      <point x="128" y="670"/>
+      <point x="61" y="563"/>
+      <point x="61" y="346" type="curve" smooth="yes"/>
+      <point x="61" y="103"/>
+      <point x="150" y="-10"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.W_avy/contents.plist 
b/src/Cantarell-Regular.ufo/glyphs.W_avy/contents.plist
new file mode 100644
index 00000000..1ae1e5b4
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.W_avy/contents.plist
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>be-cy</key>
+    <string>be-cy.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.W_avy/layerinfo.plist 
b/src/Cantarell-Regular.ufo/glyphs.W_avy/layerinfo.plist
new file mode 100644
index 00000000..84c095c5
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.W_avy/layerinfo.plist
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>2F09CC62-E2F3-44DE-A7E9-EB8C7DB936FE</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.be-cy</key>
+      <integer>1</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_-cy.glif b/src/Cantarell-Regular.ufo/glyphs/A_-cy.glif
index b2b0da38..a1269a56 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="A-cy" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="0410"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_.glif b/src/Cantarell-Regular.ufo/glyphs/A_.glif
index 68e456df..0d184da6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_.glif
@@ -1,29 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="A" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="0041"/>
-  <note>
-A
-</note>
-  <anchor x="339" y="0" name="bottom"/>
-  <anchor x="622" y="10" name="ogonek"/>
-  <anchor x="339" y="694" name="top"/>
+  <anchor x="314" y="0" name="bottom"/>
+  <anchor x="597" y="10" name="ogonek"/>
+  <anchor x="314" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="32" y="0" type="line"/>
-      <point x="119" y="0" type="line"/>
-      <point x="346" y="636" type="line"/>
-      <point x="337" y="636" type="line"/>
-      <point x="551" y="0" type="line"/>
-      <point x="644" y="0" type="line"/>
-      <point x="400" y="694" type="line"/>
-      <point x="292" y="694" type="line"/>
+      <point x="7" y="0" type="line"/>
+      <point x="94" y="0" type="line"/>
+      <point x="321" y="636" type="line"/>
+      <point x="312" y="636" type="line"/>
+      <point x="526" y="0" type="line"/>
+      <point x="619" y="0" type="line"/>
+      <point x="375" y="694" type="line"/>
+      <point x="267" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="163" y="206" type="line"/>
-      <point x="510" y="206" type="line"/>
-      <point x="510" y="278" type="line"/>
-      <point x="163" y="278" type="line"/>
+      <point x="138" y="206" type="line"/>
+      <point x="485" y="206" type="line"/>
+      <point x="485" y="278" type="line"/>
+      <point x="138" y="278" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_E_.glif b/src/Cantarell-Regular.ufo/glyphs/A_E_.glif
index 42ab2f70..201d8b6f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_E_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_E_.glif
@@ -1,45 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="AE" format="2">
-  <advance width="977"/>
+  <advance width="919"/>
   <unicode hex="00C6"/>
-  <anchor x="530" y="0" name="bottom"/>
-  <anchor x="530" y="694" name="top"/>
+  <anchor x="476" y="0" name="bottom"/>
+  <anchor x="476" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="34" y="0" type="line"/>
-      <point x="126" y="0" type="line"/>
-      <point x="540" y="694" type="line"/>
-      <point x="457" y="694" type="line"/>
+      <point x="-20" y="0" type="line"/>
+      <point x="72" y="0" type="line"/>
+      <point x="486" y="694" type="line"/>
+      <point x="403" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="254" y="202" type="line"/>
-      <point x="530" y="202" type="line"/>
-      <point x="530" y="282" type="line"/>
-      <point x="254" y="282" type="line"/>
+      <point x="200" y="202" type="line"/>
+      <point x="476" y="202" type="line"/>
+      <point x="476" y="282" type="line"/>
+      <point x="200" y="282" type="line"/>
     </contour>
     <contour>
-      <point x="481" y="0" type="line"/>
-      <point x="564" y="0" type="line"/>
-      <point x="564" y="694" type="line"/>
-      <point x="481" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="521" y="0" type="line"/>
-      <point x="917" y="0" type="line"/>
-      <point x="917" y="72" type="line"/>
-      <point x="521" y="72" type="line"/>
-    </contour>
-    <contour>
-      <point x="521" y="323" type="line"/>
-      <point x="890" y="323" type="line"/>
-      <point x="890" y="395" type="line"/>
-      <point x="521" y="395" type="line"/>
-    </contour>
-    <contour>
-      <point x="521" y="622" type="line"/>
-      <point x="917" y="622" type="line"/>
-      <point x="917" y="694" type="line"/>
-      <point x="521" y="694" type="line"/>
+      <point x="427" y="0" type="line"/>
+      <point x="863" y="0" type="line"/>
+      <point x="863" y="72" type="line"/>
+      <point x="510" y="72" type="line"/>
+      <point x="510" y="323" type="line"/>
+      <point x="836" y="323" type="line"/>
+      <point x="836" y="395" type="line"/>
+      <point x="510" y="395" type="line"/>
+      <point x="510" y="622" type="line"/>
+      <point x="863" y="622" type="line"/>
+      <point x="863" y="694" type="line"/>
+      <point x="427" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_E_acute.glif b/src/Cantarell-Regular.ufo/glyphs/A_E_acute.glif
index 6e87ba81..943e4632 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_E_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_E_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="AEacute" format="2">
-  <advance width="977"/>
+  <advance width="919"/>
   <unicode hex="01FC"/>
   <outline>
     <component base="AE"/>
-    <component base="acutecomb.case" xOffset="442"/>
+    <component base="acutecomb.case" xOffset="388"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_acute.glif b/src/Cantarell-Regular.ufo/glyphs/A_acute.glif
index d5d03555..4e6bddf6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aacute" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="00C1"/>
   <outline>
     <component base="A"/>
-    <component base="acutecomb.case" xOffset="251"/>
+    <component base="acutecomb.case" xOffset="226"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_breve-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_breve-cy.glif
index 29fb7c6b..3d1c33bf 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_breve-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_breve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreve-cy" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="04D0"/>
   <outline>
     <component base="A-cy"/>
-    <component base="brevecomb-cy.case" xOffset="124"/>
+    <component base="brevecomb-cy.case" xOffset="99"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_breve.glif b/src/Cantarell-Regular.ufo/glyphs/A_breve.glif
index 01449a40..0ed05a90 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreve" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="0102"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.case" xOffset="130"/>
+    <component base="brevecomb.case" xOffset="105"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif
index 1c104afa..b73b7a4c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreveacute" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="1EAE"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_acutecomb.case" xOffset="164" yOffset="12"/>
+    <component base="brevecomb.loclVIET" xOffset="106" yOffset="212"/>
+    <component base="acutecomb.loclVIET" xOffset="231" yOffset="310"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_brevedotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_brevedotbelow.glif
index 732e5b83..27f54623 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_brevedotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_brevedotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevedotbelow" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="1EB6"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="203"/>
-    <component base="brevecomb.case" xOffset="130"/>
+    <component base="dotbelowcomb" xOffset="178"/>
+    <component base="brevecomb.case" xOffset="105"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif
index ef7feafd..009f20ec 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevegrave" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="1EB0"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_gravecomb.case" xOffset="157" yOffset="12"/>
+    <component base="brevecomb.loclVIET" xOffset="106" yOffset="212"/>
+    <component base="gravecomb.loclVIET" xOffset="144" yOffset="310"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_brevehookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_brevehookabove.glif
index e9543c57..d4f7ff05 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_brevehookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_brevehookabove.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevehookabove" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="1EB2"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_hookabovecomb.case" xOffset="162" yOffset="12"/>
+    <component base="brevecomb.loclVIET" xOffset="106" yOffset="212"/>
+    <component base="hookabovecomb.loclVIET" xOffset="180" yOffset="310"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_brevetilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_brevetilde.glif
index 94422baf..ca705bc9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_brevetilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_brevetilde.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevetilde" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="1EB4"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_tildecomb.case" xOffset="133" yOffset="12"/>
+    <component base="brevecomb.loclVIET" xOffset="106" yOffset="212"/>
+    <component base="tildecomb.loclVIET" xOffset="92" yOffset="310"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_caron.glif b/src/Cantarell-Regular.ufo/glyphs/A_caron.glif
index 120e4b27..cf879171 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acaron" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="01CD"/>
   <outline>
     <component base="A"/>
-    <component base="caroncomb.case" xOffset="155"/>
+    <component base="caroncomb.case" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif
index 2b6db446..3d3d84b5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflex" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="00C2"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.case" xOffset="151"/>
+    <component base="circumflexcomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflexacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflexacute.glif
index de4cdc70..f6a3b5c0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflexacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflexacute.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexacute" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="1EA4"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="173" yOffset="12"/>
+    <component base="circumflexcomb.loclVIET" xOffset="123" yOffset="212"/>
+    <component base="acutecomb.loclVIET" xOffset="361" yOffset="293"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflexdotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflexdotbelow.glif
index 210177b8..65b095cc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflexdotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexdotbelow" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="1EAC"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="203"/>
-    <component base="circumflexcomb.case" xOffset="151"/>
+    <component base="dotbelowcomb" xOffset="178"/>
+    <component base="circumflexcomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflexgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflexgrave.glif
index fc67cefe..16351143 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflexgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflexgrave.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexgrave" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="1EA6"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="173" yOffset="12"/>
+    <component base="circumflexcomb.loclVIET" xOffset="123" yOffset="212"/>
+    <component base="gravecomb.loclVIET" xOffset="274" yOffset="293"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflexhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflexhookabove.glif
index d68fef37..9ee610bb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflexhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflexhookabove.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexhookabove" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="1EA8"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="173" yOffset="12"/>
+    <component base="circumflexcomb.loclVIET" xOffset="123" yOffset="212"/>
+    <component base="hookabovecomb.loclVIET" xOffset="310" yOffset="293"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflextilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflextilde.glif
index 40b0167d..a05cd19c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflextilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflextilde.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflextilde" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="1EAA"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="140" yOffset="12"/>
+    <component base="circumflexcomb.loclVIET" xOffset="123" yOffset="212"/>
+    <component base="tildecomb.loclVIET" xOffset="93" yOffset="310"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_dblgrave.glif
index 94ad7570..49edff96 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adblgrave" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="0200"/>
   <outline>
     <component base="A"/>
-    <component base="dblgravecomb.case" xOffset="118"/>
+    <component base="dblgravecomb.case" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_dieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_dieresis-cy.glif
index 10ed757e..83188b6b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_dieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_dieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adieresis-cy" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="04D2"/>
   <outline>
     <component base="A-cy"/>
-    <component base="dieresiscomb.case" xOffset="103"/>
+    <component base="dieresiscomb.case" xOffset="78"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif
index 3234142f..a8477069 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adieresis" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="00C4"/>
   <outline>
     <component base="A"/>
-    <component base="dieresiscomb.case" xOffset="103"/>
+    <component base="dieresiscomb.case" xOffset="78"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif
index dae0e255..ce22b1c6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adotbelow" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="1EA0"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="203"/>
+    <component base="dotbelowcomb" xOffset="178"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_grave.glif b/src/Cantarell-Regular.ufo/glyphs/A_grave.glif
index 0e011bb1..46afbb5f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Agrave" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="00C0"/>
   <outline>
     <component base="A"/>
-    <component base="gravecomb.case" xOffset="144"/>
+    <component base="gravecomb.case" xOffset="119"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif
index 0f8b2d25..eaeb6375 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ahookabove" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="1EA2"/>
   <outline>
     <component base="A"/>
-    <component base="hookabovecomb.case" xOffset="195"/>
+    <component base="hookabovecomb.case" xOffset="170"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_ie-cy.glif b/src/Cantarell-Regular.ufo/glyphs/A_ie-cy.glif
index 7c00c804..d1554916 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_ie-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_ie-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aie-cy" format="2">
-  <advance width="977"/>
+  <advance width="919"/>
   <unicode hex="04D4"/>
   <outline>
     <component base="AE"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_invertedbreve.glif
index 389eb32c..eea7eb08 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ainvertedbreve" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="0202"/>
   <outline>
     <component base="A"/>
-    <component base="breveinvertedcomb.case" xOffset="142"/>
+    <component base="breveinvertedcomb.case" xOffset="117"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_macron.glif b/src/Cantarell-Regular.ufo/glyphs/A_macron.glif
index 742da92c..5c57eaa6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Amacron" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="0100"/>
   <outline>
     <component base="A"/>
-    <component base="macroncomb.case" xOffset="97"/>
+    <component base="macroncomb.case" xOffset="72"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif
index 08c36e89..13c909d0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aogonek" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="0104"/>
   <outline>
     <component base="A"/>
-    <component base="ogonekcomb" xOffset="190"/>
+    <component base="ogonekcomb" xOffset="165"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_ring.glif b/src/Cantarell-Regular.ufo/glyphs/A_ring.glif
index 93c0fe74..d0913546 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_ring.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_ring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aring" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="00C5"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb.case" xOffset="166"/>
+    <component base="ringcomb.case" xOffset="141"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif
index c33672c5..6ff232a8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aringacute" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="01FA"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb_acutecomb.case" xOffset="179"/>
+    <component base="ringcomb_acutecomb.case" xOffset="154"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/A_tilde.glif
index 235b03e5..208825cd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Atilde" format="2">
-  <advance width="677"/>
+  <advance width="626"/>
   <unicode hex="00C3"/>
   <outline>
     <component base="A"/>
-    <component base="tildecomb.case" xOffset="99"/>
+    <component base="tildecomb.case" xOffset="74"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/B_.glif b/src/Cantarell-Regular.ufo/glyphs/B_.glif
index 5dc4f301..2be365a0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/B_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/B_.glif
@@ -1,48 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="B" format="2">
-  <advance width="656"/>
+  <advance width="630"/>
   <unicode hex="0042"/>
-  <note>
-B
-</note>
-  <anchor x="326" y="0" name="bottom"/>
-  <anchor x="326" y="694" name="top"/>
+  <anchor x="314" y="0" name="bottom"/>
+  <anchor x="314" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="346" y="0" type="line" smooth="yes"/>
-      <point x="506" y="0"/>
-      <point x="600" y="75"/>
-      <point x="600" y="202" type="curve" smooth="yes"/>
-      <point x="600" y="319"/>
-      <point x="512" y="396"/>
-      <point x="379" y="396" type="curve" smooth="yes"/>
-      <point x="153" y="396" type="line"/>
-      <point x="153" y="327" type="line"/>
-      <point x="370" y="327" type="line" smooth="yes"/>
-      <point x="458" y="327"/>
-      <point x="515" y="271"/>
-      <point x="515" y="185" type="curve" smooth="yes"/>
-      <point x="515" y="105"/>
-      <point x="467" y="71"/>
-      <point x="356" y="71" type="curve" smooth="yes"/>
-      <point x="187" y="71" type="line"/>
-      <point x="187" y="623" type="line"/>
-      <point x="305" y="623" type="line" smooth="yes"/>
-      <point x="411" y="623"/>
-      <point x="463" y="584"/>
-      <point x="463" y="505" type="curve" smooth="yes"/>
-      <point x="463" y="444"/>
-      <point x="429" y="409"/>
-      <point x="337" y="375" type="curve"/>
-      <point x="457" y="375" type="line"/>
-      <point x="512" y="399"/>
-      <point x="548" y="460"/>
-      <point x="548" y="527" type="curve" smooth="yes"/>
-      <point x="548" y="633"/>
-      <point x="463" y="694"/>
-      <point x="315" y="694" type="curve" smooth="yes"/>
-      <point x="104" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="334" y="0" type="line" smooth="yes"/>
+      <point x="494" y="0"/>
+      <point x="588" y="75"/>
+      <point x="588" y="202" type="curve" smooth="yes"/>
+      <point x="588" y="319"/>
+      <point x="500" y="396"/>
+      <point x="367" y="396" type="curve" smooth="yes"/>
+      <point x="141" y="396" type="line"/>
+      <point x="141" y="327" type="line"/>
+      <point x="358" y="327" type="line" smooth="yes"/>
+      <point x="446" y="327"/>
+      <point x="503" y="271"/>
+      <point x="503" y="185" type="curve" smooth="yes"/>
+      <point x="503" y="105"/>
+      <point x="455" y="71"/>
+      <point x="344" y="71" type="curve" smooth="yes"/>
+      <point x="175" y="71" type="line"/>
+      <point x="175" y="623" type="line"/>
+      <point x="293" y="623" type="line" smooth="yes"/>
+      <point x="399" y="623"/>
+      <point x="451" y="584"/>
+      <point x="451" y="505" type="curve" smooth="yes"/>
+      <point x="451" y="444"/>
+      <point x="417" y="409"/>
+      <point x="325" y="375" type="curve"/>
+      <point x="445" y="375" type="line"/>
+      <point x="500" y="399"/>
+      <point x="536" y="460"/>
+      <point x="536" y="527" type="curve" smooth="yes"/>
+      <point x="536" y="633"/>
+      <point x="451" y="694"/>
+      <point x="303" y="694" type="curve" smooth="yes"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/B_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/B_e-cy.glif
index 142ae766..3b33d7bb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/B_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/B_e-cy.glif
@@ -1,31 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Be-cy" format="2">
-  <advance width="643"/>
+  <advance width="621"/>
   <unicode hex="0411"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="336" y="0" type="line" smooth="yes"/>
-      <point x="492" y="0"/>
-      <point x="590" y="82"/>
-      <point x="590" y="212" type="curve" smooth="yes"/>
-      <point x="590" y="332"/>
-      <point x="499" y="417"/>
-      <point x="369" y="417" type="curve" smooth="yes"/>
-      <point x="153" y="417" type="line"/>
-      <point x="153" y="345" type="line"/>
-      <point x="360" y="345" type="line" smooth="yes"/>
-      <point x="445" y="345"/>
-      <point x="505" y="284"/>
-      <point x="505" y="195" type="curve" smooth="yes"/>
-      <point x="505" y="112"/>
-      <point x="453" y="72"/>
-      <point x="346" y="72" type="curve" smooth="yes"/>
-      <point x="187" y="72" type="line"/>
-      <point x="187" y="623" type="line"/>
-      <point x="515" y="623" type="line"/>
-      <point x="515" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="324" y="0" type="line" smooth="yes"/>
+      <point x="480" y="0"/>
+      <point x="578" y="82"/>
+      <point x="578" y="212" type="curve" smooth="yes"/>
+      <point x="578" y="332"/>
+      <point x="487" y="417"/>
+      <point x="357" y="417" type="curve" smooth="yes"/>
+      <point x="141" y="417" type="line"/>
+      <point x="141" y="345" type="line"/>
+      <point x="348" y="345" type="line" smooth="yes"/>
+      <point x="433" y="345"/>
+      <point x="493" y="284"/>
+      <point x="493" y="195" type="curve" smooth="yes"/>
+      <point x="493" y="112"/>
+      <point x="441" y="72"/>
+      <point x="334" y="72" type="curve" smooth="yes"/>
+      <point x="175" y="72" type="line"/>
+      <point x="175" y="623" type="line"/>
+      <point x="503" y="623" type="line"/>
+      <point x="503" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Softsign-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_.glif b/src/Cantarell-Regular.ufo/glyphs/C_.glif
index b6b34189..44acceb4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_.glif
@@ -1,40 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="C" format="2">
-  <advance width="653"/>
+  <advance width="645"/>
   <unicode hex="0043"/>
-  <note>
-C
-</note>
-  <anchor x="374" y="0" name="bottom"/>
-  <anchor x="374" y="694" name="top"/>
+  <anchor x="367" y="0" name="bottom"/>
+  <anchor x="367" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="403" y="-10" type="curve" smooth="yes"/>
-      <point x="470" y="-10"/>
-      <point x="540" y="5"/>
-      <point x="606" y="34" type="curve"/>
-      <point x="587" y="95" type="line"/>
-      <point x="537" y="75"/>
-      <point x="475" y="63"/>
-      <point x="422" y="63" type="curve" smooth="yes"/>
-      <point x="256" y="63"/>
-      <point x="146" y="181"/>
-      <point x="146" y="358" type="curve" smooth="yes"/>
-      <point x="146" y="527"/>
-      <point x="247" y="630"/>
-      <point x="414" y="630" type="curve" smooth="yes"/>
-      <point x="470" y="630"/>
-      <point x="533" y="618"/>
-      <point x="586" y="598" type="curve"/>
-      <point x="610" y="660" type="line"/>
-      <point x="559" y="687"/>
-      <point x="487" y="703"/>
-      <point x="419" y="703" type="curve" smooth="yes"/>
-      <point x="204" y="703"/>
-      <point x="61" y="557"/>
-      <point x="61" y="339" type="curve" smooth="yes"/>
-      <point x="61" y="130"/>
-      <point x="198" y="-10"/>
+      <point x="396" y="-10" type="curve" smooth="yes"/>
+      <point x="463" y="-10"/>
+      <point x="533" y="5"/>
+      <point x="599" y="34" type="curve"/>
+      <point x="580" y="95" type="line"/>
+      <point x="530" y="75"/>
+      <point x="468" y="63"/>
+      <point x="415" y="63" type="curve" smooth="yes"/>
+      <point x="249" y="63"/>
+      <point x="139" y="181"/>
+      <point x="139" y="358" type="curve" smooth="yes"/>
+      <point x="139" y="527"/>
+      <point x="240" y="630"/>
+      <point x="407" y="630" type="curve" smooth="yes"/>
+      <point x="463" y="630"/>
+      <point x="526" y="618"/>
+      <point x="579" y="598" type="curve"/>
+      <point x="603" y="660" type="line"/>
+      <point x="552" y="687"/>
+      <point x="480" y="703"/>
+      <point x="412" y="703" type="curve" smooth="yes"/>
+      <point x="197" y="703"/>
+      <point x="54" y="557"/>
+      <point x="54" y="339" type="curve" smooth="yes"/>
+      <point x="54" y="130"/>
+      <point x="191" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_acute.glif b/src/Cantarell-Regular.ufo/glyphs/C_acute.glif
index 4c7182e0..0e650e23 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cacute" format="2">
-  <advance width="653"/>
+  <advance width="645"/>
   <unicode hex="0106"/>
   <outline>
     <component base="C"/>
-    <component base="acutecomb.case" xOffset="286"/>
+    <component base="acutecomb.case" xOffset="279"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_caron.glif b/src/Cantarell-Regular.ufo/glyphs/C_caron.glif
index a66d0728..b0641dc0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccaron" format="2">
-  <advance width="653"/>
+  <advance width="645"/>
   <unicode hex="010C"/>
   <outline>
     <component base="C"/>
-    <component base="caroncomb.case" xOffset="190"/>
+    <component base="caroncomb.case" xOffset="183"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif b/src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif
index de8c4521..33df3219 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedilla" format="2">
-  <advance width="653"/>
+  <advance width="645"/>
   <unicode hex="00C7"/>
   <outline>
     <component base="C"/>
-    <component base="cedillacomb" xOffset="227"/>
+    <component base="cedillacomb" xOffset="220"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_cedillaacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/C_cedillaacute.glif
index f5e61a20..72be0042 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_cedillaacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_cedillaacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedillaacute" format="2">
-  <advance width="653"/>
+  <advance width="645"/>
   <unicode hex="1E08"/>
   <outline>
     <component base="C"/>
-    <component base="cedillacomb" xOffset="227"/>
-    <component base="acutecomb.case" xOffset="286"/>
+    <component base="cedillacomb" xOffset="220"/>
+    <component base="acutecomb.case" xOffset="279"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif
index d84d5e8e..0c1eaede 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccircumflex" format="2">
-  <advance width="653"/>
+  <advance width="645"/>
   <unicode hex="0108"/>
   <outline>
     <component base="C"/>
-    <component base="circumflexcomb.case" xOffset="186"/>
+    <component base="circumflexcomb.case" xOffset="179"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif
index 8a51b93a..a36ab22f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cdotaccent" format="2">
-  <advance width="653"/>
+  <advance width="645"/>
   <unicode hex="010A"/>
   <outline>
     <component base="C"/>
-    <component base="dotaccentcomb.case" xOffset="238"/>
+    <component base="dotaccentcomb.case" xOffset="231"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_he-cy.glif b/src/Cantarell-Regular.ufo/glyphs/C_he-cy.glif
index 913365af..10784655 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_he-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_he-cy.glif
@@ -1,33 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Che-cy" format="2">
-  <advance width="657"/>
+  <advance width="635"/>
   <unicode hex="0427"/>
-  <anchor x="579" y="0" name="bottomright"/>
-  <anchor x="330" y="694" name="top"/>
+  <anchor x="555" y="0" name="bottomright"/>
+  <anchor x="320" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="280" y="252" type="curve" smooth="yes"/>
-      <point x="356" y="252"/>
-      <point x="447" y="278"/>
-      <point x="509" y="331" type="curve"/>
-      <point x="492" y="383" type="line"/>
-      <point x="448" y="350"/>
-      <point x="377" y="323"/>
-      <point x="302" y="323" type="curve" smooth="yes"/>
-      <point x="209" y="323"/>
-      <point x="150" y="367"/>
-      <point x="150" y="445" type="curve" smooth="yes"/>
-      <point x="150" y="694" type="line"/>
-      <point x="68" y="694" type="line"/>
-      <point x="68" y="428" type="line" smooth="yes"/>
-      <point x="68" y="321"/>
-      <point x="153" y="252"/>
+      <point x="270" y="252" type="curve" smooth="yes"/>
+      <point x="346" y="252"/>
+      <point x="437" y="278"/>
+      <point x="499" y="331" type="curve"/>
+      <point x="482" y="383" type="line"/>
+      <point x="438" y="350"/>
+      <point x="367" y="323"/>
+      <point x="292" y="323" type="curve" smooth="yes"/>
+      <point x="199" y="323"/>
+      <point x="140" y="367"/>
+      <point x="140" y="445" type="curve" smooth="yes"/>
+      <point x="140" y="694" type="line"/>
+      <point x="58" y="694" type="line"/>
+      <point x="58" y="428" type="line" smooth="yes"/>
+      <point x="58" y="321"/>
+      <point x="143" y="252"/>
     </contour>
     <contour>
-      <point x="471" y="0" type="line"/>
-      <point x="553" y="0" type="line"/>
-      <point x="553" y="694" type="line"/>
-      <point x="471" y="694" type="line"/>
+      <point x="461" y="0" type="line"/>
+      <point x="543" y="0" type="line"/>
+      <point x="543" y="694" type="line"/>
+      <point x="461" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_hedescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/C_hedescender-cy.glif
index 1e2bd5a1..322d7164 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_hedescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_hedescender-cy.glif
@@ -1,13 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chedescender-cy" format="2">
-  <advance width="694"/>
+  <advance width="658"/>
   <unicode hex="04B6"/>
   <outline>
     <component base="Che-cy"/>
-    <component base="descender-cy.case" xOffset="472"/>
+    <component base="descender-cy.case" xOffset="448"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Che-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Tse-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_hedieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/C_hedieresis-cy.glif
index acdb2440..1ef234b5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_hedieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_hedieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chedieresis-cy" format="2">
-  <advance width="657"/>
+  <advance width="635"/>
   <unicode hex="04F4"/>
   <outline>
     <component base="Che-cy"/>
-    <component base="dieresiscomb.case" xOffset="94"/>
+    <component base="dieresiscomb.case" xOffset="84"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_hekhakassian-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/C_hekhakassian-cy.glif
index 63585208..058a0cd8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_hekhakassian-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_hekhakassian-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chekhakassian-cy" format="2">
-  <advance width="657"/>
+  <advance width="635"/>
   <unicode hex="04CB"/>
   <outline>
     <component base="Che-cy"/>
-    <component base="_descenderreverse-cy.case" xOffset="400"/>
+    <component base="_descenderreverse-cy.case" xOffset="364"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_heverticalstroke-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/C_heverticalstroke-cy.glif
index 3ced4a24..f13cf511 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_heverticalstroke-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_heverticalstroke-cy.glif
@@ -1,37 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cheverticalstroke-cy" format="2">
-  <advance width="676"/>
+  <advance width="654"/>
   <unicode hex="04B8"/>
   <outline>
     <contour>
-      <point x="291" y="252" type="curve" smooth="yes"/>
-      <point x="378" y="252"/>
-      <point x="470" y="282"/>
-      <point x="532" y="331" type="curve"/>
-      <point x="513" y="382" type="line"/>
-      <point x="461" y="345"/>
-      <point x="387" y="322"/>
-      <point x="312" y="322" type="curve" smooth="yes"/>
-      <point x="209" y="322"/>
-      <point x="148" y="366"/>
-      <point x="148" y="444" type="curve" smooth="yes"/>
-      <point x="148" y="694" type="line"/>
-      <point x="68" y="694" type="line"/>
-      <point x="68" y="428" type="line" smooth="yes"/>
-      <point x="68" y="321"/>
-      <point x="156" y="252"/>
+      <point x="281" y="252" type="curve" smooth="yes"/>
+      <point x="368" y="252"/>
+      <point x="460" y="282"/>
+      <point x="522" y="331" type="curve"/>
+      <point x="503" y="382" type="line"/>
+      <point x="451" y="345"/>
+      <point x="377" y="322"/>
+      <point x="302" y="322" type="curve" smooth="yes"/>
+      <point x="199" y="322"/>
+      <point x="138" y="366"/>
+      <point x="138" y="444" type="curve" smooth="yes"/>
+      <point x="138" y="694" type="line"/>
+      <point x="58" y="694" type="line"/>
+      <point x="58" y="428" type="line" smooth="yes"/>
+      <point x="58" y="321"/>
+      <point x="146" y="252"/>
     </contour>
     <contour>
-      <point x="287" y="110" type="line"/>
-      <point x="356" y="110" type="line"/>
-      <point x="356" y="480" type="line"/>
-      <point x="287" y="480" type="line"/>
+      <point x="277" y="110" type="line"/>
+      <point x="346" y="110" type="line"/>
+      <point x="346" y="480" type="line"/>
+      <point x="277" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="492" y="0" type="line"/>
-      <point x="572" y="0" type="line"/>
-      <point x="572" y="694" type="line"/>
-      <point x="492" y="694" type="line"/>
+      <point x="482" y="0" type="line"/>
+      <point x="562" y="0" type="line"/>
+      <point x="562" y="694" type="line"/>
+      <point x="482" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Che-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_.glif b/src/Cantarell-Regular.ufo/glyphs/D_.glif
index ab11956b..ab78069f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_.glif
@@ -1,35 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="D" format="2">
-  <advance width="733"/>
+  <advance width="711"/>
   <unicode hex="0044"/>
-  <note>
-D
-</note>
-  <anchor x="334" y="0" name="bottom"/>
-  <anchor x="171" y="347" name="center"/>
-  <anchor x="334" y="694" name="top"/>
+  <anchor x="322" y="0" name="bottom"/>
+  <anchor x="159" y="347" name="center"/>
+  <anchor x="322" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="316" y="0" type="line" smooth="yes"/>
-      <point x="526" y="0"/>
-      <point x="669" y="137"/>
-      <point x="669" y="360" type="curve" smooth="yes"/>
-      <point x="669" y="570"/>
-      <point x="543" y="694"/>
-      <point x="331" y="694" type="curve" smooth="yes"/>
-      <point x="104" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="304" y="0" type="line" smooth="yes"/>
+      <point x="514" y="0"/>
+      <point x="657" y="137"/>
+      <point x="657" y="360" type="curve" smooth="yes"/>
+      <point x="657" y="570"/>
+      <point x="531" y="694"/>
+      <point x="319" y="694" type="curve" smooth="yes"/>
+      <point x="92" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="187" y="72" type="line"/>
-      <point x="187" y="622" type="line"/>
-      <point x="321" y="622" type="line" smooth="yes"/>
-      <point x="490" y="622"/>
-      <point x="584" y="523"/>
-      <point x="584" y="347" type="curve" smooth="yes"/>
-      <point x="584" y="172"/>
-      <point x="491" y="72"/>
-      <point x="326" y="72" type="curve" smooth="yes"/>
+      <point x="175" y="72" type="line"/>
+      <point x="175" y="622" type="line"/>
+      <point x="309" y="622" type="line" smooth="yes"/>
+      <point x="478" y="622"/>
+      <point x="572" y="523"/>
+      <point x="572" y="347" type="curve" smooth="yes"/>
+      <point x="572" y="172"/>
+      <point x="479" y="72"/>
+      <point x="314" y="72" type="curve" smooth="yes"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_Z_caron.glif b/src/Cantarell-Regular.ufo/glyphs/D_Z_caron.glif
index 0e9bb595..a8a9085b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_Z_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_Z_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="DZcaron" format="2">
-  <advance width="1387"/>
+  <advance width="1347"/>
   <unicode hex="01C4"/>
   <outline>
     <component base="D"/>
-    <component base="Zcaron" xOffset="733"/>
+    <component base="Zcaron" xOffset="711"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_caron.glif b/src/Cantarell-Regular.ufo/glyphs/D_caron.glif
index ef740280..be7e5d56 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dcaron" format="2">
-  <advance width="733"/>
+  <advance width="711"/>
   <unicode hex="010E"/>
   <outline>
     <component base="D"/>
-    <component base="caroncomb.case" xOffset="150"/>
+    <component base="caroncomb.case" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_croat.glif b/src/Cantarell-Regular.ufo/glyphs/D_croat.glif
index 46441219..34edd88b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_croat.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_croat.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dcroat" format="2">
-  <advance width="733"/>
+  <advance width="711"/>
   <unicode hex="0110"/>
   <outline>
     <component base="Eth"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/D_dotbelow.glif
index 89e58ee6..b8d003da 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ddotbelow" format="2">
-  <advance width="733"/>
+  <advance width="711"/>
   <unicode hex="1E0C"/>
   <outline>
     <component base="D"/>
-    <component base="dotbelowcomb" xOffset="198"/>
+    <component base="dotbelowcomb" xOffset="186"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/D_e-cy.glif
index 325c0e5e..a7cc3df4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_e-cy.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="De-cy" format="2">
-  <advance width="784"/>
+  <advance width="728"/>
   <unicode hex="0414"/>
   <outline>
     <contour>
-      <point x="92" y="17" type="line"/>
-      <point x="221" y="17"/>
-      <point x="289" y="128"/>
-      <point x="289" y="342" type="curve" smooth="yes"/>
-      <point x="289" y="624" type="line"/>
-      <point x="552" y="624" type="line"/>
-      <point x="552" y="40" type="line"/>
-      <point x="633" y="40" type="line"/>
-      <point x="633" y="694" type="line"/>
-      <point x="208" y="694" type="line"/>
-      <point x="208" y="342" type="line" smooth="yes"/>
-      <point x="208" y="161"/>
-      <point x="165" y="67"/>
-      <point x="82" y="67" type="curve"/>
+      <point x="77" y="17" type="line"/>
+      <point x="206" y="17"/>
+      <point x="269" y="129"/>
+      <point x="269" y="342" type="curve" smooth="yes"/>
+      <point x="269" y="624" type="line"/>
+      <point x="532" y="624" type="line"/>
+      <point x="532" y="40" type="line"/>
+      <point x="613" y="40" type="line"/>
+      <point x="613" y="694" type="line"/>
+      <point x="188" y="694" type="line"/>
+      <point x="188" y="342" type="line" smooth="yes"/>
+      <point x="188" y="161"/>
+      <point x="150" y="67"/>
+      <point x="67" y="67" type="curve"/>
     </contour>
     <contour>
-      <point x="39" y="-178" type="line"/>
-      <point x="114" y="-178" type="line"/>
-      <point x="114" y="0" type="line"/>
-      <point x="670" y="0" type="line"/>
-      <point x="670" y="-178" type="line"/>
-      <point x="745" y="-178" type="line"/>
-      <point x="745" y="71" type="line"/>
-      <point x="39" y="71" type="line"/>
+      <point x="28" y="-178" type="line"/>
+      <point x="103" y="-178" type="line"/>
+      <point x="103" y="0" type="line"/>
+      <point x="625" y="0" type="line"/>
+      <point x="625" y="-178" type="line"/>
+      <point x="700" y="-178" type="line"/>
+      <point x="700" y="71" type="line"/>
+      <point x="28" y="71" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_je-cy.glif b/src/Cantarell-Regular.ufo/glyphs/D_je-cy.glif
index f870fb98..ae0c51af 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_je-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_je-cy.glif
@@ -1,41 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dje-cy" format="2">
-  <advance width="800"/>
+  <advance width="780"/>
   <unicode hex="0402"/>
   <outline>
     <contour>
-      <point x="480" y="0" type="line"/>
-      <point x="640" y="6"/>
-      <point x="747" y="103"/>
-      <point x="747" y="243" type="curve" smooth="yes"/>
-      <point x="747" y="363"/>
-      <point x="662" y="442"/>
-      <point x="533" y="442" type="curve" smooth="yes"/>
-      <point x="438" y="442"/>
-      <point x="344" y="399"/>
-      <point x="293" y="333" type="curve"/>
-      <point x="312" y="282" type="line"/>
-      <point x="353" y="336"/>
-      <point x="432" y="372"/>
-      <point x="508" y="372" type="curve" smooth="yes"/>
-      <point x="603" y="372"/>
-      <point x="667" y="315"/>
-      <point x="667" y="230" type="curve" smooth="yes"/>
-      <point x="667" y="136"/>
-      <point x="590" y="69"/>
-      <point x="474" y="62" type="curve"/>
+      <point x="470" y="0" type="line"/>
+      <point x="630" y="6"/>
+      <point x="737" y="103"/>
+      <point x="737" y="243" type="curve" smooth="yes"/>
+      <point x="737" y="363"/>
+      <point x="652" y="442"/>
+      <point x="523" y="442" type="curve" smooth="yes"/>
+      <point x="428" y="442"/>
+      <point x="334" y="399"/>
+      <point x="283" y="333" type="curve"/>
+      <point x="302" y="282" type="line"/>
+      <point x="343" y="336"/>
+      <point x="422" y="372"/>
+      <point x="498" y="372" type="curve" smooth="yes"/>
+      <point x="593" y="372"/>
+      <point x="657" y="315"/>
+      <point x="657" y="230" type="curve" smooth="yes"/>
+      <point x="657" y="136"/>
+      <point x="580" y="69"/>
+      <point x="464" y="62" type="curve"/>
     </contour>
     <contour>
-      <point x="260" y="0" type="line"/>
-      <point x="343" y="0" type="line"/>
-      <point x="343" y="660" type="line"/>
-      <point x="260" y="660" type="line"/>
+      <point x="250" y="0" type="line"/>
+      <point x="333" y="0" type="line"/>
+      <point x="333" y="660" type="line"/>
+      <point x="250" y="660" type="line"/>
     </contour>
     <contour>
-      <point x="39" y="622" type="line"/>
-      <point x="585" y="622" type="line"/>
-      <point x="585" y="694" type="line"/>
-      <point x="39" y="694" type="line"/>
+      <point x="29" y="622" type="line"/>
+      <point x="575" y="622" type="line"/>
+      <point x="575" y="694" type="line"/>
+      <point x="29" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|Ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/D_linebelow.glif
index c2c157cc..41ade85c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_linebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dlinebelow" format="2">
-  <advance width="733"/>
+  <advance width="711"/>
   <unicode hex="1E0E"/>
   <outline>
     <component base="D"/>
-    <component base="macronbelowcomb" xOffset="89"/>
+    <component base="macronbelowcomb" xOffset="77"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_zcaron.glif b/src/Cantarell-Regular.ufo/glyphs/D_zcaron.glif
index db329a71..5baaf6ea 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_zcaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_zcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dzcaron" format="2">
-  <advance width="1197"/>
+  <advance width="1175"/>
   <unicode hex="01C5"/>
   <outline>
     <component base="D"/>
-    <component base="zcaron" xOffset="733"/>
+    <component base="zcaron" xOffset="711"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_ze-cy.glif b/src/Cantarell-Regular.ufo/glyphs/D_ze-cy.glif
index d828d477..7a157a8d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_ze-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_ze-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dze-cy" format="2">
-  <advance width="586"/>
+  <advance width="553"/>
   <unicode hex="0405"/>
   <outline>
     <component base="S"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_zhe-cy.glif b/src/Cantarell-Regular.ufo/glyphs/D_zhe-cy.glif
index 6334d05f..0c29531a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_zhe-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_zhe-cy.glif
@@ -1,21 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dzhe-cy" format="2">
-  <advance width="747"/>
+  <advance width="723"/>
   <unicode hex="040F"/>
   <outline>
     <contour>
-      <point x="341" y="-187" type="line"/>
-      <point x="416" y="-187" type="line"/>
-      <point x="416" y="0" type="line"/>
-      <point x="643" y="0" type="line"/>
-      <point x="643" y="694" type="line"/>
-      <point x="561" y="694" type="line"/>
-      <point x="561" y="71" type="line"/>
-      <point x="186" y="71" type="line"/>
-      <point x="186" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
-      <point x="104" y="0" type="line"/>
-      <point x="341" y="0" type="line"/>
+      <point x="329" y="-187" type="line"/>
+      <point x="404" y="-187" type="line"/>
+      <point x="404" y="0" type="line"/>
+      <point x="631" y="0" type="line"/>
+      <point x="631" y="694" type="line"/>
+      <point x="549" y="694" type="line"/>
+      <point x="549" y="71" type="line"/>
+      <point x="174" y="71" type="line"/>
+      <point x="174" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="329" y="0" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_-cy.glif
index 3e7481fa..891a85b0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_-cy.glif
@@ -1,41 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="E-cy" format="2">
-  <advance width="676"/>
+  <advance width="661"/>
   <unicode hex="0404"/>
   <outline>
     <contour>
-      <point x="84" y="320" type="line"/>
-      <point x="548" y="320" type="line"/>
-      <point x="548" y="388" type="line"/>
-      <point x="84" y="388" type="line"/>
+      <point x="406" y="-10" type="curve" smooth="yes"/>
+      <point x="475" y="-10"/>
+      <point x="547" y="5"/>
+      <point x="615" y="34" type="curve"/>
+      <point x="596" y="95" type="line"/>
+      <point x="544" y="75"/>
+      <point x="478" y="63"/>
+      <point x="425" y="63" type="curve" smooth="yes"/>
+      <point x="254" y="63"/>
+      <point x="139" y="181"/>
+      <point x="139" y="358" type="curve" smooth="yes"/>
+      <point x="139" y="527"/>
+      <point x="245" y="630"/>
+      <point x="417" y="630" type="curve" smooth="yes"/>
+      <point x="474" y="630"/>
+      <point x="540" y="618"/>
+      <point x="595" y="598" type="curve"/>
+      <point x="619" y="660" type="line"/>
+      <point x="566" y="687"/>
+      <point x="492" y="703"/>
+      <point x="422" y="703" type="curve" smooth="yes"/>
+      <point x="202" y="703"/>
+      <point x="54" y="557"/>
+      <point x="54" y="339" type="curve" smooth="yes"/>
+      <point x="54" y="130"/>
+      <point x="196" y="-10"/>
     </contour>
     <contour>
-      <point x="415" y="-10" type="curve" smooth="yes"/>
-      <point x="484" y="-10"/>
-      <point x="556" y="5"/>
-      <point x="624" y="34" type="curve"/>
-      <point x="605" y="95" type="line"/>
-      <point x="553" y="75"/>
-      <point x="487" y="63"/>
-      <point x="434" y="63" type="curve" smooth="yes"/>
-      <point x="263" y="63"/>
-      <point x="148" y="181"/>
-      <point x="148" y="358" type="curve" smooth="yes"/>
-      <point x="148" y="527"/>
-      <point x="254" y="630"/>
-      <point x="426" y="630" type="curve" smooth="yes"/>
-      <point x="483" y="630"/>
-      <point x="549" y="618"/>
-      <point x="604" y="598" type="curve"/>
-      <point x="628" y="660" type="line"/>
-      <point x="575" y="687"/>
-      <point x="501" y="703"/>
-      <point x="431" y="703" type="curve" smooth="yes"/>
-      <point x="211" y="703"/>
-      <point x="63" y="557"/>
-      <point x="63" y="339" type="curve" smooth="yes"/>
-      <point x="63" y="130"/>
-      <point x="205" y="-10"/>
+      <point x="75" y="320" type="line"/>
+      <point x="539" y="320" type="line"/>
+      <point x="539" y="388" type="line"/>
+      <point x="75" y="388" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Es-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Es-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_.glif b/src/Cantarell-Regular.ufo/glyphs/E_.glif
index 4674195f..fb3eff37 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_.glif
@@ -1,38 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="E" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="0045"/>
-  <note>
-E
-</note>
-  <anchor x="313" y="0" name="bottom"/>
-  <anchor x="518" y="10" name="ogonek"/>
-  <anchor x="333" y="694" name="top"/>
-  <anchor x="15" y="694" name="topleft"/>
+  <anchor x="301" y="0" name="bottom"/>
+  <anchor x="506" y="10" name="ogonek"/>
+  <anchor x="321" y="694" name="top"/>
+  <anchor x="3" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="187" y="0" type="line"/>
-      <point x="187" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="144" y="0" type="line"/>
-      <point x="540" y="0" type="line"/>
-      <point x="540" y="72" type="line"/>
-      <point x="144" y="72" type="line"/>
-    </contour>
-    <contour>
-      <point x="144" y="323" type="line"/>
-      <point x="513" y="323" type="line"/>
-      <point x="513" y="395" type="line"/>
-      <point x="144" y="395" type="line"/>
-    </contour>
-    <contour>
-      <point x="144" y="622" type="line"/>
-      <point x="540" y="622" type="line"/>
-      <point x="540" y="694" type="line"/>
-      <point x="144" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="528" y="0" type="line"/>
+      <point x="528" y="72" type="line"/>
+      <point x="175" y="72" type="line"/>
+      <point x="175" y="323" type="line"/>
+      <point x="501" y="323" type="line"/>
+      <point x="501" y="395" type="line"/>
+      <point x="175" y="395" type="line"/>
+      <point x="175" y="622" type="line"/>
+      <point x="528" y="622" type="line"/>
+      <point x="528" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_acute.glif b/src/Cantarell-Regular.ufo/glyphs/E_acute.glif
index e4ea2b76..d64a177b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eacute" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="00C9"/>
   <outline>
     <component base="E"/>
-    <component base="acutecomb.case" xOffset="245"/>
+    <component base="acutecomb.case" xOffset="233"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_breve.glif b/src/Cantarell-Regular.ufo/glyphs/E_breve.glif
index 57eddbd9..be443b6b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ebreve" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="0114"/>
   <outline>
     <component base="E"/>
-    <component base="brevecomb.case" xOffset="124"/>
+    <component base="brevecomb.case" xOffset="112"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_caron.glif b/src/Cantarell-Regular.ufo/glyphs/E_caron.glif
index 39b00011..9bd22dbc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecaron" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="011A"/>
   <outline>
     <component base="E"/>
-    <component base="caroncomb.case" xOffset="149"/>
+    <component base="caroncomb.case" xOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_cedillabreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_cedillabreve.glif
index 3ed8e667..d96af962 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_cedillabreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_cedillabreve.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecedillabreve" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1E1C"/>
   <outline>
     <component base="E"/>
-    <component base="cedillacomb" xOffset="166"/>
-    <component base="brevecomb.case" xOffset="124"/>
+    <component base="cedillacomb" xOffset="154"/>
+    <component base="brevecomb.case" xOffset="112"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif
index e1edec2d..8815a726 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflex" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="00CA"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.case" xOffset="145"/>
+    <component base="circumflexcomb.case" xOffset="133"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflexacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflexacute.glif
index 8257fb9a..3a694d63 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflexacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflexacute.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexacute" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1EBE"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="167" yOffset="12"/>
+    <component base="circumflexcomb.loclVIET" xOffset="130" yOffset="212"/>
+    <component base="acutecomb.loclVIET" xOffset="368" yOffset="293"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflexdotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflexdotbelow.glif
index d3f96410..762e3ffd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflexdotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexdotbelow" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1EC6"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="177"/>
-    <component base="circumflexcomb.case" xOffset="145"/>
+    <component base="dotbelowcomb" xOffset="165"/>
+    <component base="circumflexcomb.case" xOffset="133"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflexgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflexgrave.glif
index 4773ec6b..2ff838f9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflexgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflexgrave.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexgrave" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1EC0"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="167" yOffset="12"/>
+    <component base="circumflexcomb.loclVIET" xOffset="130" yOffset="212"/>
+    <component base="gravecomb.loclVIET" xOffset="281" yOffset="293"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflexhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflexhookabove.glif
index 5631b1fa..556572fd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflexhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflexhookabove.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexhookabove" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1EC2"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="167" yOffset="12"/>
+    <component base="circumflexcomb.loclVIET" xOffset="130" yOffset="212"/>
+    <component base="hookabovecomb.loclVIET" xOffset="317" yOffset="293"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflextilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflextilde.glif
index 537282ad..1faa67a3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflextilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflextilde.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflextilde" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1EC4"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="134" yOffset="12"/>
+    <component base="circumflexcomb.loclVIET" xOffset="130" yOffset="212"/>
+    <component base="tildecomb.loclVIET" xOffset="100" yOffset="310"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif
index 28382070..c2437d2a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edblgrave" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="0204"/>
   <outline>
     <component base="E"/>
-    <component base="dblgravecomb.case" xOffset="112"/>
+    <component base="dblgravecomb.case" xOffset="100"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif
index ec34832e..7d9e6df1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edieresis" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="00CB"/>
   <outline>
     <component base="E"/>
-    <component base="dieresiscomb.case" xOffset="97"/>
+    <component base="dieresiscomb.case" xOffset="85"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif
index 1e09985b..6b2ae6bf 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotaccent" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="0116"/>
   <outline>
     <component base="E"/>
-    <component base="dotaccentcomb.case" xOffset="197"/>
+    <component base="dotaccentcomb.case" xOffset="185"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif
index 39dde9e0..dbea133b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotbelow" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1EB8"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="177"/>
+    <component base="dotbelowcomb" xOffset="165"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_f-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_f-cy.glif
index 9795fcc8..420fb17a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_f-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_f-cy.glif
@@ -1,41 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ef-cy" format="2">
-  <advance width="826"/>
+  <advance width="798"/>
   <unicode hex="0424"/>
   <outline>
     <contour>
-      <point x="407" y="68" type="curve" smooth="yes"/>
-      <point x="635" y="68"/>
-      <point x="769" y="173"/>
-      <point x="769" y="350" type="curve" smooth="yes"/>
-      <point x="769" y="525"/>
-      <point x="638" y="628"/>
-      <point x="416" y="628" type="curve" smooth="yes"/>
-      <point x="190" y="628"/>
-      <point x="57" y="522"/>
-      <point x="57" y="343" type="curve" smooth="yes"/>
-      <point x="57" y="170"/>
-      <point x="187" y="68"/>
+      <point x="358" y="-20" type="line"/>
+      <point x="439" y="-20" type="line"/>
+      <point x="439" y="714" type="line"/>
+      <point x="358" y="714" type="line"/>
     </contour>
     <contour>
-      <point x="416" y="141" type="curve" smooth="yes"/>
-      <point x="244" y="141"/>
-      <point x="142" y="219"/>
-      <point x="142" y="350" type="curve" smooth="yes"/>
-      <point x="142" y="479"/>
-      <point x="240" y="555"/>
-      <point x="406" y="555" type="curve" smooth="yes"/>
-      <point x="581" y="555"/>
-      <point x="684" y="476"/>
-      <point x="684" y="343" type="curve" smooth="yes"/>
-      <point x="684" y="216"/>
-      <point x="584" y="141"/>
+      <point x="393" y="68" type="curve" smooth="yes"/>
+      <point x="621" y="68"/>
+      <point x="755" y="173"/>
+      <point x="755" y="350" type="curve" smooth="yes"/>
+      <point x="755" y="525"/>
+      <point x="624" y="628"/>
+      <point x="402" y="628" type="curve" smooth="yes"/>
+      <point x="176" y="628"/>
+      <point x="43" y="522"/>
+      <point x="43" y="343" type="curve" smooth="yes"/>
+      <point x="43" y="170"/>
+      <point x="173" y="68"/>
     </contour>
     <contour>
-      <point x="371" y="-20" type="line"/>
-      <point x="454" y="-20" type="line"/>
-      <point x="454" y="714" type="line"/>
-      <point x="371" y="714" type="line"/>
+      <point x="402" y="141" type="curve" smooth="yes"/>
+      <point x="230" y="141"/>
+      <point x="128" y="219"/>
+      <point x="128" y="350" type="curve" smooth="yes"/>
+      <point x="128" y="479"/>
+      <point x="226" y="555"/>
+      <point x="392" y="555" type="curve" smooth="yes"/>
+      <point x="567" y="555"/>
+      <point x="670" y="476"/>
+      <point x="670" y="343" type="curve" smooth="yes"/>
+      <point x="670" y="216"/>
+      <point x="570" y="141"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_grave.glif b/src/Cantarell-Regular.ufo/glyphs/E_grave.glif
index 0efbd1a4..66b7fe84 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Egrave" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="00C8"/>
   <outline>
     <component base="E"/>
-    <component base="gravecomb.case" xOffset="138"/>
+    <component base="gravecomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif
index 55266049..4b91a259 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ehookabove" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1EBA"/>
   <outline>
     <component base="E"/>
-    <component base="hookabovecomb.case" xOffset="189"/>
+    <component base="hookabovecomb.case" xOffset="177"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_invertedbreve.glif
index 90e90000..25f6f380 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Einvertedbreve" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="0206"/>
   <outline>
     <component base="E"/>
-    <component base="breveinvertedcomb.case" xOffset="136"/>
+    <component base="breveinvertedcomb.case" xOffset="124"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_l-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_l-cy.glif
index f20eca67..ecbb4893 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_l-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_l-cy.glif
@@ -1,29 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="El-cy" format="2">
-  <advance width="716"/>
+  <advance width="713"/>
   <unicode hex="041B"/>
   <outline>
     <contour>
-      <point x="108" y="-10" type="curve" smooth="yes"/>
-      <point x="210" y="-10"/>
-      <point x="259" y="75"/>
-      <point x="259" y="252" type="curve" smooth="yes"/>
-      <point x="259" y="624" type="line"/>
-      <point x="531" y="624" type="line"/>
-      <point x="531" y="0" type="line"/>
-      <point x="612" y="0" type="line"/>
-      <point x="612" y="694" type="line"/>
-      <point x="180" y="694" type="line"/>
-      <point x="180" y="252" type="line" smooth="yes"/>
-      <point x="180" y="120"/>
-      <point x="154" y="62"/>
-      <point x="95" y="62" type="curve" smooth="yes"/>
-      <point x="74" y="62"/>
-      <point x="47" y="69"/>
-      <point x="24" y="83" type="curve"/>
-      <point x="2" y="19" type="line"/>
-      <point x="31" y="1"/>
-      <point x="71" y="-10"/>
+      <point x="117" y="-10" type="curve" smooth="yes"/>
+      <point x="219" y="-10"/>
+      <point x="268" y="75"/>
+      <point x="268" y="252" type="curve" smooth="yes"/>
+      <point x="268" y="624" type="line"/>
+      <point x="540" y="624" type="line"/>
+      <point x="540" y="0" type="line"/>
+      <point x="621" y="0" type="line"/>
+      <point x="621" y="694" type="line"/>
+      <point x="189" y="694" type="line"/>
+      <point x="189" y="252" type="line" smooth="yes"/>
+      <point x="189" y="120"/>
+      <point x="163" y="62"/>
+      <point x="104" y="62" type="curve" smooth="yes"/>
+      <point x="83" y="62"/>
+      <point x="56" y="69"/>
+      <point x="33" y="83" type="curve"/>
+      <point x="11" y="19" type="line"/>
+      <point x="40" y="1"/>
+      <point x="80" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_m-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_m-cy.glif
index e7a0a0a4..18c62196 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_m-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_m-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Em-cy" format="2">
-  <advance width="883"/>
+  <advance width="859"/>
   <unicode hex="041C"/>
   <outline>
     <component base="M"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_macron.glif b/src/Cantarell-Regular.ufo/glyphs/E_macron.glif
index 73112e43..451ba8de 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacron" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="0112"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="91"/>
+    <component base="macroncomb.case" xOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_macronacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_macronacute.glif
index 0876e4b4..d84143c1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_macronacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_macronacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacronacute" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1E16"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="91"/>
-    <component base="acutecomb.case" xOffset="245" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="79"/>
+    <component base="acutecomb.case" xOffset="233" yOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_macrongrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_macrongrave.glif
index fa8c132c..65d82fde 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_macrongrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_macrongrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacrongrave" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1E14"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="91"/>
-    <component base="gravecomb.case" xOffset="138" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="79"/>
+    <component base="gravecomb.case" xOffset="126" yOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_n-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_n-cy.glif
index 380f0626..471e3ea3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_n-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_n-cy.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="En-cy" format="2">
-  <advance width="745"/>
+  <advance width="721"/>
   <unicode hex="041D"/>
-  <anchor x="672" y="0" name="bottomright"/>
+  <anchor x="641" y="0" name="bottomright"/>
   <outline>
     <component base="H"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_ndescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_ndescender-cy.glif
index 76c9ea34..89b63288 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_ndescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_ndescender-cy.glif
@@ -1,13 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Endescender-cy" format="2">
-  <advance width="787"/>
+  <advance width="744"/>
   <unicode hex="04A2"/>
   <outline>
     <component base="En-cy"/>
-    <component base="descender-cy.case" xOffset="565"/>
+    <component base="descender-cy.case" xOffset="534"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Tse-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_ng.glif b/src/Cantarell-Regular.ufo/glyphs/E_ng.glif
index 6910b8cc..0db655ae 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_ng.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_ng.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eng" format="2">
-  <advance width="774"/>
+  <advance width="750"/>
   <unicode hex="014A"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="182" y="0" type="line"/>
-      <point x="182" y="605" type="line"/>
-      <point x="165" y="605" type="line"/>
-      <point x="599" y="-25" type="line"/>
-      <point x="670" y="0" type="line"/>
-      <point x="670" y="694" type="line"/>
-      <point x="592" y="694" type="line"/>
-      <point x="592" y="87" type="line"/>
-      <point x="610" y="87" type="line"/>
-      <point x="199" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="587" y="-25" type="line"/>
+      <point x="658" y="0" type="line"/>
+      <point x="658" y="694" type="line"/>
+      <point x="580" y="694" type="line"/>
+      <point x="580" y="87" type="line"/>
+      <point x="598" y="87" type="line"/>
+      <point x="187" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="170" y="0" type="line"/>
+      <point x="170" y="605" type="line"/>
+      <point x="153" y="605" type="line"/>
     </contour>
     <contour>
-      <point x="547" y="-234" type="line"/>
-      <point x="621" y="-201"/>
-      <point x="670" y="-117"/>
-      <point x="670" y="-23" type="curve" smooth="yes"/>
-      <point x="670" y="0" type="line"/>
-      <point x="590" y="0" type="line"/>
-      <point x="590" y="-35" type="line" smooth="yes"/>
-      <point x="590" y="-102"/>
-      <point x="562" y="-162"/>
-      <point x="520" y="-186" type="curve"/>
+      <point x="535" y="-234" type="line"/>
+      <point x="609" y="-201"/>
+      <point x="658" y="-117"/>
+      <point x="658" y="-23" type="curve" smooth="yes"/>
+      <point x="658" y="0" type="line"/>
+      <point x="578" y="0" type="line"/>
+      <point x="578" y="-35" type="line" smooth="yes"/>
+      <point x="578" y="-102"/>
+      <point x="550" y="-162"/>
+      <point x="508" y="-186" type="curve"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_nghe-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_nghe-cy.glif
index e64de6b9..37b8ea49 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_nghe-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_nghe-cy.glif
@@ -1,31 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Enghe-cy" format="2">
-  <advance width="926"/>
+  <advance width="919"/>
   <unicode hex="04A4"/>
   <outline>
     <contour>
-      <point x="558" y="0" type="line"/>
-      <point x="641" y="0" type="line"/>
-      <point x="641" y="694" type="line"/>
-      <point x="558" y="694" type="line"/>
+      <point x="546" y="0" type="line"/>
+      <point x="629" y="0" type="line"/>
+      <point x="629" y="622" type="line"/>
+      <point x="890" y="622" type="line"/>
+      <point x="890" y="694" type="line"/>
+      <point x="546" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="187" y="0" type="line"/>
-      <point x="187" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="136" y="323" type="line"/>
-      <point x="606" y="323" type="line"/>
-      <point x="606" y="395" type="line"/>
-      <point x="136" y="395" type="line"/>
-    </contour>
-    <contour>
-      <point x="558" y="622" type="line"/>
-      <point x="902" y="622" type="line"/>
-      <point x="902" y="694" type="line"/>
-      <point x="558" y="694" type="line"/>
+      <point x="124" y="323" type="line"/>
+      <point x="594" y="323" type="line"/>
+      <point x="594" y="395" type="line"/>
+      <point x="124" y="395" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif
index 4a44b4b9..4b665886 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eogonek" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="0118"/>
   <anchor x="303" y="694" name="top"/>
   <outline>
     <component base="E"/>
-    <component base="ogonekcomb" xOffset="86"/>
+    <component base="ogonekcomb" xOffset="74"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif
index 2eee313c..e30145a2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Er-cy" format="2">
-  <advance width="618"/>
+  <advance width="590"/>
   <unicode hex="0420"/>
   <outline>
     <component base="P"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_reversed-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_reversed-cy.glif
index c75339b3..f556337c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_reversed-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_reversed-cy.glif
@@ -1,42 +1,50 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ereversed-cy" format="2">
-  <advance width="679"/>
+  <advance width="660"/>
   <unicode hex="042D"/>
-  <anchor x="340" y="694" name="top"/>
+  <anchor x="331" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="260" y="-10" type="curve" smooth="yes"/>
-      <point x="473" y="-10"/>
-      <point x="615" y="132"/>
-      <point x="615" y="352" type="curve" smooth="yes"/>
-      <point x="615" y="566"/>
-      <point x="481" y="703"/>
-      <point x="274" y="703" type="curve" smooth="yes"/>
-      <point x="202" y="703"/>
-      <point x="121" y="687"/>
-      <point x="55" y="659" type="curve"/>
-      <point x="74" y="598" type="line"/>
-      <point x="126" y="617"/>
-      <point x="198" y="630"/>
-      <point x="255" y="630" type="curve" smooth="yes"/>
-      <point x="423" y="630"/>
-      <point x="530" y="515"/>
-      <point x="530" y="335" type="curve" smooth="yes"/>
-      <point x="530" y="163"/>
-      <point x="432" y="63"/>
-      <point x="262" y="63" type="curve" smooth="yes"/>
-      <point x="201" y="63"/>
-      <point x="131" y="75"/>
-      <point x="75" y="95" type="curve"/>
-      <point x="51" y="33" type="line"/>
-      <point x="102" y="7"/>
-      <point x="185" y="-10"/>
+      <point x="251" y="-10" type="curve" smooth="yes"/>
+      <point x="464" y="-10"/>
+      <point x="606" y="132"/>
+      <point x="606" y="352" type="curve" smooth="yes"/>
+      <point x="606" y="566"/>
+      <point x="472" y="703"/>
+      <point x="265" y="703" type="curve" smooth="yes"/>
+      <point x="193" y="703"/>
+      <point x="112" y="687"/>
+      <point x="46" y="659" type="curve"/>
+      <point x="65" y="598" type="line"/>
+      <point x="117" y="617"/>
+      <point x="189" y="630"/>
+      <point x="246" y="630" type="curve" smooth="yes"/>
+      <point x="414" y="630"/>
+      <point x="521" y="515"/>
+      <point x="521" y="335" type="curve" smooth="yes"/>
+      <point x="521" y="163"/>
+      <point x="423" y="63"/>
+      <point x="253" y="63" type="curve" smooth="yes"/>
+      <point x="192" y="63"/>
+      <point x="122" y="75"/>
+      <point x="66" y="95" type="curve"/>
+      <point x="42" y="33" type="line"/>
+      <point x="93" y="7"/>
+      <point x="176" y="-10"/>
     </contour>
     <contour>
-      <point x="109" y="323" type="line"/>
-      <point x="569" y="323" type="line"/>
-      <point x="569" y="391" type="line"/>
-      <point x="109" y="391" type="line"/>
+      <point x="100" y="323" type="line"/>
+      <point x="560" y="323" type="line"/>
+      <point x="560" y="391" type="line"/>
+      <point x="100" y="391" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|Es-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|Es-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif
index d1f8d40b..ce9e21b8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Es-cy" format="2">
-  <advance width="653"/>
+  <advance width="645"/>
   <unicode hex="0421"/>
   <anchor x="380" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_sdescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_sdescender-cy.glif
index 1f988a9e..fd868e08 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_sdescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_sdescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Esdescender-cy" format="2">
-  <advance width="653"/>
+  <advance width="645"/>
   <unicode hex="04AA"/>
   <outline>
     <component base="Es-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_th.glif b/src/Cantarell-Regular.ufo/glyphs/E_th.glif
index e8032e26..3c22857e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_th.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_th.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eth" format="2">
-  <advance width="733"/>
+  <advance width="711"/>
   <unicode hex="00D0"/>
   <outline>
     <component base="D"/>
-    <component base="strokeshortcomb.case" xOffset="-57" yOffset="49"/>
+    <component base="strokeshortcomb.case" xOffset="-69" yOffset="49"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/E_tilde.glif
index 397033e7..a78c7c76 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etilde" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1EBC"/>
   <outline>
     <component base="E"/>
-    <component base="tildecomb.case" xOffset="93"/>
+    <component base="tildecomb.case" xOffset="81"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/F_.glif b/src/Cantarell-Regular.ufo/glyphs/F_.glif
index 87ba8327..d0f78e4a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/F_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/F_.glif
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="F" format="2">
-  <advance width="582"/>
+  <advance width="563"/>
   <unicode hex="0046"/>
-  <note>
-F
-</note>
-  <anchor x="271" y="0" name="bottom"/>
-  <anchor x="271" y="694" name="top"/>
+  <anchor x="259" y="0" name="bottom"/>
+  <anchor x="259" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="187" y="0" type="line"/>
-      <point x="187" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="136" y="322" type="line"/>
-      <point x="506" y="322" type="line"/>
-      <point x="506" y="394" type="line"/>
-      <point x="136" y="394" type="line"/>
-    </contour>
-    <contour>
-      <point x="136" y="622" type="line"/>
-      <point x="535" y="622" type="line"/>
-      <point x="535" y="694" type="line"/>
-      <point x="136" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="322" type="line"/>
+      <point x="494" y="322" type="line"/>
+      <point x="494" y="394" type="line"/>
+      <point x="175" y="394" type="line"/>
+      <point x="175" y="622" type="line"/>
+      <point x="523" y="622" type="line"/>
+      <point x="523" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/F_ita-cy.glif b/src/Cantarell-Regular.ufo/glyphs/F_ita-cy.glif
index 82f28af6..35648400 100644
--- a/src/Cantarell-Regular.ufo/glyphs/F_ita-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/F_ita-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Fita-cy" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="0472"/>
   <outline>
     <component base="Obarred-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_.glif b/src/Cantarell-Regular.ufo/glyphs/G_.glif
index a4a98c89..9c3fe392 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_.glif
@@ -1,45 +1,48 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="G" format="2">
-  <advance width="739"/>
+  <advance width="715"/>
   <unicode hex="0047"/>
-  <note>
-G
-</note>
-  <anchor x="403" y="0" name="bottom"/>
-  <anchor x="403" y="694" name="top"/>
+  <anchor x="393" y="0" name="bottom"/>
+  <anchor x="393" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="412" y="-9" type="curve" smooth="yes"/>
-      <point x="508" y="-9"/>
-      <point x="595" y="19"/>
-      <point x="665" y="74" type="curve"/>
-      <point x="665" y="368" type="line"/>
-      <point x="385" y="368" type="line"/>
-      <point x="385" y="296" type="line"/>
-      <point x="582" y="296" type="line"/>
-      <point x="582" y="71" type="line"/>
-      <point x="601" y="112" type="line"/>
-      <point x="547" y="81"/>
-      <point x="486" y="64"/>
-      <point x="424" y="64" type="curve" smooth="yes"/>
-      <point x="257" y="64"/>
-      <point x="149" y="179"/>
-      <point x="149" y="357" type="curve" smooth="yes"/>
-      <point x="149" y="530"/>
-      <point x="248" y="630"/>
-      <point x="417" y="630" type="curve" smooth="yes"/>
-      <point x="480" y="630"/>
-      <point x="553" y="616"/>
-      <point x="614" y="593" type="curve"/>
-      <point x="638" y="657" type="line"/>
-      <point x="577" y="687"/>
-      <point x="504" y="703"/>
-      <point x="428" y="703" type="curve" smooth="yes"/>
-      <point x="209" y="703"/>
-      <point x="64" y="560"/>
-      <point x="64" y="342" type="curve" smooth="yes"/>
-      <point x="64" y="130"/>
-      <point x="202" y="-9"/>
+      <point x="402" y="-9" type="curve" smooth="yes"/>
+      <point x="498" y="-9"/>
+      <point x="585" y="19"/>
+      <point x="655" y="74" type="curve"/>
+      <point x="655" y="368" type="line"/>
+      <point x="375" y="368" type="line"/>
+      <point x="375" y="296" type="line"/>
+      <point x="572" y="296" type="line"/>
+      <point x="572" y="71" type="line"/>
+      <point x="591" y="112" type="line"/>
+      <point x="537" y="81"/>
+      <point x="476" y="64"/>
+      <point x="414" y="64" type="curve" smooth="yes"/>
+      <point x="247" y="64"/>
+      <point x="139" y="179"/>
+      <point x="139" y="357" type="curve" smooth="yes"/>
+      <point x="139" y="530"/>
+      <point x="238" y="630"/>
+      <point x="407" y="630" type="curve" smooth="yes"/>
+      <point x="470" y="630"/>
+      <point x="543" y="616"/>
+      <point x="604" y="593" type="curve"/>
+      <point x="628" y="657" type="line"/>
+      <point x="567" y="687"/>
+      <point x="494" y="703"/>
+      <point x="418" y="703" type="curve" smooth="yes"/>
+      <point x="199" y="703"/>
+      <point x="54" y="560"/>
+      <point x="54" y="342" type="curve" smooth="yes"/>
+      <point x="54" y="130"/>
+      <point x="192" y="-9"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_breve.glif b/src/Cantarell-Regular.ufo/glyphs/G_breve.glif
index 600e3877..bf02f17e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gbreve" format="2">
-  <advance width="739"/>
+  <advance width="715"/>
   <unicode hex="011E"/>
   <outline>
     <component base="G"/>
-    <component base="brevecomb.case" xOffset="194"/>
+    <component base="brevecomb.case" xOffset="184"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_caron.glif b/src/Cantarell-Regular.ufo/glyphs/G_caron.glif
index 6ae06373..da386c6c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcaron" format="2">
-  <advance width="739"/>
+  <advance width="715"/>
   <unicode hex="01E6"/>
   <outline>
     <component base="G"/>
-    <component base="caroncomb.case" xOffset="219"/>
+    <component base="caroncomb.case" xOffset="209"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif
index 63350ccf..00f0ff3f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcircumflex" format="2">
-  <advance width="739"/>
+  <advance width="715"/>
   <unicode hex="011C"/>
   <outline>
     <component base="G"/>
-    <component base="circumflexcomb.case" xOffset="215"/>
+    <component base="circumflexcomb.case" xOffset="205"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_commaaccent.glif
index 4cb91a70..0a6ca522 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcommaaccent" format="2">
-  <advance width="739"/>
+  <advance width="715"/>
   <unicode hex="0122"/>
   <outline>
     <component base="G"/>
-    <component base="commaaccentcomb" xOffset="237"/>
+    <component base="commaaccentcomb" xOffset="227"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif
index 9ddd3339..07628249 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gdotaccent" format="2">
-  <advance width="739"/>
+  <advance width="715"/>
   <unicode hex="0120"/>
   <outline>
     <component base="G"/>
-    <component base="dotaccentcomb.case" xOffset="267"/>
+    <component base="dotaccentcomb.case" xOffset="257"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/G_e-cy.glif
index 117a468f..2e22c962 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_e-cy.glif
@@ -1,17 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ge-cy" format="2">
-  <advance width="550"/>
+  <advance width="542"/>
   <unicode hex="0413"/>
-  <anchor x="196" y="0" name="bottomright"/>
-  <anchor x="286" y="694" name="top"/>
+  <anchor x="187" y="0" name="bottomright"/>
+  <anchor x="274" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="187" y="0" type="line"/>
-      <point x="187" y="620" type="line"/>
-      <point x="525" y="620" type="line"/>
-      <point x="525" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="620" type="line"/>
+      <point x="513" y="620" type="line"/>
+      <point x="513" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_edescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_edescender-cy.glif
index a75be52a..50fbe122 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_edescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_edescender-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gedescender-cy" format="2">
-  <advance width="550"/>
+  <advance width="542"/>
   <unicode hex="04F6"/>
   <outline>
     <component base="Ge-cy"/>
-    <component base="descender-cy.case" xOffset="89"/>
+    <component base="descender-cy.case" xOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_ermandbls.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_ermandbls.glif
index 55b4085c..8936f214 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_ermandbls.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_ermandbls.glif
@@ -1,46 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Germandbls" format="2">
-  <advance width="716"/>
+  <advance width="692"/>
   <unicode hex="1E9E"/>
   <outline>
     <contour>
-      <point x="447" y="-10" type="curve" smooth="yes"/>
-      <point x="576" y="-10"/>
-      <point x="662" y="66"/>
-      <point x="662" y="181" type="curve" smooth="yes"/>
-      <point x="662" y="283"/>
-      <point x="594" y="364"/>
-      <point x="466" y="388" type="curve"/>
-      <point x="476" y="352" type="line"/>
-      <point x="612" y="583" type="line"/>
-      <point x="579" y="657"/>
-      <point x="483" y="704"/>
-      <point x="366" y="704" type="curve" smooth="yes"/>
-      <point x="201" y="704"/>
-      <point x="93" y="610"/>
-      <point x="93" y="468" type="curve" smooth="yes"/>
-      <point x="93" y="0" type="line"/>
-      <point x="176" y="0" type="line"/>
-      <point x="176" y="468" type="line" smooth="yes"/>
-      <point x="176" y="566"/>
-      <point x="246" y="631"/>
-      <point x="361" y="631" type="curve" smooth="yes"/>
-      <point x="434" y="631"/>
-      <point x="495" y="605"/>
-      <point x="518" y="565" type="curve"/>
-      <point x="383" y="332" type="line"/>
-      <point x="508" y="312"/>
-      <point x="577" y="255"/>
-      <point x="577" y="171" type="curve" smooth="yes"/>
-      <point x="577" y="102"/>
-      <point x="531" y="63"/>
-      <point x="452" y="63" type="curve" smooth="yes"/>
-      <point x="410" y="63"/>
-      <point x="357" y="74"/>
-      <point x="317" y="91" type="curve"/>
-      <point x="292" y="26" type="line"/>
-      <point x="336" y="3"/>
-      <point x="392" y="-10"/>
+      <point x="437" y="-10" type="curve" smooth="yes"/>
+      <point x="566" y="-10"/>
+      <point x="652" y="66"/>
+      <point x="652" y="181" type="curve" smooth="yes"/>
+      <point x="652" y="283"/>
+      <point x="584" y="364"/>
+      <point x="456" y="388" type="curve"/>
+      <point x="466" y="352" type="line"/>
+      <point x="602" y="583" type="line"/>
+      <point x="569" y="657"/>
+      <point x="473" y="704"/>
+      <point x="356" y="704" type="curve" smooth="yes"/>
+      <point x="191" y="704"/>
+      <point x="83" y="610"/>
+      <point x="83" y="468" type="curve" smooth="yes"/>
+      <point x="83" y="0" type="line"/>
+      <point x="166" y="0" type="line"/>
+      <point x="166" y="468" type="line" smooth="yes"/>
+      <point x="166" y="566"/>
+      <point x="236" y="631"/>
+      <point x="351" y="631" type="curve" smooth="yes"/>
+      <point x="424" y="631"/>
+      <point x="485" y="605"/>
+      <point x="508" y="565" type="curve"/>
+      <point x="373" y="332" type="line"/>
+      <point x="498" y="312"/>
+      <point x="567" y="255"/>
+      <point x="567" y="171" type="curve" smooth="yes"/>
+      <point x="567" y="102"/>
+      <point x="521" y="63"/>
+      <point x="442" y="63" type="curve" smooth="yes"/>
+      <point x="400" y="63"/>
+      <point x="347" y="74"/>
+      <point x="307" y="91" type="curve"/>
+      <point x="282" y="26" type="line"/>
+      <point x="326" y="3"/>
+      <point x="382" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_hemiddlehook-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_hemiddlehook-cy.glif
index 596c1c05..9cedfc80 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_hemiddlehook-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_hemiddlehook-cy.glif
@@ -1,37 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ghemiddlehook-cy" format="2">
-  <advance width="683"/>
+  <advance width="655"/>
   <unicode hex="0494"/>
   <outline>
     <contour>
-      <point x="290" y="-235" type="line"/>
-      <point x="500" y="-207"/>
-      <point x="626" y="-74"/>
-      <point x="626" y="120" type="curve" smooth="yes"/>
-      <point x="626" y="291"/>
-      <point x="528" y="402"/>
-      <point x="379" y="402" type="curve" smooth="yes"/>
-      <point x="286" y="402"/>
-      <point x="190" y="359"/>
-      <point x="137" y="293" type="curve"/>
-      <point x="156" y="242" type="line"/>
-      <point x="198" y="296"/>
-      <point x="276" y="332"/>
-      <point x="351" y="332" type="curve" smooth="yes"/>
-      <point x="469" y="332"/>
-      <point x="541" y="245"/>
-      <point x="541" y="103" type="curve" smooth="yes"/>
-      <point x="541" y="-61"/>
-      <point x="444" y="-167"/>
-      <point x="279" y="-185" type="curve"/>
+      <point x="278" y="-235" type="line"/>
+      <point x="488" y="-207"/>
+      <point x="614" y="-74"/>
+      <point x="614" y="120" type="curve" smooth="yes"/>
+      <point x="614" y="291"/>
+      <point x="516" y="402"/>
+      <point x="367" y="402" type="curve" smooth="yes"/>
+      <point x="274" y="402"/>
+      <point x="178" y="359"/>
+      <point x="125" y="293" type="curve"/>
+      <point x="144" y="242" type="line"/>
+      <point x="186" y="296"/>
+      <point x="264" y="332"/>
+      <point x="339" y="332" type="curve" smooth="yes"/>
+      <point x="457" y="332"/>
+      <point x="529" y="245"/>
+      <point x="529" y="103" type="curve" smooth="yes"/>
+      <point x="529" y="-61"/>
+      <point x="432" y="-167"/>
+      <point x="267" y="-185" type="curve"/>
     </contour>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="187" y="0" type="line"/>
-      <point x="187" y="622" type="line"/>
-      <point x="515" y="622" type="line"/>
-      <point x="515" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="622" type="line"/>
+      <point x="503" y="622" type="line"/>
+      <point x="503" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_hestroke-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_hestroke-cy.glif
index 91d3510f..d9d8f143 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_hestroke-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_hestroke-cy.glif
@@ -1,21 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ghestroke-cy" format="2">
-  <advance width="560"/>
+  <advance width="539"/>
   <unicode hex="0492"/>
   <outline>
     <contour>
-      <point x="125" y="0" type="line"/>
-      <point x="208" y="0" type="line"/>
-      <point x="208" y="622" type="line"/>
-      <point x="536" y="622" type="line"/>
-      <point x="536" y="694" type="line"/>
-      <point x="125" y="694" type="line"/>
+      <point x="99" y="0" type="line"/>
+      <point x="182" y="0" type="line"/>
+      <point x="182" y="622" type="line"/>
+      <point x="510" y="622" type="line"/>
+      <point x="510" y="694" type="line"/>
+      <point x="99" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="35" y="295" type="line"/>
-      <point x="375" y="295" type="line"/>
-      <point x="375" y="360" type="line"/>
-      <point x="35" y="360" type="line"/>
+      <point x="9" y="295" type="line"/>
+      <point x="349" y="295" type="line"/>
+      <point x="349" y="360" type="line"/>
+      <point x="9" y="360" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Eth</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_heupturn-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_heupturn-cy.glif
index 84c0e162..888463de 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_heupturn-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_heupturn-cy.glif
@@ -1,17 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gheupturn-cy" format="2">
-  <advance width="549"/>
+  <advance width="542"/>
   <unicode hex="0490"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="187" y="0" type="line"/>
-      <point x="187" y="622" type="line"/>
-      <point x="525" y="622" type="line"/>
-      <point x="525" y="854" type="line"/>
-      <point x="459" y="854" type="line"/>
-      <point x="459" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="622" type="line"/>
+      <point x="513" y="622" type="line"/>
+      <point x="513" y="854" type="line"/>
+      <point x="447" y="854" type="line"/>
+      <point x="447" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_je-cy.glif b/src/Cantarell-Regular.ufo/glyphs/G_je-cy.glif
index 1277596c..5b339957 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_je-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_je-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gje-cy" format="2">
-  <advance width="550"/>
+  <advance width="542"/>
   <unicode hex="0403"/>
   <outline>
     <component base="Ge-cy"/>
-    <component base="acutecomb.case" xOffset="198"/>
+    <component base="acutecomb.case" xOffset="186"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_macron.glif b/src/Cantarell-Regular.ufo/glyphs/G_macron.glif
index 5fbe89b2..5a0d86ae 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gmacron" format="2">
-  <advance width="739"/>
+  <advance width="715"/>
   <unicode hex="1E20"/>
   <outline>
     <component base="G"/>
-    <component base="macroncomb.case" xOffset="161"/>
+    <component base="macroncomb.case" xOffset="151"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_.glif b/src/Cantarell-Regular.ufo/glyphs/H_.glif
index e17b1f31..be1ae3b9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_.glif
@@ -1,32 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="H" format="2">
-  <advance width="745"/>
+  <advance width="721"/>
   <unicode hex="0048"/>
-  <note>
-H
-</note>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="373" y="539" name="center"/>
-  <anchor x="373" y="694" name="top"/>
-  <anchor x="15" y="694" name="topleft"/>
+  <anchor x="361" y="0" name="bottom"/>
+  <anchor x="361" y="539" name="center"/>
+  <anchor x="361" y="694" name="top"/>
+  <anchor x="3" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="558" y="0" type="line"/>
-      <point x="641" y="0" type="line"/>
-      <point x="641" y="694" type="line"/>
-      <point x="558" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="187" y="0" type="line"/>
-      <point x="187" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="136" y="323" type="line"/>
-      <point x="606" y="323" type="line"/>
-      <point x="606" y="395" type="line"/>
-      <point x="136" y="395" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="323" type="line"/>
+      <point x="546" y="323" type="line"/>
+      <point x="546" y="0" type="line"/>
+      <point x="629" y="0" type="line"/>
+      <point x="629" y="694" type="line"/>
+      <point x="546" y="694" type="line"/>
+      <point x="546" y="395" type="line"/>
+      <point x="175" y="395" type="line"/>
+      <point x="175" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif b/src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif
index 6f9236b1..4714d83c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ha-cy" format="2">
-  <advance width="633"/>
+  <advance width="596"/>
   <unicode hex="0425"/>
-  <anchor x="584" y="0" name="bottomright"/>
+  <anchor x="544" y="0" name="bottomright"/>
   <outline>
     <component base="X"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_adescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/H_adescender-cy.glif
index 57060bdc..331d95fd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_adescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_adescender-cy.glif
@@ -1,13 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hadescender-cy" format="2">
-  <advance width="712"/>
+  <advance width="647"/>
   <unicode hex="04B2"/>
   <outline>
-    <component base="Ha-cy" xOffset="13"/>
-    <component base="descender-cy.case" xOffset="490"/>
+    <component base="Ha-cy"/>
+    <component base="descender-cy.case" xOffset="437"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Ha-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Tse-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_ardsign-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/H_ardsign-cy.glif
index d09d0c7c..c8185d78 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_ardsign-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_ardsign-cy.glif
@@ -1,32 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hardsign-cy" format="2">
-  <advance width="743"/>
+  <advance width="723"/>
   <unicode hex="042A"/>
-  <anchor x="373" y="694" name="top"/>
+  <anchor x="363" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="218" y="0" type="line"/>
-      <point x="443" y="0" type="line" smooth="yes"/>
-      <point x="592" y="0"/>
-      <point x="690" y="85"/>
-      <point x="690" y="217" type="curve" smooth="yes"/>
-      <point x="690" y="339"/>
-      <point x="600" y="427"/>
-      <point x="476" y="427" type="curve" smooth="yes"/>
-      <point x="268" y="427" type="line"/>
-      <point x="268" y="355" type="line"/>
-      <point x="466" y="355" type="line" smooth="yes"/>
-      <point x="546" y="355"/>
-      <point x="605" y="290"/>
-      <point x="605" y="200" type="curve" smooth="yes"/>
-      <point x="605" y="115"/>
-      <point x="553" y="72"/>
-      <point x="453" y="72" type="curve" smooth="yes"/>
-      <point x="301" y="72" type="line"/>
-      <point x="301" y="694" type="line"/>
-      <point x="39" y="694" type="line"/>
-      <point x="39" y="622" type="line"/>
-      <point x="218" y="622" type="line"/>
+      <point x="208" y="0" type="line"/>
+      <point x="433" y="0" type="line" smooth="yes"/>
+      <point x="582" y="0"/>
+      <point x="680" y="85"/>
+      <point x="680" y="217" type="curve" smooth="yes"/>
+      <point x="680" y="339"/>
+      <point x="590" y="427"/>
+      <point x="466" y="427" type="curve" smooth="yes"/>
+      <point x="258" y="427" type="line"/>
+      <point x="258" y="355" type="line"/>
+      <point x="456" y="355" type="line" smooth="yes"/>
+      <point x="536" y="355"/>
+      <point x="595" y="290"/>
+      <point x="595" y="200" type="curve" smooth="yes"/>
+      <point x="595" y="115"/>
+      <point x="543" y="72"/>
+      <point x="443" y="72" type="curve" smooth="yes"/>
+      <point x="291" y="72" type="line"/>
+      <point x="291" y="694" type="line"/>
+      <point x="29" y="694" type="line"/>
+      <point x="29" y="622" type="line"/>
+      <point x="208" y="622" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|Ge-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Softsign-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_bar.glif b/src/Cantarell-Regular.ufo/glyphs/H_bar.glif
index 09848176..1865f4b4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_bar.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_bar.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hbar" format="2">
-  <advance width="745"/>
+  <advance width="721"/>
   <unicode hex="0126"/>
   <outline>
     <component base="H"/>
-    <component base="strokelongcomb" xOffset="-72" yOffset="197"/>
+    <component base="strokelongcomb" xOffset="-84" yOffset="197"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_brevebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/H_brevebelow.glif
index ce1a159a..99d5bc73 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_brevebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_brevebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hbrevebelow" format="2">
-  <advance width="745"/>
+  <advance width="721"/>
   <unicode hex="1E2A"/>
   <outline>
     <component base="H"/>
-    <component base="brevebelowcomb" xOffset="167"/>
+    <component base="brevebelowcomb" xOffset="155"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/H_circumflex.glif
index 6a5394f2..51dd9940 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hcircumflex" format="2">
-  <advance width="745"/>
+  <advance width="721"/>
   <unicode hex="0124"/>
   <outline>
     <component base="H"/>
-    <component base="circumflexcomb.case" xOffset="185"/>
+    <component base="circumflexcomb.case" xOffset="173"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/H_dotbelow.glif
index 29d46e8f..68998e48 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hdotbelow" format="2">
-  <advance width="745"/>
+  <advance width="721"/>
   <unicode hex="1E24"/>
   <outline>
     <component base="H"/>
-    <component base="dotbelowcomb" xOffset="237"/>
+    <component base="dotbelowcomb" xOffset="225"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_-cy.glif b/src/Cantarell-Regular.ufo/glyphs/I_-cy.glif
index 1a16e845..67023ea0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="I-cy" format="2">
-  <advance width="291"/>
+  <advance width="267"/>
   <unicode hex="0406"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_.glif b/src/Cantarell-Regular.ufo/glyphs/I_.glif
index 07238e34..61a4ce57 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_.glif
@@ -1,20 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="I" format="2">
-  <advance width="291"/>
+  <advance width="267"/>
   <unicode hex="0049"/>
-  <note>
-I
-</note>
-  <anchor x="146" y="0" name="bottom"/>
-  <anchor x="165" y="10" name="ogonek"/>
-  <anchor x="146" y="694" name="top"/>
-  <anchor x="15" y="694" name="topleft"/>
+  <anchor x="134" y="0" name="bottom"/>
+  <anchor x="153" y="10" name="ogonek"/>
+  <anchor x="134" y="694" name="top"/>
+  <anchor x="3" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="187" y="0" type="line"/>
-      <point x="187" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_a-cy.glif b/src/Cantarell-Regular.ufo/glyphs/I_a-cy.glif
index b810945a..70cea435 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_a-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_a-cy.glif
@@ -1,40 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ia-cy" format="2">
-  <advance width="652"/>
+  <advance width="610"/>
   <unicode hex="042F"/>
-  <anchor x="326" y="694" name="top"/>
+  <anchor x="296" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="293" y="260" type="curve" smooth="yes"/>
-      <point x="495" y="260" type="line"/>
-      <point x="495" y="330" type="line"/>
-      <point x="303" y="330" type="line" smooth="yes"/>
-      <point x="213" y="330"/>
-      <point x="151" y="390"/>
-      <point x="151" y="480" type="curve" smooth="yes"/>
-      <point x="151" y="569"/>
-      <point x="206" y="622"/>
-      <point x="293" y="622" type="curve" smooth="yes"/>
-      <point x="495" y="622" type="line"/>
-      <point x="495" y="694" type="line"/>
-      <point x="303" y="694" type="line" smooth="yes"/>
-      <point x="166" y="694"/>
-      <point x="66" y="597"/>
-      <point x="66" y="465" type="curve" smooth="yes"/>
-      <point x="66" y="341"/>
-      <point x="157" y="260"/>
+      <point x="435" y="0" type="line"/>
+      <point x="518" y="0" type="line"/>
+      <point x="518" y="694" type="line"/>
+      <point x="273" y="694" type="line" smooth="yes"/>
+      <point x="136" y="694"/>
+      <point x="36" y="597"/>
+      <point x="36" y="465" type="curve" smooth="yes"/>
+      <point x="36" y="341"/>
+      <point x="127" y="260"/>
+      <point x="263" y="260" type="curve" smooth="yes"/>
+      <point x="465" y="260" type="line"/>
+      <point x="465" y="330" type="line"/>
+      <point x="273" y="330" type="line" smooth="yes"/>
+      <point x="183" y="330"/>
+      <point x="121" y="390"/>
+      <point x="121" y="480" type="curve" smooth="yes"/>
+      <point x="121" y="569"/>
+      <point x="176" y="622"/>
+      <point x="263" y="622" type="curve" smooth="yes"/>
+      <point x="435" y="622" type="line"/>
     </contour>
     <contour>
-      <point x="56" y="0" type="line"/>
-      <point x="155" y="0" type="line"/>
-      <point x="338" y="306" type="line"/>
-      <point x="244" y="306" type="line"/>
-    </contour>
-    <contour>
-      <point x="465" y="0" type="line"/>
-      <point x="548" y="0" type="line"/>
-      <point x="548" y="694" type="line"/>
-      <point x="465" y="694" type="line"/>
+      <point x="26" y="0" type="line"/>
+      <point x="125" y="0" type="line"/>
+      <point x="308" y="306" type="line"/>
+      <point x="214" y="306" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|R</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_acute.glif b/src/Cantarell-Regular.ufo/glyphs/I_acute.glif
index d84d93d7..f9dd8de4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iacute" format="2">
-  <advance width="291"/>
+  <advance width="267"/>
   <unicode hex="00CD"/>
   <outline>
     <component base="I"/>
-    <component base="acutecomb.case" xOffset="58"/>
+    <component base="acutecomb.case" xOffset="46"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_breve.glif b/src/Cantarell-Regular.ufo/glyphs/I_breve.glif
index f77e4056..1cbde9a8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ibreve" format="2">
-  <advance width="291"/>
+  <advance width="267"/>
   <unicode hex="012C"/>
   <outline>
     <component base="I"/>
-    <component base="brevecomb.case" xOffset="-63"/>
+    <component base="brevecomb.case" xOffset="-75"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_caron.glif b/src/Cantarell-Regular.ufo/glyphs/I_caron.glif
index 4c9176b5..8da639cf 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Icaron" format="2">
-  <advance width="291"/>
+  <advance width="267"/>
   <unicode hex="01CF"/>
   <outline>
     <component base="I"/>
-    <component base="caroncomb.case" xOffset="-38"/>
+    <component base="caroncomb.case" xOffset="-50"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_circumflex.glif
index 387b0ca1..441dd5a2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Icircumflex" format="2">
-  <advance width="291"/>
+  <advance width="267"/>
   <unicode hex="00CE"/>
   <outline>
     <component base="I"/>
-    <component base="circumflexcomb.case" xOffset="-42"/>
+    <component base="circumflexcomb.case" xOffset="-54"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_dblgrave.glif
index 5933627b..2d739e1f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idblgrave" format="2">
-  <advance width="291"/>
+  <advance width="267"/>
   <unicode hex="0208"/>
   <outline>
     <component base="I"/>
-    <component base="dblgravecomb.case" xOffset="-75"/>
+    <component base="dblgravecomb.case" xOffset="-87"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_dieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_dieresis-cy.glif
index 20af69f7..309a22d5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_dieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_dieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idieresis-cy" format="2">
-  <advance width="764"/>
+  <advance width="740"/>
   <unicode hex="04E4"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="dieresiscomb.case" xOffset="146"/>
+    <component base="dieresiscomb.case" xOffset="134"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_dieresis.glif
index 1e28da74..8ee55938 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idieresis" format="2">
-  <advance width="291"/>
+  <advance width="267"/>
   <unicode hex="00CF"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-90"/>
+    <component base="dieresiscomb.case" xOffset="-102"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_dieresisacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_dieresisacute.glif
index c9098159..4df5a704 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_dieresisacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_dieresisacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idieresisacute" format="2">
-  <advance width="291"/>
+  <advance width="267"/>
   <unicode hex="1E2E"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-90"/>
-    <component base="acutecomb.case" xOffset="58" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="-102"/>
+    <component base="acutecomb.case" xOffset="46" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_dotaccent.glif
index e761e2df..d4b12d37 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idotaccent" format="2">
-  <advance width="291"/>
+  <advance width="267"/>
   <unicode hex="0130"/>
   <outline>
     <component base="I"/>
-    <component base="dotaccentcomb.case" xOffset="10"/>
+    <component base="dotaccentcomb.case" xOffset="-2"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_dotbelow.glif
index 77ed70a8..34a51f7c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idotbelow" format="2">
-  <advance width="291"/>
+  <advance width="267"/>
   <unicode hex="1ECA"/>
   <outline>
     <component base="I"/>
-    <component base="dotbelowcomb" xOffset="10"/>
+    <component base="dotbelowcomb" xOffset="-2"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif
index 6bf48a43..592bc545 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ie-cy" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="0415"/>
-  <anchor x="303" y="694" name="top"/>
   <outline>
     <component base="E"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif
index 746fd147..b99a2c6b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iebreve-cy" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="04D6"/>
   <outline>
     <component base="Ie-cy"/>
-    <component base="brevecomb-cy.case" xOffset="88"/>
+    <component base="brevecomb-cy.case" xOffset="106"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif
index c755a11c..a3d40a88 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iegrave-cy" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="0400"/>
   <outline>
     <component base="Ie-cy"/>
-    <component base="gravecomb.case" xOffset="108"/>
+    <component base="gravecomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_grave.glif b/src/Cantarell-Regular.ufo/glyphs/I_grave.glif
index adf1b57b..27da716c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Igrave" format="2">
-  <advance width="291"/>
+  <advance width="267"/>
   <unicode hex="00CC"/>
   <outline>
     <component base="I"/>
-    <component base="gravecomb.case" xOffset="-49"/>
+    <component base="gravecomb.case" xOffset="-61"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_hookabove.glif
index 818d53d9..8f1c8b7c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ihookabove" format="2">
-  <advance width="291"/>
+  <advance width="267"/>
   <unicode hex="1EC8"/>
   <outline>
     <component base="I"/>
-    <component base="hookabovecomb.case" xOffset="2"/>
+    <component base="hookabovecomb.case" xOffset="-10"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_i-cy.glif b/src/Cantarell-Regular.ufo/glyphs/I_i-cy.glif
index 65b4c4b9..a02a057b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_i-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_i-cy.glif
@@ -1,23 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ii-cy" format="2">
-  <advance width="764"/>
+  <advance width="740"/>
   <unicode hex="0418"/>
-  <anchor x="746" y="0" name="bottomright"/>
-  <anchor x="382" y="694" name="top"/>
+  <anchor x="734" y="0" name="bottomright"/>
+  <anchor x="370" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="193" y="0" type="line"/>
-      <point x="597" y="605" type="line"/>
-      <point x="579" y="605" type="line"/>
-      <point x="579" y="0" type="line"/>
-      <point x="660" y="0" type="line"/>
-      <point x="660" y="694" type="line"/>
-      <point x="568" y="694" type="line"/>
-      <point x="166" y="87" type="line"/>
-      <point x="185" y="87" type="line"/>
-      <point x="185" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="181" y="0" type="line"/>
+      <point x="585" y="605" type="line"/>
+      <point x="567" y="605" type="line"/>
+      <point x="567" y="0" type="line"/>
+      <point x="648" y="0" type="line"/>
+      <point x="648" y="694" type="line"/>
+      <point x="556" y="694" type="line"/>
+      <point x="154" y="87" type="line"/>
+      <point x="173" y="87" type="line"/>
+      <point x="173" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_igrave-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_igrave-cy.glif
index 62030dfe..72d30c99 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_igrave-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_igrave-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iigrave-cy" format="2">
-  <advance width="764"/>
+  <advance width="740"/>
   <unicode hex="040D"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="gravecomb.case" xOffset="187"/>
+    <component base="gravecomb.case" xOffset="175"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_invertedbreve.glif
index 29dc435b..4bfc41c3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iinvertedbreve" format="2">
-  <advance width="291"/>
+  <advance width="267"/>
   <unicode hex="020A"/>
   <outline>
     <component base="I"/>
-    <component base="breveinvertedcomb.case" xOffset="-51"/>
+    <component base="breveinvertedcomb.case" xOffset="-63"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_ishort-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_ishort-cy.glif
index cf237992..5966d3f8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_ishort-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_ishort-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iishort-cy" format="2">
-  <advance width="764"/>
+  <advance width="740"/>
   <unicode hex="0419"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="brevecomb-cy.case" xOffset="167"/>
+    <component base="brevecomb-cy.case" xOffset="155"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_macron-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_macron-cy.glif
index ffdd8e50..c9496b9e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_macron-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_macron-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Imacron-cy" format="2">
-  <advance width="764"/>
+  <advance width="740"/>
   <unicode hex="04E2"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="macroncomb.case" xOffset="140"/>
+    <component base="macroncomb.case" xOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_macron.glif b/src/Cantarell-Regular.ufo/glyphs/I_macron.glif
index 5dbc2793..47885db1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Imacron" format="2">
-  <advance width="291"/>
+  <advance width="267"/>
   <unicode hex="012A"/>
   <outline>
     <component base="I"/>
-    <component base="macroncomb.narrow.case" xOffset="-68"/>
+    <component base="macroncomb.narrow.case" xOffset="-80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif b/src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif
index 5d694f67..d30cc063 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Io-cy" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="0401"/>
   <outline>
     <component base="Ie-cy"/>
-    <component base="dieresiscomb.case" xOffset="67"/>
+    <component base="dieresiscomb.case" xOffset="85"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/I_ogonek.glif
index 4dad5f88..96d8fbfd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iogonek" format="2">
-  <advance width="291"/>
+  <advance width="267"/>
   <unicode hex="012E"/>
   <outline>
     <component base="I"/>
-    <component base="ogonekcomb.narrow" xOffset="-244"/>
+    <component base="ogonekcomb.narrow" xOffset="-256"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/I_tilde.glif
index 5a1919a5..6ada5d7f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Itilde" format="2">
-  <advance width="291"/>
+  <advance width="267"/>
   <unicode hex="0128"/>
   <outline>
     <component base="I"/>
-    <component base="tildecomb.case" xOffset="-94"/>
+    <component base="tildecomb.case" xOffset="-106"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_u-cy.glif b/src/Cantarell-Regular.ufo/glyphs/I_u-cy.glif
index e3e51ea8..f1c355fc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_u-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_u-cy.glif
@@ -1,48 +1,56 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iu-cy" format="2">
-  <advance width="1026"/>
+  <advance width="1003"/>
   <unicode hex="042E"/>
-  <anchor x="513" y="694" name="top"/>
+  <anchor x="501" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="631" y="-7" type="curve" smooth="yes"/>
-      <point x="826" y="-7"/>
-      <point x="961" y="140"/>
-      <point x="961" y="353" type="curve" smooth="yes"/>
-      <point x="961" y="563"/>
-      <point x="832" y="703"/>
-      <point x="640" y="703" type="curve" smooth="yes"/>
-      <point x="448" y="703"/>
-      <point x="324" y="562"/>
-      <point x="324" y="344" type="curve" smooth="yes"/>
-      <point x="324" y="130"/>
-      <point x="444" y="-7"/>
+      <point x="619" y="-7" type="curve" smooth="yes"/>
+      <point x="814" y="-7"/>
+      <point x="949" y="140"/>
+      <point x="949" y="353" type="curve" smooth="yes"/>
+      <point x="949" y="563"/>
+      <point x="820" y="703"/>
+      <point x="628" y="703" type="curve" smooth="yes"/>
+      <point x="436" y="703"/>
+      <point x="312" y="562"/>
+      <point x="312" y="344" type="curve" smooth="yes"/>
+      <point x="312" y="130"/>
+      <point x="432" y="-7"/>
     </contour>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="187" y="0" type="line"/>
-      <point x="187" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="140" y="323" type="line"/>
-      <point x="350" y="323" type="line"/>
-      <point x="350" y="395" type="line"/>
-      <point x="140" y="395" type="line"/>
+      <point x="128" y="323" type="line"/>
+      <point x="338" y="323" type="line"/>
+      <point x="338" y="395" type="line"/>
+      <point x="128" y="395" type="line"/>
     </contour>
     <contour>
-      <point x="637" y="65" type="curve" smooth="yes"/>
-      <point x="495" y="65"/>
-      <point x="406" y="176"/>
-      <point x="406" y="353" type="curve" smooth="yes"/>
-      <point x="406" y="527"/>
-      <point x="490" y="630"/>
-      <point x="631" y="630" type="curve" smooth="yes"/>
-      <point x="776" y="630"/>
-      <point x="876" y="513"/>
-      <point x="876" y="344" type="curve" smooth="yes"/>
-      <point x="876" y="177"/>
-      <point x="780" y="65"/>
+      <point x="625" y="65" type="curve" smooth="yes"/>
+      <point x="483" y="65"/>
+      <point x="394" y="176"/>
+      <point x="394" y="353" type="curve" smooth="yes"/>
+      <point x="394" y="527"/>
+      <point x="478" y="630"/>
+      <point x="619" y="630" type="curve" smooth="yes"/>
+      <point x="764" y="630"/>
+      <point x="864" y="513"/>
+      <point x="864" y="344" type="curve" smooth="yes"/>
+      <point x="864" y="177"/>
+      <point x="768" y="65"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_zhitsa-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_zhitsa-cy.glif
index d3c686d6..8e15e547 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_zhitsa-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_zhitsa-cy.glif
@@ -1,23 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Izhitsa-cy" format="2">
-  <advance width="728"/>
+  <advance width="649"/>
   <unicode hex="0474"/>
   <outline>
     <contour>
-      <point x="292" y="0" type="line"/>
-      <point x="373" y="0" type="line"/>
-      <point x="532" y="464" type="line" smooth="yes"/>
-      <point x="570" y="574"/>
-      <point x="619" y="623"/>
-      <point x="689" y="623" type="curve"/>
-      <point x="680" y="701" type="line"/>
-      <point x="578" y="701"/>
-      <point x="504" y="634"/>
-      <point x="463" y="506" type="curve" smooth="yes"/>
-      <point x="311" y="29" type="line"/>
-      <point x="361" y="29" type="line"/>
-      <point x="134" y="694" type="line"/>
-      <point x="39" y="694" type="line"/>
+      <point x="261" y="0" type="line"/>
+      <point x="342" y="0" type="line"/>
+      <point x="501" y="464" type="line" smooth="yes"/>
+      <point x="539" y="574"/>
+      <point x="588" y="623"/>
+      <point x="658" y="623" type="curve"/>
+      <point x="649" y="701" type="line"/>
+      <point x="547" y="701"/>
+      <point x="473" y="634"/>
+      <point x="432" y="506" type="curve" smooth="yes"/>
+      <point x="280" y="29" type="line"/>
+      <point x="330" y="29" type="line"/>
+      <point x="103" y="694" type="line"/>
+      <point x="8" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>V</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/J_.glif b/src/Cantarell-Regular.ufo/glyphs/J_.glif
index 7c1b073d..24a10db4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/J_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/J_.glif
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="J" format="2">
-  <advance width="443"/>
+  <advance width="398"/>
   <unicode hex="004A"/>
-  <note>
-J
-</note>
-  <anchor x="228" y="0" name="bottom"/>
-  <anchor x="303" y="694" name="top"/>
+  <anchor x="200" y="0" name="bottom"/>
+  <anchor x="275" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="161" y="-10" type="curve" smooth="yes"/>
-      <point x="279" y="-10"/>
-      <point x="346" y="65"/>
-      <point x="346" y="200" type="curve" smooth="yes"/>
-      <point x="346" y="694" type="line"/>
-      <point x="263" y="694" type="line"/>
-      <point x="263" y="191" type="line" smooth="yes"/>
-      <point x="263" y="109"/>
-      <point x="226" y="63"/>
-      <point x="159" y="63" type="curve" smooth="yes"/>
-      <point x="129" y="63"/>
-      <point x="89" y="72"/>
-      <point x="61" y="86" type="curve"/>
-      <point x="37" y="24" type="line"/>
-      <point x="77" y="0"/>
-      <point x="119" y="-10"/>
+      <point x="133" y="-10" type="curve" smooth="yes"/>
+      <point x="251" y="-10"/>
+      <point x="318" y="65"/>
+      <point x="318" y="200" type="curve" smooth="yes"/>
+      <point x="318" y="694" type="line"/>
+      <point x="235" y="694" type="line"/>
+      <point x="235" y="191" type="line" smooth="yes"/>
+      <point x="235" y="109"/>
+      <point x="198" y="63"/>
+      <point x="131" y="63" type="curve" smooth="yes"/>
+      <point x="101" y="63"/>
+      <point x="61" y="72"/>
+      <point x="33" y="86" type="curve"/>
+      <point x="9" y="24" type="line"/>
+      <point x="49" y="0"/>
+      <point x="91" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/J_acute.glif b/src/Cantarell-Regular.ufo/glyphs/J_acute.glif
index 55938235..97db3ff7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/J_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/J_acute.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Jacute" format="2">
-  <advance width="443"/>
+  <advance width="398"/>
   <outline>
     <component base="J"/>
-    <component base="acutecomb.case" xOffset="215"/>
+    <component base="acutecomb.case" xOffset="187"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/J_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/J_circumflex.glif
index 3b828b05..0601a1a3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/J_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/J_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Jcircumflex" format="2">
-  <advance width="443"/>
+  <advance width="398"/>
   <unicode hex="0134"/>
   <outline>
     <component base="J"/>
-    <component base="circumflexcomb.case" xOffset="115"/>
+    <component base="circumflexcomb.case" xOffset="87"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/J_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/J_e-cy.glif
index d9db3b5d..1b397dca 100644
--- a/src/Cantarell-Regular.ufo/glyphs/J_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/J_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Je-cy" format="2">
-  <advance width="443"/>
+  <advance width="398"/>
   <unicode hex="0408"/>
   <outline>
     <component base="J"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_.glif b/src/Cantarell-Regular.ufo/glyphs/K_.glif
index 2801866d..408ccd1a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_.glif
@@ -1,27 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="K" format="2">
-  <advance width="627"/>
+  <advance width="608"/>
   <unicode hex="004B"/>
-  <note>
-K
-</note>
-  <anchor x="318" y="0" name="bottom"/>
-  <anchor x="318" y="694" name="top"/>
+  <anchor x="310" y="0" name="bottom"/>
+  <anchor x="310" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="496" y="0" type="line"/>
-      <point x="606" y="0" type="line"/>
-      <point x="273" y="380" type="line"/>
-      <point x="276" y="358" type="line"/>
-      <point x="591" y="694" type="line"/>
-      <point x="490" y="694" type="line"/>
-      <point x="184" y="361" type="line"/>
+      <point x="494" y="0" type="line"/>
+      <point x="603" y="0" type="line"/>
+      <point x="260" y="380" type="line"/>
+      <point x="264" y="357" type="line"/>
+      <point x="590" y="694" type="line"/>
+      <point x="488" y="694" type="line"/>
+      <point x="172" y="361" type="line"/>
     </contour>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="187" y="0" type="line"/>
-      <point x="187" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_a-cy.glif b/src/Cantarell-Regular.ufo/glyphs/K_a-cy.glif
index 6061a8f1..ae3b1dba 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_a-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_a-cy.glif
@@ -1,30 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ka-cy" format="2">
-  <advance width="655"/>
+  <advance width="636"/>
   <unicode hex="041A"/>
-  <anchor x="609" y="0" name="bottomright"/>
-  <anchor x="325" y="694" name="top"/>
+  <anchor x="578" y="0" name="bottomright"/>
+  <anchor x="314" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="538" y="0" type="line"/>
-      <point x="633" y="0" type="line"/>
-      <point x="375" y="380" type="line"/>
-      <point x="380" y="358" type="line"/>
-      <point x="620" y="694" type="line"/>
-      <point x="532" y="694" type="line"/>
-      <point x="291" y="361" type="line"/>
+      <point x="527" y="0" type="line"/>
+      <point x="622" y="0" type="line"/>
+      <point x="364" y="380" type="line"/>
+      <point x="369" y="358" type="line"/>
+      <point x="609" y="694" type="line"/>
+      <point x="521" y="694" type="line"/>
+      <point x="280" y="361" type="line"/>
     </contour>
     <contour>
-      <point x="103" y="0" type="line"/>
-      <point x="185" y="0" type="line"/>
-      <point x="185" y="694" type="line"/>
-      <point x="103" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="174" y="0" type="line"/>
+      <point x="174" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="136" y="323" type="line"/>
-      <point x="341" y="323" type="line"/>
-      <point x="341" y="395" type="line"/>
-      <point x="136" y="395" type="line"/>
+      <point x="125" y="323" type="line"/>
+      <point x="330" y="323" type="line"/>
+      <point x="330" y="395" type="line"/>
+      <point x="125" y="395" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_abashkir-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/K_abashkir-cy.glif
index 8456ff67..e755cb5e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_abashkir-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_abashkir-cy.glif
@@ -1,38 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kabashkir-cy" format="2">
-  <advance width="752"/>
+  <advance width="749"/>
   <unicode hex="04A0"/>
   <outline>
     <contour>
-      <point x="24" y="622" type="line"/>
-      <point x="282" y="622" type="line"/>
-      <point x="282" y="694" type="line"/>
-      <point x="24" y="694" type="line"/>
+      <point x="640" y="0" type="line"/>
+      <point x="735" y="0" type="line"/>
+      <point x="477" y="380" type="line"/>
+      <point x="482" y="358" type="line"/>
+      <point x="722" y="694" type="line"/>
+      <point x="634" y="694" type="line"/>
+      <point x="393" y="361" type="line"/>
     </contour>
     <contour>
-      <point x="635" y="0" type="line"/>
-      <point x="730" y="0" type="line"/>
-      <point x="472" y="380" type="line"/>
-      <point x="477" y="358" type="line"/>
-      <point x="717" y="694" type="line"/>
-      <point x="629" y="694" type="line"/>
-      <point x="388" y="361" type="line"/>
+      <point x="205" y="0" type="line"/>
+      <point x="287" y="0" type="line"/>
+      <point x="287" y="694" type="line"/>
+      <point x="29" y="694" type="line"/>
+      <point x="29" y="622" type="line"/>
+      <point x="205" y="622" type="line"/>
     </contour>
     <contour>
-      <point x="200" y="0" type="line"/>
-      <point x="282" y="0" type="line"/>
-      <point x="282" y="694" type="line"/>
-      <point x="200" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="233" y="323" type="line"/>
-      <point x="438" y="323" type="line"/>
-      <point x="438" y="395" type="line"/>
-      <point x="233" y="395" type="line"/>
+      <point x="238" y="323" type="line"/>
+      <point x="443" y="323" type="line"/>
+      <point x="443" y="395" type="line"/>
+      <point x="238" y="395" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|Ge-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>Ka-cy</string>
     </dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_acute.glif b/src/Cantarell-Regular.ufo/glyphs/K_acute.glif
index 162d4d6e..81d8e261 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kacute" format="2">
-  <advance width="627"/>
+  <advance width="608"/>
   <unicode hex="1E30"/>
   <outline>
     <component base="K"/>
-    <component base="acutecomb.case" xOffset="230"/>
+    <component base="acutecomb.case" xOffset="222"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_adescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/K_adescender-cy.glif
index 83c9a1ba..a3d8e6db 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_adescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_adescender-cy.glif
@@ -1,13 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kadescender-cy" format="2">
-  <advance width="725"/>
+  <advance width="667"/>
   <unicode hex="049A"/>
   <outline>
-    <component base="Ka-cy" xOffset="1"/>
-    <component base="descender-cy.case" xOffset="503"/>
+    <component base="Ka-cy"/>
+    <component base="descender-cy.case" xOffset="471"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Ka-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_averticalstroke-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/K_averticalstroke-cy.glif
index c4246f3d..dd77d165 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_averticalstroke-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_averticalstroke-cy.glif
@@ -1,34 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kaverticalstroke-cy" format="2">
-  <advance width="675"/>
+  <advance width="651"/>
   <unicode hex="049C"/>
   <outline>
     <contour>
-      <point x="554" y="0" type="line"/>
-      <point x="649" y="0" type="line"/>
-      <point x="411" y="380" type="line"/>
-      <point x="416" y="358" type="line"/>
-      <point x="636" y="694" type="line"/>
-      <point x="548" y="694" type="line"/>
-      <point x="327" y="361" type="line"/>
+      <point x="542" y="0" type="line"/>
+      <point x="637" y="0" type="line"/>
+      <point x="399" y="380" type="line"/>
+      <point x="404" y="358" type="line"/>
+      <point x="624" y="694" type="line"/>
+      <point x="536" y="694" type="line"/>
+      <point x="315" y="361" type="line"/>
     </contour>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="186" y="0" type="line"/>
-      <point x="186" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="174" y="0" type="line"/>
+      <point x="174" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="137" y="323" type="line"/>
-      <point x="377" y="323" type="line"/>
-      <point x="377" y="395" type="line"/>
-      <point x="137" y="395" type="line"/>
+      <point x="125" y="323" type="line"/>
+      <point x="365" y="323" type="line"/>
+      <point x="365" y="395" type="line"/>
+      <point x="125" y="395" type="line"/>
     </contour>
     <contour>
-      <point x="249" y="175" type="line"/>
-      <point x="318" y="175" type="line"/>
-      <point x="318" y="545" type="line"/>
-      <point x="249" y="545" type="line"/>
+      <point x="237" y="175" type="line"/>
+      <point x="306" y="175" type="line"/>
+      <point x="306" y="545" type="line"/>
+      <point x="237" y="545" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Ka-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/K_commaaccent.glif
index c3043ef2..27b116f2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kcommaaccent" format="2">
-  <advance width="627"/>
+  <advance width="608"/>
   <unicode hex="0136"/>
   <outline>
     <component base="K"/>
-    <component base="commaaccentcomb" xOffset="152"/>
+    <component base="commaaccentcomb" xOffset="144"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_je-cy.glif b/src/Cantarell-Regular.ufo/glyphs/K_je-cy.glif
index 11418823..05a309af 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_je-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_je-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kje-cy" format="2">
-  <advance width="655"/>
+  <advance width="636"/>
   <unicode hex="040C"/>
   <outline>
     <component base="Ka-cy"/>
-    <component base="acutecomb.case" xOffset="237"/>
+    <component base="acutecomb.case" xOffset="226"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_.glif b/src/Cantarell-Regular.ufo/glyphs/L_.glif
index df407abf..5310763c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_.glif
@@ -1,23 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="L" format="2">
-  <advance width="537"/>
+  <advance width="506"/>
   <unicode hex="004C"/>
-  <note>
-L
-</note>
-  <anchor x="302" y="0" name="bottom"/>
-  <anchor x="172" y="347" name="center"/>
-  <anchor x="543" y="352" name="periodcentered"/>
-  <anchor x="147" y="694" name="top"/>
-  <anchor x="311" y="482" name="topright"/>
+  <anchor x="290" y="0" name="bottom"/>
+  <anchor x="160" y="347" name="center"/>
+  <anchor x="531" y="352" name="periodcentered"/>
+  <anchor x="135" y="694" name="top"/>
+  <anchor x="299" y="482" name="topright"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="498" y="0" type="line"/>
-      <point x="498" y="74" type="line"/>
-      <point x="187" y="74" type="line"/>
-      <point x="187" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="486" y="0" type="line"/>
+      <point x="486" y="74" type="line"/>
+      <point x="175" y="74" type="line"/>
+      <point x="175" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_J_.glif b/src/Cantarell-Regular.ufo/glyphs/L_J_.glif
index d9882817..75607292 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_J_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_J_.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="LJ" format="2">
-  <advance width="980"/>
+  <advance width="904"/>
   <unicode hex="01C7"/>
   <outline>
     <component base="L"/>
-    <component base="J" xOffset="537"/>
+    <component base="J" xOffset="506"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_acute.glif b/src/Cantarell-Regular.ufo/glyphs/L_acute.glif
index f15ac952..f8eb9209 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lacute" format="2">
-  <advance width="537"/>
+  <advance width="506"/>
   <unicode hex="0139"/>
   <outline>
     <component base="L"/>
-    <component base="acutecomb.case" xOffset="59"/>
+    <component base="acutecomb.case" xOffset="47"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_caron.glif b/src/Cantarell-Regular.ufo/glyphs/L_caron.glif
index 5e23bc99..b1f81249 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcaron" format="2">
-  <advance width="537"/>
+  <advance width="506"/>
   <unicode hex="013D"/>
   <outline>
     <component base="L"/>
-    <component base="caroncomb.alt" xOffset="185"/>
+    <component base="caroncomb.alt" xOffset="173"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/L_commaaccent.glif
index 224732b1..1f7668e7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcommaaccent" format="2">
-  <advance width="537"/>
+  <advance width="506"/>
   <unicode hex="013B"/>
   <outline>
     <component base="L"/>
-    <component base="commaaccentcomb" xOffset="136"/>
+    <component base="commaaccentcomb" xOffset="124"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_dot.glif b/src/Cantarell-Regular.ufo/glyphs/L_dot.glif
index 5710ed3e..81997547 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_dot.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_dot.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldot" format="2">
-  <advance width="537"/>
+  <advance width="506"/>
   <unicode hex="013F"/>
   <outline>
     <component base="L"/>
-    <component base="periodcentered.loclCAT.case" xOffset="543"/>
+    <component base="periodcentered.loclCAT.case" xOffset="531"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif
index c574a3ee..ef7362da 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldotbelow" format="2">
-  <advance width="537"/>
+  <advance width="506"/>
   <unicode hex="1E36"/>
   <outline>
     <component base="L"/>
-    <component base="dotbelowcomb" xOffset="166"/>
+    <component base="dotbelowcomb" xOffset="154"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_j.glif b/src/Cantarell-Regular.ufo/glyphs/L_j.glif
index 2f048ea8..ac403df8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_j.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_j.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lj" format="2">
-  <advance width="792"/>
+  <advance width="752"/>
   <unicode hex="01C8"/>
   <outline>
     <component base="L"/>
-    <component base="j" xOffset="537"/>
+    <component base="j" xOffset="506"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_je-cy.glif b/src/Cantarell-Regular.ufo/glyphs/L_je-cy.glif
index e92ac0c9..a388e04a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_je-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_je-cy.glif
@@ -1,55 +1,57 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lje-cy" format="2">
-  <advance width="1070"/>
+  <advance width="1069"/>
   <unicode hex="0409"/>
   <outline>
     <contour>
-      <point x="578" y="0" type="line"/>
-      <point x="763" y="0" type="line" smooth="yes"/>
-      <point x="917" y="0"/>
-      <point x="1017" y="85"/>
-      <point x="1017" y="217" type="curve" smooth="yes"/>
-      <point x="1017" y="339"/>
-      <point x="924" y="427"/>
-      <point x="796" y="427" type="curve" smooth="yes"/>
-      <point x="580" y="427" type="line"/>
-      <point x="580" y="355" type="line"/>
-      <point x="787" y="355" type="line" smooth="yes"/>
-      <point x="871" y="355"/>
-      <point x="932" y="290"/>
-      <point x="932" y="200" type="curve" smooth="yes"/>
-      <point x="932" y="115"/>
-      <point x="878" y="72"/>
-      <point x="773" y="72" type="curve" smooth="yes"/>
-      <point x="578" y="72" type="line"/>
+      <point x="117" y="-10" type="curve" smooth="yes"/>
+      <point x="219" y="-10"/>
+      <point x="268" y="75"/>
+      <point x="268" y="252" type="curve" smooth="yes"/>
+      <point x="268" y="624" type="line"/>
+      <point x="540" y="624" type="line"/>
+      <point x="540" y="0" type="line"/>
+      <point x="621" y="0" type="line"/>
+      <point x="621" y="694" type="line"/>
+      <point x="189" y="694" type="line"/>
+      <point x="189" y="252" type="line" smooth="yes"/>
+      <point x="189" y="120"/>
+      <point x="163" y="62"/>
+      <point x="104" y="62" type="curve" smooth="yes"/>
+      <point x="83" y="62"/>
+      <point x="56" y="69"/>
+      <point x="33" y="83" type="curve"/>
+      <point x="11" y="19" type="line"/>
+      <point x="40" y="1"/>
+      <point x="80" y="-10"/>
     </contour>
     <contour>
-      <point x="108" y="-10" type="curve" smooth="yes"/>
-      <point x="210" y="-10"/>
-      <point x="259" y="75"/>
-      <point x="259" y="252" type="curve" smooth="yes"/>
-      <point x="259" y="624" type="line"/>
-      <point x="531" y="624" type="line"/>
-      <point x="531" y="0" type="line"/>
-      <point x="612" y="0" type="line"/>
-      <point x="612" y="694" type="line"/>
-      <point x="180" y="694" type="line"/>
-      <point x="180" y="252" type="line" smooth="yes"/>
-      <point x="180" y="120"/>
-      <point x="154" y="62"/>
-      <point x="95" y="62" type="curve" smooth="yes"/>
-      <point x="74" y="62"/>
-      <point x="47" y="69"/>
-      <point x="24" y="83" type="curve"/>
-      <point x="2" y="19" type="line"/>
-      <point x="31" y="1"/>
-      <point x="71" y="-10"/>
+      <point x="587" y="0" type="line"/>
+      <point x="772" y="0" type="line" smooth="yes"/>
+      <point x="926" y="0"/>
+      <point x="1026" y="85"/>
+      <point x="1026" y="217" type="curve" smooth="yes"/>
+      <point x="1026" y="339"/>
+      <point x="933" y="427"/>
+      <point x="805" y="427" type="curve" smooth="yes"/>
+      <point x="589" y="427" type="line"/>
+      <point x="589" y="355" type="line"/>
+      <point x="796" y="355" type="line" smooth="yes"/>
+      <point x="880" y="355"/>
+      <point x="941" y="290"/>
+      <point x="941" y="200" type="curve" smooth="yes"/>
+      <point x="941" y="115"/>
+      <point x="887" y="72"/>
+      <point x="782" y="72" type="curve" smooth="yes"/>
+      <point x="587" y="72" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>El-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Softsign-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif
index 8c6d7d11..7a0f59d8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Llinebelow" format="2">
-  <advance width="537"/>
+  <advance width="506"/>
   <unicode hex="1E3A"/>
   <outline>
     <component base="L"/>
-    <component base="macronbelowcomb" xOffset="57"/>
+    <component base="macronbelowcomb" xOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_slash.glif b/src/Cantarell-Regular.ufo/glyphs/L_slash.glif
index f19a4669..86ac9311 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_slash.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_slash.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lslash" format="2">
-  <advance width="537"/>
+  <advance width="506"/>
   <unicode hex="0141"/>
   <outline>
     <component base="L"/>
-    <component base="slashshortcomb.case" xOffset="-9" yOffset="65"/>
+    <component base="slashshortcomb.case" xOffset="-21" yOffset="65"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/M_.glif b/src/Cantarell-Regular.ufo/glyphs/M_.glif
index b1553466..452a0e62 100644
--- a/src/Cantarell-Regular.ufo/glyphs/M_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/M_.glif
@@ -1,30 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="M" format="2">
-  <advance width="883"/>
+  <advance width="859"/>
   <unicode hex="004D"/>
-  <note>
-M
-</note>
-  <anchor x="442" y="0" name="bottom"/>
-  <anchor x="442" y="694" name="top"/>
+  <anchor x="430" y="0" name="bottom"/>
+  <anchor x="430" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="183" y="0" type="line"/>
-      <point x="183" y="578" type="line"/>
-      <point x="166" y="578" type="line"/>
-      <point x="408" y="108" type="line"/>
-      <point x="473" y="108" type="line"/>
-      <point x="712" y="578" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="171" y="0" type="line"/>
+      <point x="171" y="578" type="line"/>
+      <point x="154" y="578" type="line"/>
+      <point x="396" y="108" type="line"/>
+      <point x="461" y="108" type="line"/>
       <point x="700" y="578" type="line"/>
-      <point x="700" y="0" type="line"/>
-      <point x="779" y="0" type="line"/>
-      <point x="779" y="694" type="line"/>
-      <point x="697" y="694" type="line"/>
-      <point x="418" y="148" type="line"/>
-      <point x="468" y="148" type="line"/>
-      <point x="189" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="688" y="578" type="line"/>
+      <point x="688" y="0" type="line"/>
+      <point x="767" y="0" type="line"/>
+      <point x="767" y="694" type="line"/>
+      <point x="685" y="694" type="line"/>
+      <point x="406" y="148" type="line"/>
+      <point x="456" y="148" type="line"/>
+      <point x="177" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/M_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/M_dotbelow.glif
index b13cb696..78c6c3d3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/M_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/M_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Mdotbelow" format="2">
-  <advance width="883"/>
+  <advance width="859"/>
   <unicode hex="1E42"/>
   <outline>
     <component base="M"/>
-    <component base="dotbelowcomb" xOffset="306"/>
+    <component base="dotbelowcomb" xOffset="294"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_.glif b/src/Cantarell-Regular.ufo/glyphs/N_.glif
index ac673bea..611da7af 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_.glif
@@ -1,26 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="N" format="2">
-  <advance width="774"/>
+  <advance width="750"/>
   <unicode hex="004E"/>
-  <note>
-N
-</note>
-  <anchor x="387" y="0" name="bottom"/>
-  <anchor x="387" y="694" name="top"/>
+  <anchor x="375" y="0" name="bottom"/>
+  <anchor x="375" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="182" y="0" type="line"/>
-      <point x="182" y="605" type="line"/>
-      <point x="167" y="605" type="line"/>
-      <point x="578" y="0" type="line"/>
-      <point x="670" y="0" type="line"/>
-      <point x="670" y="694" type="line"/>
-      <point x="592" y="694" type="line"/>
-      <point x="592" y="87" type="line"/>
-      <point x="608" y="87" type="line"/>
-      <point x="199" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="170" y="0" type="line"/>
+      <point x="170" y="605" type="line"/>
+      <point x="155" y="605" type="line"/>
+      <point x="566" y="0" type="line"/>
+      <point x="658" y="0" type="line"/>
+      <point x="658" y="694" type="line"/>
+      <point x="580" y="694" type="line"/>
+      <point x="580" y="87" type="line"/>
+      <point x="596" y="87" type="line"/>
+      <point x="187" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_J_.glif b/src/Cantarell-Regular.ufo/glyphs/N_J_.glif
index aec875d6..10a68c88 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_J_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_J_.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="NJ" format="2">
-  <advance width="1217"/>
+  <advance width="1148"/>
   <unicode hex="01CA"/>
   <outline>
     <component base="N"/>
-    <component base="J" xOffset="774"/>
+    <component base="J" xOffset="750"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_acute.glif b/src/Cantarell-Regular.ufo/glyphs/N_acute.glif
index 33e47d36..54121b6b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nacute" format="2">
-  <advance width="774"/>
+  <advance width="750"/>
   <unicode hex="0143"/>
   <outline>
     <component base="N"/>
-    <component base="acutecomb.case" xOffset="299"/>
+    <component base="acutecomb.case" xOffset="287"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_caron.glif b/src/Cantarell-Regular.ufo/glyphs/N_caron.glif
index 272d2ead..242c2778 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ncaron" format="2">
-  <advance width="774"/>
+  <advance width="750"/>
   <unicode hex="0147"/>
   <outline>
     <component base="N"/>
-    <component base="caroncomb.case" xOffset="203"/>
+    <component base="caroncomb.case" xOffset="191"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/N_commaaccent.glif
index fb77a16d..720860e9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ncommaaccent" format="2">
-  <advance width="774"/>
+  <advance width="750"/>
   <unicode hex="0145"/>
   <outline>
     <component base="N"/>
-    <component base="commaaccentcomb" xOffset="221"/>
+    <component base="commaaccentcomb" xOffset="209"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/N_dotaccent.glif
index 74dbd488..9c1b76bc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ndotaccent" format="2">
-  <advance width="774"/>
+  <advance width="750"/>
   <unicode hex="1E44"/>
   <outline>
     <component base="N"/>
-    <component base="dotaccentcomb.case" xOffset="251"/>
+    <component base="dotaccentcomb.case" xOffset="239"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/N_dotbelow.glif
index 71a6cd50..c706992f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ndotbelow" format="2">
-  <advance width="774"/>
+  <advance width="750"/>
   <unicode hex="1E46"/>
   <outline>
     <component base="N"/>
-    <component base="dotbelowcomb" xOffset="251"/>
+    <component base="dotbelowcomb" xOffset="239"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_j.glif b/src/Cantarell-Regular.ufo/glyphs/N_j.glif
index 9f22173b..c9042147 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_j.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_j.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nj" format="2">
-  <advance width="1029"/>
+  <advance width="996"/>
   <unicode hex="01CB"/>
   <outline>
     <component base="N"/>
-    <component base="j" xOffset="774"/>
+    <component base="j" xOffset="750"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_je-cy.glif b/src/Cantarell-Regular.ufo/glyphs/N_je-cy.glif
index 5f343882..25a67105 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_je-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_je-cy.glif
@@ -1,45 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nje-cy" format="2">
-  <advance width="1093"/>
+  <advance width="1071"/>
   <unicode hex="040A"/>
   <outline>
     <contour>
-      <point x="601" y="0" type="line"/>
-      <point x="786" y="0" type="line" smooth="yes"/>
-      <point x="940" y="0"/>
-      <point x="1040" y="85"/>
-      <point x="1040" y="217" type="curve" smooth="yes"/>
-      <point x="1040" y="339"/>
-      <point x="947" y="427"/>
-      <point x="819" y="427" type="curve" smooth="yes"/>
-      <point x="593" y="427" type="line"/>
-      <point x="593" y="355" type="line"/>
-      <point x="810" y="355" type="line" smooth="yes"/>
-      <point x="894" y="355"/>
-      <point x="955" y="290"/>
-      <point x="955" y="200" type="curve" smooth="yes"/>
-      <point x="955" y="115"/>
-      <point x="901" y="72"/>
-      <point x="796" y="72" type="curve" smooth="yes"/>
-      <point x="601" y="72" type="line"/>
+      <point x="589" y="0" type="line"/>
+      <point x="774" y="0" type="line" smooth="yes"/>
+      <point x="931" y="0"/>
+      <point x="1028" y="78"/>
+      <point x="1028" y="207" type="curve" smooth="yes"/>
+      <point x="1028" y="322"/>
+      <point x="944" y="395"/>
+      <point x="807" y="395" type="curve" smooth="yes"/>
+      <point x="611" y="395" type="line"/>
+      <point x="611" y="323" type="line"/>
+      <point x="798" y="323" type="line" smooth="yes"/>
+      <point x="890" y="323"/>
+      <point x="943" y="275"/>
+      <point x="943" y="192" type="curve" smooth="yes"/>
+      <point x="943" y="110"/>
+      <point x="893" y="72"/>
+      <point x="784" y="72" type="curve" smooth="yes"/>
+      <point x="589" y="72" type="line"/>
     </contour>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="187" y="0" type="line"/>
-      <point x="187" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="136" y="323" type="line"/>
-      <point x="606" y="323" type="line"/>
-      <point x="606" y="395" type="line"/>
-      <point x="136" y="395" type="line"/>
+      <point x="124" y="323" type="line"/>
+      <point x="594" y="323" type="line"/>
+      <point x="594" y="395" type="line"/>
+      <point x="124" y="395" type="line"/>
     </contour>
     <contour>
-      <point x="558" y="0" type="line"/>
-      <point x="641" y="0" type="line"/>
-      <point x="641" y="694" type="line"/>
-      <point x="558" y="694" type="line"/>
+      <point x="546" y="0" type="line"/>
+      <point x="629" y="0" type="line"/>
+      <point x="629" y="694" type="line"/>
+      <point x="546" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Softsign-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/N_linebelow.glif
index 848e6094..00c5fb50 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_linebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nlinebelow" format="2">
-  <advance width="774"/>
+  <advance width="750"/>
   <unicode hex="1E48"/>
   <outline>
     <component base="N"/>
-    <component base="macronbelowcomb" xOffset="142"/>
+    <component base="macronbelowcomb" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/N_tilde.glif
index cad4495c..06882d37 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ntilde" format="2">
-  <advance width="774"/>
+  <advance width="750"/>
   <unicode hex="00D1"/>
   <outline>
     <component base="N"/>
-    <component base="tildecomb.case" xOffset="147"/>
+    <component base="tildecomb.case" xOffset="135"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_-cy.glif b/src/Cantarell-Regular.ufo/glyphs/O_-cy.glif
index 8e6116ea..c8a73c3b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="O-cy" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="041E"/>
-  <anchor x="394" y="694" name="top"/>
   <outline>
     <component base="O"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_.glif b/src/Cantarell-Regular.ufo/glyphs/O_.glif
index d1291519..84266b1a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_.glif
@@ -1,45 +1,48 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="O" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="004F"/>
-  <note>
-O
-</note>
-  <anchor x="589" y="107" name="Qtail"/>
-  <anchor x="391" y="0" name="bottom"/>
-  <anchor x="391" y="347" name="center"/>
-  <anchor x="472" y="10" name="ogonek"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
-  <anchor x="706" y="694" name="topright"/>
+  <anchor x="578" y="107" name="Qtail"/>
+  <anchor x="380" y="0" name="bottom"/>
+  <anchor x="380" y="347" name="center"/>
+  <anchor x="461" y="10" name="ogonek"/>
+  <anchor x="380" y="694" name="top"/>
+  <anchor x="9" y="694" name="topleft"/>
+  <anchor x="695" y="694" name="topright"/>
   <outline>
     <contour>
-      <point x="383" y="-7" type="curve" smooth="yes"/>
-      <point x="583" y="-7"/>
-      <point x="717" y="138"/>
-      <point x="717" y="356" type="curve" smooth="yes"/>
-      <point x="717" y="564"/>
-      <point x="587" y="703"/>
-      <point x="393" y="703" type="curve" smooth="yes"/>
-      <point x="196" y="703"/>
-      <point x="65" y="559"/>
-      <point x="65" y="344" type="curve" smooth="yes"/>
-      <point x="65" y="133"/>
-      <point x="192" y="-7"/>
+      <point x="372" y="-7" type="curve" smooth="yes"/>
+      <point x="572" y="-7"/>
+      <point x="706" y="138"/>
+      <point x="706" y="356" type="curve" smooth="yes"/>
+      <point x="706" y="564"/>
+      <point x="576" y="703"/>
+      <point x="382" y="703" type="curve" smooth="yes"/>
+      <point x="185" y="703"/>
+      <point x="54" y="559"/>
+      <point x="54" y="344" type="curve" smooth="yes"/>
+      <point x="54" y="133"/>
+      <point x="181" y="-7"/>
     </contour>
     <contour>
-      <point x="393" y="65" type="curve" smooth="yes"/>
-      <point x="247" y="65"/>
-      <point x="150" y="181"/>
-      <point x="150" y="356" type="curve" smooth="yes"/>
-      <point x="150" y="520"/>
-      <point x="243" y="630"/>
-      <point x="383" y="630" type="curve" smooth="yes"/>
-      <point x="532" y="630"/>
-      <point x="632" y="516"/>
-      <point x="632" y="344" type="curve" smooth="yes"/>
-      <point x="632" y="177"/>
-      <point x="536" y="65"/>
+      <point x="382" y="65" type="curve" smooth="yes"/>
+      <point x="236" y="65"/>
+      <point x="139" y="181"/>
+      <point x="139" y="356" type="curve" smooth="yes"/>
+      <point x="139" y="520"/>
+      <point x="232" y="630"/>
+      <point x="372" y="630" type="curve" smooth="yes"/>
+      <point x="521" y="630"/>
+      <point x="621" y="516"/>
+      <point x="621" y="344" type="curve" smooth="yes"/>
+      <point x="621" y="177"/>
+      <point x="525" y="65"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_E_.glif b/src/Cantarell-Regular.ufo/glyphs/O_E_.glif
index ede7fae8..5d2ab794 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_E_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_E_.glif
@@ -1,61 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="OE" format="2">
-  <advance width="1012"/>
+  <advance width="997"/>
   <unicode hex="0152"/>
-  <anchor x="566" y="0" name="bottom"/>
-  <anchor x="566" y="694" name="top"/>
+  <anchor x="555" y="0" name="bottom"/>
+  <anchor x="555" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="414" y="-7" type="curve" smooth="yes"/>
-      <point x="468" y="-7"/>
-      <point x="540" y="1"/>
-      <point x="564" y="10" type="curve"/>
-      <point x="524" y="79" type="line"/>
-      <point x="503" y="71"/>
-      <point x="459" y="65"/>
-      <point x="414" y="65" type="curve" smooth="yes"/>
-      <point x="253" y="65"/>
-      <point x="150" y="178"/>
-      <point x="150" y="355" type="curve" smooth="yes"/>
-      <point x="150" y="525"/>
-      <point x="246" y="630"/>
-      <point x="406" y="630" type="curve" smooth="yes"/>
-      <point x="451" y="630"/>
-      <point x="498" y="625"/>
-      <point x="524" y="611" type="curve"/>
-      <point x="564" y="686" type="line"/>
-      <point x="540" y="695"/>
-      <point x="467" y="703"/>
-      <point x="415" y="703" type="curve" smooth="yes"/>
-      <point x="198" y="703"/>
-      <point x="65" y="564"/>
-      <point x="65" y="343" type="curve" smooth="yes"/>
-      <point x="65" y="127"/>
-      <point x="192" y="-7"/>
+      <point x="403" y="-7" type="curve" smooth="yes"/>
+      <point x="457" y="-7"/>
+      <point x="529" y="1"/>
+      <point x="553" y="10" type="curve"/>
+      <point x="513" y="79" type="line"/>
+      <point x="492" y="71"/>
+      <point x="448" y="65"/>
+      <point x="403" y="65" type="curve" smooth="yes"/>
+      <point x="242" y="65"/>
+      <point x="139" y="178"/>
+      <point x="139" y="355" type="curve" smooth="yes"/>
+      <point x="139" y="525"/>
+      <point x="235" y="630"/>
+      <point x="395" y="630" type="curve" smooth="yes"/>
+      <point x="440" y="630"/>
+      <point x="487" y="625"/>
+      <point x="513" y="611" type="curve"/>
+      <point x="553" y="686" type="line"/>
+      <point x="529" y="695"/>
+      <point x="456" y="703"/>
+      <point x="404" y="703" type="curve" smooth="yes"/>
+      <point x="187" y="703"/>
+      <point x="54" y="564"/>
+      <point x="54" y="343" type="curve" smooth="yes"/>
+      <point x="54" y="127"/>
+      <point x="181" y="-7"/>
     </contour>
     <contour>
-      <point x="516" y="0" type="line"/>
-      <point x="599" y="0" type="line"/>
-      <point x="599" y="694" type="line"/>
-      <point x="516" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="556" y="0" type="line"/>
-      <point x="952" y="0" type="line"/>
-      <point x="952" y="72" type="line"/>
-      <point x="556" y="72" type="line"/>
-    </contour>
-    <contour>
-      <point x="556" y="323" type="line"/>
-      <point x="925" y="323" type="line"/>
-      <point x="925" y="395" type="line"/>
-      <point x="556" y="395" type="line"/>
-    </contour>
-    <contour>
-      <point x="556" y="622" type="line"/>
-      <point x="952" y="622" type="line"/>
-      <point x="952" y="694" type="line"/>
-      <point x="556" y="694" type="line"/>
+      <point x="505" y="0" type="line"/>
+      <point x="941" y="0" type="line"/>
+      <point x="941" y="72" type="line"/>
+      <point x="588" y="72" type="line"/>
+      <point x="588" y="323" type="line"/>
+      <point x="914" y="323" type="line"/>
+      <point x="914" y="395" type="line"/>
+      <point x="588" y="395" type="line"/>
+      <point x="588" y="622" type="line"/>
+      <point x="941" y="622" type="line"/>
+      <point x="941" y="694" type="line"/>
+      <point x="505" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_acute.glif b/src/Cantarell-Regular.ufo/glyphs/O_acute.glif
index 718eb4d1..c2602e1e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oacute" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="00D3"/>
   <outline>
     <component base="O"/>
-    <component base="acutecomb.case" xOffset="303"/>
+    <component base="acutecomb.case" xOffset="292"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_barred-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_barred-cy.glif
index 424f5a37..57f43c48 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_barred-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_barred-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Obarred-cy" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="04E8"/>
   <outline>
     <component base="O"/>
-    <component base="_bar-cy" xOffset="-54" yOffset="5"/>
+    <component base="_bar-cy" xOffset="-65" yOffset="5"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_breve.glif b/src/Cantarell-Regular.ufo/glyphs/O_breve.glif
index 16e10a34..fc6b1aca 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Obreve" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="014E"/>
   <outline>
     <component base="O"/>
-    <component base="brevecomb.case" xOffset="182"/>
+    <component base="brevecomb.case" xOffset="171"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_caron.glif b/src/Cantarell-Regular.ufo/glyphs/O_caron.glif
index 9e9da0df..e38880fe 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocaron" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="01D1"/>
   <outline>
     <component base="O"/>
-    <component base="caroncomb.case" xOffset="207"/>
+    <component base="caroncomb.case" xOffset="196"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflex.glif
index 4b6ea36c..3a43babe 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflex" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="00D4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb.case" xOffset="203"/>
+    <component base="circumflexcomb.case" xOffset="192"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflexacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflexacute.glif
index a004cd92..c4788855 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_circumflexacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_circumflexacute.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexacute" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="1ED0"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="225" yOffset="12"/>
+    <component base="circumflexcomb.loclVIET" xOffset="189" yOffset="212"/>
+    <component base="acutecomb.loclVIET" xOffset="427" yOffset="293"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflexdotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflexdotbelow.glif
index 13b1c3b4..135eb879 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_circumflexdotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexdotbelow" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="1ED8"/>
   <outline>
     <component base="O"/>
-    <component base="dotbelowcomb" xOffset="255"/>
-    <component base="circumflexcomb.case" xOffset="203"/>
+    <component base="dotbelowcomb" xOffset="244"/>
+    <component base="circumflexcomb.case" xOffset="192"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflexgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflexgrave.glif
index b90c278c..0ad4d7d5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_circumflexgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_circumflexgrave.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexgrave" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="1ED2"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="225" yOffset="12"/>
+    <component base="circumflexcomb.loclVIET" xOffset="189" yOffset="212"/>
+    <component base="gravecomb.loclVIET" xOffset="340" yOffset="293"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflexhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflexhookabove.glif
index 5e66d217..17a5dd7f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_circumflexhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_circumflexhookabove.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexhookabove" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="1ED4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="225" yOffset="12"/>
+    <component base="circumflexcomb.loclVIET" xOffset="189" yOffset="212"/>
+    <component base="hookabovecomb.loclVIET" xOffset="376" yOffset="293"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflextilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflextilde.glif
index db904b2f..292838a2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_circumflextilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_circumflextilde.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflextilde" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="1ED6"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="192" yOffset="12"/>
+    <component base="circumflexcomb.loclVIET" xOffset="189" yOffset="212"/>
+    <component base="tildecomb.loclVIET" xOffset="159" yOffset="310"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_dblgrave.glif
index 64c830a9..f883be08 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odblgrave" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="020C"/>
   <outline>
     <component base="O"/>
-    <component base="dblgravecomb.case" xOffset="170"/>
+    <component base="dblgravecomb.case" xOffset="159"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_dieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_dieresis-cy.glif
index fe9a5e5a..6e8269b5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_dieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_dieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odieresis-cy" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="04E6"/>
   <outline>
     <component base="O-cy"/>
-    <component base="dieresiscomb.case" xOffset="158"/>
+    <component base="dieresiscomb.case" xOffset="144"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_dieresis.glif
index 5a3c1807..740e6245 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odieresis" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="00D6"/>
   <outline>
     <component base="O"/>
-    <component base="dieresiscomb.case" xOffset="155"/>
+    <component base="dieresiscomb.case" xOffset="144"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_dieresismacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_dieresismacron.glif
index 0023d90c..406a29c6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_dieresismacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_dieresismacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odieresismacron" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="022A"/>
   <outline>
     <component base="O"/>
-    <component base="dieresiscomb.case" xOffset="155"/>
-    <component base="macroncomb.case" xOffset="149" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="144"/>
+    <component base="macroncomb.case" xOffset="138" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_dotaccentmacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_dotaccentmacron.glif
index 2a22d8b0..838496f6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_dotaccentmacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_dotaccentmacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odotaccentmacron" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="0230"/>
   <outline>
     <component base="O"/>
-    <component base="dotaccentcomb.case" xOffset="255"/>
-    <component base="macroncomb.case" xOffset="149" yOffset="162"/>
+    <component base="dotaccentcomb.case" xOffset="244"/>
+    <component base="macroncomb.case" xOffset="138" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_dotbelow.glif
index 0c0a955c..b7940ba0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odotbelow" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="1ECC"/>
   <outline>
     <component base="O"/>
-    <component base="dotbelowcomb" xOffset="255"/>
+    <component base="dotbelowcomb" xOffset="244"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_grave.glif b/src/Cantarell-Regular.ufo/glyphs/O_grave.glif
index b5584573..1b4aa166 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ograve" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="00D2"/>
   <outline>
     <component base="O"/>
-    <component base="gravecomb.case" xOffset="196"/>
+    <component base="gravecomb.case" xOffset="185"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_hm.glif b/src/Cantarell-Regular.ufo/glyphs/O_hm.glif
index c719df21..e78d6583 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_hm.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_hm.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohm" format="2">
-  <advance width="818"/>
+  <advance width="814"/>
   <unicode hex="2126"/>
   <outline>
     <contour>
-      <point x="84" y="0" type="line"/>
-      <point x="337" y="0" type="line"/>
-      <point x="337" y="53" type="line"/>
-      <point x="246" y="124"/>
-      <point x="185" y="260"/>
-      <point x="185" y="394" type="curve" smooth="yes"/>
-      <point x="185" y="538"/>
-      <point x="271" y="631"/>
-      <point x="402" y="631" type="curve" smooth="yes"/>
-      <point x="538" y="631"/>
-      <point x="635" y="529"/>
-      <point x="635" y="388" type="curve" smooth="yes"/>
-      <point x="635" y="266"/>
-      <point x="573" y="132"/>
-      <point x="481" y="53" type="curve"/>
-      <point x="481" y="0" type="line"/>
-      <point x="733" y="0" type="line"/>
-      <point x="733" y="72" type="line"/>
-      <point x="569" y="72" type="line"/>
-      <point x="658" y="135"/>
-      <point x="717" y="265"/>
-      <point x="717" y="397" type="curve" smooth="yes"/>
-      <point x="717" y="581"/>
-      <point x="595" y="704"/>
-      <point x="413" y="704" type="curve" smooth="yes"/>
-      <point x="226" y="704"/>
-      <point x="102" y="576"/>
-      <point x="102" y="385" type="curve" smooth="yes"/>
-      <point x="102" y="247"/>
-      <point x="161" y="122"/>
-      <point x="250" y="72" type="curve"/>
-      <point x="84" y="72" type="line"/>
+      <point x="82" y="0" type="line"/>
+      <point x="335" y="0" type="line"/>
+      <point x="335" y="53" type="line"/>
+      <point x="244" y="124"/>
+      <point x="183" y="260"/>
+      <point x="183" y="394" type="curve" smooth="yes"/>
+      <point x="183" y="538"/>
+      <point x="269" y="631"/>
+      <point x="400" y="631" type="curve" smooth="yes"/>
+      <point x="536" y="631"/>
+      <point x="633" y="529"/>
+      <point x="633" y="388" type="curve" smooth="yes"/>
+      <point x="633" y="266"/>
+      <point x="571" y="132"/>
+      <point x="479" y="53" type="curve"/>
+      <point x="479" y="0" type="line"/>
+      <point x="731" y="0" type="line"/>
+      <point x="731" y="72" type="line"/>
+      <point x="567" y="72" type="line"/>
+      <point x="656" y="135"/>
+      <point x="715" y="265"/>
+      <point x="715" y="397" type="curve" smooth="yes"/>
+      <point x="715" y="581"/>
+      <point x="593" y="704"/>
+      <point x="411" y="704" type="curve" smooth="yes"/>
+      <point x="224" y="704"/>
+      <point x="100" y="576"/>
+      <point x="100" y="385" type="curve" smooth="yes"/>
+      <point x="100" y="247"/>
+      <point x="159" y="122"/>
+      <point x="248" y="72" type="curve"/>
+      <point x="82" y="72" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_hookabove.glif
index 21366be5..b8ca28ed 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohookabove" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="1ECE"/>
   <outline>
     <component base="O"/>
-    <component base="hookabovecomb.case" xOffset="247"/>
+    <component base="hookabovecomb.case" xOffset="236"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_horn.glif b/src/Cantarell-Regular.ufo/glyphs/O_horn.glif
index 8cd614ea..961390e4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_horn.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_horn.glif
@@ -1,15 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorn" format="2">
-  <advance width="839"/>
+  <advance width="760"/>
   <unicode hex="01A0"/>
   <outline>
     <component base="O"/>
-    <component base="horncomb" xOffset="564" yOffset="212"/>
+    <component base="horncomb" xOffset="553" yOffset="212"/>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
-      <string>=+57</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_hornacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_hornacute.glif
index fff1bfef..cb1f7ca9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_hornacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_hornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohornacute" format="2">
-  <advance width="839"/>
+  <advance width="760"/>
   <unicode hex="1EDA"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="acutecomb.case" xOffset="303"/>
+    <component base="acutecomb.case" xOffset="292"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_horndotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_horndotbelow.glif
index 11f96b3f..666a2f15 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_horndotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_horndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorndotbelow" format="2">
-  <advance width="839"/>
+  <advance width="760"/>
   <unicode hex="1EE2"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="dotbelowcomb" xOffset="255"/>
+    <component base="dotbelowcomb" xOffset="244"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_horngrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_horngrave.glif
index 9ae595c3..7e349e22 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_horngrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_horngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorngrave" format="2">
-  <advance width="839"/>
+  <advance width="760"/>
   <unicode hex="1EDC"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="gravecomb.case" xOffset="196"/>
+    <component base="gravecomb.case" xOffset="185"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_hornhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_hornhookabove.glif
index d8f4d6c5..beacdcee 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_hornhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_hornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohornhookabove" format="2">
-  <advance width="839"/>
+  <advance width="760"/>
   <unicode hex="1EDE"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="hookabovecomb.case" xOffset="247"/>
+    <component base="hookabovecomb.case" xOffset="236"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_horntilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_horntilde.glif
index be621635..5afc1418 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_horntilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_horntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorntilde" format="2">
-  <advance width="839"/>
+  <advance width="760"/>
   <unicode hex="1EE0"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="tildecomb.case" xOffset="151"/>
+    <component base="tildecomb.case" xOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_hungarumlaut.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_hungarumlaut.glif
index d7d619e0..83c8f79b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_hungarumlaut.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_hungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohungarumlaut" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="0150"/>
   <outline>
     <component base="O"/>
-    <component base="hungarumlautcomb.case" xOffset="181"/>
+    <component base="hungarumlautcomb.case" xOffset="170"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_invertedbreve.glif
index e866dc89..1b0da851 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oinvertedbreve" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="020E"/>
   <outline>
     <component base="O"/>
-    <component base="breveinvertedcomb.case" xOffset="194"/>
+    <component base="breveinvertedcomb.case" xOffset="183"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_macron.glif b/src/Cantarell-Regular.ufo/glyphs/O_macron.glif
index 2a7ec8c5..beca4097 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacron" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="014C"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="149"/>
+    <component base="macroncomb.case" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_macronacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_macronacute.glif
index 8d8bc9c7..70dc15db 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_macronacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_macronacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacronacute" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="1E52"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="149"/>
-    <component base="acutecomb.case" xOffset="303" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="138"/>
+    <component base="acutecomb.case" xOffset="292" yOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_macrongrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_macrongrave.glif
index 80863b6a..f0909174 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_macrongrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_macrongrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacrongrave" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="1E50"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="149"/>
-    <component base="gravecomb.case" xOffset="196" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="138"/>
+    <component base="gravecomb.case" xOffset="185" yOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/O_ogonek.glif
index 1c6ffaba..00bc5fa1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oogonek" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="01EA"/>
   <outline>
     <component base="O"/>
-    <component base="ogonekcomb.tall.case" xOffset="40"/>
+    <component base="ogonekcomb.tall.case" xOffset="29"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_slash.glif b/src/Cantarell-Regular.ufo/glyphs/O_slash.glif
index 5be56b05..96d34847 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_slash.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_slash.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oslash" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="00D8"/>
   <outline>
     <component base="O"/>
-    <component base="slashlongcomb.case" xOffset="121" yOffset="-2"/>
+    <component base="slashlongcomb.case" xOffset="110" yOffset="-2"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_slashacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_slashacute.glif
index e361a62a..3b0879ea 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_slashacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_slashacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oslashacute" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="01FE"/>
   <outline>
     <component base="Oslash"/>
-    <component base="acutecomb.case" xOffset="303"/>
+    <component base="acutecomb.case" xOffset="292"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/O_tilde.glif
index c8427ad7..02acba2e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otilde" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="00D5"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="151"/>
+    <component base="tildecomb.case" xOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_tildeacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_tildeacute.glif
index 2b9c88e0..96e6eb7b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_tildeacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_tildeacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildeacute" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="1E4C"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="151"/>
-    <component base="acutecomb.case" xOffset="304" yOffset="182"/>
+    <component base="tildecomb.case" xOffset="140"/>
+    <component base="acutecomb.case" xOffset="293" yOffset="182"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_tildedieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_tildedieresis.glif
index 993e4713..e32d2de7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_tildedieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_tildedieresis.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildedieresis" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="1E4E"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="151"/>
-    <component base="dieresiscomb.case" xOffset="156" yOffset="182"/>
+    <component base="tildecomb.case" xOffset="140"/>
+    <component base="dieresiscomb.case" xOffset="145" yOffset="182"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_tildemacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_tildemacron.glif
index da9570b9..dfde4b5e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_tildemacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_tildemacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildemacron" format="2">
-  <advance width="782"/>
+  <advance width="760"/>
   <unicode hex="022C"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="151"/>
-    <component base="macroncomb.case" xOffset="150" yOffset="182"/>
+    <component base="tildecomb.case" xOffset="140"/>
+    <component base="macroncomb.case" xOffset="139" yOffset="182"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/P_.glif b/src/Cantarell-Regular.ufo/glyphs/P_.glif
index 7b572043..055371a2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/P_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/P_.glif
@@ -1,38 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="P" format="2">
-  <advance width="618"/>
+  <advance width="590"/>
   <unicode hex="0050"/>
-  <note>
-P
-</note>
-  <anchor x="305" y="0" name="bottom"/>
-  <anchor x="305" y="694" name="top"/>
+  <anchor x="293" y="0" name="bottom"/>
+  <anchor x="293" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="187" y="0" type="line"/>
-      <point x="187" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="157" y="242" type="line"/>
-      <point x="305" y="242" type="line" smooth="yes"/>
-      <point x="460" y="242"/>
-      <point x="564" y="334"/>
-      <point x="564" y="473" type="curve" smooth="yes"/>
-      <point x="564" y="606"/>
-      <point x="466" y="694"/>
-      <point x="320" y="694" type="curve" smooth="yes"/>
-      <point x="157" y="694" type="line"/>
-      <point x="157" y="622" type="line"/>
-      <point x="310" y="622" type="line" smooth="yes"/>
-      <point x="411" y="622"/>
-      <point x="479" y="556"/>
-      <point x="479" y="458" type="curve" smooth="yes"/>
-      <point x="479" y="364"/>
-      <point x="423" y="314"/>
-      <point x="320" y="314" type="curve" smooth="yes"/>
-      <point x="157" y="314" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="622" type="line"/>
+      <point x="298" y="622" type="line" smooth="yes"/>
+      <point x="399" y="622"/>
+      <point x="467" y="556"/>
+      <point x="467" y="458" type="curve" smooth="yes"/>
+      <point x="467" y="364"/>
+      <point x="411" y="314"/>
+      <point x="308" y="314" type="curve" smooth="yes"/>
+      <point x="145" y="314" type="line"/>
+      <point x="145" y="242" type="line"/>
+      <point x="293" y="242" type="line" smooth="yes"/>
+      <point x="448" y="242"/>
+      <point x="552" y="334"/>
+      <point x="552" y="473" type="curve" smooth="yes"/>
+      <point x="552" y="606"/>
+      <point x="454" y="694"/>
+      <point x="308" y="694" type="curve" smooth="yes"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/P_alochka-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/P_alochka-cy.glif
index c0ba7298..f4cd7fcb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/P_alochka-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/P_alochka-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Palochka-cy" format="2">
-  <advance width="291"/>
+  <advance width="267"/>
   <unicode hex="04C0"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/P_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/P_e-cy.glif
index 18376538..e31f3b62 100644
--- a/src/Cantarell-Regular.ufo/glyphs/P_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/P_e-cy.glif
@@ -1,18 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Pe-cy" format="2">
-  <advance width="723"/>
+  <advance width="699"/>
   <unicode hex="041F"/>
-  <anchor x="705" y="0" name="bottomright"/>
+  <anchor x="693" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="185" y="0" type="line"/>
-      <point x="185" y="624" type="line"/>
-      <point x="538" y="624" type="line"/>
-      <point x="538" y="0" type="line"/>
-      <point x="619" y="0" type="line"/>
-      <point x="619" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="173" y="0" type="line"/>
+      <point x="173" y="624" type="line"/>
+      <point x="526" y="624" type="line"/>
+      <point x="526" y="0" type="line"/>
+      <point x="607" y="0" type="line"/>
+      <point x="607" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Q_.glif b/src/Cantarell-Regular.ufo/glyphs/Q_.glif
index 320f4f52..cdb14fbb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Q_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Q_.glif
@@ -1,46 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Q" format="2">
-  <advance width="795"/>
+  <advance width="765"/>
   <unicode hex="0051"/>
-  <note>
-Q
-</note>
-  <anchor x="391" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
+  <anchor x="380" y="0" name="bottom"/>
+  <anchor x="380" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="383" y="-7" type="curve" smooth="yes"/>
-      <point x="583" y="-7"/>
-      <point x="717" y="138"/>
-      <point x="717" y="356" type="curve" smooth="yes"/>
-      <point x="717" y="564"/>
-      <point x="587" y="703"/>
-      <point x="393" y="703" type="curve" smooth="yes"/>
-      <point x="196" y="703"/>
-      <point x="65" y="559"/>
-      <point x="65" y="344" type="curve" smooth="yes"/>
-      <point x="65" y="133"/>
-      <point x="192" y="-7"/>
+      <point x="372" y="-7" type="curve" smooth="yes"/>
+      <point x="572" y="-7"/>
+      <point x="706" y="138"/>
+      <point x="706" y="356" type="curve" smooth="yes"/>
+      <point x="706" y="564"/>
+      <point x="576" y="703"/>
+      <point x="382" y="703" type="curve" smooth="yes"/>
+      <point x="185" y="703"/>
+      <point x="54" y="559"/>
+      <point x="54" y="344" type="curve" smooth="yes"/>
+      <point x="54" y="133"/>
+      <point x="181" y="-7"/>
     </contour>
     <contour>
-      <point x="393" y="65" type="curve" smooth="yes"/>
-      <point x="247" y="65"/>
-      <point x="150" y="181"/>
-      <point x="150" y="356" type="curve" smooth="yes"/>
-      <point x="150" y="520"/>
-      <point x="243" y="630"/>
-      <point x="383" y="630" type="curve" smooth="yes"/>
-      <point x="532" y="630"/>
-      <point x="632" y="516"/>
-      <point x="632" y="344" type="curve" smooth="yes"/>
-      <point x="632" y="177"/>
-      <point x="536" y="65"/>
+      <point x="676" y="-32" type="line"/>
+      <point x="725" y="19" type="line"/>
+      <point x="416" y="309" type="line"/>
+      <point x="371" y="259" type="line"/>
     </contour>
     <contour>
-      <point x="687" y="-32" type="line"/>
-      <point x="736" y="19" type="line"/>
-      <point x="427" y="309" type="line"/>
-      <point x="382" y="259" type="line"/>
+      <point x="382" y="65" type="curve" smooth="yes"/>
+      <point x="236" y="65"/>
+      <point x="139" y="181"/>
+      <point x="139" y="356" type="curve" smooth="yes"/>
+      <point x="139" y="520"/>
+      <point x="232" y="630"/>
+      <point x="372" y="630" type="curve" smooth="yes"/>
+      <point x="521" y="630"/>
+      <point x="621" y="516"/>
+      <point x="621" y="344" type="curve" smooth="yes"/>
+      <point x="621" y="177"/>
+      <point x="525" y="65"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif b/src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif
index 921d4cbe..c2407d8e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Qa-cy" format="2">
-  <advance width="795"/>
+  <advance width="765"/>
   <unicode hex="051A"/>
   <outline>
     <component base="Q"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_.glif b/src/Cantarell-Regular.ufo/glyphs/R_.glif
index 3715c7db..14d740ca 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_.glif
@@ -1,44 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="R" format="2">
-  <advance width="645"/>
+  <advance width="620"/>
   <unicode hex="0052"/>
-  <note>
-R
-</note>
-  <anchor x="321" y="0" name="bottom"/>
-  <anchor x="321" y="694" name="top"/>
+  <anchor x="309" y="0" name="bottom"/>
+  <anchor x="309" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="187" y="0" type="line"/>
-      <point x="187" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="622" type="line"/>
+      <point x="312" y="622" type="line" smooth="yes"/>
+      <point x="411" y="622"/>
+      <point x="469" y="571"/>
+      <point x="469" y="485" type="curve" smooth="yes"/>
+      <point x="469" y="400"/>
+      <point x="417" y="351"/>
+      <point x="322" y="351" type="curve" smooth="yes"/>
+      <point x="145" y="351" type="line"/>
+      <point x="145" y="281" type="line"/>
+      <point x="312" y="281" type="line" smooth="yes"/>
+      <point x="456" y="281"/>
+      <point x="554" y="372"/>
+      <point x="554" y="500" type="curve" smooth="yes"/>
+      <point x="554" y="622"/>
+      <point x="464" y="694"/>
+      <point x="322" y="694" type="curve" smooth="yes"/>
+      <point x="92" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="157" y="281" type="line"/>
-      <point x="324" y="281" type="line" smooth="yes"/>
-      <point x="468" y="281"/>
-      <point x="566" y="372"/>
-      <point x="566" y="500" type="curve" smooth="yes"/>
-      <point x="566" y="622"/>
-      <point x="476" y="694"/>
-      <point x="334" y="694" type="curve" smooth="yes"/>
-      <point x="157" y="694" type="line"/>
-      <point x="157" y="622" type="line"/>
-      <point x="324" y="622" type="line" smooth="yes"/>
-      <point x="423" y="622"/>
-      <point x="481" y="571"/>
-      <point x="481" y="485" type="curve" smooth="yes"/>
-      <point x="481" y="400"/>
-      <point x="429" y="351"/>
-      <point x="334" y="351" type="curve" smooth="yes"/>
-      <point x="157" y="351" type="line"/>
-    </contour>
-    <contour>
-      <point x="507" y="0" type="line"/>
-      <point x="606" y="0" type="line"/>
-      <point x="414" y="328" type="line"/>
-      <point x="319" y="328" type="line"/>
+      <point x="495" y="0" type="line"/>
+      <point x="594" y="0" type="line"/>
+      <point x="402" y="328" type="line"/>
+      <point x="307" y="328" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_acute.glif b/src/Cantarell-Regular.ufo/glyphs/R_acute.glif
index 2f574794..869527b9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Racute" format="2">
-  <advance width="645"/>
+  <advance width="620"/>
   <unicode hex="0154"/>
   <outline>
     <component base="R"/>
-    <component base="acutecomb.case" xOffset="233"/>
+    <component base="acutecomb.case" xOffset="221"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_caron.glif b/src/Cantarell-Regular.ufo/glyphs/R_caron.glif
index 66bbd51e..d2ea98f4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcaron" format="2">
-  <advance width="645"/>
+  <advance width="620"/>
   <unicode hex="0158"/>
   <outline>
     <component base="R"/>
-    <component base="caroncomb.case" xOffset="137"/>
+    <component base="caroncomb.case" xOffset="125"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_commaaccent.glif
index 3970711b..bba12eec 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcommaaccent" format="2">
-  <advance width="645"/>
+  <advance width="620"/>
   <unicode hex="0156"/>
   <outline>
     <component base="R"/>
-    <component base="commaaccentcomb" xOffset="155"/>
+    <component base="commaaccentcomb" xOffset="143"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif
index 47c8f762..0010573d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdblgrave" format="2">
-  <advance width="645"/>
+  <advance width="620"/>
   <unicode hex="0210"/>
   <outline>
     <component base="R"/>
-    <component base="dblgravecomb.case" xOffset="100"/>
+    <component base="dblgravecomb.case" xOffset="88"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif
index e6dafd6d..bc39ed1e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdotbelow" format="2">
-  <advance width="645"/>
+  <advance width="620"/>
   <unicode hex="1E5A"/>
   <outline>
     <component base="R"/>
-    <component base="dotbelowcomb" xOffset="185"/>
+    <component base="dotbelowcomb" xOffset="173"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_invertedbreve.glif
index 379a6347..455feddb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rinvertedbreve" format="2">
-  <advance width="645"/>
+  <advance width="620"/>
   <unicode hex="0212"/>
   <outline>
     <component base="R"/>
-    <component base="breveinvertedcomb.case" xOffset="124"/>
+    <component base="breveinvertedcomb.case" xOffset="112"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif
index d679203e..c5630e80 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rlinebelow" format="2">
-  <advance width="645"/>
+  <advance width="620"/>
   <unicode hex="1E5E"/>
   <outline>
     <component base="R"/>
-    <component base="macronbelowcomb" xOffset="76"/>
+    <component base="macronbelowcomb" xOffset="64"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_.glif b/src/Cantarell-Regular.ufo/glyphs/S_.glif
index e872a4f1..09fb1278 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_.glif
@@ -1,46 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="S" format="2">
-  <advance width="586"/>
+  <advance width="553"/>
   <unicode hex="0053"/>
-  <note>
-S
-</note>
-  <anchor x="290" y="0" name="bottom"/>
-  <anchor x="290" y="694" name="top"/>
+  <anchor x="273" y="0" name="bottom"/>
+  <anchor x="273" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="280" y="-10" type="curve" smooth="yes"/>
-      <point x="435" y="-10"/>
-      <point x="536" y="69"/>
-      <point x="536" y="191" type="curve" smooth="yes"/>
-      <point x="536" y="437"/>
-      <point x="147" y="339"/>
-      <point x="147" y="518" type="curve" smooth="yes"/>
-      <point x="147" y="591"/>
-      <point x="206" y="631"/>
-      <point x="312" y="631" type="curve" smooth="yes"/>
-      <point x="371" y="631"/>
-      <point x="435" y="619"/>
-      <point x="485" y="598" type="curve"/>
-      <point x="510" y="663" type="line"/>
-      <point x="451" y="689"/>
-      <point x="384" y="703"/>
-      <point x="318" y="703" type="curve" smooth="yes"/>
-      <point x="163" y="703"/>
-      <point x="62" y="626"/>
-      <point x="62" y="505" type="curve" smooth="yes"/>
-      <point x="62" y="267"/>
-      <point x="450" y="356"/>
-      <point x="450" y="179" type="curve" smooth="yes"/>
-      <point x="450" y="109"/>
-      <point x="390" y="64"/>
-      <point x="285" y="64" type="curve" smooth="yes"/>
-      <point x="222" y="64"/>
-      <point x="144" y="81"/>
-      <point x="76" y="109" type="curve"/>
-      <point x="51" y="44" type="line"/>
-      <point x="128" y="9"/>
-      <point x="206" y="-10"/>
+      <point x="263" y="-10" type="curve" smooth="yes"/>
+      <point x="418" y="-10"/>
+      <point x="519" y="69"/>
+      <point x="519" y="191" type="curve" smooth="yes"/>
+      <point x="519" y="437"/>
+      <point x="130" y="339"/>
+      <point x="130" y="518" type="curve" smooth="yes"/>
+      <point x="130" y="591"/>
+      <point x="189" y="631"/>
+      <point x="295" y="631" type="curve" smooth="yes"/>
+      <point x="354" y="631"/>
+      <point x="418" y="619"/>
+      <point x="468" y="598" type="curve"/>
+      <point x="493" y="663" type="line"/>
+      <point x="434" y="689"/>
+      <point x="367" y="703"/>
+      <point x="301" y="703" type="curve" smooth="yes"/>
+      <point x="146" y="703"/>
+      <point x="45" y="626"/>
+      <point x="45" y="505" type="curve" smooth="yes"/>
+      <point x="45" y="267"/>
+      <point x="433" y="356"/>
+      <point x="433" y="179" type="curve" smooth="yes"/>
+      <point x="433" y="109"/>
+      <point x="373" y="64"/>
+      <point x="268" y="64" type="curve" smooth="yes"/>
+      <point x="205" y="64"/>
+      <point x="127" y="81"/>
+      <point x="59" y="109" type="curve"/>
+      <point x="34" y="44" type="line"/>
+      <point x="111" y="9"/>
+      <point x="189" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_acute.glif b/src/Cantarell-Regular.ufo/glyphs/S_acute.glif
index 95b45e65..7cb67720 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sacute" format="2">
-  <advance width="586"/>
+  <advance width="553"/>
   <unicode hex="015A"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="202"/>
+    <component base="acutecomb.case" xOffset="185"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_acutedotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_acutedotaccent.glif
index 6167e8d9..c8cc0830 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_acutedotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_acutedotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sacutedotaccent" format="2">
-  <advance width="586"/>
+  <advance width="553"/>
   <unicode hex="1E64"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="202"/>
-    <component base="dotaccentcomb.case" xOffset="105" yOffset="107"/>
+    <component base="acutecomb.case" xOffset="185"/>
+    <component base="dotaccentcomb.case" xOffset="88" yOffset="107"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_altillo.glif b/src/Cantarell-Regular.ufo/glyphs/S_altillo.glif
index 7b71f549..dd93270f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_altillo.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_altillo.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Saltillo" format="2">
-  <advance width="261"/>
+  <advance width="274"/>
   <unicode hex="A78B"/>
   <outline>
-    <component base="quotesingle" xScale="1.04" yScale="2.16474" xOffset="2" yOffset="-808"/>
+    <component base="quotesingle" xScale="1.04" yScale="2.16474" xOffset="10" yOffset="-808"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_caron.glif b/src/Cantarell-Regular.ufo/glyphs/S_caron.glif
index b59e6f99..ce6df1d9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scaron" format="2">
-  <advance width="586"/>
+  <advance width="553"/>
   <unicode hex="0160"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="106"/>
+    <component base="caroncomb.case" xOffset="89"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_carondotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_carondotaccent.glif
index 18733c5f..e5ec03fa 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_carondotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_carondotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scarondotaccent" format="2">
-  <advance width="586"/>
+  <advance width="553"/>
   <unicode hex="1E66"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="106"/>
-    <component base="dotaccentcomb.case" xOffset="154" yOffset="142"/>
+    <component base="caroncomb.case" xOffset="89"/>
+    <component base="dotaccentcomb.case" xOffset="137" yOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_cedilla.glif b/src/Cantarell-Regular.ufo/glyphs/S_cedilla.glif
index 8a625ffd..53d5eb30 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_cedilla.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scedilla" format="2">
-  <advance width="586"/>
+  <advance width="553"/>
   <unicode hex="015E"/>
   <outline>
     <component base="S"/>
-    <component base="cedillacomb" xOffset="143"/>
+    <component base="cedillacomb" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_chwa-cy.glif b/src/Cantarell-Regular.ufo/glyphs/S_chwa-cy.glif
index 9c086472..253553d9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_chwa-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_chwa-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Schwa-cy" format="2">
-  <advance width="744"/>
+  <advance width="723"/>
   <unicode hex="04D8"/>
   <outline>
     <component base="Schwa"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_chwa.glif b/src/Cantarell-Regular.ufo/glyphs/S_chwa.glif
index d502fdf2..aa19dbe5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_chwa.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_chwa.glif
@@ -1,42 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Schwa" format="2">
-  <advance width="744"/>
+  <advance width="723"/>
   <unicode hex="018F"/>
-  <anchor x="369" y="0" name="bottom"/>
-  <anchor x="369" y="694" name="top"/>
+  <anchor x="359" y="0" name="bottom"/>
+  <anchor x="359" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="322" y="700" type="curve" smooth="yes"/>
-      <point x="235" y="700"/>
-      <point x="157" y="680"/>
-      <point x="87" y="640" type="curve"/>
-      <point x="106" y="579" type="line"/>
-      <point x="170" y="610"/>
-      <point x="240" y="627"/>
-      <point x="308" y="627" type="curve" smooth="yes"/>
-      <point x="486" y="627"/>
-      <point x="594" y="521"/>
-      <point x="594" y="329" type="curve" smooth="yes"/>
-      <point x="594" y="158"/>
-      <point x="509" y="63"/>
-      <point x="362" y="63" type="curve" smooth="yes"/>
-      <point x="222" y="63"/>
-      <point x="140" y="148"/>
-      <point x="140" y="300" type="curve"/>
-      <point x="615" y="300" type="line"/>
-      <point x="615" y="368" type="line"/>
-      <point x="67" y="368" type="line"/>
-      <point x="65" y="345"/>
-      <point x="63" y="312"/>
-      <point x="63" y="291" type="curve" smooth="yes"/>
-      <point x="63" y="111"/>
-      <point x="179" y="-10"/>
-      <point x="355" y="-10" type="curve" smooth="yes"/>
-      <point x="546" y="-10"/>
-      <point x="679" y="132"/>
-      <point x="679" y="347" type="curve" smooth="yes"/>
-      <point x="679" y="566"/>
-      <point x="541" y="700"/>
+      <point x="345" y="-10" type="curve" smooth="yes"/>
+      <point x="536" y="-10"/>
+      <point x="669" y="132"/>
+      <point x="669" y="347" type="curve" smooth="yes"/>
+      <point x="669" y="566"/>
+      <point x="531" y="700"/>
+      <point x="312" y="700" type="curve" smooth="yes"/>
+      <point x="225" y="700"/>
+      <point x="147" y="680"/>
+      <point x="77" y="640" type="curve"/>
+      <point x="96" y="579" type="line"/>
+      <point x="160" y="610"/>
+      <point x="230" y="627"/>
+      <point x="298" y="627" type="curve" smooth="yes"/>
+      <point x="476" y="627"/>
+      <point x="584" y="521"/>
+      <point x="584" y="329" type="curve" smooth="yes"/>
+      <point x="584" y="158"/>
+      <point x="499" y="63"/>
+      <point x="352" y="63" type="curve" smooth="yes"/>
+      <point x="212" y="63"/>
+      <point x="130" y="148"/>
+      <point x="130" y="300" type="curve"/>
+      <point x="605" y="300" type="line"/>
+      <point x="605" y="368" type="line"/>
+      <point x="57" y="368" type="line"/>
+      <point x="55" y="345"/>
+      <point x="53" y="312"/>
+      <point x="53" y="291" type="curve" smooth="yes"/>
+      <point x="53" y="111"/>
+      <point x="169" y="-10"/>
     </contour>
   </outline>
   <lib>
@@ -48,6 +48,8 @@
         <key>width</key>
         <integer>150</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>O</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif
index bc16b923..d7868865 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scircumflex" format="2">
-  <advance width="586"/>
+  <advance width="553"/>
   <unicode hex="015C"/>
   <outline>
     <component base="S"/>
-    <component base="circumflexcomb.case" xOffset="102"/>
+    <component base="circumflexcomb.case" xOffset="85"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_commaaccent.glif
index 2119d59a..4f595c25 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scommaaccent" format="2">
-  <advance width="586"/>
+  <advance width="553"/>
   <unicode hex="0218"/>
   <outline>
     <component base="S"/>
-    <component base="commaaccentcomb" xOffset="124"/>
+    <component base="commaaccentcomb" xOffset="107"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif
index 0af030bd..062f0562 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotaccent" format="2">
-  <advance width="586"/>
+  <advance width="553"/>
   <unicode hex="1E60"/>
   <outline>
     <component base="S"/>
-    <component base="dotaccentcomb.case" xOffset="154"/>
+    <component base="dotaccentcomb.case" xOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif
index da1206ef..81f29883 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotbelow" format="2">
-  <advance width="586"/>
+  <advance width="553"/>
   <unicode hex="1E62"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="154"/>
+    <component base="dotbelowcomb" xOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_dotbelowdotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_dotbelowdotaccent.glif
index 3434d6f2..4cc41c3d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_dotbelowdotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_dotbelowdotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotbelowdotaccent" format="2">
-  <advance width="586"/>
+  <advance width="553"/>
   <unicode hex="1E68"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="154"/>
-    <component base="dotaccentcomb.case" xOffset="154"/>
+    <component base="dotbelowcomb" xOffset="137"/>
+    <component base="dotaccentcomb.case" xOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_ha-cy.glif b/src/Cantarell-Regular.ufo/glyphs/S_ha-cy.glif
index 7d0e4a11..06612a03 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_ha-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_ha-cy.glif
@@ -1,23 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sha-cy" format="2">
-  <advance width="1022"/>
+  <advance width="998"/>
   <unicode hex="0428"/>
+  <anchor x="918" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="918" y="0" type="line"/>
-      <point x="918" y="694" type="line"/>
-      <point x="836" y="694" type="line"/>
-      <point x="836" y="71" type="line"/>
-      <point x="186" y="71" type="line"/>
-      <point x="186" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="906" y="0" type="line"/>
+      <point x="906" y="694" type="line"/>
+      <point x="824" y="694" type="line"/>
+      <point x="824" y="71" type="line"/>
+      <point x="174" y="71" type="line"/>
+      <point x="174" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="470" y="30" type="line"/>
-      <point x="552" y="30" type="line"/>
-      <point x="552" y="694" type="line"/>
-      <point x="470" y="694" type="line"/>
+      <point x="458" y="30" type="line"/>
+      <point x="540" y="30" type="line"/>
+      <point x="540" y="694" type="line"/>
+      <point x="458" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_hcha-cy.glif b/src/Cantarell-Regular.ufo/glyphs/S_hcha-cy.glif
index 2ad3ccb0..42a2ad69 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_hcha-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_hcha-cy.glif
@@ -1,29 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Shcha-cy" format="2">
-  <advance width="1068"/>
+  <advance width="1021"/>
   <unicode hex="0429"/>
   <outline>
-    <contour>
-      <point x="953" y="-178" type="line"/>
-      <point x="1029" y="-178" type="line"/>
-      <point x="1029" y="71" type="line"/>
-      <point x="186" y="71" type="line"/>
-      <point x="186" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
-      <point x="104" y="0" type="line"/>
-      <point x="953" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="470" y="30" type="line"/>
-      <point x="552" y="30" type="line"/>
-      <point x="552" y="694" type="line"/>
-      <point x="470" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="836" y="30" type="line"/>
-      <point x="918" y="30" type="line"/>
-      <point x="918" y="694" type="line"/>
-      <point x="836" y="694" type="line"/>
-    </contour>
+    <component base="Sha-cy"/>
+    <component base="descender-cy.case" xOffset="811"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Tse-cy</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>-1</integer>
+        <integer>0</integer>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_hha-cy.glif b/src/Cantarell-Regular.ufo/glyphs/S_hha-cy.glif
index 5f0f69ac..a142da76 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_hha-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_hha-cy.glif
@@ -1,31 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Shha-cy" format="2">
-  <advance width="649"/>
+  <advance width="623"/>
   <unicode hex="04BA"/>
   <outline>
     <contour>
-      <point x="503" y="0" type="line"/>
-      <point x="583" y="0" type="line"/>
-      <point x="583" y="246" type="line" smooth="yes"/>
-      <point x="583" y="353"/>
-      <point x="497" y="422"/>
-      <point x="365" y="422" type="curve" smooth="yes"/>
-      <point x="279" y="422"/>
-      <point x="190" y="392"/>
-      <point x="129" y="343" type="curve"/>
-      <point x="148" y="292" type="line"/>
-      <point x="199" y="329"/>
-      <point x="270" y="352"/>
-      <point x="344" y="352" type="curve" smooth="yes"/>
-      <point x="444" y="352"/>
-      <point x="503" y="308"/>
-      <point x="503" y="230" type="curve" smooth="yes"/>
+      <point x="492" y="0" type="line"/>
+      <point x="572" y="0" type="line"/>
+      <point x="572" y="246" type="line" smooth="yes"/>
+      <point x="572" y="353"/>
+      <point x="486" y="422"/>
+      <point x="354" y="422" type="curve" smooth="yes"/>
+      <point x="268" y="422"/>
+      <point x="179" y="392"/>
+      <point x="118" y="343" type="curve"/>
+      <point x="137" y="292" type="line"/>
+      <point x="188" y="329"/>
+      <point x="259" y="352"/>
+      <point x="333" y="352" type="curve" smooth="yes"/>
+      <point x="433" y="352"/>
+      <point x="492" y="308"/>
+      <point x="492" y="230" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="103" y="0" type="line"/>
-      <point x="186" y="0" type="line"/>
-      <point x="186" y="660" type="line"/>
-      <point x="103" y="660" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_oftsign-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_oftsign-cy.glif
index fcfcc260..b4a6e3df 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_oftsign-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_oftsign-cy.glif
@@ -1,29 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Softsign-cy" format="2">
-  <advance width="638"/>
+  <advance width="616"/>
   <unicode hex="042C"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="334" y="0" type="line" smooth="yes"/>
-      <point x="485" y="0"/>
-      <point x="585" y="85"/>
-      <point x="585" y="217" type="curve" smooth="yes"/>
-      <point x="585" y="339"/>
-      <point x="493" y="427"/>
-      <point x="366" y="427" type="curve" smooth="yes"/>
-      <point x="153" y="427" type="line"/>
-      <point x="153" y="355" type="line"/>
-      <point x="357" y="355" type="line" smooth="yes"/>
-      <point x="440" y="355"/>
-      <point x="500" y="289"/>
-      <point x="500" y="200" type="curve" smooth="yes"/>
-      <point x="500" y="115"/>
-      <point x="446" y="72"/>
-      <point x="344" y="72" type="curve" smooth="yes"/>
-      <point x="187" y="72" type="line"/>
-      <point x="187" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="322" y="0" type="line" smooth="yes"/>
+      <point x="473" y="0"/>
+      <point x="573" y="85"/>
+      <point x="573" y="217" type="curve" smooth="yes"/>
+      <point x="573" y="339"/>
+      <point x="481" y="427"/>
+      <point x="354" y="427" type="curve" smooth="yes"/>
+      <point x="141" y="427" type="line"/>
+      <point x="141" y="355" type="line"/>
+      <point x="345" y="355" type="line" smooth="yes"/>
+      <point x="428" y="355"/>
+      <point x="488" y="289"/>
+      <point x="488" y="200" type="curve" smooth="yes"/>
+      <point x="488" y="115"/>
+      <point x="434" y="72"/>
+      <point x="332" y="72" type="curve" smooth="yes"/>
+      <point x="175" y="72" type="line"/>
+      <point x="175" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_.glif b/src/Cantarell-Regular.ufo/glyphs/T_.glif
index 21c93827..4481ac16 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_.glif
@@ -1,25 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="T" format="2">
-  <advance width="594"/>
+  <advance width="566"/>
   <unicode hex="0054"/>
-  <note>
-T
-</note>
-  <anchor x="297" y="0" name="bottom"/>
-  <anchor x="297" y="347" name="center"/>
-  <anchor x="297" y="694" name="top"/>
+  <anchor x="283" y="0" name="bottom"/>
+  <anchor x="283" y="347" name="center"/>
+  <anchor x="283" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="255" y="0" type="line"/>
-      <point x="338" y="0" type="line"/>
-      <point x="338" y="660" type="line"/>
-      <point x="255" y="660" type="line"/>
-    </contour>
-    <contour>
-      <point x="24" y="622" type="line"/>
-      <point x="570" y="622" type="line"/>
-      <point x="570" y="694" type="line"/>
-      <point x="24" y="694" type="line"/>
+      <point x="241" y="0" type="line"/>
+      <point x="324" y="0" type="line"/>
+      <point x="324" y="622" type="line"/>
+      <point x="556" y="622" type="line"/>
+      <point x="556" y="694" type="line"/>
+      <point x="10" y="694" type="line"/>
+      <point x="10" y="622" type="line"/>
+      <point x="241" y="622" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_bar.glif b/src/Cantarell-Regular.ufo/glyphs/T_bar.glif
index d5c5ecdc..92e8b551 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_bar.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_bar.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tbar" format="2">
-  <advance width="594"/>
+  <advance width="566"/>
   <unicode hex="0166"/>
   <outline>
     <component base="T"/>
-    <component base="strokeshortcomb.case" xOffset="69" yOffset="49"/>
+    <component base="strokeshortcomb.case" xOffset="55" yOffset="49"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_caron.glif b/src/Cantarell-Regular.ufo/glyphs/T_caron.glif
index 0beff189..a55759cb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcaron" format="2">
-  <advance width="594"/>
+  <advance width="566"/>
   <unicode hex="0164"/>
   <outline>
     <component base="T"/>
-    <component base="caroncomb.case" xOffset="113"/>
+    <component base="caroncomb.case" xOffset="99"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_cedilla.glif b/src/Cantarell-Regular.ufo/glyphs/T_cedilla.glif
index 7f80a0d7..6509f2df 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_cedilla.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcedilla" format="2">
-  <advance width="594"/>
+  <advance width="566"/>
   <unicode hex="0162"/>
   <outline>
     <component base="T"/>
-    <component base="cedillacomb" xOffset="150"/>
+    <component base="cedillacomb" xOffset="136"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/T_commaaccent.glif
index 98e12121..13c43a07 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcommaaccent" format="2">
-  <advance width="594"/>
+  <advance width="566"/>
   <unicode hex="021A"/>
   <outline>
     <component base="T"/>
-    <component base="commaaccentcomb" xOffset="131"/>
+    <component base="commaaccentcomb" xOffset="117"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/T_dotbelow.glif
index 5ff1372b..a316b14c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tdotbelow" format="2">
-  <advance width="594"/>
+  <advance width="566"/>
   <unicode hex="1E6C"/>
   <outline>
     <component base="T"/>
-    <component base="dotbelowcomb" xOffset="161"/>
+    <component base="dotbelowcomb" xOffset="147"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/T_e-cy.glif
index f25d4d19..0b22c63d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_e-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Te-cy" format="2">
-  <advance width="594"/>
+  <advance width="566"/>
   <unicode hex="0422"/>
-  <anchor x="614" y="0" name="bottomright"/>
   <outline>
     <component base="T"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_horn.glif b/src/Cantarell-Regular.ufo/glyphs/T_horn.glif
index b8b22cd7..76daca9a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_horn.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_horn.glif
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Thorn" format="2">
-  <advance width="618"/>
+  <advance width="590"/>
   <unicode hex="00DE"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="187" y="0" type="line"/>
-      <point x="187" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="145" y="139" type="line"/>
+      <point x="298" y="139" type="line" smooth="yes"/>
+      <point x="451" y="139"/>
+      <point x="552" y="229"/>
+      <point x="552" y="365" type="curve" smooth="yes"/>
+      <point x="552" y="499"/>
+      <point x="453" y="591"/>
+      <point x="308" y="591" type="curve" smooth="yes"/>
+      <point x="145" y="591" type="line"/>
+      <point x="145" y="519" type="line"/>
+      <point x="298" y="519" type="line" smooth="yes"/>
+      <point x="402" y="519"/>
+      <point x="467" y="456"/>
+      <point x="467" y="355" type="curve" smooth="yes"/>
+      <point x="467" y="261"/>
+      <point x="411" y="211"/>
+      <point x="308" y="211" type="curve" smooth="yes"/>
+      <point x="145" y="211" type="line"/>
     </contour>
     <contour>
-      <point x="157" y="139" type="line"/>
-      <point x="310" y="139" type="line" smooth="yes"/>
-      <point x="463" y="139"/>
-      <point x="564" y="229"/>
-      <point x="564" y="365" type="curve" smooth="yes"/>
-      <point x="564" y="499"/>
-      <point x="465" y="591"/>
-      <point x="320" y="591" type="curve" smooth="yes"/>
-      <point x="157" y="591" type="line"/>
-      <point x="157" y="519" type="line"/>
-      <point x="310" y="519" type="line" smooth="yes"/>
-      <point x="414" y="519"/>
-      <point x="479" y="456"/>
-      <point x="479" y="355" type="curve" smooth="yes"/>
-      <point x="479" y="261"/>
-      <point x="423" y="211"/>
-      <point x="320" y="211" type="curve" smooth="yes"/>
-      <point x="157" y="211" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>P</string>
+      <string>I</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>P</string>
     </dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/T_linebelow.glif
index c103381e..8dc02082 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_linebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tlinebelow" format="2">
-  <advance width="594"/>
+  <advance width="566"/>
   <unicode hex="1E6E"/>
   <outline>
     <component base="T"/>
-    <component base="macronbelowcomb" xOffset="52"/>
+    <component base="macronbelowcomb" xOffset="38"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_se-cy.glif b/src/Cantarell-Regular.ufo/glyphs/T_se-cy.glif
index 98b14701..c28f0e88 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_se-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_se-cy.glif
@@ -1,23 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tse-cy" format="2">
-  <advance width="764"/>
+  <advance width="712"/>
   <unicode hex="0426"/>
   <outline>
     <contour>
-      <point x="650" y="-178" type="line"/>
-      <point x="725" y="-178" type="line"/>
-      <point x="725" y="71" type="line"/>
-      <point x="186" y="71" type="line"/>
-      <point x="186" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
-      <point x="104" y="0" type="line"/>
-      <point x="650" y="0" type="line"/>
+      <point x="609" y="-178" type="line"/>
+      <point x="684" y="-178" type="line"/>
+      <point x="684" y="71" type="line"/>
+      <point x="174" y="71" type="line"/>
+      <point x="174" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="609" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="527" y="30" type="line"/>
-      <point x="609" y="30" type="line"/>
-      <point x="609" y="694" type="line"/>
-      <point x="527" y="694" type="line"/>
+      <point x="515" y="30" type="line"/>
+      <point x="597" y="30" type="line"/>
+      <point x="597" y="694" type="line"/>
+      <point x="515" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>De-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_she-cy.glif b/src/Cantarell-Regular.ufo/glyphs/T_she-cy.glif
index 7a5a3a0f..6fe7841e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_she-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_she-cy.glif
@@ -1,37 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tshe-cy" format="2">
-  <advance width="806"/>
+  <advance width="781"/>
   <unicode hex="040B"/>
   <outline>
     <contour>
-      <point x="660" y="0" type="line"/>
-      <point x="740" y="0" type="line"/>
-      <point x="740" y="246" type="line" smooth="yes"/>
-      <point x="740" y="353"/>
-      <point x="654" y="422"/>
-      <point x="522" y="422" type="curve" smooth="yes"/>
-      <point x="436" y="422"/>
-      <point x="347" y="392"/>
-      <point x="286" y="343" type="curve"/>
-      <point x="305" y="292" type="line"/>
-      <point x="356" y="329"/>
-      <point x="427" y="352"/>
-      <point x="501" y="352" type="curve" smooth="yes"/>
-      <point x="601" y="352"/>
-      <point x="660" y="308"/>
-      <point x="660" y="230" type="curve" smooth="yes"/>
+      <point x="250" y="0" type="line"/>
+      <point x="333" y="0" type="line"/>
+      <point x="333" y="622" type="line"/>
+      <point x="575" y="622" type="line"/>
+      <point x="575" y="694" type="line"/>
+      <point x="29" y="694" type="line"/>
+      <point x="29" y="622" type="line"/>
+      <point x="250" y="622" type="line"/>
     </contour>
     <contour>
-      <point x="260" y="0" type="line"/>
-      <point x="343" y="0" type="line"/>
-      <point x="343" y="660" type="line"/>
-      <point x="260" y="660" type="line"/>
-    </contour>
-    <contour>
-      <point x="39" y="622" type="line"/>
-      <point x="585" y="622" type="line"/>
-      <point x="585" y="694" type="line"/>
-      <point x="39" y="694" type="line"/>
+      <point x="650" y="0" type="line"/>
+      <point x="730" y="0" type="line"/>
+      <point x="730" y="246" type="line" smooth="yes"/>
+      <point x="730" y="353"/>
+      <point x="644" y="422"/>
+      <point x="512" y="422" type="curve" smooth="yes"/>
+      <point x="426" y="422"/>
+      <point x="337" y="392"/>
+      <point x="276" y="343" type="curve"/>
+      <point x="295" y="292" type="line"/>
+      <point x="346" y="329"/>
+      <point x="417" y="352"/>
+      <point x="491" y="352" type="curve" smooth="yes"/>
+      <point x="591" y="352"/>
+      <point x="650" y="308"/>
+      <point x="650" y="230" type="curve" smooth="yes"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|Ge-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Shha-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_-cy.glif b/src/Cantarell-Regular.ufo/glyphs/U_-cy.glif
index 95f6cf76..01e869f2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_-cy.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="U-cy" format="2">
-  <advance width="627"/>
+  <advance width="598"/>
   <unicode hex="0423"/>
-  <anchor x="314" y="694" name="top"/>
+  <anchor x="299" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="159" y="0" type="line"/>
-      <point x="247" y="0" type="line"/>
-      <point x="606" y="694" type="line"/>
-      <point x="522" y="694" type="line"/>
-      <point x="326" y="301" type="line"/>
-      <point x="297" y="256" type="line"/>
+      <point x="144" y="0" type="line"/>
+      <point x="237" y="0" type="line"/>
+      <point x="596" y="694" type="line"/>
+      <point x="507" y="694" type="line"/>
+      <point x="311" y="301" type="line"/>
+      <point x="282" y="256" type="line"/>
     </contour>
     <contour>
-      <point x="316" y="199" type="line"/>
-      <point x="354" y="279" type="line"/>
-      <point x="120" y="694" type="line"/>
-      <point x="20" y="694" type="line"/>
+      <point x="301" y="199" type="line"/>
+      <point x="339" y="279" type="line"/>
+      <point x="105" y="694" type="line"/>
+      <point x="5" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_.glif b/src/Cantarell-Regular.ufo/glyphs/U_.glif
index 35401f86..d57955a1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_.glif
@@ -1,34 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="U" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="0055"/>
-  <note>
-U
-</note>
-  <anchor x="355" y="0" name="bottom"/>
-  <anchor x="449" y="10" name="ogonek"/>
-  <anchor x="355" y="694" name="top"/>
-  <anchor x="690" y="694" name="topright"/>
+  <anchor x="335" y="0" name="bottom"/>
+  <anchor x="429" y="10" name="ogonek"/>
+  <anchor x="335" y="694" name="top"/>
+  <anchor x="670" y="694" name="topright"/>
   <outline>
     <contour>
-      <point x="350" y="-10" type="curve" smooth="yes"/>
-      <point x="511" y="-10"/>
-      <point x="619" y="92"/>
-      <point x="619" y="246" type="curve" smooth="yes"/>
-      <point x="619" y="694" type="line"/>
-      <point x="538" y="694" type="line"/>
-      <point x="538" y="236" type="line" smooth="yes"/>
-      <point x="538" y="127"/>
-      <point x="473" y="63"/>
-      <point x="361" y="63" type="curve" smooth="yes"/>
-      <point x="243" y="63"/>
-      <point x="175" y="133"/>
-      <point x="175" y="253" type="curve" smooth="yes"/>
-      <point x="175" y="694" type="line"/>
-      <point x="92" y="694" type="line"/>
-      <point x="92" y="243" type="line" smooth="yes"/>
-      <point x="92" y="90"/>
-      <point x="193" y="-10"/>
+      <point x="330" y="-10" type="curve" smooth="yes"/>
+      <point x="491" y="-10"/>
+      <point x="599" y="92"/>
+      <point x="599" y="246" type="curve" smooth="yes"/>
+      <point x="599" y="694" type="line"/>
+      <point x="518" y="694" type="line"/>
+      <point x="518" y="236" type="line" smooth="yes"/>
+      <point x="518" y="127"/>
+      <point x="453" y="63"/>
+      <point x="341" y="63" type="curve" smooth="yes"/>
+      <point x="223" y="63"/>
+      <point x="155" y="133"/>
+      <point x="155" y="253" type="curve" smooth="yes"/>
+      <point x="155" y="694" type="line"/>
+      <point x="72" y="694" type="line"/>
+      <point x="72" y="243" type="line" smooth="yes"/>
+      <point x="72" y="90"/>
+      <point x="173" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_acute.glif b/src/Cantarell-Regular.ufo/glyphs/U_acute.glif
index 9903567d..d88af4d3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uacute" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="00DA"/>
   <outline>
     <component base="U"/>
-    <component base="acutecomb.case" xOffset="267"/>
+    <component base="acutecomb.case" xOffset="247"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_breve.glif b/src/Cantarell-Regular.ufo/glyphs/U_breve.glif
index ee3c62c5..6a6a85e2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ubreve" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="016C"/>
   <outline>
     <component base="U"/>
-    <component base="brevecomb.case" xOffset="146"/>
+    <component base="brevecomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_caron.glif b/src/Cantarell-Regular.ufo/glyphs/U_caron.glif
index f281882f..7ee7d28a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ucaron" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="01D3"/>
   <outline>
     <component base="U"/>
-    <component base="caroncomb.case" xOffset="171"/>
+    <component base="caroncomb.case" xOffset="151"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif
index d5f05ce4..0d98eb05 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ucircumflex" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="00DB"/>
   <outline>
     <component base="U"/>
-    <component base="circumflexcomb.case" xOffset="167"/>
+    <component base="circumflexcomb.case" xOffset="147"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif
index 42b4953f..26cc213c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udblgrave" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="0214"/>
   <outline>
     <component base="U"/>
-    <component base="dblgravecomb.case" xOffset="134"/>
+    <component base="dblgravecomb.case" xOffset="114"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresis-cy.glif
index afcfe54a..8e055c49 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresis-cy" format="2">
-  <advance width="627"/>
+  <advance width="598"/>
   <unicode hex="04F0"/>
   <outline>
     <component base="U-cy"/>
-    <component base="dieresiscomb.case" xOffset="78"/>
+    <component base="dieresiscomb.case" xOffset="63"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif
index a55a2664..943d7c18 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresis" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="00DC"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="119"/>
+    <component base="dieresiscomb.case" xOffset="99"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresisacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresisacute.glif
index 50c83b4a..03e40039 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresisacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresisacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresisacute" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="01D7"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="119"/>
-    <component base="acutecomb.case" xOffset="267" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="99"/>
+    <component base="acutecomb.case" xOffset="247" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresiscaron.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresiscaron.glif
index e19a7e31..27f97c6c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresiscaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresiscaron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresiscaron" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="01D9"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="119"/>
-    <component base="caroncomb.case" xOffset="171" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="99"/>
+    <component base="caroncomb.case" xOffset="151" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresisgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresisgrave.glif
index 1078b692..10ee0381 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresisgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresisgrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresisgrave" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="01DB"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="119"/>
-    <component base="gravecomb.case" xOffset="160" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="99"/>
+    <component base="gravecomb.case" xOffset="140" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresismacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresismacron.glif
index c38a4ca3..d9827f17 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresismacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresismacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresismacron" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="01D5"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="119"/>
-    <component base="macroncomb.case" xOffset="113" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="99"/>
+    <component base="macroncomb.case" xOffset="93" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dotbelow.glif
index 8a3f3585..f82ea2a0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udotbelow" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="1EE4"/>
   <outline>
     <component base="U"/>
-    <component base="dotbelowcomb" xOffset="219"/>
+    <component base="dotbelowcomb" xOffset="199"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_grave.glif b/src/Cantarell-Regular.ufo/glyphs/U_grave.glif
index 50694fb2..bfd2f386 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ugrave" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="00D9"/>
   <outline>
     <component base="U"/>
-    <component base="gravecomb.case" xOffset="160"/>
+    <component base="gravecomb.case" xOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif
index 5c0034e2..3a8fd153 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhookabove" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="1EE6"/>
   <outline>
     <component base="U"/>
-    <component base="hookabovecomb.case" xOffset="211"/>
+    <component base="hookabovecomb.case" xOffset="191"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_horn.glif b/src/Cantarell-Regular.ufo/glyphs/U_horn.glif
index f57fb026..9c125ced 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_horn.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_horn.glif
@@ -1,15 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorn" format="2">
-  <advance width="826"/>
+  <advance width="671"/>
   <unicode hex="01AF"/>
   <outline>
     <component base="U"/>
-    <component base="horncomb" xOffset="548" yOffset="212"/>
+    <component base="horncomb" xOffset="528" yOffset="212"/>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
-      <string>=+115</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>U</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_hornacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_hornacute.glif
index 8454d0bd..dd5bb246 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_hornacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_hornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhornacute" format="2">
-  <advance width="826"/>
+  <advance width="671"/>
   <unicode hex="1EE8"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="acutecomb.case" xOffset="267"/>
+    <component base="acutecomb.case" xOffset="247"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_horndotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_horndotbelow.glif
index 9edd2bbe..288be41d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_horndotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_horndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorndotbelow" format="2">
-  <advance width="826"/>
+  <advance width="671"/>
   <unicode hex="1EF0"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="dotbelowcomb" xOffset="219"/>
+    <component base="dotbelowcomb" xOffset="199"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif
index f164a9bc..80c5fcdc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorngrave" format="2">
-  <advance width="826"/>
+  <advance width="671"/>
   <unicode hex="1EEA"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="gravecomb.case" xOffset="160"/>
+    <component base="gravecomb.case" xOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_hornhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_hornhookabove.glif
index 48a13b06..6cf32d46 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_hornhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_hornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhornhookabove" format="2">
-  <advance width="826"/>
+  <advance width="671"/>
   <unicode hex="1EEC"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="hookabovecomb.case" xOffset="211"/>
+    <component base="hookabovecomb.case" xOffset="191"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif
index 9218aa40..a23a764f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorntilde" format="2">
-  <advance width="826"/>
+  <advance width="671"/>
   <unicode hex="1EEE"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="tildecomb.case" xOffset="115"/>
+    <component base="tildecomb.case" xOffset="95"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut-cy.glif
index c1962b40..91a5a69e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhungarumlaut-cy" format="2">
-  <advance width="627"/>
+  <advance width="598"/>
   <unicode hex="04F2"/>
   <outline>
     <component base="U-cy"/>
-    <component base="hungarumlautcomb.case" xOffset="104"/>
+    <component base="hungarumlautcomb.case" xOffset="89"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut.glif
index 475579a7..4aeee7a0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhungarumlaut" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="0170"/>
   <outline>
     <component base="U"/>
-    <component base="hungarumlautcomb.case" xOffset="145"/>
+    <component base="hungarumlautcomb.case" xOffset="125"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_invertedbreve.glif
index c5b750f2..4405c46c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uinvertedbreve" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="0216"/>
   <outline>
     <component base="U"/>
-    <component base="breveinvertedcomb.case" xOffset="158"/>
+    <component base="breveinvertedcomb.case" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_macron-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_macron-cy.glif
index 77eaf903..56180256 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_macron-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_macron-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacron-cy" format="2">
-  <advance width="627"/>
+  <advance width="598"/>
   <unicode hex="04EE"/>
   <outline>
     <component base="U-cy"/>
-    <component base="macroncomb.case" xOffset="72"/>
+    <component base="macroncomb.case" xOffset="57"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_macron.glif b/src/Cantarell-Regular.ufo/glyphs/U_macron.glif
index f689de81..6d79ed08 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacron" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="016A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="113"/>
+    <component base="macroncomb.case" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_macrondieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_macrondieresis.glif
index fd38c39f..62f87005 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_macrondieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_macrondieresis.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacrondieresis" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="1E7A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="113"/>
-    <component base="dieresiscomb.case" xOffset="119" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="93"/>
+    <component base="dieresiscomb.case" xOffset="99" yOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/U_ogonek.glif
index d7f453cf..51697727 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uogonek" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="0172"/>
   <outline>
     <component base="U"/>
-    <component base="ogonekcomb.tall.case" xOffset="17"/>
+    <component base="ogonekcomb.tall.case" xOffset="-3"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_ring.glif b/src/Cantarell-Regular.ufo/glyphs/U_ring.glif
index 0f8692ab..f2739feb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_ring.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_ring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uring" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="016E"/>
   <outline>
     <component base="U"/>
-    <component base="ringcomb.case" xOffset="182"/>
+    <component base="ringcomb.case" xOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_short-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_short-cy.glif
index f2f056c5..a0892543 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_short-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_short-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ushort-cy" format="2">
-  <advance width="627"/>
+  <advance width="598"/>
   <unicode hex="040E"/>
   <outline>
     <component base="U-cy"/>
-    <component base="brevecomb-cy.case" xOffset="99"/>
+    <component base="brevecomb-cy.case" xOffset="84"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_straight-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_straight-cy.glif
index c9b30995..914c303a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_straight-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_straight-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ustraight-cy" format="2">
-  <advance width="606"/>
+  <advance width="580"/>
   <unicode hex="04AE"/>
   <anchor x="310" y="271" name="center"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_straightstroke-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_straightstroke-cy.glif
index 7cad688b..812998f1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_straightstroke-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_straightstroke-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ustraightstroke-cy" format="2">
-  <advance width="606"/>
+  <advance width="580"/>
   <unicode hex="04B0"/>
   <outline>
     <component base="Ustraight-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/U_tilde.glif
index 79181b0c..37b7cb41 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Utilde" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="0168"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="115"/>
+    <component base="tildecomb.case" xOffset="95"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif
index cf66f35d..ca661130 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Utildeacute" format="2">
-  <advance width="711"/>
+  <advance width="671"/>
   <unicode hex="1E78"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="115"/>
-    <component base="acutecomb.case" xOffset="268" yOffset="182"/>
+    <component base="tildecomb.case" xOffset="95"/>
+    <component base="acutecomb.case" xOffset="248" yOffset="182"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/V_.glif b/src/Cantarell-Regular.ufo/glyphs/V_.glif
index c8d64275..c8c91929 100644
--- a/src/Cantarell-Regular.ufo/glyphs/V_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/V_.glif
@@ -1,22 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="V" format="2">
-  <advance width="641"/>
+  <advance width="603"/>
   <unicode hex="0056"/>
-  <note>
-V
-</note>
-  <anchor x="321" y="0" name="bottom"/>
-  <anchor x="321" y="694" name="top"/>
+  <anchor x="302" y="0" name="bottom"/>
+  <anchor x="302" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="280" y="0" type="line"/>
-      <point x="361" y="0" type="line"/>
-      <point x="614" y="694" type="line"/>
-      <point x="530" y="694" type="line"/>
-      <point x="299" y="29" type="line"/>
-      <point x="349" y="29" type="line"/>
-      <point x="122" y="694" type="line"/>
-      <point x="27" y="694" type="line"/>
+      <point x="261" y="0" type="line"/>
+      <point x="342" y="0" type="line"/>
+      <point x="595" y="694" type="line"/>
+      <point x="511" y="694" type="line"/>
+      <point x="280" y="29" type="line"/>
+      <point x="330" y="29" type="line"/>
+      <point x="103" y="694" type="line"/>
+      <point x="8" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif
index a7528f87..e81f402b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ve-cy" format="2">
-  <advance width="656"/>
+  <advance width="630"/>
   <unicode hex="0412"/>
   <outline>
     <component base="B"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_.glif b/src/Cantarell-Regular.ufo/glyphs/W_.glif
index 32b1f8d4..c4687bda 100644
--- a/src/Cantarell-Regular.ufo/glyphs/W_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/W_.glif
@@ -1,30 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="W" format="2">
-  <advance width="1016"/>
+  <advance width="980"/>
   <unicode hex="0057"/>
-  <note>
-W
-</note>
-  <anchor x="505" y="0" name="bottom"/>
-  <anchor x="505" y="694" name="top"/>
+  <anchor x="487" y="0" name="bottom"/>
+  <anchor x="487" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="249" y="0" type="line"/>
-      <point x="332" y="0" type="line"/>
-      <point x="524" y="653" type="line"/>
-      <point x="482" y="653" type="line"/>
-      <point x="690" y="0" type="line"/>
-      <point x="770" y="0" type="line"/>
-      <point x="986" y="694" type="line"/>
-      <point x="903" y="694" type="line"/>
-      <point x="711" y="39" type="line"/>
-      <point x="756" y="39" type="line"/>
-      <point x="555" y="689" type="line"/>
-      <point x="462" y="689" type="line"/>
-      <point x="273" y="39" type="line"/>
-      <point x="313" y="39" type="line"/>
-      <point x="126" y="694" type="line"/>
-      <point x="30" y="694" type="line"/>
+      <point x="221" y="0" type="line"/>
+      <point x="304" y="0" type="line"/>
+      <point x="508" y="653" type="line"/>
+      <point x="466" y="653" type="line"/>
+      <point x="682" y="0" type="line"/>
+      <point x="762" y="0" type="line"/>
+      <point x="968" y="694" type="line"/>
+      <point x="885" y="694" type="line"/>
+      <point x="703" y="39" type="line"/>
+      <point x="748" y="39" type="line"/>
+      <point x="539" y="689" type="line"/>
+      <point x="446" y="689" type="line"/>
+      <point x="245" y="39" type="line"/>
+      <point x="285" y="39" type="line"/>
+      <point x="108" y="694" type="line"/>
+      <point x="12" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_acute.glif b/src/Cantarell-Regular.ufo/glyphs/W_acute.glif
index d364f896..63e89322 100644
--- a/src/Cantarell-Regular.ufo/glyphs/W_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/W_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wacute" format="2">
-  <advance width="1016"/>
+  <advance width="980"/>
   <unicode hex="1E82"/>
   <outline>
     <component base="W"/>
-    <component base="acutecomb.case" xOffset="417"/>
+    <component base="acutecomb.case" xOffset="399"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/W_circumflex.glif
index 1dbff283..9e508592 100644
--- a/src/Cantarell-Regular.ufo/glyphs/W_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/W_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wcircumflex" format="2">
-  <advance width="1016"/>
+  <advance width="980"/>
   <unicode hex="0174"/>
   <outline>
     <component base="W"/>
-    <component base="circumflexcomb.case" xOffset="317"/>
+    <component base="circumflexcomb.case" xOffset="299"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/W_dieresis.glif
index bc4e7f0d..72a6f07e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/W_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/W_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wdieresis" format="2">
-  <advance width="1016"/>
+  <advance width="980"/>
   <unicode hex="1E84"/>
   <outline>
     <component base="W"/>
-    <component base="dieresiscomb.case" xOffset="269"/>
+    <component base="dieresiscomb.case" xOffset="251"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/W_e-cy.glif
index 3cff651e..3db42018 100644
--- a/src/Cantarell-Regular.ufo/glyphs/W_e-cy.glif
+++ b/src/Cantarell-Regular.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="1016"/>
+  <advance width="980"/>
   <unicode hex="051C"/>
   <outline>
     <component base="W"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_grave.glif b/src/Cantarell-Regular.ufo/glyphs/W_grave.glif
index baa87ad2..67a5a257 100644
--- a/src/Cantarell-Regular.ufo/glyphs/W_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/W_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wgrave" format="2">
-  <advance width="1016"/>
+  <advance width="980"/>
   <unicode hex="1E80"/>
   <outline>
     <component base="W"/>
-    <component base="gravecomb.case" xOffset="310"/>
+    <component base="gravecomb.case" xOffset="292"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/X_.glif b/src/Cantarell-Regular.ufo/glyphs/X_.glif
index 83bedc29..4dfd12ee 100644
--- a/src/Cantarell-Regular.ufo/glyphs/X_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/X_.glif
@@ -1,32 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="X" format="2">
-  <advance width="633"/>
+  <advance width="596"/>
   <unicode hex="0058"/>
-  <note>
-X
-</note>
-  <anchor x="317" y="0" name="bottom"/>
-  <anchor x="317" y="694" name="top"/>
+  <anchor x="298" y="0" name="bottom"/>
+  <anchor x="298" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="511" y="0" type="line"/>
-      <point x="610" y="0" type="line"/>
-      <point x="345" y="383" type="line"/>
-      <point x="143" y="694" type="line"/>
-      <point x="44" y="694" type="line"/>
-      <point x="289" y="331" type="line"/>
+      <point x="492" y="0" type="line"/>
+      <point x="591" y="0" type="line"/>
+      <point x="326" y="383" type="line"/>
+      <point x="124" y="694" type="line"/>
+      <point x="25" y="694" type="line"/>
+      <point x="270" y="331" type="line"/>
     </contour>
     <contour>
-      <point x="24" y="0" type="line"/>
-      <point x="118" y="0" type="line"/>
-      <point x="321" y="309" type="line"/>
-      <point x="278" y="373" type="line"/>
+      <point x="5" y="0" type="line"/>
+      <point x="99" y="0" type="line"/>
+      <point x="302" y="309" type="line"/>
+      <point x="259" y="373" type="line"/>
     </contour>
     <contour>
-      <point x="349" y="351" type="line"/>
-      <point x="584" y="694" type="line"/>
-      <point x="490" y="694" type="line"/>
-      <point x="306" y="415" type="line"/>
+      <point x="330" y="351" type="line"/>
+      <point x="565" y="694" type="line"/>
+      <point x="471" y="694" type="line"/>
+      <point x="287" y="415" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_.glif b/src/Cantarell-Regular.ufo/glyphs/Y_.glif
index 2fca8b70..b1200a6a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_.glif
@@ -1,25 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Y" format="2">
-  <advance width="606"/>
+  <advance width="580"/>
   <unicode hex="0059"/>
-  <note>
-Y
-</note>
-  <anchor x="309" y="0" name="bottom"/>
-  <anchor x="309" y="694" name="top"/>
-  <anchor x="31" y="694" name="topleft"/>
+  <anchor x="296" y="0" name="bottom"/>
+  <anchor x="296" y="694" name="top"/>
+  <anchor x="18" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="264" y="0" type="line"/>
-      <point x="347" y="0" type="line"/>
-      <point x="347" y="299" type="line"/>
-      <point x="587" y="694" type="line"/>
-      <point x="496" y="694" type="line"/>
-      <point x="303" y="362" type="line"/>
-      <point x="314" y="362" type="line"/>
-      <point x="116" y="694" type="line"/>
-      <point x="19" y="694" type="line"/>
-      <point x="264" y="299" type="line"/>
+      <point x="251" y="0" type="line"/>
+      <point x="334" y="0" type="line"/>
+      <point x="334" y="299" type="line"/>
+      <point x="574" y="694" type="line"/>
+      <point x="483" y="694" type="line"/>
+      <point x="290" y="362" type="line"/>
+      <point x="301" y="362" type="line"/>
+      <point x="103" y="694" type="line"/>
+      <point x="6" y="694" type="line"/>
+      <point x="251" y="299" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_acute.glif b/src/Cantarell-Regular.ufo/glyphs/Y_acute.glif
index 5de34bed..0858bdc0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yacute" format="2">
-  <advance width="606"/>
+  <advance width="580"/>
   <unicode hex="00DD"/>
   <outline>
     <component base="Y"/>
-    <component base="acutecomb.case" xOffset="221"/>
+    <component base="acutecomb.case" xOffset="208"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_at-cy.glif b/src/Cantarell-Regular.ufo/glyphs/Y_at-cy.glif
index 713f77a3..71cefe05 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_at-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_at-cy.glif
@@ -1,35 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yat-cy" format="2">
-  <advance width="717"/>
+  <advance width="673"/>
   <unicode hex="0462"/>
   <outline>
     <contour>
-      <point x="168" y="0" type="line"/>
-      <point x="410" y="0" type="line" smooth="yes"/>
-      <point x="564" y="0"/>
-      <point x="664" y="85"/>
-      <point x="664" y="217" type="curve" smooth="yes"/>
-      <point x="664" y="339"/>
-      <point x="571" y="427"/>
-      <point x="443" y="427" type="curve" smooth="yes"/>
-      <point x="217" y="427" type="line"/>
-      <point x="217" y="355" type="line"/>
-      <point x="434" y="355" type="line" smooth="yes"/>
-      <point x="518" y="355"/>
-      <point x="579" y="290"/>
-      <point x="579" y="200" type="curve" smooth="yes"/>
-      <point x="579" y="115"/>
-      <point x="525" y="72"/>
-      <point x="420" y="72" type="curve" smooth="yes"/>
-      <point x="251" y="72" type="line"/>
-      <point x="251" y="694" type="line"/>
-      <point x="168" y="694" type="line"/>
+      <point x="136" y="0" type="line"/>
+      <point x="376" y="0" type="line" smooth="yes"/>
+      <point x="530" y="0"/>
+      <point x="630" y="85"/>
+      <point x="630" y="217" type="curve" smooth="yes"/>
+      <point x="630" y="339"/>
+      <point x="537" y="427"/>
+      <point x="409" y="427" type="curve" smooth="yes"/>
+      <point x="183" y="427" type="line"/>
+      <point x="183" y="355" type="line"/>
+      <point x="400" y="355" type="line" smooth="yes"/>
+      <point x="484" y="355"/>
+      <point x="545" y="290"/>
+      <point x="545" y="200" type="curve" smooth="yes"/>
+      <point x="545" y="115"/>
+      <point x="491" y="72"/>
+      <point x="386" y="72" type="curve" smooth="yes"/>
+      <point x="217" y="72" type="line"/>
+      <point x="217" y="694" type="line"/>
+      <point x="136" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="43" y="523" type="line"/>
-      <point x="423" y="523" type="line"/>
-      <point x="423" y="588" type="line"/>
-      <point x="43" y="588" type="line"/>
+      <point x="9" y="522" type="line"/>
+      <point x="389" y="522" type="line"/>
+      <point x="389" y="590" type="line"/>
+      <point x="9" y="590" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Eth</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Softsign-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif
index b3f21cb9..adc5b224 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ycircumflex" format="2">
-  <advance width="606"/>
+  <advance width="580"/>
   <unicode hex="0176"/>
   <outline>
     <component base="Y"/>
-    <component base="circumflexcomb.case" xOffset="121"/>
+    <component base="circumflexcomb.case" xOffset="108"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif
index b20c743e..ec9bd8ac 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydieresis" format="2">
-  <advance width="606"/>
+  <advance width="580"/>
   <unicode hex="0178"/>
   <outline>
     <component base="Y"/>
-    <component base="dieresiscomb.case" xOffset="73"/>
+    <component base="dieresiscomb.case" xOffset="60"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif
index a0d76907..fb347d06 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydotaccent" format="2">
-  <advance width="606"/>
+  <advance width="580"/>
   <unicode hex="1E8E"/>
   <outline>
     <component base="Y"/>
-    <component base="dotaccentcomb.case" xOffset="173"/>
+    <component base="dotaccentcomb.case" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif
index 4a6442d1..3239aca3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydotbelow" format="2">
-  <advance width="606"/>
+  <advance width="580"/>
   <unicode hex="1EF4"/>
   <outline>
     <component base="Y"/>
-    <component base="dotbelowcomb" xOffset="173"/>
+    <component base="dotbelowcomb" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_eru-cy.glif b/src/Cantarell-Regular.ufo/glyphs/Y_eru-cy.glif
index 9177c453..71b24849 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_eru-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_eru-cy.glif
@@ -1,36 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yeru-cy" format="2">
-  <advance width="861"/>
+  <advance width="837"/>
   <unicode hex="042B"/>
-  <anchor x="436" y="694" name="top"/>
+  <anchor x="424" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="316" y="0" type="line" smooth="yes"/>
-      <point x="470" y="0"/>
-      <point x="570" y="85"/>
-      <point x="570" y="217" type="curve" smooth="yes"/>
-      <point x="570" y="339"/>
-      <point x="477" y="427"/>
-      <point x="349" y="427" type="curve" smooth="yes"/>
-      <point x="153" y="427" type="line"/>
-      <point x="153" y="355" type="line"/>
-      <point x="340" y="355" type="line" smooth="yes"/>
-      <point x="424" y="355"/>
-      <point x="485" y="290"/>
-      <point x="485" y="200" type="curve" smooth="yes"/>
-      <point x="485" y="115"/>
-      <point x="431" y="72"/>
-      <point x="326" y="72" type="curve" smooth="yes"/>
-      <point x="187" y="72" type="line"/>
-      <point x="187" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="304" y="0" type="line" smooth="yes"/>
+      <point x="458" y="0"/>
+      <point x="558" y="85"/>
+      <point x="558" y="217" type="curve" smooth="yes"/>
+      <point x="558" y="339"/>
+      <point x="465" y="427"/>
+      <point x="337" y="427" type="curve" smooth="yes"/>
+      <point x="141" y="427" type="line"/>
+      <point x="141" y="355" type="line"/>
+      <point x="328" y="355" type="line" smooth="yes"/>
+      <point x="412" y="355"/>
+      <point x="473" y="290"/>
+      <point x="473" y="200" type="curve" smooth="yes"/>
+      <point x="473" y="115"/>
+      <point x="419" y="72"/>
+      <point x="314" y="72" type="curve" smooth="yes"/>
+      <point x="175" y="72" type="line"/>
+      <point x="175" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="674" y="0" type="line"/>
-      <point x="757" y="0" type="line"/>
-      <point x="757" y="694" type="line"/>
-      <point x="674" y="694" type="line"/>
+      <point x="662" y="0" type="line"/>
+      <point x="745" y="0" type="line"/>
+      <point x="745" y="694" type="line"/>
+      <point x="662" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_erudieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_erudieresis-cy.glif
index 0f937539..4a02823d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_erudieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_erudieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yerudieresis-cy" format="2">
-  <advance width="861"/>
+  <advance width="837"/>
   <unicode hex="04F8"/>
   <outline>
     <component base="Yeru-cy"/>
-    <component base="dieresiscomb.case" xOffset="200"/>
+    <component base="dieresiscomb.case" xOffset="188"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_grave.glif b/src/Cantarell-Regular.ufo/glyphs/Y_grave.glif
index dd21742c..212ab17f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ygrave" format="2">
-  <advance width="606"/>
+  <advance width="580"/>
   <unicode hex="1EF2"/>
   <outline>
     <component base="Y"/>
-    <component base="gravecomb.case" xOffset="114"/>
+    <component base="gravecomb.case" xOffset="101"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif
index 61f0d4b1..1baf257f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yhookabove" format="2">
-  <advance width="606"/>
+  <advance width="580"/>
   <unicode hex="1EF6"/>
   <outline>
     <component base="Y"/>
-    <component base="hookabovecomb.case" xOffset="165"/>
+    <component base="hookabovecomb.case" xOffset="152"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_i-cy.glif b/src/Cantarell-Regular.ufo/glyphs/Y_i-cy.glif
index fd1d7573..d7bcf047 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_i-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_i-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yi-cy" format="2">
-  <advance width="291"/>
+  <advance width="267"/>
   <unicode hex="0407"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-90"/>
+    <component base="dieresiscomb.case" xOffset="-102"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_macron.glif b/src/Cantarell-Regular.ufo/glyphs/Y_macron.glif
index fd710dd3..e6d8be59 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ymacron" format="2">
-  <advance width="606"/>
+  <advance width="580"/>
   <unicode hex="0232"/>
   <outline>
     <component base="Y"/>
-    <component base="macroncomb.case" xOffset="67"/>
+    <component base="macroncomb.case" xOffset="54"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif
index 0160dc82..4384661d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ytilde" format="2">
-  <advance width="606"/>
+  <advance width="580"/>
   <unicode hex="1EF8"/>
   <outline>
     <component base="Y"/>
-    <component base="tildecomb.case" xOffset="69"/>
+    <component base="tildecomb.case" xOffset="56"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_usbig-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_usbig-cy.glif
index 19cb3ec2..d11c820e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_usbig-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_usbig-cy.glif
@@ -1,43 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yusbig-cy" format="2">
-  <advance width="799"/>
+  <advance width="779"/>
   <unicode hex="046A"/>
   <outline>
     <contour>
-      <point x="317" y="380" type="line"/>
-      <point x="414" y="380" type="line"/>
-      <point x="187" y="650" type="line"/>
-      <point x="180" y="624" type="line"/>
-      <point x="620" y="624" type="line"/>
-      <point x="610" y="650" type="line"/>
-      <point x="392" y="391" type="line"/>
-      <point x="486" y="391" type="line"/>
-      <point x="684" y="622" type="line"/>
-      <point x="684" y="694" type="line"/>
-      <point x="112" y="694" type="line"/>
-      <point x="112" y="622" type="line"/>
+      <point x="43" y="0" type="curve"/>
+      <point x="124" y="0" type="line"/>
+      <point x="124" y="226"/>
+      <point x="206" y="330"/>
+      <point x="384" y="330" type="curve" smooth="yes"/>
+      <point x="570" y="330"/>
+      <point x="655" y="226"/>
+      <point x="655" y="0" type="curve"/>
+      <point x="736" y="0" type="line"/>
+      <point x="736" y="274"/>
+      <point x="628" y="400"/>
+      <point x="392" y="400" type="curve" smooth="yes"/>
+      <point x="153" y="400"/>
+      <point x="43" y="274"/>
     </contour>
     <contour>
-      <point x="440" y="346" type="line"/>
-      <point x="357" y="346" type="line"/>
-      <point x="357" y="0" type="line"/>
-      <point x="440" y="0" type="line"/>
+      <point x="347" y="0" type="line"/>
+      <point x="430" y="0" type="line"/>
+      <point x="430" y="346" type="line"/>
+      <point x="347" y="346" type="line"/>
     </contour>
     <contour>
-      <point x="134" y="0" type="line"/>
-      <point x="134" y="226"/>
-      <point x="216" y="330"/>
-      <point x="394" y="330" type="curve" smooth="yes"/>
-      <point x="580" y="330"/>
-      <point x="665" y="226"/>
-      <point x="665" y="0" type="curve"/>
-      <point x="746" y="0" type="line"/>
-      <point x="746" y="274"/>
-      <point x="638" y="400"/>
-      <point x="402" y="400" type="curve" smooth="yes"/>
-      <point x="163" y="400"/>
-      <point x="53" y="274"/>
-      <point x="53" y="0" type="curve"/>
+      <point x="307" y="380" type="line"/>
+      <point x="404" y="380" type="line"/>
+      <point x="177" y="650" type="line"/>
+      <point x="170" y="624" type="line"/>
+      <point x="610" y="624" type="line"/>
+      <point x="600" y="650" type="line"/>
+      <point x="382" y="391" type="line"/>
+      <point x="476" y="391" type="line"/>
+      <point x="674" y="622" type="line"/>
+      <point x="674" y="694" type="line"/>
+      <point x="102" y="694" type="line"/>
+      <point x="102" y="622" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_.glif b/src/Cantarell-Regular.ufo/glyphs/Z_.glif
index 252c0a02..4090def7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_.glif
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Z" format="2">
-  <advance width="654"/>
+  <advance width="636"/>
   <unicode hex="005A"/>
-  <note>
-Z
-</note>
-  <anchor x="327" y="0" name="bottom"/>
-  <anchor x="327" y="694" name="top"/>
+  <anchor x="319" y="0" name="bottom"/>
+  <anchor x="319" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="48" y="0" type="line"/>
-      <point x="606" y="0" type="line"/>
-      <point x="606" y="72" type="line"/>
-      <point x="126" y="72" type="line"/>
-      <point x="138" y="47" type="line"/>
-      <point x="593" y="642" type="line"/>
-      <point x="593" y="694" type="line"/>
-      <point x="62" y="694" type="line"/>
-      <point x="62" y="622" type="line"/>
-      <point x="514" y="622" type="line"/>
-      <point x="502" y="647" type="line"/>
-      <point x="48" y="53" type="line"/>
+      <point x="40" y="0" type="line"/>
+      <point x="598" y="0" type="line"/>
+      <point x="598" y="72" type="line"/>
+      <point x="118" y="72" type="line"/>
+      <point x="130" y="47" type="line"/>
+      <point x="585" y="642" type="line"/>
+      <point x="585" y="694" type="line"/>
+      <point x="54" y="694" type="line"/>
+      <point x="54" y="622" type="line"/>
+      <point x="506" y="622" type="line"/>
+      <point x="494" y="647" type="line"/>
+      <point x="40" y="53" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_acute.glif b/src/Cantarell-Regular.ufo/glyphs/Z_acute.glif
index 4067d07b..6ac2b069 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zacute" format="2">
-  <advance width="654"/>
+  <advance width="636"/>
   <unicode hex="0179"/>
   <outline>
     <component base="Z"/>
-    <component base="acutecomb.case" xOffset="239"/>
+    <component base="acutecomb.case" xOffset="231"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_caron.glif b/src/Cantarell-Regular.ufo/glyphs/Z_caron.glif
index 26c9bb3f..76267af3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zcaron" format="2">
-  <advance width="654"/>
+  <advance width="636"/>
   <unicode hex="017D"/>
   <outline>
     <component base="Z"/>
-    <component base="caroncomb.case" xOffset="143"/>
+    <component base="caroncomb.case" xOffset="135"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif
index a3352181..adf1bfdb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zdotaccent" format="2">
-  <advance width="654"/>
+  <advance width="636"/>
   <unicode hex="017B"/>
   <outline>
     <component base="Z"/>
-    <component base="dotaccentcomb.case" xOffset="191"/>
+    <component base="dotaccentcomb.case" xOffset="183"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif
index d768c671..8d79b6f5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zdotbelow" format="2">
-  <advance width="654"/>
+  <advance width="636"/>
   <unicode hex="1E92"/>
   <outline>
     <component base="Z"/>
-    <component base="dotbelowcomb" xOffset="191"/>
+    <component base="dotbelowcomb" xOffset="183"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/Z_e-cy.glif
index fb9b4e87..c82b608f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_e-cy.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ze-cy" format="2">
-  <advance width="606"/>
+  <advance width="586"/>
   <unicode hex="0417"/>
-  <anchor x="302" y="0" name="bottom"/>
-  <anchor x="302" y="694" name="top"/>
+  <anchor x="292" y="0" name="bottom"/>
+  <anchor x="292" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="274" y="-10" type="curve" smooth="yes"/>
-      <point x="432" y="-10"/>
-      <point x="539" y="70"/>
-      <point x="539" y="197" type="curve" smooth="yes"/>
-      <point x="539" y="302"/>
-      <point x="462" y="370"/>
-      <point x="330" y="378" type="curve"/>
-      <point x="356" y="364" type="line"/>
-      <point x="460" y="369"/>
-      <point x="522" y="429"/>
-      <point x="522" y="526" type="curve" smooth="yes"/>
-      <point x="522" y="637"/>
-      <point x="433" y="704"/>
-      <point x="286" y="704" type="curve" smooth="yes"/>
-      <point x="203" y="704"/>
-      <point x="125" y="682"/>
-      <point x="63" y="647" type="curve"/>
-      <point x="81" y="585" type="line"/>
-      <point x="141" y="613"/>
-      <point x="204" y="631"/>
-      <point x="270" y="631" type="curve" smooth="yes"/>
-      <point x="374" y="631"/>
-      <point x="437" y="585"/>
-      <point x="437" y="511" type="curve" smooth="yes"/>
-      <point x="437" y="437"/>
-      <point x="375" y="393"/>
-      <point x="273" y="393" type="curve" smooth="yes"/>
-      <point x="151" y="393" type="line"/>
-      <point x="151" y="323" type="line"/>
-      <point x="245" y="323" type="line" smooth="yes"/>
-      <point x="381" y="323"/>
-      <point x="454" y="277"/>
-      <point x="454" y="189" type="curve" smooth="yes"/>
-      <point x="454" y="106"/>
-      <point x="389" y="63"/>
-      <point x="281" y="63" type="curve" smooth="yes"/>
-      <point x="218" y="63"/>
-      <point x="135" y="78"/>
-      <point x="67" y="112" type="curve"/>
-      <point x="48" y="44" type="line"/>
-      <point x="116" y="10"/>
-      <point x="194" y="-10"/>
+      <point x="264" y="-10" type="curve" smooth="yes"/>
+      <point x="422" y="-10"/>
+      <point x="529" y="70"/>
+      <point x="529" y="197" type="curve" smooth="yes"/>
+      <point x="529" y="302"/>
+      <point x="452" y="370"/>
+      <point x="320" y="378" type="curve"/>
+      <point x="346" y="364" type="line"/>
+      <point x="450" y="369"/>
+      <point x="512" y="429"/>
+      <point x="512" y="526" type="curve" smooth="yes"/>
+      <point x="512" y="637"/>
+      <point x="423" y="704"/>
+      <point x="276" y="704" type="curve" smooth="yes"/>
+      <point x="193" y="704"/>
+      <point x="115" y="682"/>
+      <point x="53" y="647" type="curve"/>
+      <point x="71" y="585" type="line"/>
+      <point x="131" y="613"/>
+      <point x="194" y="631"/>
+      <point x="260" y="631" type="curve" smooth="yes"/>
+      <point x="364" y="631"/>
+      <point x="427" y="585"/>
+      <point x="427" y="511" type="curve" smooth="yes"/>
+      <point x="427" y="437"/>
+      <point x="365" y="393"/>
+      <point x="263" y="393" type="curve" smooth="yes"/>
+      <point x="141" y="393" type="line"/>
+      <point x="141" y="323" type="line"/>
+      <point x="235" y="323" type="line" smooth="yes"/>
+      <point x="371" y="323"/>
+      <point x="444" y="277"/>
+      <point x="444" y="189" type="curve" smooth="yes"/>
+      <point x="444" y="106"/>
+      <point x="379" y="63"/>
+      <point x="271" y="63" type="curve" smooth="yes"/>
+      <point x="208" y="63"/>
+      <point x="125" y="78"/>
+      <point x="57" y="112" type="curve"/>
+      <point x="38" y="44" type="line"/>
+      <point x="106" y="10"/>
+      <point x="184" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_edescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/Z_edescender-cy.glif
index 857afa15..0e7a4ecc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_edescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_edescender-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zedescender-cy" format="2">
-  <advance width="606"/>
+  <advance width="586"/>
   <unicode hex="0498"/>
   <outline>
     <component base="Ze-cy"/>
-    <component base="cedillacomb" xOffset="155"/>
+    <component base="cedillacomb" xOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_edieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/Z_edieresis-cy.glif
index 0c698e72..1b83e13a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_edieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_edieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zedieresis-cy" format="2">
-  <advance width="606"/>
+  <advance width="586"/>
   <unicode hex="04DE"/>
   <outline>
     <component base="Ze-cy"/>
-    <component base="dieresiscomb.case" xOffset="66"/>
+    <component base="dieresiscomb.case" xOffset="56"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_he-cy.glif b/src/Cantarell-Regular.ufo/glyphs/Z_he-cy.glif
index 73c47ff1..973c2396 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_he-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_he-cy.glif
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhe-cy" format="2">
-  <advance width="964"/>
+  <advance width="942"/>
   <unicode hex="0416"/>
-  <anchor x="911" y="0" name="bottomright"/>
-  <anchor x="483" y="694" name="top"/>
+  <anchor x="885" y="0" name="bottomright"/>
+  <anchor x="472" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="839" y="0" type="line"/>
-      <point x="938" y="0" type="line"/>
-      <point x="702" y="376" type="line"/>
-      <point x="703" y="356" type="line"/>
-      <point x="925" y="694" type="line"/>
-      <point x="830" y="694" type="line"/>
-      <point x="612" y="361" type="line"/>
+      <point x="828" y="0" type="line"/>
+      <point x="927" y="0" type="line"/>
+      <point x="691" y="376" type="line"/>
+      <point x="692" y="356" type="line"/>
+      <point x="914" y="694" type="line"/>
+      <point x="819" y="694" type="line"/>
+      <point x="601" y="361" type="line"/>
     </contour>
     <contour>
-      <point x="26" y="0" type="line"/>
-      <point x="121" y="0" type="line"/>
-      <point x="352" y="363" type="line"/>
-      <point x="138" y="694" type="line"/>
-      <point x="39" y="694" type="line"/>
-      <point x="264" y="349" type="line"/>
-      <point x="262" y="368" type="line"/>
+      <point x="15" y="0" type="line"/>
+      <point x="110" y="0" type="line"/>
+      <point x="341" y="363" type="line"/>
+      <point x="127" y="694" type="line"/>
+      <point x="28" y="694" type="line"/>
+      <point x="253" y="349" type="line"/>
+      <point x="251" y="368" type="line"/>
     </contour>
     <contour>
-      <point x="284" y="323" type="line"/>
-      <point x="664" y="323" type="line"/>
-      <point x="664" y="395" type="line"/>
-      <point x="284" y="395" type="line"/>
+      <point x="430" y="0" type="line"/>
+      <point x="513" y="0" type="line"/>
+      <point x="513" y="694" type="line"/>
+      <point x="430" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="441" y="0" type="line"/>
-      <point x="524" y="0" type="line"/>
-      <point x="524" y="694" type="line"/>
-      <point x="441" y="694" type="line"/>
+      <point x="273" y="323" type="line"/>
+      <point x="653" y="323" type="line"/>
+      <point x="653" y="395" type="line"/>
+      <point x="273" y="395" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_hebreve-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/Z_hebreve-cy.glif
index 5936915a..ad9bb001 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_hebreve-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_hebreve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhebreve-cy" format="2">
-  <advance width="964"/>
+  <advance width="942"/>
   <unicode hex="04C1"/>
   <outline>
     <component base="Zhe-cy"/>
-    <component base="brevecomb-cy.case" xOffset="268"/>
+    <component base="brevecomb-cy.case" xOffset="257"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_hedescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/Z_hedescender-cy.glif
index 8f90f3a0..a2ccb60b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_hedescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_hedescender-cy.glif
@@ -1,13 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhedescender-cy" format="2">
-  <advance width="1039"/>
+  <advance width="975"/>
   <unicode hex="0496"/>
   <outline>
-    <component base="Zhe-cy" xOffset="13"/>
-    <component base="descender-cy.case" xOffset="817"/>
+    <component base="Zhe-cy"/>
+    <component base="descender-cy.case" xOffset="778"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Zhe-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Zhe-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_hedieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/Z_hedieresis-cy.glif
index 43c4bd91..97aae641 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_hedieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_hedieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhedieresis-cy" format="2">
-  <advance width="964"/>
+  <advance width="942"/>
   <unicode hex="04DC"/>
   <outline>
     <component base="Zhe-cy"/>
-    <component base="dieresiscomb.case" xOffset="247"/>
+    <component base="dieresiscomb.case" xOffset="236"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/_currencyvstem.glif 
b/src/Cantarell-Regular.ufo/glyphs/_currencyvstem.glif
index 72774cc5..1f62a8a8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/_currencyvstem.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/_currencyvstem.glif
@@ -3,10 +3,10 @@
   <advance width="698"/>
   <outline>
     <contour>
-      <point x="382" y="646" type="line"/>
-      <point x="452" y="646" type="line"/>
-      <point x="452" y="840" type="line"/>
-      <point x="382" y="840" type="line"/>
+      <point x="382" y="658" type="line"/>
+      <point x="452" y="658" type="line"/>
+      <point x="452" y="828" type="line"/>
+      <point x="382" y="828" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/_descenderreverse-cy.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/_descenderreverse-cy.case.glif
index e162e361..c08e7354 100644
--- a/src/Cantarell-Regular.ufo/glyphs/_descenderreverse-cy.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/_descenderreverse-cy.case.glif
@@ -1,14 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="_descenderreverse-cy.case" format="2">
   <advance width="321"/>
-  <anchor x="179" y="0" name="_bottomright"/>
+  <anchor x="191" y="0" name="_bottomright"/>
   <outline>
     <contour>
       <point x="10" y="-178" type="line"/>
       <point x="85" y="-178" type="line"/>
       <point x="85" y="0" type="line"/>
-      <point x="142" y="0" type="line"/>
-      <point x="142" y="72" type="line"/>
+      <point x="117" y="0" type="line"/>
+      <point x="117" y="72" type="line"/>
       <point x="10" y="72" type="line"/>
     </contour>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/_descenderreversed-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/_descenderreversed-cy.glif
index 4c9240fd..4fdb9d66 100644
--- a/src/Cantarell-Regular.ufo/glyphs/_descenderreversed-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/_descenderreversed-cy.glif
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="_descenderreversed-cy" format="2">
   <advance width="267"/>
-  <anchor x="192" y="0" name="_bottomright"/>
+  <anchor x="185" y="0" name="_bottomright"/>
   <outline>
     <contour>
       <point x="45" y="-120" type="line"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/_typoquote.glif 
b/src/Cantarell-Regular.ufo/glyphs/_typoquote.glif
index 2fc46b86..b52dae4e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/_typoquote.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/_typoquote.glif
@@ -5,12 +5,12 @@
     <contour>
       <point x="75" y="-160" type="curve"/>
       <point x="144" y="-160" type="line"/>
-      <point x="179" y="-90"/>
-      <point x="214" y="36"/>
+      <point x="186" y="-76"/>
+      <point x="214" y="34"/>
       <point x="214" y="115" type="curve"/>
       <point x="129" y="115" type="line"/>
-      <point x="129" y="38"/>
-      <point x="104" y="-88"/>
+      <point x="129" y="30"/>
+      <point x="107" y="-80"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/a-cy.glif b/src/Cantarell-Regular.ufo/glyphs/a-cy.glif
index d8953d55..a852d309 100644
--- a/src/Cantarell-Regular.ufo/glyphs/a-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/a-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="a-cy" format="2">
   <advance width="512"/>
   <unicode hex="0430"/>
-  <anchor x="258" y="482" name="top"/>
   <outline>
     <component base="a"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/a.glif b/src/Cantarell-Regular.ufo/glyphs/a.glif
index 80c50a99..78329e0b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/a.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/a.glif
@@ -2,9 +2,6 @@
 <glyph name="a" format="2">
   <advance width="512"/>
   <unicode hex="0061"/>
-  <note>
-a
-</note>
   <anchor x="261" y="0" name="bottom"/>
   <anchor x="415" y="10" name="ogonek"/>
   <anchor x="246" y="482" name="top"/>
@@ -51,4 +48,10 @@ a
       <point x="111" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/abreve-cy.glif b/src/Cantarell-Regular.ufo/glyphs/abreve-cy.glif
index aa3f92ed..1226e22b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/abreve-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/abreve-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04D1"/>
   <outline>
     <component base="a-cy"/>
-    <component base="brevecomb-cy" xOffset="36"/>
+    <component base="brevecomb-cy" xOffset="24"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/abreveacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/abreveacute.glif
index 8953a05b..e5e8f340 100644
--- a/src/Cantarell-Regular.ufo/glyphs/abreveacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/abreveacute.glif
@@ -4,6 +4,7 @@
   <unicode hex="1EAF"/>
   <outline>
     <component base="a"/>
-    <component base="brevecomb_acutecomb" xOffset="73"/>
+    <component base="brevecomb.loclVIET" xOffset="38"/>
+    <component base="acutecomb.loclVIET" xOffset="163" yOffset="98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/abrevegrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/abrevegrave.glif
index 64832354..8feaa241 100644
--- a/src/Cantarell-Regular.ufo/glyphs/abrevegrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/abrevegrave.glif
@@ -4,6 +4,7 @@
   <unicode hex="1EB1"/>
   <outline>
     <component base="a"/>
-    <component base="brevecomb_gravecomb" xOffset="45"/>
+    <component base="brevecomb.loclVIET" xOffset="38"/>
+    <component base="gravecomb.loclVIET" xOffset="76" yOffset="98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/abrevehookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/abrevehookabove.glif
index 3d33dc6b..3028c30a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/abrevehookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/abrevehookabove.glif
@@ -4,6 +4,7 @@
   <unicode hex="1EB3"/>
   <outline>
     <component base="a"/>
-    <component base="brevecomb_hookabovecomb" xOffset="53"/>
+    <component base="brevecomb.loclVIET" xOffset="38"/>
+    <component base="hookabovecomb.loclVIET" xOffset="112" yOffset="98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/abrevetilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/abrevetilde.glif
index fde4429f..d1cc1031 100644
--- a/src/Cantarell-Regular.ufo/glyphs/abrevetilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/abrevetilde.glif
@@ -4,6 +4,7 @@
   <unicode hex="1EB5"/>
   <outline>
     <component base="a"/>
-    <component base="brevecomb_tildecomb" xOffset="22"/>
+    <component base="brevecomb.loclVIET" xOffset="38"/>
+    <component base="tildecomb.loclVIET" xOffset="24" yOffset="98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/acircumflexacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/acircumflexacute.glif
index df1950aa..efbb7b25 100644
--- a/src/Cantarell-Regular.ufo/glyphs/acircumflexacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/acircumflexacute.glif
@@ -4,6 +4,22 @@
   <unicode hex="1EA5"/>
   <outline>
     <component base="a"/>
-    <component base="circumflexcomb_acutecomb" xOffset="55"/>
+    <component base="circumflexcomb.loclVIET" xOffset="55"/>
+    <component base="acutecomb.loclVIET" xOffset="293" yOffset="81"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/acircumflexgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/acircumflexgrave.glif
index 5cae15c1..73c170a5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/acircumflexgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/acircumflexgrave.glif
@@ -4,6 +4,22 @@
   <unicode hex="1EA7"/>
   <outline>
     <component base="a"/>
-    <component base="circumflexcomb_gravecomb" xOffset="55"/>
+    <component base="circumflexcomb.loclVIET" xOffset="55"/>
+    <component base="gravecomb.loclVIET" xOffset="206" yOffset="81"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/acircumflexhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/acircumflexhookabove.glif
index eb9f30b1..86eb438a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/acircumflexhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/acircumflexhookabove.glif
@@ -4,6 +4,22 @@
   <unicode hex="1EA9"/>
   <outline>
     <component base="a"/>
-    <component base="circumflexcomb_hookabovecomb" xOffset="78"/>
+    <component base="circumflexcomb.loclVIET" xOffset="55"/>
+    <component base="hookabovecomb.loclVIET" xOffset="242" yOffset="81"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/acircumflextilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/acircumflextilde.glif
index d02ca74c..c77d5112 100644
--- a/src/Cantarell-Regular.ufo/glyphs/acircumflextilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/acircumflextilde.glif
@@ -4,6 +4,7 @@
   <unicode hex="1EAB"/>
   <outline>
     <component base="a"/>
-    <component base="circumflexcomb_tildecomb" xOffset="33"/>
+    <component base="circumflexcomb.loclVIET" xOffset="55"/>
+    <component base="tildecomb.loclVIET" xOffset="25" yOffset="98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/acute.glif b/src/Cantarell-Regular.ufo/glyphs/acute.glif
index 1a1cc824..c46831d7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/acute.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acute" format="2">
-  <advance width="259"/>
+  <advance width="500"/>
   <unicode hex="00B4"/>
   <outline>
-    <component base="acutecomb" xOffset="-2"/>
+    <component base="acutecomb" xOffset="117"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/adieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/adieresis-cy.glif
index 277bffa8..8607fa67 100644
--- a/src/Cantarell-Regular.ufo/glyphs/adieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/adieresis-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04D3"/>
   <outline>
     <component base="a-cy"/>
-    <component base="dieresiscomb" xOffset="25"/>
+    <component base="dieresiscomb" xOffset="13"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ae.glif b/src/Cantarell-Regular.ufo/glyphs/ae.glif
index e1e59e83..c3f1657b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ae.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ae.glif
@@ -5,46 +5,6 @@
   <anchor x="418" y="0" name="bottom"/>
   <anchor x="418" y="482" name="top"/>
   <outline>
-    <contour>
-      <point x="362" y="224" type="line"/>
-      <point x="424" y="224" type="line"/>
-      <point x="424" y="326" type="line" smooth="yes"/>
-      <point x="424" y="434"/>
-      <point x="362" y="492"/>
-      <point x="247" y="492" type="curve" smooth="yes"/>
-      <point x="183" y="492"/>
-      <point x="123" y="474"/>
-      <point x="59" y="436" type="curve"/>
-      <point x="77" y="378" type="line"/>
-      <point x="134" y="407"/>
-      <point x="180" y="420"/>
-      <point x="230" y="420" type="curve" smooth="yes"/>
-      <point x="314" y="420"/>
-      <point x="362" y="384"/>
-      <point x="362" y="313" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="208" y="-10" type="curve" smooth="yes"/>
-      <point x="322" y="-10"/>
-      <point x="410" y="62"/>
-      <point x="426" y="169" type="curve"/>
-      <point x="397" y="183" type="line"/>
-      <point x="381" y="108"/>
-      <point x="316" y="60"/>
-      <point x="232" y="60" type="curve" smooth="yes"/>
-      <point x="168" y="60"/>
-      <point x="127" y="89"/>
-      <point x="127" y="134" type="curve" smooth="yes"/>
-      <point x="127" y="196"/>
-      <point x="201" y="219"/>
-      <point x="369" y="219" type="curve"/>
-      <point x="369" y="279" type="line"/>
-      <point x="162" y="279"/>
-      <point x="47" y="225"/>
-      <point x="47" y="120" type="curve" smooth="yes"/>
-      <point x="47" y="42"/>
-      <point x="111" y="-10"/>
-    </contour>
     <contour>
       <point x="607" y="-10" type="curve" smooth="yes"/>
       <point x="661" y="-10"/>
@@ -78,6 +38,46 @@
       <point x="358" y="82"/>
       <point x="451" y="-10"/>
     </contour>
+    <contour>
+      <point x="208" y="-10" type="curve" smooth="yes"/>
+      <point x="322" y="-10"/>
+      <point x="410" y="62"/>
+      <point x="426" y="169" type="curve"/>
+      <point x="397" y="183" type="line"/>
+      <point x="381" y="108"/>
+      <point x="316" y="60"/>
+      <point x="232" y="60" type="curve" smooth="yes"/>
+      <point x="168" y="60"/>
+      <point x="127" y="89"/>
+      <point x="127" y="134" type="curve" smooth="yes"/>
+      <point x="127" y="196"/>
+      <point x="201" y="219"/>
+      <point x="369" y="219" type="curve"/>
+      <point x="369" y="279" type="line"/>
+      <point x="162" y="279"/>
+      <point x="47" y="225"/>
+      <point x="47" y="120" type="curve" smooth="yes"/>
+      <point x="47" y="42"/>
+      <point x="111" y="-10"/>
+    </contour>
+    <contour>
+      <point x="362" y="224" type="line"/>
+      <point x="424" y="224" type="line"/>
+      <point x="424" y="326" type="line" smooth="yes"/>
+      <point x="424" y="434"/>
+      <point x="362" y="492"/>
+      <point x="247" y="492" type="curve" smooth="yes"/>
+      <point x="183" y="492"/>
+      <point x="123" y="474"/>
+      <point x="59" y="436" type="curve"/>
+      <point x="77" y="378" type="line"/>
+      <point x="134" y="407"/>
+      <point x="180" y="420"/>
+      <point x="230" y="420" type="curve" smooth="yes"/>
+      <point x="314" y="420"/>
+      <point x="362" y="384"/>
+      <point x="362" y="313" type="curve" smooth="yes"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ampersand.glif b/src/Cantarell-Regular.ufo/glyphs/ampersand.glif
index 67a459b7..7fb8e54c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ampersand.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ampersand.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ampersand" format="2">
-  <advance width="708"/>
+  <advance width="702"/>
   <unicode hex="0026"/>
   <outline>
     <contour>
-      <point x="586" y="-10" type="curve"/>
-      <point x="637" y="50" type="line"/>
-      <point x="302" y="326"/>
-      <point x="225" y="415"/>
-      <point x="225" y="524" type="curve" smooth="yes"/>
-      <point x="225" y="598"/>
-      <point x="260" y="638"/>
-      <point x="322" y="638" type="curve" smooth="yes"/>
-      <point x="380" y="638"/>
-      <point x="422" y="602"/>
-      <point x="422" y="553" type="curve" smooth="yes"/>
-      <point x="422" y="401"/>
-      <point x="72" y="426"/>
-      <point x="72" y="187" type="curve" smooth="yes"/>
-      <point x="72" y="69"/>
-      <point x="159" y="-12"/>
-      <point x="283" y="-12" type="curve" smooth="yes"/>
-      <point x="424" y="-12"/>
-      <point x="560" y="95"/>
-      <point x="639" y="277" type="curve"/>
-      <point x="578" y="313" type="line"/>
-      <point x="494" y="141"/>
-      <point x="396" y="57"/>
-      <point x="293" y="57" type="curve" smooth="yes"/>
-      <point x="210" y="57"/>
-      <point x="150" y="114"/>
-      <point x="150" y="194" type="curve" smooth="yes"/>
-      <point x="150" y="388"/>
-      <point x="498" y="353"/>
-      <point x="498" y="554" type="curve" smooth="yes"/>
-      <point x="498" y="643"/>
-      <point x="430" y="704"/>
-      <point x="331" y="704" type="curve" smooth="yes"/>
-      <point x="221" y="704"/>
-      <point x="149" y="630"/>
-      <point x="149" y="517" type="curve" smooth="yes"/>
-      <point x="149" y="386"/>
-      <point x="245" y="274"/>
+      <point x="280" y="-12" type="curve" smooth="yes"/>
+      <point x="421" y="-12"/>
+      <point x="557" y="95"/>
+      <point x="636" y="277" type="curve"/>
+      <point x="575" y="313" type="line"/>
+      <point x="491" y="141"/>
+      <point x="393" y="57"/>
+      <point x="290" y="57" type="curve" smooth="yes"/>
+      <point x="207" y="57"/>
+      <point x="147" y="114"/>
+      <point x="147" y="194" type="curve" smooth="yes"/>
+      <point x="147" y="388"/>
+      <point x="495" y="353"/>
+      <point x="495" y="554" type="curve" smooth="yes"/>
+      <point x="495" y="643"/>
+      <point x="427" y="704"/>
+      <point x="328" y="704" type="curve" smooth="yes"/>
+      <point x="218" y="704"/>
+      <point x="146" y="630"/>
+      <point x="146" y="517" type="curve" smooth="yes"/>
+      <point x="146" y="386"/>
+      <point x="242" y="274"/>
+      <point x="583" y="-10" type="curve"/>
+      <point x="634" y="50" type="line"/>
+      <point x="299" y="326"/>
+      <point x="222" y="415"/>
+      <point x="222" y="524" type="curve" smooth="yes"/>
+      <point x="222" y="598"/>
+      <point x="257" y="638"/>
+      <point x="319" y="638" type="curve" smooth="yes"/>
+      <point x="377" y="638"/>
+      <point x="419" y="602"/>
+      <point x="419" y="553" type="curve" smooth="yes"/>
+      <point x="419" y="401"/>
+      <point x="69" y="426"/>
+      <point x="69" y="187" type="curve" smooth="yes"/>
+      <point x="69" y="69"/>
+      <point x="156" y="-12"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/apostrophemod.glif 
b/src/Cantarell-Regular.ufo/glyphs/apostrophemod.glif
index 616b280d..a7632828 100644
--- a/src/Cantarell-Regular.ufo/glyphs/apostrophemod.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/apostrophemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="apostrophemod" format="2">
-  <advance width="294"/>
+  <advance width="166"/>
   <unicode hex="02BC"/>
   <outline>
-    <component base="quoteright"/>
+    <component base="quoteright" xOffset="-30"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/approxequal.glif 
b/src/Cantarell-Regular.ufo/glyphs/approxequal.glif
index a4c95842..9a0c6859 100644
--- a/src/Cantarell-Regular.ufo/glyphs/approxequal.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/approxequal.glif
@@ -1,51 +1,57 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="approxequal" format="2">
-  <advance width="637"/>
+  <advance width="580"/>
   <unicode hex="2248"/>
   <outline>
     <contour>
-      <point x="142" y="353" type="line"/>
-      <point x="154" y="397"/>
-      <point x="190" y="423"/>
-      <point x="224" y="423" type="curve" smooth="yes"/>
-      <point x="281" y="423"/>
-      <point x="312" y="349"/>
-      <point x="397" y="349" type="curve" smooth="yes"/>
-      <point x="464" y="349"/>
-      <point x="527" y="395"/>
-      <point x="547" y="473" type="curve"/>
-      <point x="490" y="498" type="line"/>
-      <point x="475" y="450"/>
-      <point x="439" y="427"/>
-      <point x="406" y="427" type="curve" smooth="yes"/>
-      <point x="347" y="427"/>
-      <point x="319" y="501"/>
-      <point x="235" y="501" type="curve" smooth="yes"/>
-      <point x="166" y="501"/>
-      <point x="107" y="452"/>
-      <point x="87" y="377" type="curve"/>
+      <point x="377" y="361" type="curve" smooth="yes"/>
+      <point x="445" y="361"/>
+      <point x="510" y="407"/>
+      <point x="531" y="484" type="curve"/>
+      <point x="478" y="508" type="line"/>
+      <point x="462" y="460"/>
+      <point x="418" y="437"/>
+      <point x="384" y="437" type="curve" smooth="yes"/>
+      <point x="321" y="437"/>
+      <point x="291" y="511"/>
+      <point x="203" y="511" type="curve" smooth="yes"/>
+      <point x="136" y="511"/>
+      <point x="71" y="466"/>
+      <point x="49" y="389" type="curve"/>
+      <point x="101" y="365" type="line"/>
+      <point x="115" y="409"/>
+      <point x="155" y="436"/>
+      <point x="192" y="436" type="curve" smooth="yes"/>
+      <point x="256" y="436"/>
+      <point x="289" y="361"/>
     </contour>
     <contour>
-      <point x="142" y="127" type="line"/>
-      <point x="154" y="171"/>
-      <point x="190" y="197"/>
-      <point x="224" y="197" type="curve" smooth="yes"/>
-      <point x="281" y="197"/>
-      <point x="312" y="123"/>
-      <point x="397" y="123" type="curve" smooth="yes"/>
-      <point x="464" y="123"/>
-      <point x="527" y="169"/>
-      <point x="547" y="247" type="curve"/>
-      <point x="490" y="272" type="line"/>
-      <point x="475" y="224"/>
-      <point x="439" y="201"/>
-      <point x="406" y="201" type="curve" smooth="yes"/>
-      <point x="347" y="201"/>
-      <point x="319" y="275"/>
-      <point x="235" y="275" type="curve" smooth="yes"/>
-      <point x="166" y="275"/>
-      <point x="107" y="226"/>
-      <point x="87" y="151" type="curve"/>
+      <point x="377" y="126" type="curve" smooth="yes"/>
+      <point x="445" y="126"/>
+      <point x="510" y="171"/>
+      <point x="531" y="248" type="curve"/>
+      <point x="478" y="272" type="line"/>
+      <point x="462" y="225"/>
+      <point x="418" y="201"/>
+      <point x="384" y="201" type="curve" smooth="yes"/>
+      <point x="321" y="201"/>
+      <point x="291" y="275"/>
+      <point x="203" y="275" type="curve" smooth="yes"/>
+      <point x="135" y="275"/>
+      <point x="70" y="227"/>
+      <point x="49" y="153" type="curve"/>
+      <point x="101" y="130" type="line"/>
+      <point x="115" y="176"/>
+      <point x="157" y="200"/>
+      <point x="192" y="200" type="curve" smooth="yes"/>
+      <point x="256" y="200"/>
+      <point x="289" y="126"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/asciicircum.glif 
b/src/Cantarell-Regular.ufo/glyphs/asciicircum.glif
index cd9efde2..e190931e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/asciicircum.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/asciicircum.glif
@@ -1,17 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="asciicircum" format="2">
-  <advance width="638"/>
+  <advance width="580"/>
   <unicode hex="005E"/>
   <outline>
     <contour>
-      <point x="125" y="232" type="line"/>
-      <point x="324" y="619" type="line"/>
-      <point x="302" y="620" type="line"/>
-      <point x="496" y="232" type="line"/>
-      <point x="572" y="268" type="line"/>
-      <point x="349" y="699" type="line"/>
-      <point x="279" y="699" type="line"/>
-      <point x="65" y="260" type="line"/>
+      <point x="111" y="272" type="line"/>
+      <point x="303" y="619" type="line"/>
+      <point x="282" y="620" type="line"/>
+      <point x="452" y="269" type="line"/>
+      <point x="528" y="305" type="line"/>
+      <point x="328" y="699" type="line"/>
+      <point x="259" y="699" type="line"/>
+      <point x="51" y="300" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/asciitilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/asciitilde.glif
index 0c462e00..f9c273d1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/asciitilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/asciitilde.glif
@@ -1,29 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="asciitilde" format="2">
-  <advance width="674"/>
+  <advance width="580"/>
   <unicode hex="007E"/>
   <outline>
     <contour>
-      <point x="146" y="252" type="line"/>
-      <point x="158" y="296"/>
-      <point x="197" y="330"/>
-      <point x="237" y="330" type="curve" smooth="yes"/>
-      <point x="299" y="330"/>
-      <point x="334" y="247"/>
-      <point x="424" y="247" type="curve" smooth="yes"/>
-      <point x="494" y="247"/>
-      <point x="560" y="297"/>
-      <point x="581" y="378" type="curve"/>
-      <point x="526" y="401" type="line"/>
-      <point x="510" y="350"/>
-      <point x="469" y="322"/>
-      <point x="433" y="322" type="curve" smooth="yes"/>
-      <point x="369" y="322"/>
-      <point x="337" y="405"/>
-      <point x="249" y="405" type="curve" smooth="yes"/>
-      <point x="176" y="405"/>
-      <point x="114" y="352"/>
-      <point x="93" y="275" type="curve"/>
+      <point x="377" y="242" type="curve" smooth="yes"/>
+      <point x="447" y="242"/>
+      <point x="513" y="292"/>
+      <point x="534" y="373" type="curve"/>
+      <point x="479" y="396" type="line"/>
+      <point x="463" y="345"/>
+      <point x="422" y="317"/>
+      <point x="386" y="317" type="curve" smooth="yes"/>
+      <point x="322" y="317"/>
+      <point x="290" y="400"/>
+      <point x="202" y="400" type="curve" smooth="yes"/>
+      <point x="129" y="400"/>
+      <point x="67" y="347"/>
+      <point x="46" y="270" type="curve"/>
+      <point x="99" y="247" type="line"/>
+      <point x="111" y="291"/>
+      <point x="150" y="325"/>
+      <point x="190" y="325" type="curve" smooth="yes"/>
+      <point x="252" y="325"/>
+      <point x="287" y="242"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/asterisk.glif b/src/Cantarell-Regular.ufo/glyphs/asterisk.glif
index 852e107d..da513633 100644
--- a/src/Cantarell-Regular.ufo/glyphs/asterisk.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/asterisk.glif
@@ -4,40 +4,46 @@
   <unicode hex="002A"/>
   <outline>
     <contour>
-      <point x="242" y="475" type="line"/>
-      <point x="427" y="566" type="line"/>
-      <point x="390" y="627" type="line"/>
-      <point x="226" y="502" type="line"/>
+      <point x="390" y="343" type="line"/>
+      <point x="430" y="409" type="line"/>
+      <point x="243" y="500" type="line"/>
+      <point x="226" y="472" type="line"/>
     </contour>
     <contour>
-      <point x="78" y="348" type="line"/>
+      <point x="79" y="345" type="line"/>
       <point x="243" y="473" type="line"/>
-      <point x="227" y="499" type="line"/>
-      <point x="41" y="408" type="line"/>
+      <point x="227" y="500" type="line"/>
+      <point x="38" y="411" type="line"/>
     </contour>
     <contour>
-      <point x="198" y="282" type="line"/>
-      <point x="269" y="282" type="line"/>
+      <point x="194" y="281" type="line"/>
+      <point x="274" y="281" type="line"/>
       <point x="251" y="488" type="line"/>
       <point x="219" y="488" type="line"/>
     </contour>
     <contour>
       <point x="227" y="475" type="line"/>
       <point x="244" y="501" type="line"/>
-      <point x="80" y="628" type="line"/>
-      <point x="43" y="568" type="line"/>
-    </contour>
-    <contour>
-      <point x="390" y="346" type="line"/>
-      <point x="427" y="406" type="line"/>
-      <point x="243" y="499" type="line"/>
-      <point x="226" y="472" type="line"/>
+      <point x="81" y="630" type="line"/>
+      <point x="40" y="565" type="line"/>
     </contour>
     <contour>
       <point x="219" y="488" type="line"/>
       <point x="251" y="488" type="line"/>
-      <point x="269" y="694" type="line"/>
-      <point x="198" y="694" type="line"/>
+      <point x="274" y="695" type="line"/>
+      <point x="194" y="695" type="line"/>
+    </contour>
+    <contour>
+      <point x="242" y="475" type="line"/>
+      <point x="431" y="561" type="line"/>
+      <point x="390" y="629" type="line"/>
+      <point x="226" y="503" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/b.glif b/src/Cantarell-Regular.ufo/glyphs/b.glif
index 1b6b5ce7..88184248 100644
--- a/src/Cantarell-Regular.ufo/glyphs/b.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/b.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="b" format="2">
-  <advance width="569"/>
+  <advance width="570"/>
   <unicode hex="0062"/>
-  <note>
-b
-</note>
   <anchor x="283" y="0" name="bottom"/>
   <anchor x="283" y="482" name="top"/>
   <outline>
-    <contour>
-      <point x="83" y="0" type="line"/>
-      <point x="139" y="0" type="line"/>
-      <point x="163" y="56" type="line"/>
-      <point x="163" y="739" type="line"/>
-      <point x="83" y="739" type="line"/>
-    </contour>
     <contour>
       <point x="288" y="-10" type="curve" smooth="yes"/>
       <point x="426" y="-10"/>
@@ -43,5 +33,20 @@ b
       <point x="137" y="33"/>
       <point x="200" y="-10"/>
     </contour>
+    <contour>
+      <point x="83" y="0" type="line"/>
+      <point x="139" y="0" type="line"/>
+      <point x="163" y="56" type="line"/>
+      <point x="163" y="739" type="line"/>
+      <point x="83" y="739" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/backslash.glif b/src/Cantarell-Regular.ufo/glyphs/backslash.glif
index d25e20b9..42a861ee 100644
--- a/src/Cantarell-Regular.ufo/glyphs/backslash.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/backslash.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="backslash" format="2">
-  <advance width="357"/>
+  <advance width="338"/>
   <unicode hex="005C"/>
   <outline>
-    <component base="slash" xScale="-1" xOffset="357"/>
+    <component base="slash" xScale="-1" xOffset="338"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|slash</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|slash</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/bar.glif b/src/Cantarell-Regular.ufo/glyphs/bar.glif
index e5b1a6eb..fd1db36c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/bar.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/bar.glif
@@ -1,13 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bar" format="2">
-  <advance width="327"/>
+  <advance width="261"/>
   <unicode hex="007C"/>
   <outline>
     <contour>
-      <point x="125" y="-159" type="line"/>
-      <point x="202" y="-159" type="line"/>
-      <point x="202" y="741" type="line"/>
-      <point x="125" y="741" type="line"/>
+      <point x="92" y="-180" type="line"/>
+      <point x="169" y="-180" type="line"/>
+      <point x="169" y="739" type="line"/>
+      <point x="92" y="739" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/be-cy.glif b/src/Cantarell-Regular.ufo/glyphs/be-cy.glif
index 954efbe8..5914782e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/be-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/be-cy.glif
@@ -1,47 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="be-cy" format="2">
-  <advance width="557"/>
+  <advance width="549"/>
   <unicode hex="0431"/>
   <outline>
     <contour>
-      <point x="293" y="-10" type="curve" smooth="yes"/>
-      <point x="424" y="-10"/>
-      <point x="507" y="89"/>
-      <point x="507" y="243" type="curve" smooth="yes"/>
-      <point x="507" y="368"/>
-      <point x="430" y="454"/>
-      <point x="317" y="454" type="curve" smooth="yes"/>
-      <point x="223" y="454"/>
-      <point x="148" y="394"/>
-      <point x="104" y="286" type="curve"/>
-      <point x="126" y="243" type="line"/>
-      <point x="158" y="332"/>
-      <point x="217" y="382"/>
-      <point x="288" y="382" type="curve" smooth="yes"/>
-      <point x="368" y="382"/>
-      <point x="423" y="321"/>
-      <point x="423" y="229" type="curve" smooth="yes"/>
-      <point x="423" y="126"/>
-      <point x="377" y="63"/>
-      <point x="303" y="63" type="curve" smooth="yes"/>
-      <point x="202" y="63"/>
-      <point x="144" y="160"/>
-      <point x="144" y="334" type="curve" smooth="yes"/>
-      <point x="144" y="554"/>
-      <point x="181" y="620"/>
-      <point x="303" y="620" type="curve" smooth="yes"/>
-      <point x="382" y="620"/>
-      <point x="440" y="648"/>
-      <point x="475" y="706" type="curve"/>
-      <point x="421" y="744" type="line"/>
-      <point x="398" y="713"/>
-      <point x="354" y="694"/>
-      <point x="295" y="694" type="curve" smooth="yes"/>
-      <point x="128" y="694"/>
-      <point x="61" y="589"/>
-      <point x="61" y="328" type="curve" smooth="yes"/>
-      <point x="61" y="110"/>
-      <point x="150" y="-10"/>
+      <point x="289" y="-10" type="curve" smooth="yes"/>
+      <point x="422" y="-10"/>
+      <point x="505" y="91"/>
+      <point x="505" y="234" type="curve" smooth="yes"/>
+      <point x="505" y="371"/>
+      <point x="428" y="454"/>
+      <point x="316" y="454" type="curve" smooth="yes"/>
+      <point x="221" y="454"/>
+      <point x="146" y="394"/>
+      <point x="102" y="286" type="curve"/>
+      <point x="124" y="243" type="line"/>
+      <point x="156" y="332"/>
+      <point x="215" y="382"/>
+      <point x="287" y="382" type="curve" smooth="yes"/>
+      <point x="363" y="382"/>
+      <point x="421" y="327"/>
+      <point x="421" y="220" type="curve" smooth="yes"/>
+      <point x="421" y="125"/>
+      <point x="375" y="63"/>
+      <point x="295" y="63" type="curve" smooth="yes"/>
+      <point x="200" y="63"/>
+      <point x="140" y="152"/>
+      <point x="140" y="361" type="curve" smooth="yes"/>
+      <point x="140" y="544"/>
+      <point x="181" y="608"/>
+      <point x="317" y="634" type="curve" smooth="yes"/>
+      <point x="442" y="658" type="line"/>
+      <point x="429" y="729" type="line"/>
+      <point x="301" y="704" type="line" smooth="yes"/>
+      <point x="129" y="670"/>
+      <point x="59" y="567"/>
+      <point x="59" y="346" type="curve" smooth="yes"/>
+      <point x="59" y="103"/>
+      <point x="148" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/blackC_ircle.glif 
b/src/Cantarell-Regular.ufo/glyphs/blackC_ircle.glif
index 15164e68..b5b24e50 100644
--- a/src/Cantarell-Regular.ufo/glyphs/blackC_ircle.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/blackC_ircle.glif
@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="blackCircle" format="2">
-  <advance width="659"/>
+  <advance width="655"/>
   <unicode hex="25CF"/>
-  <note>
-H18533
-</note>
   <outline>
     <contour>
-      <point x="327" y="109" type="curve" smooth="yes"/>
-      <point x="472" y="109"/>
-      <point x="569" y="205"/>
-      <point x="569" y="349" type="curve" smooth="yes"/>
-      <point x="569" y="490"/>
-      <point x="475" y="585"/>
-      <point x="332" y="585" type="curve" smooth="yes"/>
-      <point x="187" y="585"/>
-      <point x="90" y="488"/>
-      <point x="90" y="342" type="curve" smooth="yes"/>
-      <point x="90" y="202"/>
-      <point x="185" y="109"/>
+      <point x="325" y="109" type="curve" smooth="yes"/>
+      <point x="470" y="109"/>
+      <point x="567" y="205"/>
+      <point x="567" y="349" type="curve" smooth="yes"/>
+      <point x="567" y="490"/>
+      <point x="473" y="585"/>
+      <point x="330" y="585" type="curve" smooth="yes"/>
+      <point x="185" y="585"/>
+      <point x="88" y="488"/>
+      <point x="88" y="342" type="curve" smooth="yes"/>
+      <point x="88" y="202"/>
+      <point x="183" y="109"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/blank.glif b/src/Cantarell-Regular.ufo/glyphs/blank.glif
index f22ab3f9..ea9d4749 100644
--- a/src/Cantarell-Regular.ufo/glyphs/blank.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/blank.glif
@@ -1,20 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="blank" format="2">
-  <advance width="816"/>
+  <advance width="750"/>
   <unicode hex="2423"/>
-  <note>
-uni2423
-</note>
   <outline>
     <contour>
-      <point x="125" y="0" type="line"/>
-      <point x="691" y="0" type="line"/>
-      <point x="691" y="166" type="line"/>
-      <point x="618" y="166" type="line"/>
-      <point x="618" y="73" type="line"/>
-      <point x="198" y="73" type="line"/>
-      <point x="198" y="166" type="line"/>
-      <point x="125" y="166" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="658" y="0" type="line"/>
+      <point x="658" y="166" type="line"/>
+      <point x="585" y="166" type="line"/>
+      <point x="585" y="73" type="line"/>
+      <point x="165" y="73" type="line"/>
+      <point x="165" y="166" type="line"/>
+      <point x="92" y="166" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/braceleft.glif b/src/Cantarell-Regular.ufo/glyphs/braceleft.glif
index ba8780bc..0b955508 100644
--- a/src/Cantarell-Regular.ufo/glyphs/braceleft.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/braceleft.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="braceleft" format="2">
-  <advance width="393"/>
+  <advance width="365"/>
   <unicode hex="007B"/>
   <outline>
     <contour>
-      <point x="353" y="-173" type="curve"/>
-      <point x="353" y="-104" type="line"/>
-      <point x="257" y="-104"/>
-      <point x="228" y="-72"/>
-      <point x="228" y="-21" type="curve" smooth="yes"/>
-      <point x="228" y="138" type="line" smooth="yes"/>
-      <point x="228" y="229"/>
-      <point x="187" y="291"/>
-      <point x="118" y="302" type="curve"/>
-      <point x="118" y="303" type="line"/>
-      <point x="182" y="319"/>
-      <point x="228" y="386"/>
-      <point x="228" y="462" type="curve" smooth="yes"/>
-      <point x="228" y="596" type="line" smooth="yes"/>
-      <point x="228" y="647"/>
-      <point x="255" y="680"/>
-      <point x="353" y="680" type="curve"/>
-      <point x="353" y="749" type="line"/>
-      <point x="199" y="749"/>
-      <point x="151" y="689"/>
-      <point x="151" y="587" type="curve" smooth="yes"/>
-      <point x="151" y="452" type="line" smooth="yes"/>
-      <point x="151" y="394"/>
-      <point x="102" y="337"/>
-      <point x="31" y="316" type="curve"/>
-      <point x="31" y="290" type="line"/>
-      <point x="109" y="265"/>
-      <point x="151" y="202"/>
-      <point x="151" y="128" type="curve" smooth="yes"/>
-      <point x="151" y="-32" type="line" smooth="yes"/>
-      <point x="151" y="-114"/>
-      <point x="195" y="-173"/>
+      <point x="325" y="-187" type="curve"/>
+      <point x="330" y="-118" type="line"/>
+      <point x="239" y="-118"/>
+      <point x="207" y="-86"/>
+      <point x="215" y="-26" type="curve" smooth="yes"/>
+      <point x="234" y="117" type="line" smooth="yes"/>
+      <point x="245" y="200"/>
+      <point x="202" y="268"/>
+      <point x="133" y="283" type="curve"/>
+      <point x="133" y="279" type="line"/>
+      <point x="202" y="300"/>
+      <point x="245" y="369"/>
+      <point x="236" y="438" type="curve" smooth="yes"/>
+      <point x="217" y="586" type="line" smooth="yes"/>
+      <point x="209" y="648"/>
+      <point x="245" y="679"/>
+      <point x="330" y="679" type="curve"/>
+      <point x="325" y="748" type="line"/>
+      <point x="193" y="748"/>
+      <point x="126" y="693"/>
+      <point x="140" y="577" type="curve" smooth="yes"/>
+      <point x="158" y="429" type="line" smooth="yes"/>
+      <point x="165" y="371"/>
+      <point x="122" y="318"/>
+      <point x="61" y="315" type="curve"/>
+      <point x="61" y="236" type="line"/>
+      <point x="126" y="233"/>
+      <point x="167" y="177"/>
+      <point x="158" y="107" type="curve" smooth="yes"/>
+      <point x="139" y="-36" type="line" smooth="yes"/>
+      <point x="126" y="-136"/>
+      <point x="190" y="-187"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/braceright.glif 
b/src/Cantarell-Regular.ufo/glyphs/braceright.glif
index 62f9a1e5..2ce3d788 100644
--- a/src/Cantarell-Regular.ufo/glyphs/braceright.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/braceright.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="braceright" format="2">
-  <advance width="393"/>
+  <advance width="365"/>
   <unicode hex="007D"/>
   <outline>
-    <component base="braceleft" xScale="-1" yScale="-1" xOffset="393" yOffset="576"/>
+    <component base="braceleft" xScale="-1" yScale="-1" xOffset="365" yOffset="561"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|braceleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>braceleft</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/bracketleft.glif 
b/src/Cantarell-Regular.ufo/glyphs/bracketleft.glif
index b623414f..297363e8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/bracketleft.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/bracketleft.glif
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bracketleft" format="2">
-  <advance width="367"/>
+  <advance width="350"/>
   <unicode hex="005B"/>
   <outline>
     <contour>
       <point x="100" y="-180" type="line"/>
-      <point x="327" y="-180" type="line"/>
-      <point x="327" y="-113" type="line"/>
+      <point x="310" y="-180" type="line"/>
+      <point x="310" y="-113" type="line"/>
       <point x="175" y="-113" type="line"/>
       <point x="175" y="672" type="line"/>
-      <point x="327" y="672" type="line"/>
-      <point x="327" y="739" type="line"/>
+      <point x="310" y="672" type="line"/>
+      <point x="310" y="739" type="line"/>
       <point x="100" y="739" type="line"/>
     </contour>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/bracketright.glif 
b/src/Cantarell-Regular.ufo/glyphs/bracketright.glif
index 3fd0771f..771265db 100644
--- a/src/Cantarell-Regular.ufo/glyphs/bracketright.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/bracketright.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bracketright" format="2">
-  <advance width="367"/>
+  <advance width="350"/>
   <unicode hex="005D"/>
   <outline>
-    <component base="bracketleft" xScale="-1" xOffset="368"/>
+    <component base="bracketleft" xScale="-1" xOffset="350"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|bracketleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>bracketleft</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/breve.glif b/src/Cantarell-Regular.ufo/glyphs/breve.glif
index 7fe2eeb3..b68d8c89 100644
--- a/src/Cantarell-Regular.ufo/glyphs/breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/breve.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="breve" format="2">
-  <advance width="410"/>
+  <advance width="500"/>
   <unicode hex="02D8"/>
   <outline>
-    <component base="brevecomb" xOffset="-2"/>
+    <component base="brevecomb" xOffset="45"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/brevecomb-cy.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/brevecomb-cy.case.glif
index b4a2dfeb..f3a7103b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/brevecomb-cy.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/brevecomb-cy.case.glif
@@ -3,7 +3,7 @@
   <anchor x="215" y="694" name="_top"/>
   <anchor x="215" y="892" name="top"/>
   <outline>
-    <component base="brevecomb-cy" yOffset="197"/>
+    <component base="brevecomb-cy" yOffset="187"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/brevecomb-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/brevecomb-cy.glif
index 6a48b62c..d14b9267 100644
--- a/src/Cantarell-Regular.ufo/glyphs/brevecomb-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/brevecomb-cy.glif
@@ -5,19 +5,19 @@
   <outline>
     <contour>
       <point x="224" y="565" type="curve" smooth="yes"/>
-      <point x="316" y="565"/>
-      <point x="384" y="619"/>
-      <point x="395" y="701" type="curve"/>
+      <point x="317" y="565"/>
+      <point x="384" y="620"/>
+      <point x="395" y="706" type="curve"/>
       <point x="337" y="731" type="line"/>
       <point x="326" y="662"/>
       <point x="285" y="621"/>
-      <point x="228" y="621" type="curve" smooth="yes"/>
-      <point x="172" y="621"/>
+      <point x="229" y="621" type="curve" smooth="yes"/>
+      <point x="171" y="621"/>
       <point x="126" y="664"/>
       <point x="115" y="729" type="curve"/>
       <point x="56" y="699" type="line"/>
       <point x="71" y="616"/>
-      <point x="136" y="565"/>
+      <point x="135" y="565"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/brokenbar.glif b/src/Cantarell-Regular.ufo/glyphs/brokenbar.glif
index 27f4354a..523f3fbc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/brokenbar.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/brokenbar.glif
@@ -1,19 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="brokenbar" format="2">
-  <advance width="329"/>
+  <advance width="263"/>
   <unicode hex="00A6"/>
   <outline>
     <contour>
-      <point x="125" y="-159" type="line"/>
-      <point x="204" y="-159" type="line"/>
-      <point x="204" y="181" type="line"/>
-      <point x="125" y="181" type="line"/>
+      <point x="92" y="-182" type="line"/>
+      <point x="171" y="-182" type="line"/>
+      <point x="171" y="181" type="line"/>
+      <point x="92" y="181" type="line"/>
     </contour>
     <contour>
-      <point x="125" y="412" type="line"/>
-      <point x="204" y="412" type="line"/>
-      <point x="204" y="741" type="line"/>
-      <point x="125" y="741" type="line"/>
+      <point x="92" y="412" type="line"/>
+      <point x="171" y="412" type="line"/>
+      <point x="171" y="741" type="line"/>
+      <point x="92" y="741" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/bullet.glif b/src/Cantarell-Regular.ufo/glyphs/bullet.glif
index 3399163f..551f4d97 100644
--- a/src/Cantarell-Regular.ufo/glyphs/bullet.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/bullet.glif
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bullet" format="2">
-  <advance width="377"/>
+  <advance width="376"/>
   <unicode hex="2022"/>
   <outline>
-    <component base="period" xScale="2" yScale="2" xOffset="-84" yOffset="162"/>
+    <contour>
+      <point x="188" y="222" type="curve" smooth="yes"/>
+      <point x="264" y="222"/>
+      <point x="316" y="276"/>
+      <point x="316" y="350" type="curve" smooth="yes"/>
+      <point x="316" y="424"/>
+      <point x="264" y="478"/>
+      <point x="188" y="478" type="curve" smooth="yes"/>
+      <point x="112" y="478"/>
+      <point x="60" y="424"/>
+      <point x="60" y="350" type="curve" smooth="yes"/>
+      <point x="60" y="276"/>
+      <point x="112" y="222"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/bulletoperator.glif 
b/src/Cantarell-Regular.ufo/glyphs/bulletoperator.glif
index 03640150..64792c7a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/bulletoperator.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/bulletoperator.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bulletoperator" format="2">
-  <advance width="385"/>
+  <advance width="256"/>
   <unicode hex="2219"/>
   <outline>
-    <component base="period" xScale="1.25716" yScale="1.25716" xOffset="20" yOffset="280"/>
+    <component base="period" yOffset="284"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>period</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/c.glif b/src/Cantarell-Regular.ufo/glyphs/c.glif
index 74d03617..72d1182f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/c.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/c.glif
@@ -1,40 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="c" format="2">
-  <advance width="466"/>
+  <advance width="467"/>
   <unicode hex="0063"/>
-  <note>
-c
-</note>
-  <anchor x="247" y="0" name="bottom"/>
-  <anchor x="267" y="482" name="top"/>
+  <anchor x="248" y="0" name="bottom"/>
+  <anchor x="268" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="271" y="-10" type="curve" smooth="yes"/>
-      <point x="329" y="-10"/>
-      <point x="389" y="4"/>
-      <point x="429" y="28" type="curve"/>
-      <point x="411" y="86" type="line"/>
-      <point x="371" y="67"/>
-      <point x="327" y="56"/>
-      <point x="290" y="56" type="curve" smooth="yes"/>
-      <point x="190" y="56"/>
-      <point x="133" y="126"/>
-      <point x="133" y="243" type="curve" smooth="yes"/>
-      <point x="133" y="359"/>
-      <point x="189" y="422"/>
-      <point x="289" y="422" type="curve" smooth="yes"/>
-      <point x="327" y="422"/>
-      <point x="370" y="413"/>
-      <point x="410" y="395" type="curve"/>
-      <point x="429" y="460" type="line"/>
-      <point x="385" y="481"/>
-      <point x="338" y="492"/>
-      <point x="290" y="492" type="curve" smooth="yes"/>
-      <point x="147" y="492"/>
-      <point x="51" y="386"/>
-      <point x="51" y="227" type="curve" smooth="yes"/>
-      <point x="51" y="78"/>
-      <point x="133" y="-10"/>
+      <point x="272" y="-10" type="curve" smooth="yes"/>
+      <point x="330" y="-10"/>
+      <point x="390" y="4"/>
+      <point x="430" y="28" type="curve"/>
+      <point x="412" y="86" type="line"/>
+      <point x="372" y="67"/>
+      <point x="328" y="56"/>
+      <point x="291" y="56" type="curve" smooth="yes"/>
+      <point x="191" y="56"/>
+      <point x="134" y="126"/>
+      <point x="134" y="243" type="curve" smooth="yes"/>
+      <point x="134" y="359"/>
+      <point x="190" y="422"/>
+      <point x="290" y="422" type="curve" smooth="yes"/>
+      <point x="328" y="422"/>
+      <point x="371" y="413"/>
+      <point x="411" y="395" type="curve"/>
+      <point x="430" y="460" type="line"/>
+      <point x="386" y="481"/>
+      <point x="339" y="492"/>
+      <point x="291" y="492" type="curve" smooth="yes"/>
+      <point x="148" y="492"/>
+      <point x="52" y="386"/>
+      <point x="52" y="227" type="curve" smooth="yes"/>
+      <point x="52" y="78"/>
+      <point x="134" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/cacute.glif b/src/Cantarell-Regular.ufo/glyphs/cacute.glif
index e3dfe7e2..3c19546a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/cacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/cacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cacute" format="2">
-  <advance width="466"/>
+  <advance width="467"/>
   <unicode hex="0107"/>
   <outline>
     <component base="c"/>
-    <component base="acutecomb" xOffset="184"/>
+    <component base="acutecomb" xOffset="185"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/caron.glif b/src/Cantarell-Regular.ufo/glyphs/caron.glif
index 7b738fcc..56110bb8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/caron.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="caron" format="2">
-  <advance width="376"/>
+  <advance width="500"/>
   <unicode hex="02C7"/>
   <outline>
-    <component base="caroncomb" xOffset="3"/>
+    <component base="caroncomb" xOffset="68"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/caroncomb.loclV_I_E_T_.glif 
b/src/Cantarell-Regular.ufo/glyphs/caroncomb.loclV_I_E_T_.glif
index 219e7e0e..c5cd6214 100644
--- a/src/Cantarell-Regular.ufo/glyphs/caroncomb.loclV_I_E_T_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/caroncomb.loclV_I_E_T_.glif
@@ -4,13 +4,13 @@
   <anchor x="184" y="627" name="top"/>
   <outline>
     <contour>
+      <point x="165" y="541" type="line"/>
+      <point x="208" y="541" type="line"/>
       <point x="334" y="660" type="line"/>
       <point x="303" y="688" type="line"/>
       <point x="191" y="609" type="line"/>
       <point x="84" y="686" type="line"/>
       <point x="39" y="641" type="line"/>
-      <point x="165" y="541" type="line"/>
-      <point x="208" y="541" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ccaron.glif b/src/Cantarell-Regular.ufo/glyphs/ccaron.glif
index 5281d2f5..4bec6d0d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ccaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ccaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccaron" format="2">
-  <advance width="466"/>
+  <advance width="467"/>
   <unicode hex="010D"/>
   <outline>
     <component base="c"/>
-    <component base="caroncomb" xOffset="84"/>
+    <component base="caroncomb" xOffset="85"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ccedilla.glif b/src/Cantarell-Regular.ufo/glyphs/ccedilla.glif
index 05dcd3f6..257c5ee7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ccedilla.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ccedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccedilla" format="2">
-  <advance width="466"/>
+  <advance width="467"/>
   <unicode hex="00E7"/>
   <outline>
     <component base="c"/>
-    <component base="cedillacomb" xOffset="100"/>
+    <component base="cedillacomb" xOffset="101"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ccedillaacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/ccedillaacute.glif
index 947aeac9..d5ec8edb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ccedillaacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ccedillaacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccedillaacute" format="2">
-  <advance width="466"/>
+  <advance width="467"/>
   <unicode hex="1E09"/>
   <outline>
     <component base="c"/>
-    <component base="cedillacomb" xOffset="100"/>
-    <component base="acutecomb" xOffset="184"/>
+    <component base="cedillacomb" xOffset="101"/>
+    <component base="acutecomb" xOffset="185"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ccircumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/ccircumflex.glif
index cf720c62..6f4d174e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ccircumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ccircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccircumflex" format="2">
-  <advance width="466"/>
+  <advance width="467"/>
   <unicode hex="0109"/>
   <outline>
     <component base="c"/>
-    <component base="circumflexcomb" xOffset="74"/>
+    <component base="circumflexcomb" xOffset="75"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/cdotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/cdotaccent.glif
index 0eb90b06..65d9c2a5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/cdotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/cdotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cdotaccent" format="2">
-  <advance width="466"/>
+  <advance width="467"/>
   <unicode hex="010B"/>
   <outline>
     <component base="c"/>
-    <component base="dotaccentcomb" xOffset="134"/>
+    <component base="dotaccentcomb" xOffset="135"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/cedi.glif b/src/Cantarell-Regular.ufo/glyphs/cedi.glif
index 424daa98..92a04fc2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/cedi.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/cedi.glif
@@ -1,20 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cedi" format="2">
-  <advance width="713"/>
+  <advance width="580"/>
   <unicode hex="20B5"/>
   <outline>
-    <component base="C" xOffset="19"/>
-    <component base="_currencyvstem" xOffset="-5"/>
-    <component base="_currencyvstem" xOffset="-5" yOffset="-800"/>
+    <contour>
+      <point x="352" y="-10" type="curve" smooth="yes"/>
+      <point x="411" y="-10"/>
+      <point x="473" y="5"/>
+      <point x="529" y="34" type="curve"/>
+      <point x="510" y="95" type="line"/>
+      <point x="468" y="75"/>
+      <point x="415" y="63"/>
+      <point x="371" y="63" type="curve" smooth="yes"/>
+      <point x="231" y="63"/>
+      <point x="139" y="181"/>
+      <point x="139" y="358" type="curve" smooth="yes"/>
+      <point x="139" y="527"/>
+      <point x="223" y="630"/>
+      <point x="362" y="630" type="curve" smooth="yes"/>
+      <point x="411" y="630"/>
+      <point x="465" y="618"/>
+      <point x="509" y="598" type="curve"/>
+      <point x="533" y="660" type="line"/>
+      <point x="487" y="687"/>
+      <point x="425" y="703"/>
+      <point x="366" y="703" type="curve" smooth="yes"/>
+      <point x="180" y="703"/>
+      <point x="54" y="557"/>
+      <point x="54" y="339" type="curve" smooth="yes"/>
+      <point x="54" y="130"/>
+      <point x="174" y="-10"/>
+    </contour>
+    <contour>
+      <point x="312" y="-120" type="line"/>
+      <point x="383" y="-120" type="line"/>
+      <point x="383" y="28" type="line"/>
+      <point x="312" y="28" type="line"/>
+    </contour>
+    <contour>
+      <point x="312" y="658" type="line"/>
+      <point x="383" y="658" type="line"/>
+      <point x="383" y="818" type="line"/>
+      <point x="312" y="818" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>-1</integer>
-        <integer>-1</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/cedilla.glif b/src/Cantarell-Regular.ufo/glyphs/cedilla.glif
index 6443fff3..205e3921 100644
--- a/src/Cantarell-Regular.ufo/glyphs/cedilla.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/cedilla.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cedilla" format="2">
-  <advance width="327"/>
+  <advance width="500"/>
   <unicode hex="00B8"/>
   <outline>
-    <component base="cedillacomb" xOffset="-3"/>
+    <component base="cedillacomb" xOffset="83"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/cent.glif b/src/Cantarell-Regular.ufo/glyphs/cent.glif
index 0a8cf284..10d6c660 100644
--- a/src/Cantarell-Regular.ufo/glyphs/cent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/cent.glif
@@ -1,14 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cent" format="2">
-  <advance width="549"/>
+  <advance width="580"/>
   <unicode hex="00A2"/>
   <outline>
-    <component base="c" xOffset="35"/>
-    <component base="_currencyvstem" xOffset="-105" yOffset="-209"/>
-    <component base="_currencyvstem" xOffset="-102" yOffset="-800"/>
+    <component base="c" xOffset="52"/>
+    <component base="_currencyvstem" xOffset="-88" yOffset="-211"/>
+    <component base="_currencyvstem" xOffset="-85" yOffset="-778"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Regular.ufo/glyphs/che-cy.glif b/src/Cantarell-Regular.ufo/glyphs/che-cy.glif
index b4e74070..a855bd06 100644
--- a/src/Cantarell-Regular.ufo/glyphs/che-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/che-cy.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="che-cy" format="2">
-  <advance width="532"/>
+  <advance width="531"/>
   <unicode hex="0447"/>
-  <anchor x="446" y="0" name="bottomright"/>
-  <anchor x="266" y="482" name="top"/>
+  <anchor x="439" y="0" name="bottomright"/>
+  <anchor x="265" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="219" y="171" type="curve" smooth="yes"/>
-      <point x="283" y="171"/>
-      <point x="355" y="192"/>
-      <point x="399" y="226" type="curve"/>
-      <point x="384" y="277" type="line"/>
-      <point x="346" y="255"/>
-      <point x="291" y="241"/>
-      <point x="244" y="241" type="curve" smooth="yes"/>
-      <point x="173" y="241"/>
-      <point x="129" y="276"/>
-      <point x="129" y="336" type="curve" smooth="yes"/>
-      <point x="129" y="482" type="line"/>
-      <point x="48" y="482" type="line"/>
-      <point x="48" y="301" type="line" smooth="yes"/>
-      <point x="48" y="222"/>
-      <point x="116" y="171"/>
+      <point x="218" y="171" type="curve" smooth="yes"/>
+      <point x="282" y="171"/>
+      <point x="354" y="192"/>
+      <point x="398" y="226" type="curve"/>
+      <point x="383" y="277" type="line"/>
+      <point x="345" y="255"/>
+      <point x="290" y="241"/>
+      <point x="243" y="241" type="curve" smooth="yes"/>
+      <point x="172" y="241"/>
+      <point x="128" y="276"/>
+      <point x="128" y="336" type="curve" smooth="yes"/>
+      <point x="128" y="482" type="line"/>
+      <point x="47" y="482" type="line"/>
+      <point x="47" y="301" type="line" smooth="yes"/>
+      <point x="47" y="222"/>
+      <point x="115" y="171"/>
     </contour>
     <contour>
-      <point x="368" y="0" type="line"/>
-      <point x="449" y="0" type="line"/>
-      <point x="449" y="482" type="line"/>
-      <point x="368" y="482" type="line"/>
+      <point x="367" y="0" type="line"/>
+      <point x="448" y="0" type="line"/>
+      <point x="448" y="482" type="line"/>
+      <point x="367" y="482" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -41,6 +41,8 @@
         <key>width</key>
         <integer>78</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/chedescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/chedescender-cy.glif
index b83c478e..3a13589f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/chedescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/chedescender-cy.glif
@@ -1,15 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="chedescender-cy" format="2">
-  <advance width="549"/>
+  <advance width="542"/>
   <unicode hex="04B7"/>
   <outline>
     <component base="che-cy"/>
-    <component base="descender-cy" xOffset="339"/>
+    <component base="descender-cy" xOffset="332"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>che-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>tse-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Regular.ufo/glyphs/chedieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/chedieresis-cy.glif
index 4cafee4b..cc2b208b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/chedieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/chedieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="chedieresis-cy" format="2">
-  <advance width="532"/>
+  <advance width="531"/>
   <unicode hex="04F5"/>
   <outline>
     <component base="che-cy"/>
-    <component base="dieresiscomb" xOffset="33"/>
+    <component base="dieresiscomb" xOffset="32"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/chekhakassian-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/chekhakassian-cy.glif
index 07e590eb..8037be7f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/chekhakassian-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/chekhakassian-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="chekhakassian-cy" format="2">
-  <advance width="532"/>
+  <advance width="531"/>
   <unicode hex="04CC"/>
   <outline>
     <component base="che-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/cheverticalstroke-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/cheverticalstroke-cy.glif
index a9b78454..30c70a70 100644
--- a/src/Cantarell-Regular.ufo/glyphs/cheverticalstroke-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/cheverticalstroke-cy.glif
@@ -1,37 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cheverticalstroke-cy" format="2">
-  <advance width="542"/>
+  <advance width="541"/>
   <unicode hex="04B9"/>
   <outline>
     <contour>
-      <point x="224" y="171" type="curve" smooth="yes"/>
-      <point x="289" y="171"/>
-      <point x="364" y="192"/>
-      <point x="409" y="226" type="curve"/>
-      <point x="394" y="277" type="line"/>
-      <point x="355" y="255"/>
-      <point x="297" y="241"/>
-      <point x="249" y="241" type="curve" smooth="yes"/>
-      <point x="175" y="241"/>
-      <point x="129" y="276"/>
-      <point x="129" y="336" type="curve" smooth="yes"/>
-      <point x="129" y="482" type="line"/>
-      <point x="48" y="482" type="line"/>
-      <point x="48" y="301" type="line" smooth="yes"/>
-      <point x="48" y="222"/>
-      <point x="118" y="171"/>
+      <point x="223" y="171" type="curve" smooth="yes"/>
+      <point x="288" y="171"/>
+      <point x="363" y="192"/>
+      <point x="408" y="226" type="curve"/>
+      <point x="393" y="277" type="line"/>
+      <point x="354" y="255"/>
+      <point x="296" y="241"/>
+      <point x="248" y="241" type="curve" smooth="yes"/>
+      <point x="174" y="241"/>
+      <point x="128" y="276"/>
+      <point x="128" y="336" type="curve" smooth="yes"/>
+      <point x="128" y="482" type="line"/>
+      <point x="47" y="482" type="line"/>
+      <point x="47" y="301" type="line" smooth="yes"/>
+      <point x="47" y="222"/>
+      <point x="117" y="171"/>
     </contour>
     <contour>
-      <point x="378" y="0" type="line"/>
-      <point x="459" y="0" type="line"/>
-      <point x="459" y="482" type="line"/>
-      <point x="378" y="482" type="line"/>
+      <point x="222" y="53" type="line"/>
+      <point x="285" y="53" type="line"/>
+      <point x="285" y="378" type="line"/>
+      <point x="222" y="378" type="line"/>
     </contour>
     <contour>
-      <point x="223" y="53" type="line"/>
-      <point x="286" y="53" type="line"/>
-      <point x="286" y="378" type="line"/>
-      <point x="223" y="378" type="line"/>
+      <point x="377" y="0" type="line"/>
+      <point x="458" y="0" type="line"/>
+      <point x="458" y="482" type="line"/>
+      <point x="377" y="482" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>che-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>en-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/circumflex.glif
index e851c707..17d22094 100644
--- a/src/Cantarell-Regular.ufo/glyphs/circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/circumflex.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="circumflex" format="2">
-  <advance width="377"/>
+  <advance width="500"/>
   <unicode hex="02C6"/>
   <outline>
-    <component base="circumflexcomb" xOffset="-8"/>
+    <component base="circumflexcomb" xOffset="56"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb.glif 
b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb.glif
index f253e866..76374fe5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb.glif
@@ -6,13 +6,13 @@
   <anchor x="355" y="602" name="top_viet"/>
   <outline>
     <contour>
-      <point x="45" y="587" type="line"/>
       <point x="80" y="559" type="line"/>
       <point x="190" y="657" type="line"/>
       <point x="299" y="559" type="line"/>
       <point x="343" y="601" type="line"/>
       <point x="216" y="728" type="line"/>
       <point x="173" y="728" type="line"/>
+      <point x="45" y="587" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif 
b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif
index 5932f3ee..95cb1492 100644
--- a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif
@@ -5,13 +5,13 @@
   <anchor x="321" y="563" name="top_viet"/>
   <outline>
     <contour>
-      <point x="45" y="564" type="line"/>
       <point x="80" y="536" type="line"/>
       <point x="190" y="610" type="line"/>
       <point x="299" y="536" type="line"/>
       <point x="343" y="578" type="line"/>
       <point x="216" y="680" type="line"/>
       <point x="173" y="680" type="line"/>
+      <point x="45" y="564" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/colon.glif b/src/Cantarell-Regular.ufo/glyphs/colon.glif
index f2eeae45..493ebbbc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/colon.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/colon.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="colon" format="2">
-  <advance width="272"/>
+  <advance width="256"/>
   <unicode hex="003A"/>
   <outline>
     <component base="period"/>
@@ -8,6 +8,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>period</string>
       <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
       <string>period</string>
     </dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/colonsign.glif b/src/Cantarell-Regular.ufo/glyphs/colonsign.glif
index 9f0d5826..ed7c9afb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/colonsign.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/colonsign.glif
@@ -1,32 +1,65 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="colonsign" format="2">
-  <advance width="714"/>
+  <advance width="580"/>
   <unicode hex="20A1"/>
   <outline>
     <contour>
-      <point x="478" y="694" type="line"/>
-      <point x="538" y="694" type="line"/>
-      <point x="559" y="824" type="line"/>
-      <point x="499" y="824" type="line"/>
+      <point x="353" y="-10" type="curve" smooth="yes"/>
+      <point x="413" y="-10"/>
+      <point x="474" y="5"/>
+      <point x="530" y="34" type="curve"/>
+      <point x="511" y="95" type="line"/>
+      <point x="469" y="75"/>
+      <point x="416" y="63"/>
+      <point x="372" y="63" type="curve" smooth="yes"/>
+      <point x="232" y="63"/>
+      <point x="140" y="181"/>
+      <point x="140" y="358" type="curve" smooth="yes"/>
+      <point x="140" y="527"/>
+      <point x="224" y="630"/>
+      <point x="363" y="630" type="curve" smooth="yes"/>
+      <point x="411" y="630"/>
+      <point x="466" y="618"/>
+      <point x="510" y="598" type="curve"/>
+      <point x="534" y="660" type="line"/>
+      <point x="488" y="687"/>
+      <point x="426" y="703"/>
+      <point x="368" y="703" type="curve" smooth="yes"/>
+      <point x="181" y="703"/>
+      <point x="55" y="557"/>
+      <point x="55" y="339" type="curve" smooth="yes"/>
+      <point x="55" y="130"/>
+      <point x="175" y="-10"/>
     </contour>
     <contour>
-      <point x="263" y="-140" type="line"/>
-      <point x="323" y="-140" type="line"/>
-      <point x="350" y="26" type="line"/>
-      <point x="290" y="26" type="line"/>
+      <point x="210" y="-120" type="line"/>
+      <point x="269" y="-120" type="line"/>
+      <point x="294" y="26" type="line"/>
+      <point x="235" y="26" type="line"/>
     </contour>
     <contour>
-      <point x="368" y="694" type="line"/>
-      <point x="428" y="694" type="line"/>
-      <point x="449" y="824" type="line"/>
-      <point x="389" y="824" type="line"/>
+      <point x="314" y="-120" type="line"/>
+      <point x="373" y="-120" type="line"/>
+      <point x="398" y="26" type="line"/>
+      <point x="339" y="26" type="line"/>
     </contour>
     <contour>
-      <point x="374" y="-140" type="line"/>
-      <point x="434" y="-140" type="line"/>
-      <point x="461" y="26" type="line"/>
-      <point x="401" y="26" type="line"/>
+      <point x="299" y="684" type="line"/>
+      <point x="358" y="684" type="line"/>
+      <point x="379" y="818" type="line"/>
+      <point x="320" y="818" type="line"/>
+    </contour>
+    <contour>
+      <point x="402" y="684" type="line"/>
+      <point x="461" y="684" type="line"/>
+      <point x="482" y="818" type="line"/>
+      <point x="423" y="818" type="line"/>
     </contour>
-    <component base="C" xOffset="20"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/comma.glif b/src/Cantarell-Regular.ufo/glyphs/comma.glif
index 973b3afa..824447ca 100644
--- a/src/Cantarell-Regular.ufo/glyphs/comma.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/comma.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="comma" format="2">
-  <advance width="272"/>
+  <advance width="256"/>
   <unicode hex="002C"/>
   <outline>
     <contour>
-      <point x="62" y="-174" type="curve"/>
-      <point x="125" y="-174" type="line"/>
-      <point x="161" y="-84"/>
-      <point x="182" y="20"/>
-      <point x="182" y="107" type="curve"/>
-      <point x="99" y="107" type="line"/>
-      <point x="99" y="17"/>
-      <point x="85" y="-88"/>
+      <point x="48" y="-174" type="curve"/>
+      <point x="120" y="-174" type="line"/>
+      <point x="155" y="-87"/>
+      <point x="175" y="20"/>
+      <point x="175" y="119" type="curve"/>
+      <point x="88" y="119" type="line"/>
+      <point x="88" y="18"/>
+      <point x="73" y="-91"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/commaturnedabovecomb.glif 
b/src/Cantarell-Regular.ufo/glyphs/commaturnedabovecomb.glif
index c77997a0..80909872 100644
--- a/src/Cantarell-Regular.ufo/glyphs/commaturnedabovecomb.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/commaturnedabovecomb.glif
@@ -5,14 +5,14 @@
   <anchor x="151" y="749" name="top"/>
   <outline>
     <contour>
-      <point x="205" y="732" type="curve"/>
-      <point x="146" y="732" type="line"/>
-      <point x="114" y="688"/>
-      <point x="99" y="637"/>
       <point x="99" y="570" type="curve"/>
       <point x="174" y="570" type="line"/>
       <point x="174" y="632"/>
       <point x="186" y="697"/>
+      <point x="205" y="732" type="curve"/>
+      <point x="146" y="732" type="line"/>
+      <point x="114" y="688"/>
+      <point x="99" y="637"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/commaturnedmod.glif 
b/src/Cantarell-Regular.ufo/glyphs/commaturnedmod.glif
index 7f9636e5..46631def 100644
--- a/src/Cantarell-Regular.ufo/glyphs/commaturnedmod.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/commaturnedmod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="commaturnedmod" format="2">
-  <advance width="329"/>
+  <advance width="157"/>
   <unicode hex="02BB"/>
   <outline>
-    <component base="commaturnedabovecomb"/>
+    <component base="commaturnedabovecomb" xOffset="-70"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/commercialM_inusS_ign.glif 
b/src/Cantarell-Regular.ufo/glyphs/commercialM_inusS_ign.glif
index c8c80122..b74e048a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/commercialM_inusS_ign.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/commercialM_inusS_ign.glif
@@ -1,41 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="commercialMinusSign" format="2">
-  <advance width="676"/>
+  <advance width="580"/>
   <unicode hex="2052"/>
   <outline>
     <contour>
-      <point x="63" y="0" type="line"/>
-      <point x="146" y="0" type="line"/>
-      <point x="612" y="694" type="line"/>
-      <point x="523" y="694" type="line"/>
+      <point x="46" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="534" y="694" type="line"/>
+      <point x="445" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="511" y="-10" type="curve" smooth="yes"/>
-      <point x="555" y="-10"/>
-      <point x="585" y="21"/>
-      <point x="585" y="64" type="curve" smooth="yes"/>
-      <point x="585" y="106"/>
-      <point x="555" y="137"/>
-      <point x="511" y="137" type="curve" smooth="yes"/>
-      <point x="467" y="137"/>
-      <point x="437" y="106"/>
-      <point x="437" y="64" type="curve" smooth="yes"/>
-      <point x="437" y="21"/>
-      <point x="467" y="-10"/>
+      <point x="442" y="-10" type="curve" smooth="yes"/>
+      <point x="482" y="-10"/>
+      <point x="511" y="21"/>
+      <point x="511" y="64" type="curve" smooth="yes"/>
+      <point x="511" y="106"/>
+      <point x="482" y="137"/>
+      <point x="442" y="137" type="curve" smooth="yes"/>
+      <point x="402" y="137"/>
+      <point x="373" y="106"/>
+      <point x="373" y="64" type="curve" smooth="yes"/>
+      <point x="373" y="21"/>
+      <point x="402" y="-10"/>
     </contour>
     <contour>
-      <point x="165" y="557" type="curve" smooth="yes"/>
-      <point x="209" y="557"/>
-      <point x="239" y="588"/>
-      <point x="239" y="630" type="curve" smooth="yes"/>
-      <point x="239" y="673"/>
-      <point x="209" y="704"/>
-      <point x="165" y="704" type="curve" smooth="yes"/>
-      <point x="121" y="704"/>
-      <point x="91" y="673"/>
-      <point x="91" y="630" type="curve" smooth="yes"/>
-      <point x="91" y="588"/>
-      <point x="121" y="557"/>
+      <point x="139" y="557" type="curve" smooth="yes"/>
+      <point x="179" y="557"/>
+      <point x="208" y="588"/>
+      <point x="208" y="630" type="curve" smooth="yes"/>
+      <point x="208" y="673"/>
+      <point x="179" y="704"/>
+      <point x="139" y="704" type="curve" smooth="yes"/>
+      <point x="98" y="704"/>
+      <point x="69" y="673"/>
+      <point x="69" y="630" type="curve" smooth="yes"/>
+      <point x="69" y="588"/>
+      <point x="98" y="557"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/contents.plist b/src/Cantarell-Regular.ufo/glyphs/contents.plist
index 818d6b92..286fd932 100644
--- a/src/Cantarell-Regular.ufo/glyphs/contents.plist
+++ b/src/Cantarell-Regular.ufo/glyphs/contents.plist
@@ -686,8 +686,6 @@
     <string>_descenderreverse-cy.case.glif</string>
     <key>_descenderreversed-cy</key>
     <string>_descenderreversed-cy.glif</string>
-    <key>_o.numero</key>
-    <string>_o.numero.glif</string>
     <key>_slash.zero</key>
     <string>_slash.zero.glif</string>
     <key>_slash.zero.osf</key>
@@ -736,8 +734,6 @@
     <string>acutecomb.case.glif</string>
     <key>acutecomb.loclVIET</key>
     <string>acutecomb.loclV_I_E_T_.glif</string>
-    <key>acutecomb_dotaccentcomb</key>
-    <string>acutecomb_dotaccentcomb.glif</string>
     <key>adblgrave</key>
     <string>adblgrave.glif</string>
     <key>adieresis</key>
@@ -768,8 +764,6 @@
     <string>apostrophemod.glif</string>
     <key>approxequal</key>
     <string>approxequal.glif</string>
-    <key>approxequal.tf</key>
-    <string>approxequal.tf.glif</string>
     <key>aring</key>
     <string>aring.glif</string>
     <key>aringacute</key>
@@ -818,22 +812,6 @@
     <string>brevecomb.case.glif</string>
     <key>brevecomb.loclVIET</key>
     <string>brevecomb.loclV_I_E_T_.glif</string>
-    <key>brevecomb_acutecomb</key>
-    <string>brevecomb_acutecomb.glif</string>
-    <key>brevecomb_acutecomb.case</key>
-    <string>brevecomb_acutecomb.case.glif</string>
-    <key>brevecomb_gravecomb</key>
-    <string>brevecomb_gravecomb.glif</string>
-    <key>brevecomb_gravecomb.case</key>
-    <string>brevecomb_gravecomb.case.glif</string>
-    <key>brevecomb_hookabovecomb</key>
-    <string>brevecomb_hookabovecomb.glif</string>
-    <key>brevecomb_hookabovecomb.case</key>
-    <string>brevecomb_hookabovecomb.case.glif</string>
-    <key>brevecomb_tildecomb</key>
-    <string>brevecomb_tildecomb.glif</string>
-    <key>brevecomb_tildecomb.case</key>
-    <string>brevecomb_tildecomb.case.glif</string>
     <key>breveinvertedcomb</key>
     <string>breveinvertedcomb.glif</string>
     <key>breveinvertedcomb.case</key>
@@ -844,8 +822,6 @@
     <string>bullet.glif</string>
     <key>bulletoperator</key>
     <string>bulletoperator.glif</string>
-    <key>bulletoperator.tf</key>
-    <string>bulletoperator.tf.glif</string>
     <key>c</key>
     <string>c.glif</string>
     <key>cacute</key>
@@ -860,8 +836,6 @@
     <string>caroncomb.case.glif</string>
     <key>caroncomb.loclVIET</key>
     <string>caroncomb.loclV_I_E_T_.glif</string>
-    <key>caroncomb_dotaccentcomb</key>
-    <string>caroncomb_dotaccentcomb.glif</string>
     <key>ccaron</key>
     <string>ccaron.glif</string>
     <key>ccedilla</key>
@@ -898,22 +872,6 @@
     <string>circumflexcomb.case.glif</string>
     <key>circumflexcomb.loclVIET</key>
     <string>circumflexcomb.loclV_I_E_T_.glif</string>
-    <key>circumflexcomb_acutecomb</key>
-    <string>circumflexcomb_acutecomb.glif</string>
-    <key>circumflexcomb_acutecomb.case</key>
-    <string>circumflexcomb_acutecomb.case.glif</string>
-    <key>circumflexcomb_gravecomb</key>
-    <string>circumflexcomb_gravecomb.glif</string>
-    <key>circumflexcomb_gravecomb.case</key>
-    <string>circumflexcomb_gravecomb.case.glif</string>
-    <key>circumflexcomb_hookabovecomb</key>
-    <string>circumflexcomb_hookabovecomb.glif</string>
-    <key>circumflexcomb_hookabovecomb.case</key>
-    <string>circumflexcomb_hookabovecomb.case.glif</string>
-    <key>circumflexcomb_tildecomb</key>
-    <string>circumflexcomb_tildecomb.glif</string>
-    <key>circumflexcomb_tildecomb.case</key>
-    <string>circumflexcomb_tildecomb.case.glif</string>
     <key>colon</key>
     <string>colon.glif</string>
     <key>colonsign</key>
@@ -928,8 +886,6 @@
     <string>commaturnedmod.glif</string>
     <key>commercialMinusSign</key>
     <string>commercialM_inusS_ign.glif</string>
-    <key>commercialMinusSign.tf</key>
-    <string>commercialM_inusS_ign.tf.glif</string>
     <key>copyright</key>
     <string>copyright.glif</string>
     <key>currency</key>
@@ -970,22 +926,10 @@
     <string>dieresiscomb.case.glif</string>
     <key>dieresiscomb.loclVIET</key>
     <string>dieresiscomb.loclV_I_E_T_.glif</string>
-    <key>dieresiscomb_acutecomb</key>
-    <string>dieresiscomb_acutecomb.glif</string>
-    <key>dieresiscomb_caroncomb</key>
-    <string>dieresiscomb_caroncomb.glif</string>
-    <key>dieresiscomb_gravecomb</key>
-    <string>dieresiscomb_gravecomb.glif</string>
-    <key>dieresiscomb_macroncomb</key>
-    <string>dieresiscomb_macroncomb.glif</string>
     <key>divide</key>
     <string>divide.glif</string>
-    <key>divide.tf</key>
-    <string>divide.tf.glif</string>
     <key>divisionslash</key>
     <string>divisionslash.glif</string>
-    <key>divisionslash.tf</key>
-    <string>divisionslash.tf.glif</string>
     <key>dje-cy</key>
     <string>dje-cy.glif</string>
     <key>dlinebelow</key>
@@ -1002,8 +946,6 @@
     <string>dotaccentcomb.case.glif</string>
     <key>dotaccentcomb.loclVIET</key>
     <string>dotaccentcomb.loclV_I_E_T_.glif</string>
-    <key>dotaccentcomb_macroncomb</key>
-    <string>dotaccentcomb_macroncomb.glif</string>
     <key>dotbelowcomb</key>
     <string>dotbelowcomb.glif</string>
     <key>doubleprimemod</key>
@@ -1064,8 +1006,6 @@
     <string>eight.osf.glif</string>
     <key>eight.tf</key>
     <string>eight.tf.glif</string>
-    <key>eight.tosf</key>
-    <string>eight.tosf.glif</string>
     <key>eightinferior</key>
     <string>eightinferior.glif</string>
     <key>eightsuperior</key>
@@ -1088,8 +1028,6 @@
     <string>emdash.glif</string>
     <key>emptyset</key>
     <string>emptyset.glif</string>
-    <key>emquad</key>
-    <string>emquad.glif</string>
     <key>emspace</key>
     <string>emspace.glif</string>
     <key>en-cy</key>
@@ -1102,20 +1040,14 @@
     <string>eng.glif</string>
     <key>enghe-cy</key>
     <string>enghe-cy.glif</string>
-    <key>enquad</key>
-    <string>enquad.glif</string>
     <key>enspace</key>
     <string>enspace.glif</string>
     <key>eogonek</key>
     <string>eogonek.glif</string>
     <key>equal</key>
     <string>equal.glif</string>
-    <key>equal.tf</key>
-    <string>equal.tf.glif</string>
     <key>equivalence</key>
     <string>equivalence.glif</string>
-    <key>equivalence.tf</key>
-    <string>equivalence.tf.glif</string>
     <key>er-cy</key>
     <string>er-cy.glif</string>
     <key>ereversed-cy</key>
@@ -1138,12 +1070,6 @@
     <string>exclamdown.glif</string>
     <key>f</key>
     <string>f.glif</string>
-    <key>f_f</key>
-    <string>f_f.glif</string>
-    <key>f_f_i</key>
-    <string>f_f_i.glif</string>
-    <key>f_f_l</key>
-    <string>f_f_l.glif</string>
     <key>fi</key>
     <string>fi.glif</string>
     <key>figuredash</key>
@@ -1164,8 +1090,6 @@
     <string>five.osf.glif</string>
     <key>five.tf</key>
     <string>five.tf.glif</string>
-    <key>five.tosf</key>
-    <string>five.tosf.glif</string>
     <key>fiveeighths</key>
     <string>fiveeighths.glif</string>
     <key>fiveinferior</key>
@@ -1188,8 +1112,6 @@
     <string>four.osf.glif</string>
     <key>four.tf</key>
     <string>four.tf.glif</string>
-    <key>four.tosf</key>
-    <string>four.tosf.glif</string>
     <key>fourfifths</key>
     <string>fourfifths.glif</string>
     <key>fourinferior</key>
@@ -1242,12 +1164,8 @@
     <string>gravecomb.loclV_I_E_T_.glif</string>
     <key>greater</key>
     <string>greater.glif</string>
-    <key>greater.tf</key>
-    <string>greater.tf.glif</string>
     <key>greaterequal</key>
     <string>greaterequal.glif</string>
-    <key>greaterequal.tf</key>
-    <string>greaterequal.tf.glif</string>
     <key>guarani</key>
     <string>guarani.glif</string>
     <key>guillemetleft</key>
@@ -1282,8 +1200,6 @@
     <string>hookabovecomb.case.glif</string>
     <key>hookabovecomb.loclVIET</key>
     <string>hookabovecomb.loclV_I_E_T_.glif</string>
-    <key>horizontalbar</key>
-    <string>horizontalbar.glif</string>
     <key>horncomb</key>
     <string>horncomb.glif</string>
     <key>hryvnia</key>
@@ -1296,8 +1212,6 @@
     <string>hungarumlautcomb.case.glif</string>
     <key>hyphen</key>
     <string>hyphen.glif</string>
-    <key>hyphentwo</key>
-    <string>hyphentwo.glif</string>
     <key>i</key>
     <string>i.glif</string>
     <key>i-cy</key>
@@ -1396,6 +1310,8 @@
     <string>kje-cy.glif</string>
     <key>l</key>
     <string>l.glif</string>
+    <key>l.ss01</key>
+    <string>l.ss01.glif</string>
     <key>lacute</key>
     <string>lacute.glif</string>
     <key>lcaron</key>
@@ -1412,12 +1328,8 @@
     <string>leftanglebracket-math.glif</string>
     <key>less</key>
     <string>less.glif</string>
-    <key>less.tf</key>
-    <string>less.tf.glif</string>
     <key>lessequal</key>
     <string>lessequal.glif</string>
-    <key>lessequal.tf</key>
-    <string>lessequal.tf.glif</string>
     <key>lira</key>
     <string>lira.glif</string>
     <key>liraTurkish</key>
@@ -1432,8 +1344,6 @@
     <string>llinebelow.glif</string>
     <key>logicalnot</key>
     <string>logicalnot.glif</string>
-    <key>logicalnot.tf</key>
-    <string>logicalnot.tf.glif</string>
     <key>lozenge</key>
     <string>lozenge.glif</string>
     <key>lslash</key>
@@ -1456,12 +1366,6 @@
     <string>macroncomb.narrow.glif</string>
     <key>macroncomb.narrow.case</key>
     <string>macroncomb.narrow.case.glif</string>
-    <key>macroncomb_acutecomb</key>
-    <string>macroncomb_acutecomb.glif</string>
-    <key>macroncomb_dieresiscomb</key>
-    <string>macroncomb_dieresiscomb.glif</string>
-    <key>macroncomb_gravecomb</key>
-    <string>macroncomb_gravecomb.glif</string>
     <key>manat</key>
     <string>manat.glif</string>
     <key>mdotbelow</key>
@@ -1470,22 +1374,16 @@
     <string>micro.glif</string>
     <key>minus</key>
     <string>minus.glif</string>
-    <key>minus.tf</key>
-    <string>minus.tf.glif</string>
     <key>minute</key>
     <string>minute.glif</string>
     <key>multiply</key>
     <string>multiply.glif</string>
-    <key>multiply.tf</key>
-    <string>multiply.tf.glif</string>
     <key>n</key>
     <string>n.glif</string>
     <key>nacute</key>
     <string>nacute.glif</string>
     <key>naira</key>
     <string>naira.glif</string>
-    <key>nbspace</key>
-    <string>nbspace.glif</string>
     <key>ncaron</key>
     <string>ncaron.glif</string>
     <key>ncommaaccent</key>
@@ -1504,8 +1402,6 @@
     <string>nine.osf.glif</string>
     <key>nine.tf</key>
     <string>nine.tf.glif</string>
-    <key>nine.tosf</key>
-    <string>nine.tosf.glif</string>
     <key>nineinferior</key>
     <string>nineinferior.glif</string>
     <key>ninesuperior</key>
@@ -1516,16 +1412,10 @@
     <string>nje-cy.glif</string>
     <key>nlinebelow</key>
     <string>nlinebelow.glif</string>
-    <key>nonbreakinghyphen</key>
-    <string>nonbreakinghyphen.glif</string>
     <key>notequal</key>
     <string>notequal.glif</string>
-    <key>notequal.tf</key>
-    <string>notequal.tf.glif</string>
     <key>notidentical</key>
     <string>notidentical.glif</string>
-    <key>notidentical.tf</key>
-    <string>notidentical.tf.glif</string>
     <key>ntilde</key>
     <string>ntilde.glif</string>
     <key>numbersign</key>
@@ -1616,8 +1506,6 @@
     <string>one.osf.glif</string>
     <key>one.tf</key>
     <string>one.tf.glif</string>
-    <key>one.tosf</key>
-    <string>one.tosf.glif</string>
     <key>oneeighth</key>
     <string>oneeighth.glif</string>
     <key>onefifth</key>
@@ -1694,12 +1582,8 @@
     <string>pi.glif</string>
     <key>plus</key>
     <string>plus.glif</string>
-    <key>plus.tf</key>
-    <string>plus.tf.glif</string>
     <key>plusminus</key>
     <string>plusminus.glif</string>
-    <key>plusminus.tf</key>
-    <string>plusminus.tf.glif</string>
     <key>primeReversed</key>
     <string>primeR_eversed.glif</string>
     <key>primemod</key>
@@ -1822,8 +1706,6 @@
     <string>seven.osf.glif</string>
     <key>seven.tf</key>
     <string>seven.tf.glif</string>
-    <key>seven.tosf</key>
-    <string>seven.tosf.glif</string>
     <key>seveneighths</key>
     <string>seveneighths.glif</string>
     <key>seveninferior</key>
@@ -1846,8 +1728,6 @@
     <string>six.osf.glif</string>
     <key>six.tf</key>
     <string>six.tf.glif</string>
-    <key>six.tosf</key>
-    <string>six.tosf.glif</string>
     <key>sixinferior</key>
     <string>sixinferior.glif</string>
     <key>sixperemspace</key>
@@ -1864,8 +1744,6 @@
     <string>slashshortcomb.glif</string>
     <key>slashshortcomb.case</key>
     <string>slashshortcomb.case.glif</string>
-    <key>softhyphen</key>
-    <string>softhyphen.glif</string>
     <key>softsign-cy</key>
     <string>softsign-cy.glif</string>
     <key>space</key>
@@ -1912,8 +1790,6 @@
     <string>three.osf.glif</string>
     <key>three.tf</key>
     <string>three.tf.glif</string>
-    <key>three.tosf</key>
-    <string>three.tosf.glif</string>
     <key>threeeighths</key>
     <string>threeeighths.glif</string>
     <key>threefifths</key>
@@ -1934,12 +1810,6 @@
     <string>tildecomb.case.glif</string>
     <key>tildecomb.loclVIET</key>
     <string>tildecomb.loclV_I_E_T_.glif</string>
-    <key>tildecomb_acutecomb</key>
-    <string>tildecomb_acutecomb.glif</string>
-    <key>tildecomb_dieresiscomb</key>
-    <string>tildecomb_dieresiscomb.glif</string>
-    <key>tildecomb_macroncomb</key>
-    <string>tildecomb_macroncomb.glif</string>
     <key>tlinebelow</key>
     <string>tlinebelow.glif</string>
     <key>trademark</key>
@@ -1962,8 +1832,6 @@
     <string>two.osf.glif</string>
     <key>two.tf</key>
     <string>two.tf.glif</string>
-    <key>two.tosf</key>
-    <string>two.tosf.glif</string>
     <key>twofifths</key>
     <string>twofifths.glif</string>
     <key>twoinferior</key>
@@ -2138,10 +2006,6 @@
     <string>zero.tf.glif</string>
     <key>zero.tf.zero</key>
     <string>zero.tf.zero.glif</string>
-    <key>zero.tosf</key>
-    <string>zero.tosf.glif</string>
-    <key>zero.tosf.zero</key>
-    <string>zero.tosf.zero.glif</string>
     <key>zero.zero</key>
     <string>zero.zero.glif</string>
     <key>zeroinferior</key>
diff --git a/src/Cantarell-Regular.ufo/glyphs/copyright.glif b/src/Cantarell-Regular.ufo/glyphs/copyright.glif
index a005dcec..00285301 100644
--- a/src/Cantarell-Regular.ufo/glyphs/copyright.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/copyright.glif
@@ -1,63 +1,69 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="copyright" format="2">
-  <advance width="885"/>
+  <advance width="881"/>
   <unicode hex="00A9"/>
   <outline>
     <contour>
-      <point x="438" y="-3" type="curve" smooth="yes"/>
-      <point x="656" y="-3"/>
-      <point x="802" y="140"/>
-      <point x="802" y="354" type="curve" smooth="yes"/>
-      <point x="802" y="564"/>
-      <point x="660" y="704"/>
-      <point x="446" y="704" type="curve" smooth="yes"/>
-      <point x="228" y="704"/>
-      <point x="83" y="560"/>
-      <point x="83" y="344" type="curve" smooth="yes"/>
-      <point x="83" y="136"/>
-      <point x="225" y="-3"/>
+      <point x="436" y="-3" type="curve" smooth="yes"/>
+      <point x="654" y="-3"/>
+      <point x="800" y="140"/>
+      <point x="800" y="354" type="curve" smooth="yes"/>
+      <point x="800" y="564"/>
+      <point x="658" y="704"/>
+      <point x="444" y="704" type="curve" smooth="yes"/>
+      <point x="226" y="704"/>
+      <point x="81" y="560"/>
+      <point x="81" y="344" type="curve" smooth="yes"/>
+      <point x="81" y="136"/>
+      <point x="223" y="-3"/>
     </contour>
     <contour>
-      <point x="448" y="59" type="curve" smooth="yes"/>
-      <point x="266" y="59"/>
-      <point x="145" y="177"/>
-      <point x="145" y="354" type="curve" smooth="yes"/>
-      <point x="145" y="527"/>
-      <point x="262" y="642"/>
-      <point x="438" y="642" type="curve" smooth="yes"/>
-      <point x="619" y="642"/>
-      <point x="740" y="523"/>
-      <point x="740" y="344" type="curve" smooth="yes"/>
-      <point x="740" y="173"/>
-      <point x="623" y="59"/>
+      <point x="451" y="134" type="curve" smooth="yes"/>
+      <point x="494" y="134"/>
+      <point x="541" y="143"/>
+      <point x="578" y="160" type="curve"/>
+      <point x="560" y="219" type="line"/>
+      <point x="532" y="209"/>
+      <point x="498" y="202"/>
+      <point x="469" y="202" type="curve" smooth="yes"/>
+      <point x="379" y="202"/>
+      <point x="321" y="262"/>
+      <point x="321" y="355" type="curve" smooth="yes"/>
+      <point x="321" y="442"/>
+      <point x="372" y="494"/>
+      <point x="460" y="494" type="curve" smooth="yes"/>
+      <point x="492" y="494"/>
+      <point x="529" y="487"/>
+      <point x="560" y="475" type="curve"/>
+      <point x="581" y="538" type="line"/>
+      <point x="546" y="554"/>
+      <point x="506" y="562"/>
+      <point x="464" y="562" type="curve" smooth="yes"/>
+      <point x="329" y="562"/>
+      <point x="239" y="475"/>
+      <point x="239" y="343" type="curve" smooth="yes"/>
+      <point x="239" y="217"/>
+      <point x="323" y="134"/>
     </contour>
     <contour>
-      <point x="453" y="134" type="curve" smooth="yes"/>
-      <point x="496" y="134"/>
-      <point x="543" y="143"/>
-      <point x="580" y="160" type="curve"/>
-      <point x="562" y="219" type="line"/>
-      <point x="534" y="209"/>
-      <point x="500" y="202"/>
-      <point x="471" y="202" type="curve" smooth="yes"/>
-      <point x="381" y="202"/>
-      <point x="323" y="262"/>
-      <point x="323" y="355" type="curve" smooth="yes"/>
-      <point x="323" y="442"/>
-      <point x="374" y="494"/>
-      <point x="462" y="494" type="curve" smooth="yes"/>
-      <point x="494" y="494"/>
-      <point x="531" y="487"/>
-      <point x="562" y="475" type="curve"/>
-      <point x="583" y="538" type="line"/>
-      <point x="548" y="554"/>
-      <point x="508" y="562"/>
-      <point x="466" y="562" type="curve" smooth="yes"/>
-      <point x="331" y="562"/>
-      <point x="241" y="475"/>
-      <point x="241" y="343" type="curve" smooth="yes"/>
-      <point x="241" y="217"/>
-      <point x="325" y="134"/>
+      <point x="446" y="59" type="curve" smooth="yes"/>
+      <point x="264" y="59"/>
+      <point x="143" y="177"/>
+      <point x="143" y="354" type="curve" smooth="yes"/>
+      <point x="143" y="527"/>
+      <point x="260" y="642"/>
+      <point x="436" y="642" type="curve" smooth="yes"/>
+      <point x="617" y="642"/>
+      <point x="738" y="523"/>
+      <point x="738" y="344" type="curve" smooth="yes"/>
+      <point x="738" y="173"/>
+      <point x="621" y="59"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/currency.glif b/src/Cantarell-Regular.ufo/glyphs/currency.glif
index 36928f25..b38812ec 100644
--- a/src/Cantarell-Regular.ufo/glyphs/currency.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/currency.glif
@@ -1,59 +1,65 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="currency" format="2">
-  <advance width="662"/>
+  <advance width="580"/>
   <unicode hex="00A4"/>
   <outline>
     <contour>
-      <point x="326" y="131" type="curve" smooth="yes"/>
-      <point x="450" y="131"/>
-      <point x="532" y="215"/>
-      <point x="532" y="342" type="curve" smooth="yes"/>
-      <point x="532" y="461"/>
-      <point x="454" y="540"/>
-      <point x="336" y="540" type="curve" smooth="yes"/>
-      <point x="212" y="540"/>
-      <point x="130" y="456"/>
-      <point x="130" y="331" type="curve" smooth="yes"/>
-      <point x="130" y="211"/>
-      <point x="208" y="131"/>
+      <point x="286" y="131" type="curve" smooth="yes"/>
+      <point x="410" y="131"/>
+      <point x="492" y="215"/>
+      <point x="492" y="342" type="curve" smooth="yes"/>
+      <point x="492" y="461"/>
+      <point x="414" y="540"/>
+      <point x="296" y="540" type="curve" smooth="yes"/>
+      <point x="172" y="540"/>
+      <point x="90" y="456"/>
+      <point x="90" y="331" type="curve" smooth="yes"/>
+      <point x="90" y="211"/>
+      <point x="168" y="131"/>
     </contour>
     <contour>
-      <point x="135" y="90" type="line"/>
-      <point x="227" y="181" type="line"/>
-      <point x="186" y="222" type="line"/>
-      <point x="94" y="131" type="line"/>
+      <point x="95" y="90" type="line"/>
+      <point x="187" y="181" type="line"/>
+      <point x="146" y="222" type="line"/>
+      <point x="54" y="131" type="line"/>
     </contour>
     <contour>
-      <point x="527" y="90" type="line"/>
-      <point x="567" y="131" type="line"/>
-      <point x="475" y="221" type="line"/>
-      <point x="435" y="181" type="line"/>
+      <point x="487" y="90" type="line"/>
+      <point x="527" y="131" type="line"/>
+      <point x="435" y="221" type="line"/>
+      <point x="395" y="181" type="line"/>
     </contour>
     <contour>
-      <point x="336" y="204" type="curve" smooth="yes"/>
-      <point x="260" y="204"/>
-      <point x="210" y="259"/>
-      <point x="210" y="341" type="curve" smooth="yes"/>
-      <point x="210" y="417"/>
-      <point x="256" y="467"/>
-      <point x="326" y="467" type="curve" smooth="yes"/>
-      <point x="402" y="467"/>
-      <point x="452" y="413"/>
-      <point x="452" y="332" type="curve" smooth="yes"/>
-      <point x="452" y="255"/>
-      <point x="406" y="204"/>
+      <point x="296" y="204" type="curve" smooth="yes"/>
+      <point x="220" y="204"/>
+      <point x="170" y="259"/>
+      <point x="170" y="341" type="curve" smooth="yes"/>
+      <point x="170" y="417"/>
+      <point x="216" y="467"/>
+      <point x="286" y="467" type="curve" smooth="yes"/>
+      <point x="362" y="467"/>
+      <point x="412" y="413"/>
+      <point x="412" y="332" type="curve" smooth="yes"/>
+      <point x="412" y="255"/>
+      <point x="366" y="204"/>
     </contour>
     <contour>
-      <point x="185" y="448" type="line"/>
-      <point x="227" y="488" type="line"/>
-      <point x="135" y="580" type="line"/>
-      <point x="94" y="539" type="line"/>
+      <point x="145" y="448" type="line"/>
+      <point x="187" y="488" type="line"/>
+      <point x="95" y="580" type="line"/>
+      <point x="54" y="539" type="line"/>
     </contour>
     <contour>
-      <point x="475" y="448" type="line"/>
-      <point x="567" y="539" type="line"/>
-      <point x="526" y="580" type="line"/>
-      <point x="434" y="488" type="line"/>
+      <point x="435" y="448" type="line"/>
+      <point x="527" y="539" type="line"/>
+      <point x="486" y="580" type="line"/>
+      <point x="394" y="488" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/d.glif b/src/Cantarell-Regular.ufo/glyphs/d.glif
index a0013c39..1116134f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/d.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/d.glif
@@ -2,21 +2,11 @@
 <glyph name="d" format="2">
   <advance width="570"/>
   <unicode hex="0064"/>
-  <note>
-d
-</note>
   <anchor x="287" y="0" name="bottom"/>
   <anchor x="412" y="598" name="center"/>
   <anchor x="287" y="482" name="top"/>
   <anchor x="591" y="482" name="topright"/>
   <outline>
-    <contour>
-      <point x="431" y="0" type="line"/>
-      <point x="487" y="0" type="line"/>
-      <point x="487" y="739" type="line"/>
-      <point x="407" y="739" type="line"/>
-      <point x="407" y="56" type="line"/>
-    </contour>
     <contour>
       <point x="267" y="-10" type="curve" smooth="yes"/>
       <point x="348" y="-10"/>
@@ -45,5 +35,20 @@ d
       <point x="52" y="89"/>
       <point x="138" y="-10"/>
     </contour>
+    <contour>
+      <point x="431" y="0" type="line"/>
+      <point x="487" y="0" type="line"/>
+      <point x="487" y="739" type="line"/>
+      <point x="407" y="739" type="line"/>
+      <point x="407" y="56" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dagger.glif b/src/Cantarell-Regular.ufo/glyphs/dagger.glif
index 5514837b..daf82d06 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dagger.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dagger.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dagger" format="2">
-  <advance width="458"/>
+  <advance width="454"/>
   <unicode hex="2020"/>
   <outline>
     <contour>
-      <point x="186" y="0" type="line"/>
-      <point x="270" y="0" type="line"/>
-      <point x="257" y="510" type="line"/>
-      <point x="270" y="694" type="line"/>
-      <point x="186" y="694" type="line"/>
-      <point x="194" y="510" type="line"/>
+      <point x="184" y="0" type="line"/>
+      <point x="268" y="0" type="line"/>
+      <point x="255" y="510" type="line"/>
+      <point x="268" y="694" type="line"/>
+      <point x="184" y="694" type="line"/>
+      <point x="192" y="510" type="line"/>
     </contour>
     <contour>
-      <point x="64" y="475" type="line"/>
-      <point x="223" y="482" type="line"/>
-      <point x="223" y="538" type="line"/>
-      <point x="64" y="545" type="line"/>
+      <point x="62" y="475" type="line"/>
+      <point x="221" y="482" type="line"/>
+      <point x="221" y="538" type="line"/>
+      <point x="62" y="545" type="line"/>
     </contour>
     <contour>
-      <point x="394" y="475" type="line"/>
-      <point x="394" y="545" type="line"/>
-      <point x="231" y="538" type="line"/>
-      <point x="231" y="482" type="line"/>
+      <point x="392" y="475" type="line"/>
+      <point x="392" y="545" type="line"/>
+      <point x="229" y="538" type="line"/>
+      <point x="229" y="482" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/daggerdbl.glif b/src/Cantarell-Regular.ufo/glyphs/daggerdbl.glif
index d0f5a62d..d720767b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/daggerdbl.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/daggerdbl.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="daggerdbl" format="2">
-  <advance width="470"/>
+  <advance width="466"/>
   <unicode hex="2021"/>
   <outline>
     <contour>
-      <point x="193" y="0" type="line"/>
-      <point x="276" y="0" type="line"/>
-      <point x="264" y="175" type="line"/>
-      <point x="272" y="346" type="line"/>
-      <point x="264" y="506" type="line"/>
-      <point x="276" y="694" type="line"/>
-      <point x="193" y="694" type="line"/>
-      <point x="201" y="506" type="line"/>
-      <point x="193" y="346" type="line"/>
-      <point x="201" y="175" type="line"/>
+      <point x="191" y="0" type="line"/>
+      <point x="274" y="0" type="line"/>
+      <point x="262" y="175" type="line"/>
+      <point x="270" y="346" type="line"/>
+      <point x="262" y="506" type="line"/>
+      <point x="274" y="694" type="line"/>
+      <point x="191" y="694" type="line"/>
+      <point x="199" y="506" type="line"/>
+      <point x="191" y="346" type="line"/>
+      <point x="199" y="175" type="line"/>
     </contour>
     <contour>
-      <point x="80" y="139" type="line"/>
-      <point x="229" y="146" type="line"/>
-      <point x="229" y="202" type="line"/>
-      <point x="80" y="209" type="line"/>
+      <point x="78" y="139" type="line"/>
+      <point x="227" y="146" type="line"/>
+      <point x="227" y="202" type="line"/>
+      <point x="78" y="209" type="line"/>
     </contour>
     <contour>
-      <point x="390" y="139" type="line"/>
-      <point x="390" y="209" type="line"/>
-      <point x="238" y="202" type="line"/>
-      <point x="238" y="146" type="line"/>
+      <point x="388" y="139" type="line"/>
+      <point x="388" y="209" type="line"/>
+      <point x="236" y="202" type="line"/>
+      <point x="236" y="146" type="line"/>
     </contour>
     <contour>
-      <point x="80" y="485" type="line"/>
-      <point x="229" y="492" type="line"/>
-      <point x="229" y="548" type="line"/>
-      <point x="80" y="555" type="line"/>
+      <point x="78" y="485" type="line"/>
+      <point x="227" y="492" type="line"/>
+      <point x="227" y="548" type="line"/>
+      <point x="78" y="555" type="line"/>
     </contour>
     <contour>
-      <point x="390" y="485" type="line"/>
-      <point x="390" y="555" type="line"/>
-      <point x="238" y="548" type="line"/>
-      <point x="238" y="492" type="line"/>
+      <point x="388" y="485" type="line"/>
+      <point x="388" y="555" type="line"/>
+      <point x="236" y="548" type="line"/>
+      <point x="236" y="492" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dblgravecomb.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/dblgravecomb.case.glif
index d94fb8bd..2b8777a4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dblgravecomb.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dblgravecomb.case.glif
@@ -4,16 +4,16 @@
   <anchor x="221" y="926" name="top"/>
   <outline>
     <contour>
-      <point x="356" y="764" type="line"/>
-      <point x="395" y="800" type="line"/>
-      <point x="286" y="939" type="line"/>
-      <point x="226" y="885" type="line"/>
+      <point x="336" y="764" type="line"/>
+      <point x="375" y="800" type="line"/>
+      <point x="266" y="939" type="line"/>
+      <point x="206" y="885" type="line"/>
     </contour>
     <contour>
-      <point x="166" y="764" type="line"/>
-      <point x="205" y="800" type="line"/>
-      <point x="96" y="939" type="line"/>
-      <point x="36" y="885" type="line"/>
+      <point x="146" y="764" type="line"/>
+      <point x="185" y="800" type="line"/>
+      <point x="76" y="939" type="line"/>
+      <point x="16" y="885" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dblgravecomb.glif 
b/src/Cantarell-Regular.ufo/glyphs/dblgravecomb.glif
index cd8e396e..f54b5a6a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dblgravecomb.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dblgravecomb.glif
@@ -4,18 +4,18 @@
   <anchor x="254" y="482" name="_top"/>
   <anchor x="254" y="704" name="top"/>
   <outline>
-    <contour>
-      <point x="159" y="553" type="line"/>
-      <point x="201" y="575" type="line"/>
-      <point x="125" y="747" type="line"/>
-      <point x="54" y="708" type="line"/>
-    </contour>
     <contour>
       <point x="329" y="553" type="line"/>
       <point x="371" y="575" type="line"/>
       <point x="295" y="747" type="line"/>
       <point x="224" y="708" type="line"/>
     </contour>
+    <contour>
+      <point x="159" y="553" type="line"/>
+      <point x="201" y="575" type="line"/>
+      <point x="125" y="747" type="line"/>
+      <point x="54" y="708" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/de-cy.glif b/src/Cantarell-Regular.ufo/glyphs/de-cy.glif
index 5cf568f5..00ae888b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/de-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/de-cy.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="de-cy" format="2">
-  <advance width="574"/>
+  <advance width="561"/>
   <unicode hex="0434"/>
   <outline>
     <contour>
-      <point x="69" y="20" type="line"/>
-      <point x="167" y="20"/>
-      <point x="219" y="96"/>
-      <point x="219" y="243" type="curve" smooth="yes"/>
-      <point x="219" y="415" type="line"/>
-      <point x="396" y="415" type="line"/>
-      <point x="396" y="23" type="line"/>
-      <point x="473" y="23" type="line"/>
-      <point x="473" y="482" type="line"/>
-      <point x="145" y="482" type="line"/>
-      <point x="145" y="242" type="line" smooth="yes"/>
-      <point x="145" y="126"/>
-      <point x="115" y="65"/>
-      <point x="57" y="65" type="curve"/>
+      <point x="61" y="20" type="line"/>
+      <point x="159" y="20"/>
+      <point x="211" y="96"/>
+      <point x="211" y="243" type="curve" smooth="yes"/>
+      <point x="211" y="415" type="line"/>
+      <point x="388" y="415" type="line"/>
+      <point x="388" y="23" type="line"/>
+      <point x="465" y="23" type="line"/>
+      <point x="465" y="482" type="line"/>
+      <point x="137" y="482" type="line"/>
+      <point x="137" y="242" type="line" smooth="yes"/>
+      <point x="137" y="126"/>
+      <point x="107" y="65"/>
+      <point x="49" y="65" type="curve"/>
     </contour>
     <contour>
-      <point x="23" y="-126" type="line"/>
-      <point x="95" y="-126" type="line"/>
-      <point x="95" y="0" type="line"/>
-      <point x="479" y="0" type="line"/>
-      <point x="479" y="-126" type="line"/>
-      <point x="551" y="-126" type="line"/>
-      <point x="551" y="67" type="line"/>
-      <point x="23" y="67" type="line"/>
+      <point x="21" y="-126" type="line"/>
+      <point x="93" y="-126" type="line"/>
+      <point x="93" y="0" type="line"/>
+      <point x="461" y="0" type="line"/>
+      <point x="461" y="-126" type="line"/>
+      <point x="533" y="-126" type="line"/>
+      <point x="533" y="67" type="line"/>
+      <point x="21" y="67" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/degree.glif b/src/Cantarell-Regular.ufo/glyphs/degree.glif
index 89724225..ae351d80 100644
--- a/src/Cantarell-Regular.ufo/glyphs/degree.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/degree.glif
@@ -1,35 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="degree" format="2">
-  <advance width="486"/>
+  <advance width="481"/>
   <unicode hex="00B0"/>
   <outline>
     <contour>
-      <point x="241" y="417" type="curve" smooth="yes"/>
-      <point x="327" y="417"/>
-      <point x="385" y="475"/>
-      <point x="385" y="562" type="curve" smooth="yes"/>
-      <point x="385" y="647"/>
-      <point x="329" y="704"/>
-      <point x="244" y="704" type="curve" smooth="yes"/>
-      <point x="158" y="704"/>
-      <point x="100" y="646"/>
-      <point x="100" y="559" type="curve" smooth="yes"/>
-      <point x="100" y="474"/>
-      <point x="156" y="417"/>
+      <point x="239" y="417" type="curve" smooth="yes"/>
+      <point x="325" y="417"/>
+      <point x="383" y="475"/>
+      <point x="383" y="562" type="curve" smooth="yes"/>
+      <point x="383" y="647"/>
+      <point x="327" y="704"/>
+      <point x="242" y="704" type="curve" smooth="yes"/>
+      <point x="156" y="704"/>
+      <point x="98" y="646"/>
+      <point x="98" y="559" type="curve" smooth="yes"/>
+      <point x="98" y="474"/>
+      <point x="154" y="417"/>
     </contour>
     <contour>
-      <point x="244" y="484" type="curve" smooth="yes"/>
-      <point x="197" y="484"/>
-      <point x="165" y="515"/>
-      <point x="165" y="562" type="curve" smooth="yes"/>
-      <point x="165" y="608"/>
-      <point x="195" y="639"/>
-      <point x="241" y="639" type="curve" smooth="yes"/>
-      <point x="288" y="639"/>
-      <point x="320" y="607"/>
-      <point x="320" y="559" type="curve" smooth="yes"/>
-      <point x="320" y="514"/>
-      <point x="290" y="484"/>
+      <point x="242" y="484" type="curve" smooth="yes"/>
+      <point x="195" y="484"/>
+      <point x="163" y="515"/>
+      <point x="163" y="562" type="curve" smooth="yes"/>
+      <point x="163" y="608"/>
+      <point x="193" y="639"/>
+      <point x="239" y="639" type="curve" smooth="yes"/>
+      <point x="286" y="639"/>
+      <point x="318" y="607"/>
+      <point x="318" y="559" type="curve" smooth="yes"/>
+      <point x="318" y="514"/>
+      <point x="288" y="484"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/descender-cy.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/descender-cy.case.glif
index 9b63ce53..fb7cfc15 100644
--- a/src/Cantarell-Regular.ufo/glyphs/descender-cy.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/descender-cy.case.glif
@@ -4,12 +4,12 @@
   <anchor x="107" y="0" name="_bottomright"/>
   <outline>
     <contour>
-      <point x="107" y="0" type="line"/>
       <point x="107" y="-178" type="line"/>
       <point x="182" y="-178" type="line"/>
       <point x="182" y="72" type="line"/>
-      <point x="50" y="72" type="line"/>
-      <point x="50" y="0" type="line"/>
+      <point x="75" y="72" type="line"/>
+      <point x="75" y="0" type="line"/>
+      <point x="107" y="0" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dieresis.glif b/src/Cantarell-Regular.ufo/glyphs/dieresis.glif
index ecd46f0f..fe354d54 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dieresis.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dieresis" format="2">
-  <advance width="466"/>
+  <advance width="500"/>
   <unicode hex="00A8"/>
   <outline>
-    <component base="dieresiscomb" xOffset="-3"/>
+    <component base="dieresiscomb" xOffset="17"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dieresisbelowcomb.glif 
b/src/Cantarell-Regular.ufo/glyphs/dieresisbelowcomb.glif
index 233c585e..09fc519b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dieresisbelowcomb.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dieresisbelowcomb.glif
@@ -4,20 +4,6 @@
   <anchor x="236" y="0" name="_bottom"/>
   <anchor x="236" y="-195" name="bottom"/>
   <outline>
-    <contour>
-      <point x="136" y="-195" type="curve" smooth="yes"/>
-      <point x="172" y="-195"/>
-      <point x="193" y="-174"/>
-      <point x="193" y="-138" type="curve" smooth="yes"/>
-      <point x="193" y="-102"/>
-      <point x="172" y="-81"/>
-      <point x="136" y="-81" type="curve" smooth="yes"/>
-      <point x="100" y="-81"/>
-      <point x="79" y="-102"/>
-      <point x="79" y="-138" type="curve" smooth="yes"/>
-      <point x="79" y="-174"/>
-      <point x="100" y="-195"/>
-    </contour>
     <contour>
       <point x="336" y="-195" type="curve" smooth="yes"/>
       <point x="372" y="-195"/>
@@ -32,6 +18,20 @@
       <point x="279" y="-174"/>
       <point x="300" y="-195"/>
     </contour>
+    <contour>
+      <point x="136" y="-195" type="curve" smooth="yes"/>
+      <point x="172" y="-195"/>
+      <point x="193" y="-174"/>
+      <point x="193" y="-138" type="curve" smooth="yes"/>
+      <point x="193" y="-102"/>
+      <point x="172" y="-81"/>
+      <point x="136" y="-81" type="curve" smooth="yes"/>
+      <point x="100" y="-81"/>
+      <point x="79" y="-102"/>
+      <point x="79" y="-138" type="curve" smooth="yes"/>
+      <point x="79" y="-174"/>
+      <point x="100" y="-195"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dieresiscomb.glif 
b/src/Cantarell-Regular.ufo/glyphs/dieresiscomb.glif
index e4a3801a..2ab58b0a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dieresiscomb.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dieresiscomb.glif
@@ -4,20 +4,6 @@
   <anchor x="233" y="482" name="_top"/>
   <anchor x="233" y="674" name="top"/>
   <outline>
-    <contour>
-      <point x="133" y="595" type="curve" smooth="yes"/>
-      <point x="169" y="595"/>
-      <point x="190" y="616"/>
-      <point x="190" y="652" type="curve" smooth="yes"/>
-      <point x="190" y="688"/>
-      <point x="169" y="709"/>
-      <point x="133" y="709" type="curve" smooth="yes"/>
-      <point x="97" y="709"/>
-      <point x="76" y="688"/>
-      <point x="76" y="652" type="curve" smooth="yes"/>
-      <point x="76" y="616"/>
-      <point x="97" y="595"/>
-    </contour>
     <contour>
       <point x="333" y="595" type="curve" smooth="yes"/>
       <point x="369" y="595"/>
@@ -32,6 +18,20 @@
       <point x="276" y="616"/>
       <point x="297" y="595"/>
     </contour>
+    <contour>
+      <point x="133" y="595" type="curve" smooth="yes"/>
+      <point x="169" y="595"/>
+      <point x="190" y="616"/>
+      <point x="190" y="652" type="curve" smooth="yes"/>
+      <point x="190" y="688"/>
+      <point x="169" y="709"/>
+      <point x="133" y="709" type="curve" smooth="yes"/>
+      <point x="97" y="709"/>
+      <point x="76" y="688"/>
+      <point x="76" y="652" type="curve" smooth="yes"/>
+      <point x="76" y="616"/>
+      <point x="97" y="595"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif 
b/src/Cantarell-Regular.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif
index da99f581..8722e5b9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif
@@ -3,20 +3,6 @@
   <anchor x="224" y="482" name="_top"/>
   <anchor x="224" y="604" name="top"/>
   <outline>
-    <contour>
-      <point x="129" y="550" type="curve" smooth="yes"/>
-      <point x="162" y="550"/>
-      <point x="181" y="569"/>
-      <point x="181" y="602" type="curve" smooth="yes"/>
-      <point x="181" y="635"/>
-      <point x="162" y="654"/>
-      <point x="129" y="654" type="curve" smooth="yes"/>
-      <point x="96" y="654"/>
-      <point x="77" y="635"/>
-      <point x="77" y="602" type="curve" smooth="yes"/>
-      <point x="77" y="569"/>
-      <point x="96" y="550"/>
-    </contour>
     <contour>
       <point x="319" y="550" type="curve" smooth="yes"/>
       <point x="352" y="550"/>
@@ -31,6 +17,20 @@
       <point x="267" y="569"/>
       <point x="286" y="550"/>
     </contour>
+    <contour>
+      <point x="129" y="550" type="curve" smooth="yes"/>
+      <point x="162" y="550"/>
+      <point x="181" y="569"/>
+      <point x="181" y="602" type="curve" smooth="yes"/>
+      <point x="181" y="635"/>
+      <point x="162" y="654"/>
+      <point x="129" y="654" type="curve" smooth="yes"/>
+      <point x="96" y="654"/>
+      <point x="77" y="635"/>
+      <point x="77" y="602" type="curve" smooth="yes"/>
+      <point x="77" y="569"/>
+      <point x="96" y="550"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/divide.glif b/src/Cantarell-Regular.ufo/glyphs/divide.glif
index 0b487e00..3b7f3402 100644
--- a/src/Cantarell-Regular.ufo/glyphs/divide.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/divide.glif
@@ -1,41 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="divide" format="2">
-  <advance width="637"/>
+  <advance width="580"/>
   <unicode hex="00F7"/>
   <outline>
     <contour>
-      <point x="70" y="306" type="line"/>
-      <point x="562" y="306" type="line"/>
-      <point x="562" y="375" type="line"/>
-      <point x="70" y="375" type="line"/>
+      <point x="55" y="297" type="line"/>
+      <point x="525" y="297" type="line"/>
+      <point x="525" y="371" type="line"/>
+      <point x="55" y="371" type="line"/>
     </contour>
     <contour>
-      <point x="316" y="485" type="curve" smooth="yes"/>
-      <point x="352" y="485"/>
-      <point x="373" y="506"/>
-      <point x="373" y="542" type="curve" smooth="yes"/>
-      <point x="373" y="578"/>
-      <point x="352" y="599"/>
-      <point x="316" y="599" type="curve" smooth="yes"/>
-      <point x="280" y="599"/>
-      <point x="259" y="578"/>
-      <point x="259" y="542" type="curve" smooth="yes"/>
-      <point x="259" y="506"/>
-      <point x="280" y="485"/>
+      <point x="287" y="82" type="curve" smooth="yes"/>
+      <point x="322" y="82"/>
+      <point x="346" y="104"/>
+      <point x="346" y="142" type="curve" smooth="yes"/>
+      <point x="346" y="178"/>
+      <point x="323" y="201"/>
+      <point x="287" y="201" type="curve" smooth="yes"/>
+      <point x="252" y="201"/>
+      <point x="229" y="178"/>
+      <point x="229" y="142" type="curve" smooth="yes"/>
+      <point x="229" y="104"/>
+      <point x="252" y="82"/>
     </contour>
     <contour>
-      <point x="316" y="82" type="curve" smooth="yes"/>
-      <point x="352" y="82"/>
-      <point x="373" y="103"/>
-      <point x="373" y="139" type="curve" smooth="yes"/>
-      <point x="373" y="175"/>
-      <point x="352" y="196"/>
-      <point x="316" y="196" type="curve" smooth="yes"/>
-      <point x="280" y="196"/>
-      <point x="259" y="175"/>
-      <point x="259" y="139" type="curve" smooth="yes"/>
-      <point x="259" y="103"/>
-      <point x="280" y="82"/>
+      <point x="287" y="467" type="curve" smooth="yes"/>
+      <point x="323" y="467"/>
+      <point x="346" y="490"/>
+      <point x="346" y="527" type="curve" smooth="yes"/>
+      <point x="346" y="563"/>
+      <point x="323" y="587"/>
+      <point x="287" y="587" type="curve" smooth="yes"/>
+      <point x="252" y="587"/>
+      <point x="229" y="564"/>
+      <point x="229" y="527" type="curve" smooth="yes"/>
+      <point x="229" y="490"/>
+      <point x="252" y="467"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minus</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/divisionslash.glif 
b/src/Cantarell-Regular.ufo/glyphs/divisionslash.glif
index 3d88ca54..cd3e0e20 100644
--- a/src/Cantarell-Regular.ufo/glyphs/divisionslash.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/divisionslash.glif
@@ -1,8 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="divisionslash" format="2">
-  <advance width="299"/>
+  <advance width="580"/>
   <unicode hex="2215"/>
   <outline>
-    <component base="fraction"/>
+    <contour>
+      <point x="109" y="0" type="line"/>
+      <point x="182" y="0" type="line"/>
+      <point x="472" y="694" type="line"/>
+      <point x="393" y="694" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dollar.glif b/src/Cantarell-Regular.ufo/glyphs/dollar.glif
index 9027d38e..119263c8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dollar.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dollar.glif
@@ -1,20 +1,59 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dollar" format="2">
-  <advance width="648"/>
+  <advance width="580"/>
   <unicode hex="0024"/>
   <outline>
-    <component base="S" xOffset="21"/>
-    <component base="_currencyvstem" xOffset="-88"/>
-    <component base="_currencyvstem" xOffset="-89" yOffset="-800"/>
+    <contour>
+      <point x="279" y="0" type="curve" smooth="yes"/>
+      <point x="423" y="0"/>
+      <point x="518" y="77"/>
+      <point x="518" y="196" type="curve" smooth="yes"/>
+      <point x="518" y="430"/>
+      <point x="159" y="344"/>
+      <point x="159" y="515" type="curve" smooth="yes"/>
+      <point x="159" y="582"/>
+      <point x="213" y="621"/>
+      <point x="309" y="621" type="curve" smooth="yes"/>
+      <point x="362" y="621"/>
+      <point x="423" y="609"/>
+      <point x="470" y="588" type="curve"/>
+      <point x="494" y="653" type="line"/>
+      <point x="439" y="679"/>
+      <point x="375" y="693"/>
+      <point x="315" y="693" type="curve" smooth="yes"/>
+      <point x="169" y="693"/>
+      <point x="74" y="617"/>
+      <point x="74" y="501" type="curve" smooth="yes"/>
+      <point x="74" y="273"/>
+      <point x="432" y="350"/>
+      <point x="432" y="183" type="curve" smooth="yes"/>
+      <point x="432" y="118"/>
+      <point x="377" y="74"/>
+      <point x="283" y="74" type="curve" smooth="yes"/>
+      <point x="225" y="74"/>
+      <point x="151" y="91"/>
+      <point x="88" y="119" type="curve"/>
+      <point x="63" y="54" type="line"/>
+      <point x="134" y="19"/>
+      <point x="208" y="0"/>
+    </contour>
+    <contour>
+      <point x="265" y="-120" type="line"/>
+      <point x="336" y="-120" type="line"/>
+      <point x="336" y="50" type="line"/>
+      <point x="265" y="50" type="line"/>
+    </contour>
+    <contour>
+      <point x="265" y="648" type="line"/>
+      <point x="336" y="648" type="line"/>
+      <point x="336" y="818" type="line"/>
+      <point x="265" y="818" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>-1</integer>
-        <integer>-1</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dong.glif b/src/Cantarell-Regular.ufo/glyphs/dong.glif
index 3ada93e7..081695df 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dong.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dong.glif
@@ -1,14 +1,60 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dong" format="2">
-  <advance width="670"/>
+  <advance width="580"/>
   <unicode hex="20AB"/>
   <outline>
     <contour>
-      <point x="119" y="-140" type="line"/>
-      <point x="541" y="-140" type="line"/>
-      <point x="541" y="-80" type="line"/>
-      <point x="119" y="-80" type="line"/>
+      <point x="264" y="-10" type="curve" smooth="yes"/>
+      <point x="344" y="-10"/>
+      <point x="405" y="30"/>
+      <point x="441" y="96" type="curve"/>
+      <point x="413" y="132" type="line"/>
+      <point x="387" y="87"/>
+      <point x="343" y="60"/>
+      <point x="288" y="60" type="curve" smooth="yes"/>
+      <point x="195" y="60"/>
+      <point x="135" y="136"/>
+      <point x="135" y="246" type="curve" smooth="yes"/>
+      <point x="135" y="352"/>
+      <point x="190" y="422"/>
+      <point x="279" y="422" type="curve" smooth="yes"/>
+      <point x="338" y="422"/>
+      <point x="385" y="394"/>
+      <point x="412" y="346" type="curve"/>
+      <point x="448" y="390" type="line"/>
+      <point x="414" y="455"/>
+      <point x="354" y="492"/>
+      <point x="275" y="492" type="curve" smooth="yes"/>
+      <point x="143" y="492"/>
+      <point x="55" y="390"/>
+      <point x="55" y="237" type="curve" smooth="yes"/>
+      <point x="55" y="90"/>
+      <point x="139" y="-10"/>
+    </contour>
+    <contour>
+      <point x="86" y="-140" type="line"/>
+      <point x="500" y="-140" type="line"/>
+      <point x="500" y="-80" type="line"/>
+      <point x="86" y="-80" type="line"/>
+    </contour>
+    <contour>
+      <point x="426" y="0" type="line"/>
+      <point x="481" y="0" type="line"/>
+      <point x="481" y="739" type="line"/>
+      <point x="401" y="739" type="line"/>
+      <point x="401" y="56" type="line"/>
+    </contour>
+    <contour>
+      <point x="271" y="569" type="line"/>
+      <point x="543" y="569" type="line"/>
+      <point x="543" y="627" type="line"/>
+      <point x="271" y="627" type="line"/>
     </contour>
-    <component base="dcroat" xOffset="36"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dotaccent.glif b/src/Cantarell-Regular.ufo/glyphs/dotaccent.glif
index 20daa8bb..ccd46cf3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dotaccent.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dotaccent" format="2">
-  <advance width="266"/>
+  <advance width="500"/>
   <unicode hex="02D9"/>
   <outline>
-    <component base="dotaccentcomb" xOffset="-3"/>
+    <component base="dotaccentcomb" xOffset="117"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/doubleprimemod.glif 
b/src/Cantarell-Regular.ufo/glyphs/doubleprimemod.glif
index 275d084d..461a78eb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/doubleprimemod.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/doubleprimemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="doubleprimemod" format="2">
-  <advance width="510"/>
+  <advance width="341"/>
   <unicode hex="02BA"/>
   <outline>
-    <component base="second"/>
+    <component base="second" xOffset="-81"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/downA_rrow.glif 
b/src/Cantarell-Regular.ufo/glyphs/downA_rrow.glif
index 83834f29..e8b78c14 100644
--- a/src/Cantarell-Regular.ufo/glyphs/downA_rrow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/downA_rrow.glif
@@ -1,11 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="downArrow" format="2">
-  <advance width="656"/>
+  <advance width="640"/>
   <unicode hex="2193"/>
-  <note>
-arrowdown
-</note>
   <outline>
-    <component base="upArrow" xScale="-1" yScale="-1" xOffset="656" yOffset="642"/>
+    <component base="upArrow" xScale="-1" yScale="-1" xOffset="640" yOffset="642"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>upArrow</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>upArrow</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dzhe-cy.glif b/src/Cantarell-Regular.ufo/glyphs/dzhe-cy.glif
index 3442a98e..ead2340c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dzhe-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dzhe-cy.glif
@@ -27,6 +27,10 @@
         <key>width</key>
         <integer>70</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/e-cy.glif
index f1eb6953..1d8ca9ea 100644
--- a/src/Cantarell-Regular.ufo/glyphs/e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/e-cy.glif
@@ -1,43 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="e-cy" format="2">
-  <advance width="494"/>
+  <advance width="492"/>
   <unicode hex="0454"/>
-  <anchor x="256" y="0" name="bottom"/>
-  <anchor x="278" y="482" name="top"/>
+  <anchor x="258" y="0" name="bottom"/>
+  <anchor x="280" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="285" y="-10" type="curve" smooth="yes"/>
-      <point x="348" y="-10"/>
-      <point x="412" y="5"/>
-      <point x="453" y="28" type="curve"/>
-      <point x="435" y="86" type="line"/>
-      <point x="394" y="68"/>
-      <point x="346" y="56"/>
-      <point x="304" y="56" type="curve" smooth="yes"/>
-      <point x="196" y="56"/>
-      <point x="132" y="126"/>
-      <point x="132" y="243" type="curve" smooth="yes"/>
-      <point x="132" y="359"/>
-      <point x="195" y="422"/>
-      <point x="303" y="422" type="curve" smooth="yes"/>
-      <point x="345" y="422"/>
-      <point x="394" y="412"/>
-      <point x="434" y="395" type="curve"/>
-      <point x="453" y="460" type="line"/>
-      <point x="407" y="481"/>
-      <point x="353" y="492"/>
-      <point x="305" y="492" type="curve" smooth="yes"/>
-      <point x="153" y="492"/>
-      <point x="50" y="386"/>
-      <point x="50" y="227" type="curve" smooth="yes"/>
-      <point x="50" y="78"/>
-      <point x="139" y="-10"/>
+      <point x="287" y="-10" type="curve" smooth="yes"/>
+      <point x="350" y="-10"/>
+      <point x="414" y="5"/>
+      <point x="455" y="28" type="curve"/>
+      <point x="437" y="86" type="line"/>
+      <point x="396" y="68"/>
+      <point x="348" y="56"/>
+      <point x="306" y="56" type="curve" smooth="yes"/>
+      <point x="198" y="56"/>
+      <point x="134" y="126"/>
+      <point x="134" y="243" type="curve" smooth="yes"/>
+      <point x="134" y="359"/>
+      <point x="197" y="422"/>
+      <point x="305" y="422" type="curve" smooth="yes"/>
+      <point x="347" y="422"/>
+      <point x="396" y="412"/>
+      <point x="436" y="395" type="curve"/>
+      <point x="455" y="460" type="line"/>
+      <point x="409" y="481"/>
+      <point x="355" y="492"/>
+      <point x="307" y="492" type="curve" smooth="yes"/>
+      <point x="155" y="492"/>
+      <point x="52" y="386"/>
+      <point x="52" y="227" type="curve" smooth="yes"/>
+      <point x="52" y="78"/>
+      <point x="141" y="-10"/>
     </contour>
     <contour>
-      <point x="93" y="222" type="line"/>
-      <point x="399" y="222" type="line"/>
-      <point x="399" y="287" type="line"/>
-      <point x="93" y="287" type="line"/>
+      <point x="95" y="222" type="line"/>
+      <point x="401" y="222" type="line"/>
+      <point x="401" y="287" type="line"/>
+      <point x="95" y="287" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>es-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>es-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/e.glif b/src/Cantarell-Regular.ufo/glyphs/e.glif
index 4800611e..0b5369a4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/e.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/e.glif
@@ -1,46 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="e" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0065"/>
-  <note>
-e
-</note>
-  <anchor x="285" y="0" name="bottom"/>
-  <anchor x="428" y="10" name="ogonek"/>
-  <anchor x="270" y="482" name="top"/>
+  <anchor x="286" y="0" name="bottom"/>
+  <anchor x="429" y="10" name="ogonek"/>
+  <anchor x="271" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="299" y="-10" type="curve" smooth="yes"/>
-      <point x="354" y="-10"/>
-      <point x="414" y="3"/>
-      <point x="457" y="26" type="curve"/>
-      <point x="439" y="84" type="line"/>
-      <point x="402" y="66"/>
-      <point x="355" y="55"/>
-      <point x="313" y="55" type="curve" smooth="yes"/>
-      <point x="200" y="55"/>
-      <point x="133" y="130"/>
-      <point x="133" y="255" type="curve" smooth="yes"/>
-      <point x="133" y="364"/>
-      <point x="182" y="424"/>
-      <point x="270" y="424" type="curve" smooth="yes"/>
-      <point x="352" y="424"/>
-      <point x="400" y="371"/>
-      <point x="400" y="279" type="curve"/>
-      <point x="119" y="279" type="line"/>
-      <point x="119" y="219" type="line"/>
-      <point x="471" y="219" type="line"/>
-      <point x="473" y="234"/>
-      <point x="475" y="269"/>
-      <point x="475" y="288" type="curve" smooth="yes"/>
-      <point x="475" y="409"/>
-      <point x="395" y="492"/>
-      <point x="276" y="492" type="curve" smooth="yes"/>
-      <point x="142" y="492"/>
-      <point x="51" y="387"/>
-      <point x="51" y="239" type="curve" smooth="yes"/>
-      <point x="51" y="85"/>
-      <point x="146" y="-10"/>
+      <point x="300" y="-10" type="curve" smooth="yes"/>
+      <point x="355" y="-10"/>
+      <point x="415" y="3"/>
+      <point x="458" y="26" type="curve"/>
+      <point x="440" y="84" type="line"/>
+      <point x="403" y="66"/>
+      <point x="356" y="55"/>
+      <point x="314" y="55" type="curve" smooth="yes"/>
+      <point x="201" y="55"/>
+      <point x="134" y="130"/>
+      <point x="134" y="255" type="curve" smooth="yes"/>
+      <point x="134" y="364"/>
+      <point x="183" y="424"/>
+      <point x="271" y="424" type="curve" smooth="yes"/>
+      <point x="353" y="424"/>
+      <point x="401" y="371"/>
+      <point x="401" y="279" type="curve"/>
+      <point x="120" y="279" type="line"/>
+      <point x="120" y="219" type="line"/>
+      <point x="472" y="219" type="line"/>
+      <point x="474" y="234"/>
+      <point x="476" y="269"/>
+      <point x="476" y="288" type="curve" smooth="yes"/>
+      <point x="476" y="409"/>
+      <point x="396" y="492"/>
+      <point x="277" y="492" type="curve" smooth="yes"/>
+      <point x="143" y="492"/>
+      <point x="52" y="387"/>
+      <point x="52" y="239" type="curve" smooth="yes"/>
+      <point x="52" y="85"/>
+      <point x="147" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/eacute.glif b/src/Cantarell-Regular.ufo/glyphs/eacute.glif
index 29e3db2d..9ecefd88 100644
--- a/src/Cantarell-Regular.ufo/glyphs/eacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/eacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eacute" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="00E9"/>
   <outline>
     <component base="e"/>
-    <component base="acutecomb" xOffset="187"/>
+    <component base="acutecomb" xOffset="188"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ebreve.glif b/src/Cantarell-Regular.ufo/glyphs/ebreve.glif
index bca42fe8..b0522a1d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ebreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ebreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ebreve" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0115"/>
   <outline>
     <component base="e"/>
-    <component base="brevecomb" xOffset="62"/>
+    <component base="brevecomb" xOffset="63"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ecaron.glif b/src/Cantarell-Regular.ufo/glyphs/ecaron.glif
index ce975472..04f3e21b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ecaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ecaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecaron" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="011B"/>
   <outline>
     <component base="e"/>
-    <component base="caroncomb" xOffset="87"/>
+    <component base="caroncomb" xOffset="88"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ecedillabreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/ecedillabreve.glif
index 9b674759..0180864a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ecedillabreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ecedillabreve.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecedillabreve" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1E1D"/>
   <outline>
     <component base="e"/>
-    <component base="cedillacomb" xOffset="138"/>
-    <component base="brevecomb" xOffset="62"/>
+    <component base="cedillacomb" xOffset="139"/>
+    <component base="brevecomb" xOffset="63"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ecircumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/ecircumflex.glif
index d8354208..279f1b6a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ecircumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ecircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflex" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="00EA"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb" xOffset="77"/>
+    <component base="circumflexcomb" xOffset="78"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ecircumflexacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/ecircumflexacute.glif
index ff11d400..912f6610 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ecircumflexacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ecircumflexacute.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexacute" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1EBF"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb_acutecomb" xOffset="79"/>
+    <component base="circumflexcomb.loclVIET" xOffset="80"/>
+    <component base="acutecomb.loclVIET" xOffset="318" yOffset="81"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ecircumflexdotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/ecircumflexdotbelow.glif
index 701f14fa..7532f664 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ecircumflexdotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ecircumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexdotbelow" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1EC7"/>
   <outline>
     <component base="e"/>
-    <component base="dotbelowcomb" xOffset="149"/>
-    <component base="circumflexcomb" xOffset="77"/>
+    <component base="dotbelowcomb" xOffset="150"/>
+    <component base="circumflexcomb" xOffset="78"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ecircumflexgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/ecircumflexgrave.glif
index 607e73c0..a6edc8d2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ecircumflexgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ecircumflexgrave.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexgrave" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1EC1"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb_gravecomb" xOffset="79"/>
+    <component base="circumflexcomb.loclVIET" xOffset="80"/>
+    <component base="gravecomb.loclVIET" xOffset="231" yOffset="81"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ecircumflexhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/ecircumflexhookabove.glif
index 352535cb..6957c38c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ecircumflexhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ecircumflexhookabove.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexhookabove" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1EC3"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb_hookabovecomb" xOffset="102"/>
+    <component base="circumflexcomb.loclVIET" xOffset="80"/>
+    <component base="hookabovecomb.loclVIET" xOffset="267" yOffset="81"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ecircumflextilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/ecircumflextilde.glif
index b5683ce6..ab9870be 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ecircumflextilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ecircumflextilde.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflextilde" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1EC5"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb_tildecomb" xOffset="57"/>
+    <component base="circumflexcomb.loclVIET" xOffset="80"/>
+    <component base="tildecomb.loclVIET" xOffset="50" yOffset="98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/edblgrave.glif b/src/Cantarell-Regular.ufo/glyphs/edblgrave.glif
index 9a1f3522..4d0dc533 100644
--- a/src/Cantarell-Regular.ufo/glyphs/edblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/edblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edblgrave" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0205"/>
   <outline>
     <component base="e"/>
-    <component base="dblgravecomb" xOffset="16"/>
+    <component base="dblgravecomb" xOffset="17"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/edieresis.glif b/src/Cantarell-Regular.ufo/glyphs/edieresis.glif
index 6ccb8730..a7f26140 100644
--- a/src/Cantarell-Regular.ufo/glyphs/edieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/edieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edieresis" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="00EB"/>
   <outline>
     <component base="e"/>
-    <component base="dieresiscomb" xOffset="37"/>
+    <component base="dieresiscomb" xOffset="38"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/edotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/edotaccent.glif
index 2e1dd391..96d423fb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/edotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/edotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edotaccent" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0117"/>
   <outline>
     <component base="e"/>
-    <component base="dotaccentcomb" xOffset="137"/>
+    <component base="dotaccentcomb" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/edotbelow.glif b/src/Cantarell-Regular.ufo/glyphs/edotbelow.glif
index 69748f5a..99b9875e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/edotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/edotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edotbelow" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1EB9"/>
   <outline>
     <component base="e"/>
-    <component base="dotbelowcomb" xOffset="149"/>
+    <component base="dotbelowcomb" xOffset="150"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ef-cy.glif b/src/Cantarell-Regular.ufo/glyphs/ef-cy.glif
index 9c4d0f30..b2df46ec 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ef-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ef-cy.glif
@@ -1,69 +1,77 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ef-cy" format="2">
-  <advance width="791"/>
+  <advance width="790"/>
   <unicode hex="0444"/>
   <outline>
     <contour>
-      <point x="357" y="-217" type="line"/>
-      <point x="434" y="-217" type="line"/>
-      <point x="434" y="739" type="line"/>
-      <point x="357" y="739" type="line"/>
+      <point x="537" y="-5" type="curve" smooth="yes"/>
+      <point x="656" y="-5"/>
+      <point x="738" y="100"/>
+      <point x="738" y="250" type="curve" smooth="yes"/>
+      <point x="738" y="389"/>
+      <point x="660" y="485"/>
+      <point x="547" y="485" type="curve" smooth="yes"/>
+      <point x="469" y="485"/>
+      <point x="409" y="439"/>
+      <point x="381" y="357" type="curve"/>
+      <point x="409" y="313" type="line"/>
+      <point x="428" y="377"/>
+      <point x="471" y="415"/>
+      <point x="525" y="415" type="curve" smooth="yes"/>
+      <point x="603" y="415"/>
+      <point x="657" y="342"/>
+      <point x="657" y="238" type="curve" smooth="yes"/>
+      <point x="657" y="134"/>
+      <point x="607" y="65"/>
+      <point x="533" y="65" type="curve" smooth="yes"/>
+      <point x="480" y="65"/>
+      <point x="435" y="100"/>
+      <point x="413" y="160" type="curve"/>
+      <point x="380" y="116" type="line"/>
+      <point x="408" y="36"/>
+      <point x="462" y="-5"/>
     </contour>
     <contour>
-      <point x="240" y="-5" type="curve" smooth="yes"/>
-      <point x="310" y="-5"/>
-      <point x="365" y="36"/>
-      <point x="397" y="101" type="curve"/>
-      <point x="371" y="137" type="line"/>
-      <point x="349" y="92"/>
-      <point x="309" y="65"/>
-      <point x="264" y="65" type="curve" smooth="yes"/>
+      <point x="239" y="-5" type="curve" smooth="yes"/>
+      <point x="306" y="-5"/>
+      <point x="363" y="33"/>
+      <point x="396" y="101" type="curve"/>
+      <point x="370" y="137" type="line"/>
+      <point x="348" y="92"/>
+      <point x="308" y="65"/>
+      <point x="263" y="65" type="curve" smooth="yes"/>
       <point x="186" y="65"/>
-      <point x="134" y="138"/>
-      <point x="134" y="246" type="curve" smooth="yes"/>
-      <point x="134" y="345"/>
-      <point x="183" y="412"/>
-      <point x="257" y="412" type="curve" smooth="yes"/>
-      <point x="307" y="412"/>
-      <point x="347" y="384"/>
-      <point x="370" y="336" type="curve"/>
-      <point x="402" y="380" type="line"/>
-      <point x="372" y="445"/>
-      <point x="319" y="482"/>
-      <point x="251" y="482" type="curve" smooth="yes"/>
-      <point x="134" y="482"/>
-      <point x="53" y="382"/>
-      <point x="53" y="237" type="curve" smooth="yes"/>
-      <point x="53" y="94"/>
+      <point x="133" y="140"/>
+      <point x="133" y="249" type="curve" smooth="yes"/>
+      <point x="133" y="348"/>
+      <point x="182" y="415"/>
+      <point x="256" y="415" type="curve" smooth="yes"/>
+      <point x="305" y="415"/>
+      <point x="346" y="388"/>
+      <point x="369" y="339" type="curve"/>
+      <point x="401" y="383" type="line"/>
+      <point x="371" y="449"/>
+      <point x="317" y="485"/>
+      <point x="250" y="485" type="curve" smooth="yes"/>
+      <point x="133" y="485"/>
+      <point x="52" y="385"/>
+      <point x="52" y="240" type="curve" smooth="yes"/>
+      <point x="52" y="96"/>
       <point x="129" y="-5"/>
     </contour>
     <contour>
-      <point x="538" y="-5" type="curve" smooth="yes"/>
-      <point x="657" y="-5"/>
-      <point x="739" y="97"/>
-      <point x="739" y="247" type="curve" smooth="yes"/>
-      <point x="739" y="386"/>
-      <point x="661" y="482"/>
-      <point x="548" y="482" type="curve" smooth="yes"/>
-      <point x="469" y="482"/>
-      <point x="410" y="435"/>
-      <point x="382" y="354" type="curve"/>
-      <point x="410" y="310" type="line"/>
-      <point x="429" y="374"/>
-      <point x="472" y="412"/>
-      <point x="526" y="412" type="curve" smooth="yes"/>
-      <point x="604" y="412"/>
-      <point x="658" y="339"/>
-      <point x="658" y="235" type="curve" smooth="yes"/>
-      <point x="658" y="132"/>
-      <point x="609" y="65"/>
-      <point x="534" y="65" type="curve" smooth="yes"/>
-      <point x="480" y="65"/>
-      <point x="436" y="101"/>
-      <point x="414" y="160" type="curve"/>
-      <point x="381" y="116" type="line"/>
-      <point x="408" y="38"/>
-      <point x="461" y="-5"/>
+      <point x="356" y="-217" type="line"/>
+      <point x="433" y="-217" type="line"/>
+      <point x="433" y="739" type="line"/>
+      <point x="356" y="739" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/egrave.glif b/src/Cantarell-Regular.ufo/glyphs/egrave.glif
index add976ba..cbfa81b6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/egrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/egrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="egrave" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="00E8"/>
   <outline>
     <component base="e"/>
-    <component base="gravecomb" xOffset="92"/>
+    <component base="gravecomb" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ehookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/ehookabove.glif
index dec6b570..9598db4c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ehookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ehookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ehookabove" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1EBB"/>
   <outline>
     <component base="e"/>
-    <component base="hookabovecomb" xOffset="117"/>
+    <component base="hookabovecomb" xOffset="118"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/eight.dnom.glif 
b/src/Cantarell-Regular.ufo/glyphs/eight.dnom.glif
index 1379f56e..b00fa1b3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/eight.dnom.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/eight.dnom.glif
@@ -1,55 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight.dnom" format="2">
-  <advance width="466"/>
-  <note>
-eight
-</note>
+  <advance width="429"/>
   <outline>
     <contour>
-      <point x="234" y="-7" type="curve" smooth="yes"/>
-      <point x="345" y="-7"/>
-      <point x="419" y="46"/>
-      <point x="419" y="126" type="curve" smooth="yes"/>
-      <point x="419" y="281"/>
-      <point x="140" y="246"/>
-      <point x="140" y="355" type="curve" smooth="yes"/>
-      <point x="140" y="393"/>
-      <point x="175" y="418"/>
-      <point x="229" y="418" type="curve" smooth="yes"/>
-      <point x="285" y="418"/>
-      <point x="325" y="391"/>
-      <point x="325" y="351" type="curve" smooth="yes"/>
-      <point x="325" y="311"/>
-      <point x="286" y="279"/>
-      <point x="228" y="270" type="curve"/>
-      <point x="282" y="243" type="line"/>
-      <point x="354" y="264"/>
-      <point x="397" y="309"/>
-      <point x="397" y="364" type="curve" smooth="yes"/>
-      <point x="397" y="432"/>
-      <point x="331" y="479"/>
-      <point x="236" y="479" type="curve" smooth="yes"/>
-      <point x="134" y="479"/>
-      <point x="67" y="426"/>
-      <point x="67" y="348" type="curve" smooth="yes"/>
-      <point x="67" y="190"/>
-      <point x="344" y="229"/>
-      <point x="344" y="121" type="curve" smooth="yes"/>
-      <point x="344" y="80"/>
-      <point x="305" y="55"/>
-      <point x="242" y="55" type="curve" smooth="yes"/>
-      <point x="171" y="55"/>
-      <point x="124" y="86"/>
-      <point x="124" y="132" type="curve" smooth="yes"/>
-      <point x="124" y="176"/>
-      <point x="167" y="209"/>
-      <point x="232" y="216" type="curve"/>
-      <point x="186" y="245" type="line"/>
-      <point x="103" y="232"/>
-      <point x="50" y="183"/>
-      <point x="50" y="120" type="curve" smooth="yes"/>
-      <point x="50" y="44"/>
-      <point x="124" y="-7"/>
+      <point x="214" y="-6" type="curve" smooth="yes"/>
+      <point x="311" y="-6"/>
+      <point x="377" y="42"/>
+      <point x="377" y="114" type="curve" smooth="yes"/>
+      <point x="377" y="248"/>
+      <point x="141" y="216"/>
+      <point x="141" y="309" type="curve" smooth="yes"/>
+      <point x="141" y="341"/>
+      <point x="169" y="362"/>
+      <point x="212" y="362" type="curve" smooth="yes"/>
+      <point x="256" y="362"/>
+      <point x="287" y="340"/>
+      <point x="287" y="307" type="curve" smooth="yes"/>
+      <point x="287" y="274"/>
+      <point x="256" y="249"/>
+      <point x="210" y="241" type="curve"/>
+      <point x="261" y="215" type="line"/>
+      <point x="323" y="234"/>
+      <point x="359" y="273"/>
+      <point x="359" y="320" type="curve" smooth="yes"/>
+      <point x="359" y="381"/>
+      <point x="300" y="422"/>
+      <point x="217" y="422" type="curve" smooth="yes"/>
+      <point x="128" y="422"/>
+      <point x="69" y="375"/>
+      <point x="69" y="305" type="curve" smooth="yes"/>
+      <point x="69" y="167"/>
+      <point x="304" y="200"/>
+      <point x="304" y="109" type="curve" smooth="yes"/>
+      <point x="304" y="76"/>
+      <point x="271" y="54"/>
+      <point x="220" y="54" type="curve" smooth="yes"/>
+      <point x="166" y="54"/>
+      <point x="127" y="80"/>
+      <point x="127" y="119" type="curve" smooth="yes"/>
+      <point x="127" y="155"/>
+      <point x="160" y="182"/>
+      <point x="213" y="187" type="curve"/>
+      <point x="169" y="215" type="line"/>
+      <point x="101" y="204"/>
+      <point x="54" y="163"/>
+      <point x="54" y="106" type="curve" smooth="yes"/>
+      <point x="54" y="40"/>
+      <point x="119" y="-6"/>
     </contour>
   </outline>
   <lib>
@@ -57,11 +54,11 @@ eight
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>68</integer>
+        <integer>60</integer>
         <key>weight</key>
         <integer>-7</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>63</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/eight.glif b/src/Cantarell-Regular.ufo/glyphs/eight.glif
index 6233aea8..c0ac6bd8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/eight.glif
+++ b/src/Cantarell-Regular.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="580"/>
   <unicode hex="0038"/>
   <outline>
     <contour>
-      <point x="299" y="-10" type="curve" smooth="yes"/>
-      <point x="445" y="-10"/>
-      <point x="540" y="63"/>
-      <point x="540" y="176" type="curve" smooth="yes"/>
-      <point x="540" y="401"/>
-      <point x="165" y="359"/>
-      <point x="165" y="534" type="curve" smooth="yes"/>
-      <point x="165" y="595"/>
-      <point x="212" y="633"/>
-      <point x="289" y="633" type="curve" smooth="yes"/>
-      <point x="373" y="633"/>
-      <point x="430" y="589"/>
-      <point x="430" y="523" type="curve" smooth="yes"/>
-      <point x="430" y="458"/>
-      <point x="375" y="402"/>
-      <point x="294" y="387" type="curve"/>
-      <point x="357" y="356" type="line"/>
-      <point x="451" y="384"/>
-      <point x="509" y="453"/>
-      <point x="509" y="537" type="curve" smooth="yes"/>
-      <point x="509" y="637"/>
-      <point x="426" y="704"/>
-      <point x="301" y="704" type="curve" smooth="yes"/>
-      <point x="169" y="704"/>
-      <point x="82" y="631"/>
-      <point x="82" y="521" type="curve" smooth="yes"/>
-      <point x="82" y="290"/>
-      <point x="455" y="344"/>
-      <point x="455" y="169" type="curve" smooth="yes"/>
-      <point x="455" y="102"/>
-      <point x="404" y="63"/>
-      <point x="313" y="63" type="curve" smooth="yes"/>
-      <point x="211" y="63"/>
-      <point x="143" y="112"/>
-      <point x="143" y="185" type="curve" smooth="yes"/>
-      <point x="143" y="257"/>
-      <point x="206" y="315"/>
-      <point x="298" y="328" type="curve"/>
-      <point x="244" y="361" type="line"/>
-      <point x="132" y="346"/>
-      <point x="58" y="271"/>
-      <point x="58" y="174" type="curve" smooth="yes"/>
-      <point x="58" y="64"/>
-      <point x="154" y="-10"/>
+      <point x="291" y="-10" type="curve" smooth="yes"/>
+      <point x="436" y="-10"/>
+      <point x="533" y="65"/>
+      <point x="533" y="175" type="curve" smooth="yes"/>
+      <point x="533" y="397"/>
+      <point x="157" y="354"/>
+      <point x="157" y="530" type="curve" smooth="yes"/>
+      <point x="157" y="593"/>
+      <point x="205" y="634"/>
+      <point x="282" y="634" type="curve" smooth="yes"/>
+      <point x="364" y="634"/>
+      <point x="423" y="589"/>
+      <point x="423" y="523" type="curve" smooth="yes"/>
+      <point x="423" y="459"/>
+      <point x="367" y="404"/>
+      <point x="285" y="387" type="curve"/>
+      <point x="347" y="356" type="line"/>
+      <point x="443" y="384"/>
+      <point x="502" y="456"/>
+      <point x="502" y="537" type="curve" smooth="yes"/>
+      <point x="502" y="637"/>
+      <point x="415" y="704"/>
+      <point x="292" y="704" type="curve" smooth="yes"/>
+      <point x="163" y="704"/>
+      <point x="76" y="630"/>
+      <point x="76" y="523" type="curve" smooth="yes"/>
+      <point x="76" y="295"/>
+      <point x="448" y="348"/>
+      <point x="448" y="171" type="curve" smooth="yes"/>
+      <point x="448" y="104"/>
+      <point x="395" y="62"/>
+      <point x="304" y="62" type="curve" smooth="yes"/>
+      <point x="205" y="62"/>
+      <point x="135" y="111"/>
+      <point x="135" y="185" type="curve" smooth="yes"/>
+      <point x="135" y="256"/>
+      <point x="196" y="314"/>
+      <point x="289" y="327" type="curve"/>
+      <point x="236" y="361" type="line"/>
+      <point x="125" y="346"/>
+      <point x="50" y="268"/>
+      <point x="50" y="173" type="curve" smooth="yes"/>
+      <point x="50" y="64"/>
+      <point x="148" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/eight.numr.glif 
b/src/Cantarell-Regular.ufo/glyphs/eight.numr.glif
index 2408d730..a64236d8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/eight.numr.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/eight.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight.numr" format="2">
-  <advance width="466"/>
+  <advance width="429"/>
   <outline>
     <component base="eight.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/eight.osf.glif b/src/Cantarell-Regular.ufo/glyphs/eight.osf.glif
index 008b9135..8240ec85 100644
--- a/src/Cantarell-Regular.ufo/glyphs/eight.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/eight.osf.glif
@@ -1,52 +1,60 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight.osf" format="2">
-  <advance width="601"/>
+  <advance width="576"/>
   <outline>
     <contour>
-      <point x="303" y="-10" type="curve" smooth="yes"/>
-      <point x="447" y="-10"/>
-      <point x="542" y="63"/>
-      <point x="542" y="175" type="curve" smooth="yes"/>
-      <point x="542" y="400"/>
-      <point x="166" y="356"/>
-      <point x="166" y="534" type="curve" smooth="yes"/>
-      <point x="166" y="596"/>
-      <point x="214" y="637"/>
-      <point x="293" y="637" type="curve" smooth="yes"/>
-      <point x="377" y="637"/>
-      <point x="436" y="591"/>
-      <point x="436" y="524" type="curve" smooth="yes"/>
-      <point x="436" y="460"/>
-      <point x="380" y="402"/>
-      <point x="296" y="386" type="curve"/>
-      <point x="357" y="356" type="line"/>
-      <point x="452" y="384"/>
-      <point x="511" y="455"/>
-      <point x="511" y="537" type="curve" smooth="yes"/>
-      <point x="511" y="637"/>
-      <point x="427" y="704"/>
-      <point x="303" y="704" type="curve" smooth="yes"/>
-      <point x="174" y="704"/>
-      <point x="87" y="631"/>
-      <point x="87" y="522" type="curve" smooth="yes"/>
-      <point x="87" y="291"/>
-      <point x="461" y="345"/>
-      <point x="461" y="169" type="curve" smooth="yes"/>
-      <point x="461" y="101"/>
-      <point x="409" y="59"/>
-      <point x="315" y="59" type="curve" smooth="yes"/>
-      <point x="213" y="59"/>
-      <point x="144" y="110"/>
-      <point x="144" y="184" type="curve" smooth="yes"/>
-      <point x="144" y="255"/>
-      <point x="205" y="315"/>
-      <point x="300" y="329" type="curve"/>
-      <point x="249" y="361" type="line"/>
-      <point x="137" y="346"/>
-      <point x="63" y="268"/>
-      <point x="63" y="173" type="curve" smooth="yes"/>
-      <point x="63" y="64"/>
-      <point x="159" y="-10"/>
+      <point x="290" y="-10" type="curve" smooth="yes"/>
+      <point x="434" y="-10"/>
+      <point x="529" y="63"/>
+      <point x="529" y="175" type="curve" smooth="yes"/>
+      <point x="529" y="400"/>
+      <point x="153" y="356"/>
+      <point x="153" y="534" type="curve" smooth="yes"/>
+      <point x="153" y="596"/>
+      <point x="201" y="637"/>
+      <point x="280" y="637" type="curve" smooth="yes"/>
+      <point x="364" y="637"/>
+      <point x="423" y="591"/>
+      <point x="423" y="524" type="curve" smooth="yes"/>
+      <point x="423" y="460"/>
+      <point x="367" y="402"/>
+      <point x="283" y="386" type="curve"/>
+      <point x="344" y="356" type="line"/>
+      <point x="439" y="384"/>
+      <point x="498" y="455"/>
+      <point x="498" y="537" type="curve" smooth="yes"/>
+      <point x="498" y="637"/>
+      <point x="414" y="704"/>
+      <point x="290" y="704" type="curve" smooth="yes"/>
+      <point x="161" y="704"/>
+      <point x="74" y="631"/>
+      <point x="74" y="522" type="curve" smooth="yes"/>
+      <point x="74" y="291"/>
+      <point x="448" y="345"/>
+      <point x="448" y="169" type="curve" smooth="yes"/>
+      <point x="448" y="101"/>
+      <point x="396" y="59"/>
+      <point x="302" y="59" type="curve" smooth="yes"/>
+      <point x="200" y="59"/>
+      <point x="131" y="110"/>
+      <point x="131" y="184" type="curve" smooth="yes"/>
+      <point x="131" y="255"/>
+      <point x="192" y="315"/>
+      <point x="287" y="329" type="curve"/>
+      <point x="236" y="361" type="line"/>
+      <point x="124" y="346"/>
+      <point x="50" y="268"/>
+      <point x="50" y="173" type="curve" smooth="yes"/>
+      <point x="50" y="64"/>
+      <point x="146" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>eight</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>eight</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/eight.tf.glif b/src/Cantarell-Regular.ufo/glyphs/eight.tf.glif
index 822c9e9c..7b5dfdb0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/eight.tf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/eight.tf.glif
@@ -2,52 +2,7 @@
 <glyph name="eight.tf" format="2">
   <advance width="580"/>
   <outline>
-    <contour>
-      <point x="292" y="-10" type="curve" smooth="yes"/>
-      <point x="435" y="-10"/>
-      <point x="528" y="63"/>
-      <point x="528" y="176" type="curve" smooth="yes"/>
-      <point x="528" y="401"/>
-      <point x="162" y="359"/>
-      <point x="162" y="534" type="curve" smooth="yes"/>
-      <point x="162" y="595"/>
-      <point x="208" y="633"/>
-      <point x="283" y="633" type="curve" smooth="yes"/>
-      <point x="364" y="633"/>
-      <point x="419" y="589"/>
-      <point x="419" y="523" type="curve" smooth="yes"/>
-      <point x="419" y="459"/>
-      <point x="366" y="402"/>
-      <point x="287" y="387" type="curve"/>
-      <point x="350" y="356" type="line"/>
-      <point x="442" y="384"/>
-      <point x="498" y="454"/>
-      <point x="498" y="537" type="curve" smooth="yes"/>
-      <point x="498" y="637"/>
-      <point x="416" y="704"/>
-      <point x="294" y="704" type="curve" smooth="yes"/>
-      <point x="165" y="704"/>
-      <point x="79" y="631"/>
-      <point x="79" y="521" type="curve" smooth="yes"/>
-      <point x="79" y="290"/>
-      <point x="444" y="344"/>
-      <point x="444" y="169" type="curve" smooth="yes"/>
-      <point x="444" y="102"/>
-      <point x="394" y="63"/>
-      <point x="306" y="63" type="curve" smooth="yes"/>
-      <point x="207" y="63"/>
-      <point x="141" y="112"/>
-      <point x="141" y="185" type="curve" smooth="yes"/>
-      <point x="141" y="257"/>
-      <point x="202" y="315"/>
-      <point x="291" y="328" type="curve"/>
-      <point x="238" y="361" type="line"/>
-      <point x="128" y="346"/>
-      <point x="56" y="270"/>
-      <point x="56" y="174" type="curve" smooth="yes"/>
-      <point x="56" y="64"/>
-      <point x="151" y="-10"/>
-    </contour>
+    <component base="eight"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/eightinferior.glif 
b/src/Cantarell-Regular.ufo/glyphs/eightinferior.glif
index 17e6bce9..d708794d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/eightinferior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/eightinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eightinferior" format="2">
-  <advance width="466"/>
+  <advance width="429"/>
   <unicode hex="2088"/>
   <outline>
     <component base="eight.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/eightsuperior.glif 
b/src/Cantarell-Regular.ufo/glyphs/eightsuperior.glif
index 3dd08e89..171fc5d6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/eightsuperior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/eightsuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eightsuperior" format="2">
-  <advance width="466"/>
+  <advance width="429"/>
   <unicode hex="2078"/>
   <outline>
     <component base="eight.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/einvertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/einvertedbreve.glif
index ad61c976..73954280 100644
--- a/src/Cantarell-Regular.ufo/glyphs/einvertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/einvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="einvertedbreve" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0207"/>
   <outline>
     <component base="e"/>
-    <component base="breveinvertedcomb" xOffset="60"/>
+    <component base="breveinvertedcomb" xOffset="61"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/el-cy.glif b/src/Cantarell-Regular.ufo/glyphs/el-cy.glif
index db49830d..0a4fbe92 100644
--- a/src/Cantarell-Regular.ufo/glyphs/el-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/el-cy.glif
@@ -1,29 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="el-cy" format="2">
-  <advance width="583"/>
+  <advance width="573"/>
   <unicode hex="043B"/>
   <outline>
     <contour>
-      <point x="99" y="-11" type="curve" smooth="yes"/>
-      <point x="184" y="-11"/>
-      <point x="228" y="68"/>
-      <point x="228" y="218" type="curve" smooth="yes"/>
-      <point x="228" y="415" type="line"/>
-      <point x="420" y="415" type="line"/>
-      <point x="420" y="0" type="line"/>
-      <point x="500" y="0" type="line"/>
-      <point x="500" y="482" type="line"/>
-      <point x="153" y="482" type="line"/>
-      <point x="153" y="211" type="line" smooth="yes"/>
-      <point x="153" y="111"/>
-      <point x="131" y="60"/>
-      <point x="87" y="60" type="curve" smooth="yes"/>
-      <point x="75" y="60"/>
-      <point x="58" y="64"/>
-      <point x="38" y="73" type="curve"/>
-      <point x="21" y="13" type="line"/>
-      <point x="45" y="-3"/>
-      <point x="72" y="-11"/>
+      <point x="89" y="-11" type="curve" smooth="yes"/>
+      <point x="174" y="-11"/>
+      <point x="218" y="68"/>
+      <point x="218" y="218" type="curve" smooth="yes"/>
+      <point x="218" y="415" type="line"/>
+      <point x="410" y="415" type="line"/>
+      <point x="410" y="0" type="line"/>
+      <point x="490" y="0" type="line"/>
+      <point x="490" y="482" type="line"/>
+      <point x="143" y="482" type="line"/>
+      <point x="143" y="211" type="line" smooth="yes"/>
+      <point x="143" y="111"/>
+      <point x="121" y="60"/>
+      <point x="77" y="60" type="curve" smooth="yes"/>
+      <point x="65" y="60"/>
+      <point x="49" y="64"/>
+      <point x="28" y="73" type="curve"/>
+      <point x="11" y="13" type="line"/>
+      <point x="35" y="-3"/>
+      <point x="62" y="-11"/>
     </contour>
   </outline>
   <lib>
@@ -35,6 +35,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ellipsis.glif b/src/Cantarell-Regular.ufo/glyphs/ellipsis.glif
index 4d74adf5..46658b31 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ellipsis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ellipsis.glif
@@ -1,10 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ellipsis" format="2">
-  <advance width="674"/>
+  <advance width="1000"/>
   <unicode hex="2026"/>
   <outline>
-    <component base="period" xOffset="400"/>
-    <component base="period" xOffset="200"/>
-    <component base="period"/>
+    <component base="period" xOffset="705"/>
+    <component base="period" xOffset="372"/>
+    <component base="period" xOffset="39"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/em-cy.glif b/src/Cantarell-Regular.ufo/glyphs/em-cy.glif
index 2f274dc7..928eeafd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/em-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/em-cy.glif
@@ -31,6 +31,10 @@
         <key>width</key>
         <integer>75</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/emacron.glif b/src/Cantarell-Regular.ufo/glyphs/emacron.glif
index fb643896..1a3440b8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/emacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/emacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacron" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0113"/>
   <outline>
     <component base="e"/>
-    <component base="macroncomb" xOffset="25"/>
+    <component base="macroncomb" xOffset="26"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/emacronacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/emacronacute.glif
index 1d6db003..ec350f39 100644
--- a/src/Cantarell-Regular.ufo/glyphs/emacronacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/emacronacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacronacute" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1E17"/>
   <outline>
     <component base="e"/>
-    <component base="macroncomb_acutecomb" xOffset="25"/>
+    <component base="macroncomb.loclVIET" xOffset="26"/>
+    <component base="acutecomb" xOffset="188" yOffset="133"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/emacrongrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/emacrongrave.glif
index f6079bd7..86af8a58 100644
--- a/src/Cantarell-Regular.ufo/glyphs/emacrongrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/emacrongrave.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacrongrave" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1E15"/>
   <outline>
     <component base="e"/>
-    <component base="macroncomb_gravecomb" xOffset="25"/>
+    <component base="macroncomb.loclVIET" xOffset="26"/>
+    <component base="gravecomb" xOffset="93" yOffset="133"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/emdash.glif b/src/Cantarell-Regular.ufo/glyphs/emdash.glif
index 440681aa..045b0ee3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/emdash.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/emdash.glif
@@ -1,13 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emdash" format="2">
-  <advance width="1166"/>
+  <advance width="1000"/>
   <unicode hex="2014"/>
+  <unicode hex="2015"/>
   <outline>
     <contour>
-      <point x="83" y="220" type="line"/>
-      <point x="1083" y="220" type="line"/>
-      <point x="1083" y="287" type="line"/>
-      <point x="83" y="287" type="line"/>
+      <point x="-10" y="220" type="line"/>
+      <point x="1010" y="220" type="line"/>
+      <point x="1010" y="287" type="line"/>
+      <point x="-10" y="287" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/emptyset.glif b/src/Cantarell-Regular.ufo/glyphs/emptyset.glif
index 0f66529d..e52f00a4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/emptyset.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/emptyset.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emptyset" format="2">
-  <advance width="724"/>
+  <advance width="719"/>
   <unicode hex="2205"/>
   <outline>
     <contour>
-      <point x="357" y="68" type="curve" smooth="yes"/>
-      <point x="527" y="68"/>
-      <point x="641" y="179"/>
-      <point x="641" y="345" type="curve" smooth="yes"/>
-      <point x="641" y="507"/>
-      <point x="531" y="615"/>
-      <point x="367" y="615" type="curve" smooth="yes"/>
-      <point x="197" y="615"/>
-      <point x="84" y="503"/>
-      <point x="84" y="335" type="curve" smooth="yes"/>
-      <point x="84" y="175"/>
-      <point x="193" y="68"/>
+      <point x="183" y="32" type="line"/>
+      <point x="588" y="630" type="line"/>
+      <point x="532" y="667" type="line"/>
+      <point x="127" y="69" type="line"/>
     </contour>
     <contour>
-      <point x="367" y="138" type="curve" smooth="yes"/>
-      <point x="245" y="138"/>
-      <point x="164" y="221"/>
-      <point x="164" y="345" type="curve" smooth="yes"/>
-      <point x="164" y="465"/>
-      <point x="241" y="545"/>
-      <point x="357" y="545" type="curve" smooth="yes"/>
-      <point x="479" y="545"/>
-      <point x="561" y="461"/>
-      <point x="561" y="335" type="curve" smooth="yes"/>
-      <point x="561" y="217"/>
-      <point x="483" y="138"/>
+      <point x="354" y="68" type="curve" smooth="yes"/>
+      <point x="524" y="68"/>
+      <point x="638" y="179"/>
+      <point x="638" y="345" type="curve" smooth="yes"/>
+      <point x="638" y="507"/>
+      <point x="528" y="615"/>
+      <point x="364" y="615" type="curve" smooth="yes"/>
+      <point x="194" y="615"/>
+      <point x="81" y="503"/>
+      <point x="81" y="335" type="curve" smooth="yes"/>
+      <point x="81" y="175"/>
+      <point x="190" y="68"/>
     </contour>
     <contour>
-      <point x="186" y="32" type="line"/>
-      <point x="591" y="630" type="line"/>
-      <point x="535" y="667" type="line"/>
-      <point x="130" y="69" type="line"/>
+      <point x="364" y="138" type="curve" smooth="yes"/>
+      <point x="242" y="138"/>
+      <point x="161" y="221"/>
+      <point x="161" y="345" type="curve" smooth="yes"/>
+      <point x="161" y="465"/>
+      <point x="238" y="545"/>
+      <point x="354" y="545" type="curve" smooth="yes"/>
+      <point x="476" y="545"/>
+      <point x="558" y="461"/>
+      <point x="558" y="335" type="curve" smooth="yes"/>
+      <point x="558" y="217"/>
+      <point x="480" y="138"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/emspace.glif b/src/Cantarell-Regular.ufo/glyphs/emspace.glif
index 33d6e61a..e6faaef2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/emspace.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/emspace.glif
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emspace" format="2">
   <advance width="1000"/>
+  <unicode hex="2001"/>
   <unicode hex="2003"/>
   <outline>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/en-cy.glif b/src/Cantarell-Regular.ufo/glyphs/en-cy.glif
index 15ec96a6..5ebec800 100644
--- a/src/Cantarell-Regular.ufo/glyphs/en-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/en-cy.glif
@@ -2,7 +2,7 @@
 <glyph name="en-cy" format="2">
   <advance width="574"/>
   <unicode hex="043D"/>
-  <anchor x="490" y="0" name="bottomright"/>
+  <anchor x="482" y="0" name="bottomright"/>
   <outline>
     <contour>
       <point x="411" y="0" type="line"/>
@@ -32,6 +32,10 @@
         <key>width</key>
         <integer>79</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/endash.glif b/src/Cantarell-Regular.ufo/glyphs/endash.glif
index 06e2983d..3d77f335 100644
--- a/src/Cantarell-Regular.ufo/glyphs/endash.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/endash.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="endash" format="2">
-  <advance width="666"/>
+  <advance width="500"/>
   <unicode hex="2013"/>
   <outline>
     <contour>
-      <point x="83" y="220" type="line"/>
-      <point x="583" y="220" type="line"/>
-      <point x="583" y="287" type="line"/>
-      <point x="83" y="287" type="line"/>
+      <point x="-10" y="220" type="line"/>
+      <point x="510" y="220" type="line"/>
+      <point x="510" y="287" type="line"/>
+      <point x="-10" y="287" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/endescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/endescender-cy.glif
index 0ee10d92..b2b1bd6c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/endescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/endescender-cy.glif
@@ -1,15 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="endescender-cy" format="2">
-  <advance width="591"/>
+  <advance width="585"/>
   <unicode hex="04A3"/>
   <outline>
     <component base="en-cy"/>
-    <component base="descender-cy" xOffset="383"/>
+    <component base="descender-cy" xOffset="375"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>tse-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Regular.ufo/glyphs/eng.glif b/src/Cantarell-Regular.ufo/glyphs/eng.glif
index a57fb234..b55276b4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/eng.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/eng.glif
@@ -3,13 +3,6 @@
   <advance width="567"/>
   <unicode hex="014B"/>
   <outline>
-    <contour>
-      <point x="83" y="0" type="line"/>
-      <point x="163" y="0" type="line"/>
-      <point x="163" y="426" type="line"/>
-      <point x="139" y="482" type="line"/>
-      <point x="83" y="482" type="line"/>
-    </contour>
     <contour>
       <point x="412" y="0" type="line"/>
       <point x="492" y="0" type="line"/>
@@ -40,6 +33,13 @@
       <point x="384" y="-155"/>
       <point x="342" y="-179" type="curve"/>
     </contour>
+    <contour>
+      <point x="83" y="0" type="line"/>
+      <point x="163" y="0" type="line"/>
+      <point x="163" y="426" type="line"/>
+      <point x="139" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/enghe-cy.glif b/src/Cantarell-Regular.ufo/glyphs/enghe-cy.glif
index 44e54096..e886c25a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/enghe-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/enghe-cy.glif
@@ -1,12 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="enghe-cy" format="2">
-  <advance width="688"/>
+  <advance width="699"/>
   <unicode hex="04A5"/>
   <outline>
     <contour>
       <point x="411" y="0" type="line"/>
       <point x="491" y="0" type="line"/>
-      <point x="491" y="482" type="line"/>
+      <point x="491" y="415" type="line"/>
+      <point x="678" y="415" type="line"/>
+      <point x="678" y="482" type="line"/>
       <point x="411" y="482" type="line"/>
     </contour>
     <contour>
@@ -21,11 +23,13 @@
       <point x="438" y="281" type="line"/>
       <point x="136" y="281" type="line"/>
     </contour>
-    <contour>
-      <point x="476" y="415" type="line"/>
-      <point x="678" y="415" type="line"/>
-      <point x="678" y="482" type="line"/>
-      <point x="476" y="482" type="line"/>
-    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/enspace.glif b/src/Cantarell-Regular.ufo/glyphs/enspace.glif
index 41767d40..f91bc29a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/enspace.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/enspace.glif
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="enspace" format="2">
   <advance width="500"/>
+  <unicode hex="2000"/>
   <unicode hex="2002"/>
   <outline>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/eogonek.glif b/src/Cantarell-Regular.ufo/glyphs/eogonek.glif
index 468e6981..e2434619 100644
--- a/src/Cantarell-Regular.ufo/glyphs/eogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/eogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eogonek" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0119"/>
   <outline>
     <component base="e"/>
-    <component base="ogonekcomb.tall" xOffset="-4" yOffset="-1"/>
+    <component base="ogonekcomb.tall" xOffset="-3" yOffset="-1"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/equal.glif b/src/Cantarell-Regular.ufo/glyphs/equal.glif
index 9574541c..67d852fe 100644
--- a/src/Cantarell-Regular.ufo/glyphs/equal.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/equal.glif
@@ -1,19 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="equal" format="2">
-  <advance width="715"/>
+  <advance width="580"/>
   <unicode hex="003D"/>
   <outline>
-    <contour>
-      <point x="125" y="406" type="line"/>
-      <point x="590" y="406" type="line"/>
-      <point x="590" y="475" type="line"/>
-      <point x="125" y="475" type="line"/>
-    </contour>
-    <contour>
-      <point x="125" y="166" type="line"/>
-      <point x="590" y="166" type="line"/>
-      <point x="590" y="235" type="line"/>
-      <point x="125" y="235" type="line"/>
-    </contour>
+    <component base="minus" yOffset="114"/>
+    <component base="minus" yOffset="-129"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minus</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/equivalence.glif 
b/src/Cantarell-Regular.ufo/glyphs/equivalence.glif
index 7d0ccc45..a99ef576 100644
--- a/src/Cantarell-Regular.ufo/glyphs/equivalence.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/equivalence.glif
@@ -1,25 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="equivalence" format="2">
-  <advance width="715"/>
+  <advance width="580"/>
   <unicode hex="2261"/>
   <outline>
     <contour>
-      <point x="125" y="476" type="line"/>
-      <point x="590" y="476" type="line"/>
-      <point x="590" y="545" type="line"/>
-      <point x="125" y="545" type="line"/>
+      <point x="55" y="466" type="line"/>
+      <point x="525" y="466" type="line"/>
+      <point x="525" y="535" type="line"/>
+      <point x="55" y="535" type="line"/>
     </contour>
     <contour>
-      <point x="125" y="132" type="line"/>
-      <point x="590" y="132" type="line"/>
-      <point x="590" y="201" type="line"/>
-      <point x="125" y="201" type="line"/>
+      <point x="55" y="122" type="line"/>
+      <point x="525" y="122" type="line"/>
+      <point x="525" y="191" type="line"/>
+      <point x="55" y="191" type="line"/>
     </contour>
     <contour>
-      <point x="125" y="304" type="line"/>
-      <point x="590" y="304" type="line"/>
-      <point x="590" y="373" type="line"/>
-      <point x="125" y="373" type="line"/>
+      <point x="55" y="294" type="line"/>
+      <point x="525" y="294" type="line"/>
+      <point x="525" y="363" type="line"/>
+      <point x="55" y="363" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minus</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ereversed-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/ereversed-cy.glif
index d72c741e..b97298f6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ereversed-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ereversed-cy.glif
@@ -1,42 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ereversed-cy" format="2">
-  <advance width="488"/>
+  <advance width="487"/>
   <unicode hex="044D"/>
-  <anchor x="243" y="482" name="top"/>
+  <anchor x="242" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="196" y="-7" type="curve" smooth="yes"/>
-      <point x="345" y="-7"/>
-      <point x="436" y="89"/>
-      <point x="436" y="247" type="curve" smooth="yes"/>
-      <point x="436" y="400"/>
-      <point x="351" y="492"/>
-      <point x="209" y="492" type="curve" smooth="yes"/>
-      <point x="160" y="492"/>
-      <point x="84" y="480"/>
-      <point x="42" y="460" type="curve"/>
-      <point x="60" y="401" type="line"/>
-      <point x="92" y="414"/>
-      <point x="156" y="422"/>
-      <point x="190" y="422" type="curve" smooth="yes"/>
-      <point x="296" y="422"/>
-      <point x="357" y="354"/>
-      <point x="357" y="235" type="curve" smooth="yes"/>
-      <point x="357" y="122"/>
-      <point x="302" y="63"/>
-      <point x="199" y="63" type="curve" smooth="yes"/>
-      <point x="162" y="63"/>
-      <point x="96" y="71"/>
-      <point x="60" y="84" type="curve"/>
-      <point x="38" y="23" type="line"/>
-      <point x="83" y="2"/>
-      <point x="151" y="-7"/>
+      <point x="195" y="-7" type="curve" smooth="yes"/>
+      <point x="344" y="-7"/>
+      <point x="435" y="89"/>
+      <point x="435" y="247" type="curve" smooth="yes"/>
+      <point x="435" y="400"/>
+      <point x="350" y="492"/>
+      <point x="208" y="492" type="curve" smooth="yes"/>
+      <point x="159" y="492"/>
+      <point x="83" y="480"/>
+      <point x="41" y="460" type="curve"/>
+      <point x="59" y="401" type="line"/>
+      <point x="91" y="414"/>
+      <point x="155" y="422"/>
+      <point x="189" y="422" type="curve" smooth="yes"/>
+      <point x="295" y="422"/>
+      <point x="356" y="354"/>
+      <point x="356" y="235" type="curve" smooth="yes"/>
+      <point x="356" y="122"/>
+      <point x="301" y="63"/>
+      <point x="198" y="63" type="curve" smooth="yes"/>
+      <point x="161" y="63"/>
+      <point x="95" y="71"/>
+      <point x="59" y="84" type="curve"/>
+      <point x="37" y="23" type="line"/>
+      <point x="82" y="2"/>
+      <point x="150" y="-7"/>
     </contour>
     <contour>
-      <point x="94" y="219" type="line"/>
-      <point x="378" y="219" type="line"/>
-      <point x="378" y="284" type="line"/>
-      <point x="94" y="284" type="line"/>
+      <point x="93" y="219" type="line"/>
+      <point x="377" y="219" type="line"/>
+      <point x="377" y="284" type="line"/>
+      <point x="93" y="284" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -48,6 +48,10 @@
         <key>width</key>
         <integer>74</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|es-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|es-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/es-cy.glif b/src/Cantarell-Regular.ufo/glyphs/es-cy.glif
index 74d6d5be..b29ac8fe 100644
--- a/src/Cantarell-Regular.ufo/glyphs/es-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/es-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="es-cy" format="2">
-  <advance width="466"/>
+  <advance width="467"/>
   <unicode hex="0441"/>
   <anchor x="266" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/esdescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/esdescender-cy.glif
index e9d390b3..f54f2ee8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/esdescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/esdescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="esdescender-cy" format="2">
-  <advance width="466"/>
+  <advance width="467"/>
   <unicode hex="04AB"/>
   <outline>
     <component base="es-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/estimated.glif b/src/Cantarell-Regular.ufo/glyphs/estimated.glif
index 3c4ac963..80566d58 100644
--- a/src/Cantarell-Regular.ufo/glyphs/estimated.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/estimated.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="estimated" format="2">
-  <advance width="853"/>
+  <advance width="821"/>
   <unicode hex="212E"/>
   <outline>
     <contour>
-      <point x="430" y="-10" type="curve" smooth="yes"/>
-      <point x="561" y="-10"/>
-      <point x="685" y="42"/>
-      <point x="757" y="119" type="curve"/>
-      <point x="691" y="119" type="line"/>
-      <point x="619" y="62"/>
-      <point x="527" y="36"/>
-      <point x="438" y="36" type="curve" smooth="yes"/>
-      <point x="316" y="36"/>
-      <point x="242" y="84"/>
-      <point x="195" y="145" type="curve"/>
-      <point x="195" y="315" type="line"/>
-      <point x="778" y="315" type="line"/>
-      <point x="778" y="545"/>
-      <point x="661" y="704"/>
-      <point x="433" y="704" type="curve" smooth="yes"/>
-      <point x="202" y="704"/>
-      <point x="84" y="541"/>
-      <point x="84" y="339" type="curve" smooth="yes"/>
-      <point x="84" y="123"/>
-      <point x="220" y="-10"/>
+      <point x="414" y="-10" type="curve" smooth="yes"/>
+      <point x="545" y="-10"/>
+      <point x="669" y="42"/>
+      <point x="741" y="119" type="curve"/>
+      <point x="675" y="119" type="line"/>
+      <point x="603" y="62"/>
+      <point x="511" y="36"/>
+      <point x="422" y="36" type="curve" smooth="yes"/>
+      <point x="300" y="36"/>
+      <point x="226" y="84"/>
+      <point x="179" y="145" type="curve"/>
+      <point x="179" y="315" type="line"/>
+      <point x="762" y="315" type="line"/>
+      <point x="762" y="545"/>
+      <point x="645" y="704"/>
+      <point x="417" y="704" type="curve" smooth="yes"/>
+      <point x="186" y="704"/>
+      <point x="68" y="541"/>
+      <point x="68" y="339" type="curve" smooth="yes"/>
+      <point x="68" y="123"/>
+      <point x="204" y="-10"/>
     </contour>
     <contour>
-      <point x="195" y="358" type="line"/>
-      <point x="195" y="535" type="line"/>
-      <point x="241" y="619"/>
-      <point x="316" y="662"/>
-      <point x="430" y="662" type="curve" smooth="yes"/>
-      <point x="544" y="662"/>
-      <point x="618" y="619"/>
-      <point x="664" y="535" type="curve"/>
-      <point x="664" y="358" type="line"/>
+      <point x="179" y="358" type="line"/>
+      <point x="179" y="535" type="line"/>
+      <point x="225" y="619"/>
+      <point x="300" y="662"/>
+      <point x="414" y="662" type="curve" smooth="yes"/>
+      <point x="528" y="662"/>
+      <point x="602" y="619"/>
+      <point x="648" y="535" type="curve"/>
+      <point x="648" y="358" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etilde.glif b/src/Cantarell-Regular.ufo/glyphs/etilde.glif
index 2be26c96..e4907bd3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etilde" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1EBD"/>
   <outline>
     <component base="e"/>
-    <component base="tildecomb" xOffset="38"/>
+    <component base="tildecomb" xOffset="39"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/euro.glif b/src/Cantarell-Regular.ufo/glyphs/euro.glif
index c20bf4da..e354cd5f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/euro.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/euro.glif
@@ -1,47 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="euro" format="2">
-  <advance width="786"/>
+  <advance width="580"/>
   <unicode hex="20AC"/>
   <outline>
     <contour>
-      <point x="84" y="404" type="line"/>
-      <point x="639" y="404" type="line"/>
-      <point x="639" y="464" type="line"/>
-      <point x="84" y="464" type="line"/>
+      <point x="382" y="-10" type="curve" smooth="yes"/>
+      <point x="442" y="-10"/>
+      <point x="505" y="5"/>
+      <point x="561" y="34" type="curve"/>
+      <point x="542" y="95" type="line"/>
+      <point x="500" y="75"/>
+      <point x="446" y="63"/>
+      <point x="402" y="63" type="curve" smooth="yes"/>
+      <point x="260" y="63"/>
+      <point x="168" y="183"/>
+      <point x="168" y="358" type="curve" smooth="yes"/>
+      <point x="168" y="527"/>
+      <point x="253" y="630"/>
+      <point x="393" y="630" type="curve" smooth="yes"/>
+      <point x="441" y="630"/>
+      <point x="497" y="618"/>
+      <point x="541" y="598" type="curve"/>
+      <point x="565" y="660" type="line"/>
+      <point x="519" y="687"/>
+      <point x="456" y="703"/>
+      <point x="397" y="703" type="curve" smooth="yes"/>
+      <point x="211" y="703"/>
+      <point x="83" y="557"/>
+      <point x="83" y="339" type="curve" smooth="yes"/>
+      <point x="83" y="131"/>
+      <point x="205" y="-10"/>
     </contour>
     <contour>
-      <point x="84" y="244" type="line"/>
-      <point x="616" y="244" type="line"/>
-      <point x="616" y="304" type="line"/>
-      <point x="84" y="304" type="line"/>
+      <point x="16" y="227" type="line"/>
+      <point x="486" y="227" type="line"/>
+      <point x="486" y="294" type="line"/>
+      <point x="16" y="294" type="line"/>
     </contour>
     <contour>
-      <point x="501" y="-10" type="curve" smooth="yes"/>
-      <point x="568" y="-10"/>
-      <point x="638" y="5"/>
-      <point x="704" y="34" type="curve"/>
-      <point x="685" y="95" type="line"/>
-      <point x="635" y="75"/>
-      <point x="573" y="63"/>
-      <point x="520" y="63" type="curve" smooth="yes"/>
-      <point x="354" y="63"/>
-      <point x="244" y="181"/>
-      <point x="244" y="358" type="curve" smooth="yes"/>
-      <point x="244" y="527"/>
-      <point x="345" y="630"/>
-      <point x="512" y="630" type="curve" smooth="yes"/>
-      <point x="568" y="630"/>
-      <point x="631" y="618"/>
-      <point x="684" y="598" type="curve"/>
-      <point x="708" y="660" type="line"/>
-      <point x="657" y="687"/>
-      <point x="585" y="703"/>
-      <point x="517" y="703" type="curve" smooth="yes"/>
-      <point x="302" y="703"/>
-      <point x="159" y="557"/>
-      <point x="159" y="339" type="curve" smooth="yes"/>
-      <point x="159" y="130"/>
-      <point x="296" y="-10"/>
+      <point x="16" y="404" type="line"/>
+      <point x="505" y="404" type="line"/>
+      <point x="505" y="471" type="line"/>
+      <point x="16" y="471" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/exclam.glif b/src/Cantarell-Regular.ufo/glyphs/exclam.glif
index 22ab7a87..d505ea6e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/exclam.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/exclam.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="exclam" format="2">
-  <advance width="245"/>
+  <advance width="262"/>
   <unicode hex="0021"/>
   <outline>
     <contour>
-      <point x="90" y="201" type="line"/>
-      <point x="154" y="201" type="line"/>
-      <point x="164" y="694" type="line"/>
-      <point x="80" y="694" type="line"/>
+      <point x="98" y="201" type="line"/>
+      <point x="162" y="201" type="line"/>
+      <point x="172" y="694" type="line"/>
+      <point x="88" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="123" y="-10" type="curve" smooth="yes"/>
-      <point x="161" y="-10"/>
-      <point x="187" y="17"/>
-      <point x="187" y="54" type="curve" smooth="yes"/>
-      <point x="187" y="91"/>
-      <point x="161" y="118"/>
-      <point x="123" y="118" type="curve" smooth="yes"/>
-      <point x="85" y="118"/>
-      <point x="59" y="91"/>
-      <point x="59" y="54" type="curve" smooth="yes"/>
-      <point x="59" y="17"/>
-      <point x="85" y="-10"/>
+      <point x="131" y="-10" type="curve" smooth="yes"/>
+      <point x="169" y="-10"/>
+      <point x="195" y="17"/>
+      <point x="195" y="54" type="curve" smooth="yes"/>
+      <point x="195" y="91"/>
+      <point x="169" y="118"/>
+      <point x="131" y="118" type="curve" smooth="yes"/>
+      <point x="93" y="118"/>
+      <point x="67" y="91"/>
+      <point x="67" y="54" type="curve" smooth="yes"/>
+      <point x="67" y="17"/>
+      <point x="93" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/exclamdown.glif 
b/src/Cantarell-Regular.ufo/glyphs/exclamdown.glif
index 1f81cb07..67b045d6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/exclamdown.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/exclamdown.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="exclamdown" format="2">
-  <advance width="246"/>
+  <advance width="262"/>
   <unicode hex="00A1"/>
   <outline>
-    <component base="exclam" yScale="-1" xOffset="1" yOffset="477"/>
+    <component base="exclam" yScale="-1" yOffset="477"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>exclam</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>exclam</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/f.glif b/src/Cantarell-Regular.ufo/glyphs/f.glif
index 364b5f45..556ba23f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/f.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/f.glif
@@ -2,9 +2,6 @@
 <glyph name="f" format="2">
   <advance width="340"/>
   <unicode hex="0066"/>
-  <note>
-f
-</note>
   <anchor x="139" y="0" name="bottom"/>
   <anchor x="266" y="739" name="top"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/fi.glif b/src/Cantarell-Regular.ufo/glyphs/fi.glif
index ba879a79..5b071e73 100644
--- a/src/Cantarell-Regular.ufo/glyphs/fi.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/fi.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fi" format="2">
-  <advance width="594"/>
+  <advance width="586"/>
   <unicode hex="FB01"/>
   <outline>
     <component base="f"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/figuredash.glif 
b/src/Cantarell-Regular.ufo/glyphs/figuredash.glif
index 59bdbb6b..19599e9a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/figuredash.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/figuredash.glif
@@ -1,13 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="figuredash" format="2">
-  <advance width="766"/>
+  <advance width="580"/>
   <unicode hex="2012"/>
   <outline>
     <contour>
-      <point x="83" y="220" type="line"/>
-      <point x="683" y="220" type="line"/>
-      <point x="683" y="287" type="line"/>
-      <point x="83" y="287" type="line"/>
+      <point x="40" y="220" type="line"/>
+      <point x="540" y="220" type="line"/>
+      <point x="540" y="287" type="line"/>
+      <point x="40" y="287" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/figurespace.glif 
b/src/Cantarell-Regular.ufo/glyphs/figurespace.glif
index 8513f6fc..ac02adab 100644
--- a/src/Cantarell-Regular.ufo/glyphs/figurespace.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/figurespace.glif
@@ -1,7 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="figurespace" format="2">
-  <advance width="600"/>
+  <advance width="580"/>
   <unicode hex="2007"/>
   <outline>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>zero.tf</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/firsttonechinese.glif 
b/src/Cantarell-Regular.ufo/glyphs/firsttonechinese.glif
index b73dfb90..bda7748b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/firsttonechinese.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/firsttonechinese.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="firsttonechinese" format="2">
-  <advance width="489"/>
+  <advance width="397"/>
   <unicode hex="02C9"/>
   <outline>
-    <component base="macroncomb"/>
+    <component base="macroncomb" xOffset="-46"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/fita-cy.glif b/src/Cantarell-Regular.ufo/glyphs/fita-cy.glif
index 77240095..102ddf21 100644
--- a/src/Cantarell-Regular.ufo/glyphs/fita-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/fita-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fita-cy" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="0473"/>
   <outline>
     <component base="obarred-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/five.dnom.glif b/src/Cantarell-Regular.ufo/glyphs/five.dnom.glif
index d6d408f6..7b89424f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/five.dnom.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/five.dnom.glif
@@ -1,42 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five.dnom" format="2">
-  <advance width="441"/>
-  <note>
-five
-</note>
+  <advance width="409"/>
   <outline>
     <contour>
-      <point x="198" y="-7" type="curve" smooth="yes"/>
-      <point x="318" y="-7"/>
-      <point x="395" y="54"/>
-      <point x="395" y="149" type="curve" smooth="yes"/>
-      <point x="395" y="237"/>
-      <point x="327" y="290"/>
-      <point x="210" y="290" type="curve" smooth="yes"/>
-      <point x="182" y="290"/>
-      <point x="156" y="287"/>
-      <point x="131" y="280" type="curve"/>
-      <point x="149" y="257" type="line"/>
-      <point x="157" y="407" type="line"/>
-      <point x="370" y="407" type="line"/>
-      <point x="370" y="472" type="line"/>
-      <point x="86" y="472" type="line"/>
-      <point x="74" y="219" type="line"/>
-      <point x="112" y="226"/>
-      <point x="152" y="230"/>
-      <point x="179" y="230" type="curve" smooth="yes"/>
-      <point x="268" y="230"/>
-      <point x="318" y="195"/>
-      <point x="318" y="141" type="curve" smooth="yes"/>
-      <point x="318" y="90"/>
-      <point x="274" y="58"/>
-      <point x="201" y="58" type="curve" smooth="yes"/>
-      <point x="159" y="58"/>
-      <point x="107" y="69"/>
-      <point x="69" y="87" type="curve"/>
-      <point x="48" y="28" type="line"/>
-      <point x="94" y="6"/>
-      <point x="143" y="-7"/>
+      <point x="186" y="-6" type="curve" smooth="yes"/>
+      <point x="290" y="-6"/>
+      <point x="359" y="47"/>
+      <point x="359" y="133" type="curve" smooth="yes"/>
+      <point x="359" y="211"/>
+      <point x="300" y="257"/>
+      <point x="199" y="257" type="curve" smooth="yes"/>
+      <point x="173" y="257"/>
+      <point x="153" y="254"/>
+      <point x="135" y="247" type="curve"/>
+      <point x="154" y="225" type="line"/>
+      <point x="160" y="352" type="line"/>
+      <point x="337" y="352" type="line"/>
+      <point x="337" y="416" type="line"/>
+      <point x="89" y="416" type="line"/>
+      <point x="78" y="189" type="line"/>
+      <point x="104" y="194"/>
+      <point x="138" y="198"/>
+      <point x="167" y="198" type="curve" smooth="yes"/>
+      <point x="238" y="198"/>
+      <point x="282" y="171"/>
+      <point x="282" y="125" type="curve" smooth="yes"/>
+      <point x="282" y="84"/>
+      <point x="246" y="59"/>
+      <point x="188" y="59" type="curve" smooth="yes"/>
+      <point x="152" y="59"/>
+      <point x="107" y="68"/>
+      <point x="76" y="84" type="curve"/>
+      <point x="55" y="25" type="line"/>
+      <point x="94" y="5"/>
+      <point x="140" y="-6"/>
     </contour>
   </outline>
   <lib>
@@ -44,11 +41,11 @@ five
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>68</integer>
+        <integer>60</integer>
         <key>weight</key>
         <integer>-7</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>63</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/five.glif b/src/Cantarell-Regular.ufo/glyphs/five.glif
index 24900aaf..88a0df9b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/five.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/five.glif
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five" format="2">
-  <advance width="565"/>
+  <advance width="548"/>
   <unicode hex="0035"/>
   <outline>
     <contour>
-      <point x="251" y="-10" type="curve" smooth="yes"/>
-      <point x="407" y="-10"/>
-      <point x="510" y="77"/>
-      <point x="510" y="215" type="curve" smooth="yes"/>
-      <point x="510" y="346"/>
-      <point x="417" y="427"/>
-      <point x="261" y="427" type="curve" smooth="yes"/>
-      <point x="226" y="427"/>
-      <point x="188" y="423"/>
-      <point x="150" y="415" type="curve"/>
-      <point x="169" y="389" type="line"/>
-      <point x="180" y="622" type="line"/>
-      <point x="477" y="622" type="line"/>
-      <point x="477" y="694" type="line"/>
-      <point x="105" y="694" type="line"/>
-      <point x="88" y="338" type="line"/>
-      <point x="139" y="349"/>
-      <point x="194" y="355"/>
-      <point x="233" y="355" type="curve" smooth="yes"/>
-      <point x="355" y="355"/>
-      <point x="425" y="298"/>
-      <point x="425" y="205" type="curve" smooth="yes"/>
-      <point x="425" y="116"/>
-      <point x="361" y="63"/>
-      <point x="259" y="63" type="curve" smooth="yes"/>
-      <point x="199" y="63"/>
-      <point x="134" y="79"/>
-      <point x="79" y="107" type="curve"/>
-      <point x="55" y="42" type="line"/>
-      <point x="118" y="9"/>
-      <point x="182" y="-10"/>
+      <point x="244" y="-10" type="curve" smooth="yes"/>
+      <point x="398" y="-10"/>
+      <point x="502" y="78"/>
+      <point x="502" y="214" type="curve" smooth="yes"/>
+      <point x="502" y="344"/>
+      <point x="408" y="426"/>
+      <point x="252" y="426" type="curve" smooth="yes"/>
+      <point x="214" y="426"/>
+      <point x="176" y="421"/>
+      <point x="141" y="413" type="curve"/>
+      <point x="161" y="387" type="line"/>
+      <point x="172" y="623" type="line"/>
+      <point x="469" y="623" type="line"/>
+      <point x="469" y="694" type="line"/>
+      <point x="97" y="694" type="line"/>
+      <point x="80" y="339" type="line"/>
+      <point x="125" y="349"/>
+      <point x="183" y="356"/>
+      <point x="227" y="356" type="curve" smooth="yes"/>
+      <point x="345" y="356"/>
+      <point x="417" y="301"/>
+      <point x="417" y="207" type="curve" smooth="yes"/>
+      <point x="417" y="117"/>
+      <point x="351" y="63"/>
+      <point x="249" y="63" type="curve" smooth="yes"/>
+      <point x="189" y="63"/>
+      <point x="123" y="80"/>
+      <point x="71" y="108" type="curve"/>
+      <point x="47" y="42" type="line"/>
+      <point x="109" y="9"/>
+      <point x="174" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/five.numr.glif b/src/Cantarell-Regular.ufo/glyphs/five.numr.glif
index a44a50b3..98de7554 100644
--- a/src/Cantarell-Regular.ufo/glyphs/five.numr.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/five.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five.numr" format="2">
-  <advance width="441"/>
+  <advance width="409"/>
   <outline>
     <component base="five.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/five.osf.glif b/src/Cantarell-Regular.ufo/glyphs/five.osf.glif
index d4dd720a..70afe483 100644
--- a/src/Cantarell-Regular.ufo/glyphs/five.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/five.osf.glif
@@ -1,39 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five.osf" format="2">
-  <advance width="556"/>
+  <advance width="545"/>
   <outline>
     <contour>
-      <point x="241" y="-110" type="curve" smooth="yes"/>
-      <point x="395" y="-110"/>
-      <point x="498" y="-23"/>
-      <point x="498" y="114" type="curve" smooth="yes"/>
-      <point x="498" y="245"/>
-      <point x="403" y="326"/>
-      <point x="249" y="326" type="curve" smooth="yes"/>
-      <point x="219" y="326"/>
-      <point x="179" y="322"/>
-      <point x="137" y="314" type="curve"/>
-      <point x="156" y="289" type="line"/>
-      <point x="167" y="526" type="line"/>
-      <point x="465" y="526" type="line"/>
-      <point x="465" y="594" type="line"/>
-      <point x="96" y="594" type="line"/>
-      <point x="79" y="240" type="line"/>
-      <point x="124" y="250"/>
-      <point x="181" y="257"/>
-      <point x="223" y="257" type="curve" smooth="yes"/>
-      <point x="345" y="257"/>
-      <point x="417" y="199"/>
-      <point x="417" y="105" type="curve" smooth="yes"/>
-      <point x="417" y="15"/>
-      <point x="352" y="-41"/>
-      <point x="249" y="-41" type="curve" smooth="yes"/>
-      <point x="185" y="-41"/>
-      <point x="118" y="-22"/>
-      <point x="69" y="4" type="curve"/>
-      <point x="46" y="-58" type="line"/>
-      <point x="108" y="-91"/>
-      <point x="174" y="-110"/>
+      <point x="242" y="-110" type="curve" smooth="yes"/>
+      <point x="396" y="-110"/>
+      <point x="499" y="-23"/>
+      <point x="499" y="114" type="curve" smooth="yes"/>
+      <point x="499" y="245"/>
+      <point x="404" y="326"/>
+      <point x="250" y="326" type="curve" smooth="yes"/>
+      <point x="220" y="326"/>
+      <point x="180" y="322"/>
+      <point x="138" y="314" type="curve"/>
+      <point x="157" y="289" type="line"/>
+      <point x="168" y="526" type="line"/>
+      <point x="466" y="526" type="line"/>
+      <point x="466" y="594" type="line"/>
+      <point x="97" y="594" type="line"/>
+      <point x="80" y="240" type="line"/>
+      <point x="125" y="250"/>
+      <point x="182" y="257"/>
+      <point x="224" y="257" type="curve" smooth="yes"/>
+      <point x="346" y="257"/>
+      <point x="418" y="199"/>
+      <point x="418" y="105" type="curve" smooth="yes"/>
+      <point x="418" y="15"/>
+      <point x="353" y="-41"/>
+      <point x="250" y="-41" type="curve" smooth="yes"/>
+      <point x="186" y="-41"/>
+      <point x="119" y="-22"/>
+      <point x="70" y="4" type="curve"/>
+      <point x="47" y="-58" type="line"/>
+      <point x="109" y="-91"/>
+      <point x="175" y="-110"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>five</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>five</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/five.tf.glif b/src/Cantarell-Regular.ufo/glyphs/five.tf.glif
index 7cf33f80..57b83691 100644
--- a/src/Cantarell-Regular.ufo/glyphs/five.tf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/five.tf.glif
@@ -2,39 +2,7 @@
 <glyph name="five.tf" format="2">
   <advance width="580"/>
   <outline>
-    <contour>
-      <point x="259" y="-10" type="curve" smooth="yes"/>
-      <point x="418" y="-10"/>
-      <point x="524" y="77"/>
-      <point x="524" y="215" type="curve" smooth="yes"/>
-      <point x="524" y="346"/>
-      <point x="428" y="427"/>
-      <point x="269" y="427" type="curve" smooth="yes"/>
-      <point x="233" y="427"/>
-      <point x="193" y="423"/>
-      <point x="153" y="415" type="curve"/>
-      <point x="173" y="389" type="line"/>
-      <point x="184" y="622" type="line"/>
-      <point x="490" y="622" type="line"/>
-      <point x="490" y="694" type="line"/>
-      <point x="109" y="694" type="line"/>
-      <point x="92" y="338" type="line"/>
-      <point x="144" y="349"/>
-      <point x="201" y="355"/>
-      <point x="241" y="355" type="curve" smooth="yes"/>
-      <point x="366" y="355"/>
-      <point x="439" y="298"/>
-      <point x="439" y="205" type="curve" smooth="yes"/>
-      <point x="439" y="116"/>
-      <point x="372" y="63"/>
-      <point x="267" y="63" type="curve" smooth="yes"/>
-      <point x="206" y="63"/>
-      <point x="138" y="79"/>
-      <point x="82" y="107" type="curve"/>
-      <point x="58" y="42" type="line"/>
-      <point x="122" y="9"/>
-      <point x="189" y="-10"/>
-    </contour>
+    <component base="five" xOffset="16"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/fiveeighths.glif 
b/src/Cantarell-Regular.ufo/glyphs/fiveeighths.glif
index 710ec9f6..fbe74400 100644
--- a/src/Cantarell-Regular.ufo/glyphs/fiveeighths.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/fiveeighths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fiveeighths" format="2">
-  <advance width="1206"/>
+  <advance width="1008"/>
   <unicode hex="215D"/>
   <outline>
     <component base="five.numr"/>
-    <component base="fraction" xOffset="441"/>
-    <component base="eight.dnom" xOffset="740"/>
+    <component base="fraction" xOffset="409"/>
+    <component base="eight.dnom" xOffset="579"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/fiveinferior.glif 
b/src/Cantarell-Regular.ufo/glyphs/fiveinferior.glif
index 1555404c..ea8ae202 100644
--- a/src/Cantarell-Regular.ufo/glyphs/fiveinferior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/fiveinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fiveinferior" format="2">
-  <advance width="441"/>
+  <advance width="409"/>
   <unicode hex="2085"/>
   <outline>
     <component base="five.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/fivesixths.glif 
b/src/Cantarell-Regular.ufo/glyphs/fivesixths.glif
index 2f6f63b7..fbade1d7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/fivesixths.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/fivesixths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fivesixths" format="2">
-  <advance width="1204"/>
+  <advance width="1005"/>
   <unicode hex="215A"/>
   <outline>
     <component base="five.numr"/>
-    <component base="fraction" xOffset="441"/>
-    <component base="six.dnom" xOffset="740"/>
+    <component base="fraction" xOffset="409"/>
+    <component base="six.dnom" xOffset="579"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/fivesuperior.glif 
b/src/Cantarell-Regular.ufo/glyphs/fivesuperior.glif
index 600d2e69..293374ff 100644
--- a/src/Cantarell-Regular.ufo/glyphs/fivesuperior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/fivesuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fivesuperior" format="2">
-  <advance width="441"/>
+  <advance width="409"/>
   <unicode hex="2075"/>
   <outline>
     <component base="five.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/fl.glif b/src/Cantarell-Regular.ufo/glyphs/fl.glif
index ca46ce81..b9c9d786 100644
--- a/src/Cantarell-Regular.ufo/glyphs/fl.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/fl.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fl" format="2">
-  <advance width="611"/>
+  <advance width="618"/>
   <unicode hex="FB02"/>
   <outline>
     <component base="f"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/florin.glif b/src/Cantarell-Regular.ufo/glyphs/florin.glif
index 0e5ca852..6603d9c8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/florin.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/florin.glif
@@ -1,43 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="florin" format="2">
-  <advance width="483"/>
+  <advance width="580"/>
   <unicode hex="0192"/>
   <outline>
     <contour>
-      <point x="148" y="0" type="line"/>
-      <point x="228" y="0" type="line"/>
-      <point x="228" y="587" type="line" smooth="yes"/>
-      <point x="228" y="649"/>
-      <point x="257" y="681"/>
-      <point x="312" y="681" type="curve" smooth="yes"/>
-      <point x="338" y="681"/>
-      <point x="371" y="674"/>
-      <point x="396" y="662" type="curve"/>
-      <point x="415" y="726" type="line"/>
-      <point x="384" y="741"/>
-      <point x="352" y="749"/>
-      <point x="318" y="749" type="curve" smooth="yes"/>
-      <point x="216" y="749"/>
-      <point x="148" y="680"/>
-      <point x="148" y="577" type="curve" smooth="yes"/>
+      <point x="197" y="0" type="line"/>
+      <point x="277" y="0" type="line"/>
+      <point x="277" y="587" type="line" smooth="yes"/>
+      <point x="277" y="649"/>
+      <point x="306" y="681"/>
+      <point x="361" y="681" type="curve" smooth="yes"/>
+      <point x="387" y="681"/>
+      <point x="420" y="674"/>
+      <point x="445" y="662" type="curve"/>
+      <point x="464" y="726" type="line"/>
+      <point x="433" y="741"/>
+      <point x="401" y="749"/>
+      <point x="367" y="749" type="curve" smooth="yes"/>
+      <point x="265" y="749"/>
+      <point x="197" y="680"/>
+      <point x="197" y="577" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="76" y="415" type="line"/>
-      <point x="378" y="415" type="line"/>
-      <point x="378" y="482" type="line"/>
-      <point x="76" y="482" type="line"/>
+      <point x="154" y="-227" type="line"/>
+      <point x="228" y="-194"/>
+      <point x="277" y="-113"/>
+      <point x="277" y="-23" type="curve" smooth="yes"/>
+      <point x="277" y="0" type="line"/>
+      <point x="197" y="0" type="line"/>
+      <point x="197" y="-35" type="line" smooth="yes"/>
+      <point x="197" y="-98"/>
+      <point x="169" y="-155"/>
+      <point x="127" y="-179" type="curve"/>
     </contour>
     <contour>
-      <point x="105" y="-227" type="line"/>
-      <point x="179" y="-194"/>
-      <point x="228" y="-113"/>
-      <point x="228" y="-23" type="curve" smooth="yes"/>
-      <point x="228" y="0" type="line"/>
-      <point x="148" y="0" type="line"/>
-      <point x="148" y="-35" type="line" smooth="yes"/>
-      <point x="148" y="-98"/>
-      <point x="120" y="-155"/>
-      <point x="78" y="-179" type="curve"/>
+      <point x="125" y="415" type="line"/>
+      <point x="427" y="415" type="line"/>
+      <point x="427" y="482" type="line"/>
+      <point x="125" y="482" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/four.dnom.glif b/src/Cantarell-Regular.ufo/glyphs/four.dnom.glif
index a9c5fdad..15d32030 100644
--- a/src/Cantarell-Regular.ufo/glyphs/four.dnom.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/four.dnom.glif
@@ -1,23 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four.dnom" format="2">
-  <advance width="467"/>
-  <note>
-four
-</note>
+  <advance width="420"/>
   <outline>
     <contour>
-      <point x="275" y="-5" type="line"/>
-      <point x="347" y="-5" type="line"/>
-      <point x="347" y="472" type="line"/>
-      <point x="277" y="472" type="line"/>
-      <point x="27" y="142" type="line"/>
-      <point x="27" y="103" type="line"/>
-      <point x="438" y="103" type="line"/>
-      <point x="438" y="166" type="line"/>
-      <point x="84" y="166" type="line"/>
-      <point x="93" y="145" type="line"/>
-      <point x="280" y="393" type="line"/>
-      <point x="275" y="402" type="line"/>
+      <point x="239" y="-4" type="line"/>
+      <point x="312" y="-4" type="line"/>
+      <point x="312" y="416" type="line"/>
+      <point x="242" y="416" type="line"/>
+      <point x="29" y="126" type="line"/>
+      <point x="29" y="87" type="line"/>
+      <point x="389" y="87" type="line"/>
+      <point x="389" y="150" type="line"/>
+      <point x="75" y="151" type="line"/>
+      <point x="93" y="128" type="line"/>
+      <point x="249" y="346" type="line"/>
+      <point x="240" y="363" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -25,11 +22,11 @@ four
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>68</integer>
+        <integer>60</integer>
         <key>weight</key>
         <integer>-7</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>63</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/four.glif b/src/Cantarell-Regular.ufo/glyphs/four.glif
index caf32a39..4c612ddc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/four.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/four.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four" format="2">
-  <advance width="619"/>
+  <advance width="597"/>
   <unicode hex="0034"/>
   <outline>
     <contour>
-      <point x="377" y="-10" type="line"/>
-      <point x="455" y="-10" type="line"/>
-      <point x="455" y="694" type="line"/>
-      <point x="379" y="694" type="line"/>
-      <point x="38" y="206" type="line"/>
-      <point x="38" y="164" type="line"/>
-      <point x="580" y="164" type="line"/>
-      <point x="580" y="232" type="line"/>
-      <point x="124" y="232" type="line"/>
-      <point x="119" y="214" type="line"/>
-      <point x="377" y="584" type="line"/>
-      <point x="377" y="567" type="line"/>
+      <point x="369" y="-10" type="line"/>
+      <point x="448" y="-10" type="line"/>
+      <point x="448" y="694" type="line"/>
+      <point x="371" y="694" type="line"/>
+      <point x="23" y="206" type="line"/>
+      <point x="23" y="164" type="line"/>
+      <point x="573" y="164" type="line"/>
+      <point x="573" y="232" type="line"/>
+      <point x="102" y="232" type="line"/>
+      <point x="109" y="215" type="line"/>
+      <point x="385" y="611" type="line"/>
+      <point x="370" y="613" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/four.numr.glif b/src/Cantarell-Regular.ufo/glyphs/four.numr.glif
index 3a45d101..c9fa29a6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/four.numr.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/four.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four.numr" format="2">
-  <advance width="467"/>
+  <advance width="420"/>
   <outline>
     <component base="four.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/four.osf.glif b/src/Cantarell-Regular.ufo/glyphs/four.osf.glif
index 9099bc70..0d99c8d7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/four.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/four.osf.glif
@@ -1,20 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four.osf" format="2">
-  <advance width="621"/>
+  <advance width="587"/>
   <outline>
     <contour>
-      <point x="379" y="-110" type="line"/>
-      <point x="455" y="-110" type="line"/>
-      <point x="455" y="594" type="line"/>
-      <point x="381" y="594" type="line"/>
-      <point x="40" y="106" type="line"/>
-      <point x="40" y="64" type="line"/>
-      <point x="580" y="64" type="line"/>
-      <point x="580" y="132" type="line"/>
-      <point x="124" y="132" type="line"/>
-      <point x="119" y="114" type="line"/>
-      <point x="379" y="486" type="line"/>
-      <point x="379" y="471" type="line"/>
+      <point x="362" y="-110" type="line"/>
+      <point x="438" y="-110" type="line"/>
+      <point x="438" y="594" type="line"/>
+      <point x="364" y="594" type="line"/>
+      <point x="23" y="106" type="line"/>
+      <point x="23" y="64" type="line"/>
+      <point x="563" y="64" type="line"/>
+      <point x="563" y="132" type="line"/>
+      <point x="107" y="132" type="line"/>
+      <point x="102" y="114" type="line"/>
+      <point x="362" y="486" type="line"/>
+      <point x="362" y="471" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>four</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>four</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/four.tf.glif b/src/Cantarell-Regular.ufo/glyphs/four.tf.glif
index d5428851..02ea539c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/four.tf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/four.tf.glif
@@ -3,18 +3,18 @@
   <advance width="580"/>
   <outline>
     <contour>
-      <point x="356" y="-10" type="line"/>
-      <point x="433" y="-10" type="line"/>
-      <point x="433" y="694" type="line"/>
-      <point x="358" y="694" type="line"/>
-      <point x="24" y="206" type="line"/>
-      <point x="24" y="164" type="line"/>
-      <point x="556" y="164" type="line"/>
-      <point x="556" y="232" type="line"/>
-      <point x="108" y="232" type="line"/>
-      <point x="104" y="214" type="line"/>
-      <point x="356" y="584" type="line"/>
-      <point x="356" y="567" type="line"/>
+      <point x="355" y="-10" type="line"/>
+      <point x="432" y="-10" type="line"/>
+      <point x="432" y="694" type="line"/>
+      <point x="357" y="694" type="line"/>
+      <point x="23" y="206" type="line"/>
+      <point x="23" y="164" type="line"/>
+      <point x="555" y="164" type="line"/>
+      <point x="555" y="232" type="line"/>
+      <point x="107" y="232" type="line"/>
+      <point x="103" y="214" type="line"/>
+      <point x="355" y="584" type="line"/>
+      <point x="355" y="567" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/fourfifths.glif 
b/src/Cantarell-Regular.ufo/glyphs/fourfifths.glif
index ef3a3180..d1b2a798 100644
--- a/src/Cantarell-Regular.ufo/glyphs/fourfifths.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/fourfifths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fourfifths" format="2">
-  <advance width="1207"/>
+  <advance width="999"/>
   <unicode hex="2158"/>
   <outline>
     <component base="four.numr"/>
-    <component base="fraction" xOffset="467"/>
-    <component base="five.dnom" xOffset="766"/>
+    <component base="fraction" xOffset="420"/>
+    <component base="five.dnom" xOffset="590"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/fourinferior.glif 
b/src/Cantarell-Regular.ufo/glyphs/fourinferior.glif
index 0aa90f3b..8e634737 100644
--- a/src/Cantarell-Regular.ufo/glyphs/fourinferior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/fourinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fourinferior" format="2">
-  <advance width="467"/>
+  <advance width="420"/>
   <unicode hex="2084"/>
   <outline>
     <component base="four.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/foursuperior.glif 
b/src/Cantarell-Regular.ufo/glyphs/foursuperior.glif
index 19627349..25992b92 100644
--- a/src/Cantarell-Regular.ufo/glyphs/foursuperior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/foursuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="foursuperior" format="2">
-  <advance width="467"/>
+  <advance width="420"/>
   <unicode hex="2074"/>
   <outline>
     <component base="four.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/fourthtonechinese.glif 
b/src/Cantarell-Regular.ufo/glyphs/fourthtonechinese.glif
index c6bda958..f7823401 100644
--- a/src/Cantarell-Regular.ufo/glyphs/fourthtonechinese.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/fourthtonechinese.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fourthtonechinese" format="2">
-  <advance width="260"/>
+  <advance width="159"/>
   <unicode hex="02CB"/>
   <outline>
-    <component base="gravecomb"/>
+    <component base="gravecomb" xOffset="-42"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/fraction.glif b/src/Cantarell-Regular.ufo/glyphs/fraction.glif
index 61eadcc8..69a870bd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/fraction.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/fraction.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fraction" format="2">
-  <advance width="299"/>
+  <advance width="170"/>
   <unicode hex="2044"/>
   <outline>
     <contour>
-      <point x="-30" y="0" type="line"/>
-      <point x="43" y="0" type="line"/>
-      <point x="345" y="694" type="line"/>
-      <point x="266" y="694" type="line"/>
+      <point x="-120" y="0" type="line"/>
+      <point x="-52" y="0" type="line"/>
+      <point x="300" y="694" type="line"/>
+      <point x="227" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/franc.glif b/src/Cantarell-Regular.ufo/glyphs/franc.glif
index c7e2fd05..461ba3fb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/franc.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/franc.glif
@@ -1,18 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="franc" format="2">
-  <advance width="666"/>
+  <advance width="580"/>
   <unicode hex="20A3"/>
   <outline>
-    <component base="F" xOffset="49"/>
-    <component base="strokeshortcomb.case" xOffset="-1" yOffset="-131"/>
+    <contour>
+      <point x="131" y="0" type="line"/>
+      <point x="214" y="0" type="line"/>
+      <point x="214" y="322" type="line"/>
+      <point x="492" y="322" type="line"/>
+      <point x="492" y="394" type="line"/>
+      <point x="214" y="394" type="line"/>
+      <point x="214" y="622" type="line"/>
+      <point x="518" y="622" type="line"/>
+      <point x="518" y="694" type="line"/>
+      <point x="131" y="694" type="line"/>
+    </contour>
+    <contour>
+      <point x="53" y="147" type="line"/>
+      <point x="348" y="147" type="line"/>
+      <point x="348" y="212" type="line"/>
+      <point x="53" y="212" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>0</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/g.glif b/src/Cantarell-Regular.ufo/glyphs/g.glif
index 78afd46c..5d230de1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/g.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/g.glif
@@ -2,9 +2,6 @@
 <glyph name="g" format="2">
   <advance width="570"/>
   <unicode hex="0067"/>
-  <note>
-g
-</note>
   <anchor x="287" y="0" name="bottom"/>
   <anchor x="277" y="482" name="top"/>
   <outline>
@@ -56,4 +53,12 @@ g
       <point x="138" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ge-cy.glif b/src/Cantarell-Regular.ufo/glyphs/ge-cy.glif
index ed366d8b..ec599ee5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ge-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ge-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ge-cy" format="2">
-  <advance width="430"/>
+  <advance width="441"/>
   <unicode hex="0433"/>
   <anchor x="165" y="0" name="bottomright"/>
   <anchor x="223" y="482" name="top"/>
@@ -25,6 +25,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/gedescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/gedescender-cy.glif
index d3db006d..30b5e112 100644
--- a/src/Cantarell-Regular.ufo/glyphs/gedescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/gedescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gedescender-cy" format="2">
-  <advance width="430"/>
+  <advance width="441"/>
   <unicode hex="04F7"/>
   <outline>
     <component base="ge-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/germandbls.glif 
b/src/Cantarell-Regular.ufo/glyphs/germandbls.glif
index 069bb652..de6d4876 100644
--- a/src/Cantarell-Regular.ufo/glyphs/germandbls.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/germandbls.glif
@@ -46,4 +46,10 @@
       <point x="318" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ghemiddlehook-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/ghemiddlehook-cy.glif
index 7ac32887..16b55879 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ghemiddlehook-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ghemiddlehook-cy.glif
@@ -1,17 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ghemiddlehook-cy" format="2">
-  <advance width="549"/>
+  <advance width="542"/>
   <unicode hex="0495"/>
   <outline>
     <contour>
-      <point x="83" y="0" type="line"/>
-      <point x="165" y="0" type="line"/>
-      <point x="165" y="415" type="line"/>
-      <point x="414" y="415" type="line"/>
-      <point x="414" y="482" type="line"/>
-      <point x="83" y="482" type="line"/>
-    </contour>
-    <contour>
+      <point x="249" y="-228" type="line"/>
+      <point x="416" y="-197"/>
+      <point x="511" y="-93"/>
+      <point x="511" y="61" type="curve" smooth="yes"/>
+      <point x="511" y="203"/>
+      <point x="431" y="294"/>
+      <point x="308" y="294" type="curve" smooth="yes"/>
+      <point x="233" y="294"/>
+      <point x="162" y="261"/>
       <point x="117" y="205" type="curve"/>
       <point x="133" y="155" type="line"/>
       <point x="166" y="196"/>
@@ -23,15 +24,14 @@
       <point x="430" y="-75"/>
       <point x="359" y="-158"/>
       <point x="238" y="-178" type="curve"/>
-      <point x="249" y="-228" type="line"/>
-      <point x="416" y="-197"/>
-      <point x="511" y="-93"/>
-      <point x="511" y="61" type="curve" smooth="yes"/>
-      <point x="511" y="203"/>
-      <point x="431" y="294"/>
-      <point x="308" y="294" type="curve" smooth="yes"/>
-      <point x="233" y="294"/>
-      <point x="162" y="261"/>
+    </contour>
+    <contour>
+      <point x="83" y="0" type="line"/>
+      <point x="165" y="0" type="line"/>
+      <point x="165" y="415" type="line"/>
+      <point x="414" y="415" type="line"/>
+      <point x="414" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -43,6 +43,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ghestroke-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/ghestroke-cy.glif
index 1c0dd94c..06fa0b89 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ghestroke-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ghestroke-cy.glif
@@ -1,21 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ghestroke-cy" format="2">
-  <advance width="460"/>
+  <advance width="471"/>
   <unicode hex="0493"/>
   <outline>
     <contour>
-      <point x="111" y="0" type="line"/>
-      <point x="190" y="0" type="line"/>
-      <point x="190" y="414" type="line"/>
-      <point x="448" y="414" type="line"/>
-      <point x="448" y="482" type="line"/>
-      <point x="111" y="482" type="line"/>
+      <point x="113" y="0" type="line"/>
+      <point x="192" y="0" type="line"/>
+      <point x="192" y="414" type="line"/>
+      <point x="450" y="414" type="line"/>
+      <point x="450" y="482" type="line"/>
+      <point x="113" y="482" type="line"/>
     </contour>
     <contour>
-      <point x="25" y="219" type="line"/>
-      <point x="365" y="219" type="line"/>
-      <point x="365" y="286" type="line"/>
-      <point x="25" y="286" type="line"/>
+      <point x="27" y="219" type="line"/>
+      <point x="367" y="219" type="line"/>
+      <point x="367" y="286" type="line"/>
+      <point x="27" y="286" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/gheupturn-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/gheupturn-cy.glif
index b9b91111..96bdffed 100644
--- a/src/Cantarell-Regular.ufo/glyphs/gheupturn-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/gheupturn-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gheupturn-cy" format="2">
-  <advance width="440"/>
+  <advance width="451"/>
   <unicode hex="0491"/>
   <outline>
     <contour>
@@ -14,4 +14,12 @@
       <point x="83" y="482" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>ge-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/gje-cy.glif b/src/Cantarell-Regular.ufo/glyphs/gje-cy.glif
index a10fbfd2..cd378989 100644
--- a/src/Cantarell-Regular.ufo/glyphs/gje-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/gje-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gje-cy" format="2">
-  <advance width="430"/>
+  <advance width="441"/>
   <unicode hex="0453"/>
   <outline>
     <component base="ge-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/grave.glif b/src/Cantarell-Regular.ufo/glyphs/grave.glif
index 47f01017..b0e65635 100644
--- a/src/Cantarell-Regular.ufo/glyphs/grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/grave.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="grave" format="2">
-  <advance width="260"/>
+  <advance width="500"/>
   <unicode hex="0060"/>
   <outline>
-    <component base="gravecomb"/>
+    <component base="gravecomb" xOffset="130"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/greater.glif b/src/Cantarell-Regular.ufo/glyphs/greater.glif
index 1b8f5972..6b995968 100644
--- a/src/Cantarell-Regular.ufo/glyphs/greater.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/greater.glif
@@ -1,17 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="greater" format="2">
-  <advance width="598"/>
+  <advance width="580"/>
   <unicode hex="003E"/>
   <outline>
     <contour>
-      <point x="83" y="85" type="line"/>
-      <point x="529" y="306" type="line"/>
-      <point x="529" y="370" type="line"/>
-      <point x="83" y="599" type="line"/>
-      <point x="83" y="516" type="line"/>
-      <point x="473" y="322" type="line"/>
-      <point x="473" y="350" type="line"/>
-      <point x="83" y="163" type="line"/>
+      <point x="88" y="34" type="line"/>
+      <point x="492" y="274" type="line"/>
+      <point x="492" y="342" type="line"/>
+      <point x="88" y="590" type="line"/>
+      <point x="88" y="499" type="line"/>
+      <point x="427" y="297" type="line"/>
+      <point x="427" y="320" type="line"/>
+      <point x="88" y="118" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/greaterequal.glif 
b/src/Cantarell-Regular.ufo/glyphs/greaterequal.glif
index c5d4bdc7..b54f85a0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/greaterequal.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/greaterequal.glif
@@ -1,23 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="greaterequal" format="2">
-  <advance width="645"/>
+  <advance width="580"/>
   <unicode hex="2265"/>
   <outline>
     <contour>
-      <point x="94" y="168" type="line"/>
-      <point x="565" y="349" type="line"/>
-      <point x="565" y="408" type="line"/>
-      <point x="94" y="596" type="line"/>
-      <point x="94" y="523" type="line"/>
-      <point x="504" y="370" type="line"/>
-      <point x="503" y="392" type="line"/>
-      <point x="94" y="234" type="line"/>
+      <point x="63" y="168" type="line"/>
+      <point x="517" y="349" type="line"/>
+      <point x="517" y="411" type="line"/>
+      <point x="63" y="600" type="line"/>
+      <point x="63" y="521" type="line"/>
+      <point x="450" y="370" type="line"/>
+      <point x="449" y="396" type="line"/>
+      <point x="63" y="240" type="line"/>
     </contour>
     <contour>
-      <point x="100" y="31" type="line"/>
-      <point x="565" y="31" type="line"/>
-      <point x="565" y="96" type="line"/>
-      <point x="100" y="96" type="line"/>
+      <point x="68" y="32" type="line"/>
+      <point x="517" y="32" type="line"/>
+      <point x="517" y="100" type="line"/>
+      <point x="68" y="100" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/guarani.glif b/src/Cantarell-Regular.ufo/glyphs/guarani.glif
index cc89016e..ad2ecdb2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/guarani.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/guarani.glif
@@ -1,20 +1,58 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guarani" format="2">
-  <advance width="780"/>
+  <advance width="580"/>
   <unicode hex="20B2"/>
   <outline>
-    <component base="G" xOffset="19"/>
-    <component base="_currencyvstem" xOffset="15" yOffset="-800"/>
-    <component base="_currencyvstem" xOffset="3"/>
+    <contour>
+      <point x="326" y="-9" type="curve" smooth="yes"/>
+      <point x="410" y="-9"/>
+      <point x="486" y="19"/>
+      <point x="547" y="74" type="curve"/>
+      <point x="547" y="368" type="line"/>
+      <point x="302" y="368" type="line"/>
+      <point x="302" y="296" type="line"/>
+      <point x="465" y="296" type="line"/>
+      <point x="465" y="71" type="line"/>
+      <point x="483" y="112" type="line"/>
+      <point x="440" y="81"/>
+      <point x="389" y="64"/>
+      <point x="338" y="64" type="curve" smooth="yes"/>
+      <point x="201" y="64"/>
+      <point x="111" y="180"/>
+      <point x="111" y="357" type="curve" smooth="yes"/>
+      <point x="111" y="530"/>
+      <point x="194" y="630"/>
+      <point x="334" y="630" type="curve" smooth="yes"/>
+      <point x="386" y="630"/>
+      <point x="450" y="616"/>
+      <point x="501" y="593" type="curve"/>
+      <point x="524" y="657" type="line"/>
+      <point x="472" y="687"/>
+      <point x="407" y="703"/>
+      <point x="343" y="703" type="curve" smooth="yes"/>
+      <point x="153" y="703"/>
+      <point x="26" y="559"/>
+      <point x="26" y="342" type="curve" smooth="yes"/>
+      <point x="26" y="130"/>
+      <point x="147" y="-9"/>
+    </contour>
+    <contour>
+      <point x="299" y="-120" type="line"/>
+      <point x="371" y="-120" type="line"/>
+      <point x="371" y="28" type="line"/>
+      <point x="299" y="28" type="line"/>
+    </contour>
+    <contour>
+      <point x="289" y="658" type="line"/>
+      <point x="360" y="658" type="line"/>
+      <point x="360" y="818" type="line"/>
+      <point x="289" y="818" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>-1</integer>
-        <integer>-1</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/guillemetleft.glif 
b/src/Cantarell-Regular.ufo/glyphs/guillemetleft.glif
index caac69e9..a4cc8845 100644
--- a/src/Cantarell-Regular.ufo/glyphs/guillemetleft.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/guillemetleft.glif
@@ -1,25 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guillemetleft" format="2">
-  <advance width="530"/>
+  <advance width="545"/>
   <unicode hex="00AB"/>
   <outline>
     <contour>
-      <point x="185" y="30" type="line"/>
-      <point x="275" y="30" type="line"/>
-      <point x="119" y="268" type="line"/>
-      <point x="119" y="221" type="line"/>
-      <point x="270" y="452" type="line"/>
-      <point x="189" y="452" type="line"/>
-      <point x="45" y="242" type="line"/>
+      <point x="193" y="30" type="line"/>
+      <point x="288" y="30" type="line"/>
+      <point x="123" y="268" type="line"/>
+      <point x="123" y="221" type="line"/>
+      <point x="282" y="452" type="line"/>
+      <point x="197" y="452" type="line"/>
+      <point x="44" y="242" type="line"/>
     </contour>
     <contour>
-      <point x="397" y="30" type="line"/>
-      <point x="487" y="30" type="line"/>
-      <point x="331" y="268" type="line"/>
-      <point x="331" y="221" type="line"/>
-      <point x="482" y="452" type="line"/>
-      <point x="401" y="452" type="line"/>
-      <point x="257" y="242" type="line"/>
+      <point x="409" y="30" type="line"/>
+      <point x="503" y="30" type="line"/>
+      <point x="337" y="268" type="line"/>
+      <point x="337" y="221" type="line"/>
+      <point x="498" y="452" type="line"/>
+      <point x="413" y="452" type="line"/>
+      <point x="260" y="242" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/guillemetright.glif 
b/src/Cantarell-Regular.ufo/glyphs/guillemetright.glif
index 78a00613..fea81119 100644
--- a/src/Cantarell-Regular.ufo/glyphs/guillemetright.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/guillemetright.glif
@@ -1,25 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guillemetright" format="2">
-  <advance width="520"/>
+  <advance width="545"/>
   <unicode hex="00BB"/>
   <outline>
     <contour>
-      <point x="253" y="30" type="line"/>
-      <point x="334" y="30" type="line"/>
-      <point x="475" y="241" type="line"/>
-      <point x="333" y="452" type="line"/>
-      <point x="245" y="452" type="line"/>
-      <point x="403" y="215" type="line"/>
-      <point x="403" y="262" type="line"/>
+      <point x="265" y="30" type="line"/>
+      <point x="350" y="30" type="line"/>
+      <point x="501" y="241" type="line"/>
+      <point x="349" y="452" type="line"/>
+      <point x="257" y="452" type="line"/>
+      <point x="425" y="215" type="line"/>
+      <point x="425" y="262" type="line"/>
     </contour>
     <contour>
-      <point x="51" y="30" type="line"/>
-      <point x="132" y="30" type="line"/>
-      <point x="273" y="241" type="line"/>
-      <point x="131" y="452" type="line"/>
-      <point x="43" y="452" type="line"/>
-      <point x="201" y="215" type="line"/>
-      <point x="201" y="262" type="line"/>
+      <point x="50" y="30" type="line"/>
+      <point x="135" y="30" type="line"/>
+      <point x="287" y="241" type="line"/>
+      <point x="135" y="452" type="line"/>
+      <point x="42" y="452" type="line"/>
+      <point x="210" y="215" type="line"/>
+      <point x="210" y="262" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|guillemetleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>guillemetleft</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/guilsinglleft.glif 
b/src/Cantarell-Regular.ufo/glyphs/guilsinglleft.glif
index 5cd1006f..ed0d0e05 100644
--- a/src/Cantarell-Regular.ufo/glyphs/guilsinglleft.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/guilsinglleft.glif
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guilsinglleft" format="2">
-  <advance width="318"/>
+  <advance width="339"/>
   <unicode hex="2039"/>
   <outline>
     <contour>
-      <point x="185" y="30" type="line"/>
-      <point x="275" y="30" type="line"/>
-      <point x="119" y="268" type="line"/>
-      <point x="119" y="221" type="line"/>
-      <point x="270" y="452" type="line"/>
-      <point x="189" y="452" type="line"/>
-      <point x="45" y="242" type="line"/>
+      <point x="202" y="30" type="line"/>
+      <point x="298" y="30" type="line"/>
+      <point x="122" y="268" type="line"/>
+      <point x="122" y="221" type="line"/>
+      <point x="293" y="452" type="line"/>
+      <point x="206" y="452" type="line"/>
+      <point x="42" y="242" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/guilsinglright.glif 
b/src/Cantarell-Regular.ufo/glyphs/guilsinglright.glif
index c2119003..5ad825f5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/guilsinglright.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/guilsinglright.glif
@@ -1,16 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guilsinglright" format="2">
-  <advance width="318"/>
+  <advance width="339"/>
   <unicode hex="203A"/>
   <outline>
     <contour>
-      <point x="51" y="30" type="line"/>
-      <point x="132" y="30" type="line"/>
-      <point x="273" y="241" type="line"/>
-      <point x="131" y="452" type="line"/>
-      <point x="43" y="452" type="line"/>
-      <point x="201" y="215" type="line"/>
-      <point x="201" y="262" type="line"/>
+      <point x="49" y="30" type="line"/>
+      <point x="136" y="30" type="line"/>
+      <point x="297" y="241" type="line"/>
+      <point x="135" y="452" type="line"/>
+      <point x="41" y="452" type="line"/>
+      <point x="219" y="215" type="line"/>
+      <point x="219" y="262" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|guilsinglleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>guilsinglleft</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/h.glif b/src/Cantarell-Regular.ufo/glyphs/h.glif
index 9b3e72ce..d73b31d6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/h.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/h.glif
@@ -2,19 +2,10 @@
 <glyph name="h" format="2">
   <advance width="567"/>
   <unicode hex="0068"/>
-  <note>
-h
-</note>
   <anchor x="283" y="0" name="bottom"/>
   <anchor x="161" y="593" name="center"/>
   <anchor x="289" y="739" name="top"/>
   <outline>
-    <contour>
-      <point x="83" y="0" type="line"/>
-      <point x="163" y="0" type="line"/>
-      <point x="163" y="739" type="line"/>
-      <point x="83" y="739" type="line"/>
-    </contour>
     <contour>
       <point x="412" y="0" type="line"/>
       <point x="492" y="0" type="line"/>
@@ -33,5 +24,19 @@ h
       <point x="412" y="378"/>
       <point x="412" y="300" type="curve" smooth="yes"/>
     </contour>
+    <contour>
+      <point x="83" y="0" type="line"/>
+      <point x="163" y="0" type="line"/>
+      <point x="163" y="739" type="line"/>
+      <point x="83" y="739" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ha-cy.glif b/src/Cantarell-Regular.ufo/glyphs/ha-cy.glif
index 62735cd5..de8d8d59 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ha-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ha-cy.glif
@@ -2,7 +2,7 @@
 <glyph name="ha-cy" format="2">
   <advance width="469"/>
   <unicode hex="0445"/>
-  <anchor x="396" y="0" name="bottomright"/>
+  <anchor x="394" y="0" name="bottomright"/>
   <outline>
     <component base="x"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/hadescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/hadescender-cy.glif
index 35b919f5..0bbc384f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/hadescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/hadescender-cy.glif
@@ -1,15 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hadescender-cy" format="2">
-  <advance width="503"/>
+  <advance width="485"/>
   <unicode hex="04B3"/>
   <outline>
     <component base="ha-cy"/>
-    <component base="descender-cy" xOffset="289"/>
+    <component base="descender-cy" xOffset="287"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>ha-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>kadescender-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Regular.ufo/glyphs/hardsign-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/hardsign-cy.glif
index f5b20847..57f00322 100644
--- a/src/Cantarell-Regular.ufo/glyphs/hardsign-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/hardsign-cy.glif
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hardsign-cy" format="2">
-  <advance width="579"/>
+  <advance width="574"/>
   <unicode hex="044A"/>
   <outline>
     <contour>
-      <point x="159" y="0" type="line"/>
-      <point x="340" y="0" type="line" smooth="yes"/>
-      <point x="465" y="0"/>
-      <point x="540" y="62"/>
-      <point x="540" y="164" type="curve" smooth="yes"/>
-      <point x="540" y="259"/>
-      <point x="473" y="321"/>
-      <point x="370" y="321" type="curve" smooth="yes"/>
-      <point x="210" y="321" type="line"/>
-      <point x="210" y="255" type="line"/>
-      <point x="357" y="255" type="line" smooth="yes"/>
-      <point x="418" y="255"/>
-      <point x="460" y="215"/>
-      <point x="460" y="156" type="curve" smooth="yes"/>
-      <point x="460" y="99"/>
-      <point x="420" y="67"/>
-      <point x="351" y="67" type="curve" smooth="yes"/>
-      <point x="239" y="67" type="line"/>
-      <point x="239" y="482" type="line"/>
-      <point x="159" y="482" type="line"/>
+      <point x="157" y="0" type="line"/>
+      <point x="338" y="0" type="line" smooth="yes"/>
+      <point x="463" y="0"/>
+      <point x="538" y="62"/>
+      <point x="538" y="164" type="curve" smooth="yes"/>
+      <point x="538" y="259"/>
+      <point x="471" y="321"/>
+      <point x="368" y="321" type="curve" smooth="yes"/>
+      <point x="208" y="321" type="line"/>
+      <point x="208" y="255" type="line"/>
+      <point x="355" y="255" type="line" smooth="yes"/>
+      <point x="416" y="255"/>
+      <point x="458" y="215"/>
+      <point x="458" y="156" type="curve" smooth="yes"/>
+      <point x="458" y="99"/>
+      <point x="418" y="67"/>
+      <point x="349" y="67" type="curve" smooth="yes"/>
+      <point x="237" y="67" type="line"/>
+      <point x="237" y="482" type="line"/>
+      <point x="157" y="482" type="line"/>
     </contour>
     <contour>
-      <point x="23" y="415" type="line"/>
-      <point x="204" y="415" type="line"/>
-      <point x="204" y="482" type="line"/>
-      <point x="23" y="482" type="line"/>
+      <point x="21" y="415" type="line"/>
+      <point x="202" y="415" type="line"/>
+      <point x="202" y="482" type="line"/>
+      <point x="21" y="482" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -41,6 +41,10 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|ge-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>softsign-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/hryvnia.glif b/src/Cantarell-Regular.ufo/glyphs/hryvnia.glif
index b02df3ed..dcd7b6c1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/hryvnia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/hryvnia.glif
@@ -1,7 +1,69 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hryvnia" format="2">
-  <advance width="600"/>
+  <advance width="580"/>
   <unicode hex="20B4"/>
   <outline>
+    <contour>
+      <point x="313" y="-10" type="curve" smooth="yes"/>
+      <point x="377" y="-10"/>
+      <point x="439" y="9"/>
+      <point x="510" y="46" type="curve"/>
+      <point x="488" y="107" type="line"/>
+      <point x="423" y="77"/>
+      <point x="368" y="64"/>
+      <point x="321" y="64" type="curve" smooth="yes"/>
+      <point x="236" y="64"/>
+      <point x="177" y="114"/>
+      <point x="177" y="187" type="curve" smooth="yes"/>
+      <point x="177" y="216"/>
+      <point x="188" y="243"/>
+      <point x="212" y="264" type="curve"/>
+      <point x="106" y="264" type="line"/>
+      <point x="95" y="243"/>
+      <point x="91" y="214"/>
+      <point x="91" y="187" type="curve" smooth="yes"/>
+      <point x="91" y="66"/>
+      <point x="177" y="-10"/>
+    </contour>
+    <contour>
+      <point x="20" y="227" type="line"/>
+      <point x="560" y="227" type="line"/>
+      <point x="560" y="294" type="line"/>
+      <point x="20" y="294" type="line"/>
+    </contour>
+    <contour>
+      <point x="20" y="404" type="line"/>
+      <point x="560" y="404" type="line"/>
+      <point x="560" y="471" type="line"/>
+      <point x="20" y="471" type="line"/>
+    </contour>
+    <contour>
+      <point x="384" y="443" type="curve"/>
+      <point x="480" y="443" type="line"/>
+      <point x="488" y="462"/>
+      <point x="492" y="493"/>
+      <point x="492" y="521" type="curve" smooth="yes"/>
+      <point x="492" y="639"/>
+      <point x="416" y="703"/>
+      <point x="281" y="703" type="curve" smooth="yes"/>
+      <point x="224" y="703"/>
+      <point x="157" y="689"/>
+      <point x="104" y="663" type="curve"/>
+      <point x="128" y="598" type="line"/>
+      <point x="171" y="620"/>
+      <point x="225" y="631"/>
+      <point x="269" y="631" type="curve" smooth="yes"/>
+      <point x="357" y="631"/>
+      <point x="407" y="592"/>
+      <point x="407" y="518" type="curve" smooth="yes"/>
+      <point x="407" y="492"/>
+      <point x="399" y="460"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/hungarumlaut.glif 
b/src/Cantarell-Regular.ufo/glyphs/hungarumlaut.glif
index 0c21c4c9..12d80537 100644
--- a/src/Cantarell-Regular.ufo/glyphs/hungarumlaut.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/hungarumlaut.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hungarumlaut" format="2">
-  <advance width="439"/>
+  <advance width="500"/>
   <unicode hex="02DD"/>
   <outline>
-    <component base="hungarumlautcomb" xOffset="-7"/>
+    <component base="hungarumlautcomb" xOffset="31"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/hungarumlautcomb.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/hungarumlautcomb.case.glif
index 322b1b18..12dfeff2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/hungarumlautcomb.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/hungarumlautcomb.case.glif
@@ -3,18 +3,18 @@
   <anchor x="210" y="694" name="_top"/>
   <anchor x="210" y="926" name="top"/>
   <outline>
-    <contour>
-      <point x="75" y="764" type="line"/>
-      <point x="205" y="885" type="line"/>
-      <point x="145" y="939" type="line"/>
-      <point x="36" y="800" type="line"/>
-    </contour>
     <contour>
       <point x="265" y="764" type="line"/>
       <point x="395" y="885" type="line"/>
       <point x="335" y="939" type="line"/>
       <point x="226" y="800" type="line"/>
     </contour>
+    <contour>
+      <point x="75" y="764" type="line"/>
+      <point x="205" y="885" type="line"/>
+      <point x="145" y="939" type="line"/>
+      <point x="36" y="800" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/hyphen.glif b/src/Cantarell-Regular.ufo/glyphs/hyphen.glif
index ff6c1641..6f2fd696 100644
--- a/src/Cantarell-Regular.ufo/glyphs/hyphen.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/hyphen.glif
@@ -1,13 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hyphen" format="2">
-  <advance width="456"/>
+  <advance width="424"/>
   <unicode hex="002D"/>
+  <unicode hex="00AD"/>
+  <unicode hex="2010"/>
+  <unicode hex="2011"/>
   <outline>
     <contour>
-      <point x="83" y="220" type="line"/>
-      <point x="373" y="220" type="line"/>
-      <point x="373" y="287" type="line"/>
-      <point x="83" y="287" type="line"/>
+      <point x="67" y="220" type="line"/>
+      <point x="357" y="220" type="line"/>
+      <point x="357" y="287" type="line"/>
+      <point x="67" y="287" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/i-cy.glif b/src/Cantarell-Regular.ufo/glyphs/i-cy.glif
index cc5ce851..23b75d0d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/i-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/i-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="i-cy" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="0456"/>
   <outline>
     <component base="i"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/i.glif b/src/Cantarell-Regular.ufo/glyphs/i.glif
index 33d67d80..0950f193 100644
--- a/src/Cantarell-Regular.ufo/glyphs/i.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/i.glif
@@ -1,13 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="i" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="0069"/>
-  <note>
-i
-</note>
-  <anchor x="128" y="0" name="bottom"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb" xOffset="-5"/>
+    <component base="dotaccentcomb" xOffset="-9"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ia-cy.glif b/src/Cantarell-Regular.ufo/glyphs/ia-cy.glif
index 4d21d9e4..7287c4bc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ia-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ia-cy.glif
@@ -1,40 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ia-cy" format="2">
-  <advance width="521"/>
+  <advance width="519"/>
   <unicode hex="044F"/>
-  <anchor x="261" y="482" name="top"/>
+  <anchor x="259" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="232" y="173" type="curve" smooth="yes"/>
-      <point x="385" y="173" type="line"/>
-      <point x="385" y="238" type="line"/>
-      <point x="243" y="238" type="line" smooth="yes"/>
-      <point x="177" y="238"/>
-      <point x="131" y="275"/>
-      <point x="131" y="330" type="curve" smooth="yes"/>
-      <point x="131" y="382"/>
-      <point x="171" y="412"/>
-      <point x="232" y="412" type="curve" smooth="yes"/>
-      <point x="385" y="412" type="line"/>
-      <point x="385" y="482" type="line"/>
-      <point x="243" y="482" type="line" smooth="yes"/>
-      <point x="128" y="482"/>
-      <point x="51" y="418"/>
-      <point x="51" y="322" type="curve" smooth="yes"/>
-      <point x="51" y="230"/>
-      <point x="122" y="173"/>
+      <point x="356" y="0" type="line"/>
+      <point x="436" y="0" type="line"/>
+      <point x="436" y="482" type="line"/>
+      <point x="241" y="482" type="line" smooth="yes"/>
+      <point x="126" y="482"/>
+      <point x="49" y="418"/>
+      <point x="49" y="322" type="curve" smooth="yes"/>
+      <point x="49" y="230"/>
+      <point x="120" y="173"/>
+      <point x="230" y="173" type="curve" smooth="yes"/>
+      <point x="383" y="173" type="line"/>
+      <point x="383" y="238" type="line"/>
+      <point x="241" y="238" type="line" smooth="yes"/>
+      <point x="175" y="238"/>
+      <point x="129" y="275"/>
+      <point x="129" y="330" type="curve" smooth="yes"/>
+      <point x="129" y="382"/>
+      <point x="169" y="412"/>
+      <point x="230" y="412" type="curve" smooth="yes"/>
+      <point x="356" y="412" type="line"/>
     </contour>
     <contour>
-      <point x="39" y="0" type="line"/>
-      <point x="135" y="0" type="line"/>
-      <point x="275" y="204" type="line"/>
-      <point x="187" y="204" type="line"/>
-    </contour>
-    <contour>
-      <point x="358" y="0" type="line"/>
-      <point x="438" y="0" type="line"/>
-      <point x="438" y="482" type="line"/>
-      <point x="358" y="482" type="line"/>
+      <point x="37" y="0" type="line"/>
+      <point x="133" y="0" type="line"/>
+      <point x="273" y="204" type="line"/>
+      <point x="185" y="204" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -48,6 +44,8 @@
         <key>width</key>
         <integer>76</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iacute.glif b/src/Cantarell-Regular.ufo/glyphs/iacute.glif
index 6d44d9cb..4a3e06ea 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iacute" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="00ED"/>
   <outline>
     <component base="idotless"/>
-    <component base="acutecomb" xOffset="45"/>
+    <component base="acutecomb" xOffset="41"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ibreve.glif b/src/Cantarell-Regular.ufo/glyphs/ibreve.glif
index 25bc8507..6ebf9471 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ibreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ibreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ibreve" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="012D"/>
   <outline>
     <component base="idotless"/>
-    <component base="brevecomb" xOffset="-80"/>
+    <component base="brevecomb" xOffset="-84"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/icaron.glif b/src/Cantarell-Regular.ufo/glyphs/icaron.glif
index 041f2407..405599dd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/icaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/icaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="icaron" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="01D0"/>
   <outline>
     <component base="idotless"/>
-    <component base="caroncomb" xOffset="-55"/>
+    <component base="caroncomb" xOffset="-59"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/icircumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/icircumflex.glif
index 950ac45b..0b16887e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/icircumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/icircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="icircumflex" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="00EE"/>
   <outline>
     <component base="idotless"/>
-    <component base="circumflexcomb" xOffset="-65"/>
+    <component base="circumflexcomb" xOffset="-69"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/idblgrave.glif b/src/Cantarell-Regular.ufo/glyphs/idblgrave.glif
index 5aa6cb5b..2ea10c40 100644
--- a/src/Cantarell-Regular.ufo/glyphs/idblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/idblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idblgrave" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="0209"/>
   <outline>
     <component base="idotless"/>
-    <component base="dblgravecomb" xOffset="-126"/>
+    <component base="dblgravecomb" xOffset="-130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/idieresis.glif b/src/Cantarell-Regular.ufo/glyphs/idieresis.glif
index 0e95dd66..7263b4a2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/idieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/idieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idieresis" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="00EF"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb" xOffset="-105"/>
+    <component base="dieresiscomb" xOffset="-109"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/idieresisacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/idieresisacute.glif
index dc3fcd07..672ef6f3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/idieresisacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/idieresisacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idieresisacute" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="1E2F"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb_acutecomb" xOffset="-96"/>
+    <component base="dieresiscomb.loclVIET" xOffset="-100"/>
+    <component base="acutecomb" xOffset="41" yOffset="122"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/idotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/idotaccent.glif
index 26596402..a35ba8c2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/idotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/idotaccent.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotaccent" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb" xOffset="-5"/>
+    <component base="dotaccentcomb" xOffset="-9"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/idotbelow.glif b/src/Cantarell-Regular.ufo/glyphs/idotbelow.glif
index 62461bf8..c9ba66e0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/idotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/idotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotbelow" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="1ECB"/>
   <outline>
     <component base="i"/>
-    <component base="dotbelowcomb" xScale="0.91" yScale="0.91" xOffset="4"/>
+    <component base="dotbelowcomb" xScale="0.91" yScale="0.91" xOffset="-1"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/idotless.glif b/src/Cantarell-Regular.ufo/glyphs/idotless.glif
index 85c05ff6..fbc365f6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/idotless.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/idotless.glif
@@ -1,19 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotless" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="0131"/>
-  <note>
-dotlessi
-</note>
-  <anchor x="127" y="0" name="bottom"/>
-  <anchor x="145" y="10" name="ogonek"/>
-  <anchor x="128" y="482" name="top"/>
+  <anchor x="123" y="0" name="bottom"/>
+  <anchor x="141" y="10" name="ogonek"/>
+  <anchor x="124" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="87" y="0" type="line"/>
-      <point x="167" y="0" type="line"/>
-      <point x="167" y="482" type="line"/>
-      <point x="87" y="482" type="line"/>
+      <point x="83" y="0" type="line"/>
+      <point x="163" y="0" type="line"/>
+      <point x="163" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ie-cy.glif b/src/Cantarell-Regular.ufo/glyphs/ie-cy.glif
index 871cb2a0..66128fec 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ie-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ie-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ie-cy" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0435"/>
-  <anchor x="265" y="482" name="top"/>
   <outline>
     <component base="e"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iebreve-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/iebreve-cy.glif
index c9e93d45..253ad639 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iebreve-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iebreve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iebreve-cy" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="04D7"/>
   <outline>
     <component base="ie-cy"/>
-    <component base="brevecomb-cy" xOffset="43"/>
+    <component base="brevecomb-cy" xOffset="49"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iegrave-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/iegrave-cy.glif
index 8dbef246..90cfd1eb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iegrave-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iegrave-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iegrave-cy" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0450"/>
   <outline>
     <component base="ie-cy"/>
-    <component base="gravecomb" xOffset="87"/>
+    <component base="gravecomb" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/igrave.glif b/src/Cantarell-Regular.ufo/glyphs/igrave.glif
index 90370d1e..af6ca586 100644
--- a/src/Cantarell-Regular.ufo/glyphs/igrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/igrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="igrave" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="00EC"/>
   <outline>
     <component base="idotless"/>
-    <component base="gravecomb" xOffset="-50"/>
+    <component base="gravecomb" xOffset="-54"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ihookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/ihookabove.glif
index 27edbb5b..aa19a71e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ihookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ihookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ihookabove" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="1EC9"/>
   <outline>
     <component base="idotless"/>
-    <component base="hookabovecomb" xOffset="-25"/>
+    <component base="hookabovecomb" xOffset="-29"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ii-cy.glif b/src/Cantarell-Regular.ufo/glyphs/ii-cy.glif
index c9ec3f7f..605014e6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ii-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ii-cy.glif
@@ -31,6 +31,10 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iinvertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/iinvertedbreve.glif
index 6cf05259..fb1fe44b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iinvertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iinvertedbreve" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="020B"/>
   <outline>
     <component base="idotless"/>
-    <component base="breveinvertedcomb" xOffset="-82"/>
+    <component base="breveinvertedcomb" xOffset="-86"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/imacron.glif b/src/Cantarell-Regular.ufo/glyphs/imacron.glif
index 1635bed7..6f099a13 100644
--- a/src/Cantarell-Regular.ufo/glyphs/imacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/imacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="imacron" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="012B"/>
   <outline>
     <component base="idotless"/>
-    <component base="macroncomb.narrow" xOffset="-67"/>
+    <component base="macroncomb.narrow" xOffset="-71"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/increment.glif b/src/Cantarell-Regular.ufo/glyphs/increment.glif
index 1133393b..b93f5890 100644
--- a/src/Cantarell-Regular.ufo/glyphs/increment.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/increment.glif
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="increment" format="2">
-  <advance width="692"/>
+  <advance width="686"/>
   <unicode hex="2206"/>
   <outline>
     <contour>
-      <point x="66" y="1" type="line"/>
-      <point x="626" y="1" type="line"/>
-      <point x="626" y="54" type="line"/>
-      <point x="396" y="694" type="line"/>
-      <point x="299" y="694" type="line"/>
-      <point x="66" y="54" type="line"/>
+      <point x="63" y="1" type="line"/>
+      <point x="623" y="1" type="line"/>
+      <point x="623" y="54" type="line"/>
+      <point x="393" y="694" type="line"/>
+      <point x="296" y="694" type="line"/>
+      <point x="63" y="54" type="line"/>
     </contour>
     <contour>
-      <point x="149" y="68" type="line"/>
-      <point x="342" y="616" type="line"/>
-      <point x="536" y="68" type="line"/>
+      <point x="146" y="68" type="line"/>
+      <point x="339" y="616" type="line"/>
+      <point x="533" y="68" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/infinity.glif b/src/Cantarell-Regular.ufo/glyphs/infinity.glif
index c004faa4..211c2354 100644
--- a/src/Cantarell-Regular.ufo/glyphs/infinity.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/infinity.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="infinity" format="2">
-  <advance width="955"/>
+  <advance width="948"/>
   <unicode hex="221E"/>
   <outline>
     <contour>
-      <point x="676" y="145" type="curve" smooth="yes"/>
-      <point x="786" y="145"/>
-      <point x="859" y="224"/>
-      <point x="859" y="343" type="curve" smooth="yes"/>
-      <point x="859" y="457"/>
-      <point x="790" y="533"/>
-      <point x="685" y="533" type="curve" smooth="yes"/>
-      <point x="469" y="533"/>
-      <point x="428" y="215"/>
-      <point x="276" y="215" type="curve" smooth="yes"/>
-      <point x="215" y="215"/>
-      <point x="175" y="266"/>
-      <point x="175" y="342" type="curve" smooth="yes"/>
-      <point x="175" y="415"/>
-      <point x="215" y="463"/>
-      <point x="275" y="463" type="curve" smooth="yes"/>
-      <point x="433" y="463"/>
-      <point x="459" y="145"/>
+      <point x="673" y="145" type="curve" smooth="yes"/>
+      <point x="783" y="145"/>
+      <point x="856" y="224"/>
+      <point x="856" y="343" type="curve" smooth="yes"/>
+      <point x="856" y="457"/>
+      <point x="787" y="533"/>
+      <point x="682" y="533" type="curve" smooth="yes"/>
+      <point x="466" y="533"/>
+      <point x="425" y="215"/>
+      <point x="273" y="215" type="curve" smooth="yes"/>
+      <point x="212" y="215"/>
+      <point x="172" y="266"/>
+      <point x="172" y="342" type="curve" smooth="yes"/>
+      <point x="172" y="415"/>
+      <point x="212" y="463"/>
+      <point x="272" y="463" type="curve" smooth="yes"/>
+      <point x="430" y="463"/>
+      <point x="456" y="145"/>
     </contour>
     <contour>
-      <point x="266" y="145" type="curve" smooth="yes"/>
-      <point x="479" y="145"/>
-      <point x="519" y="463"/>
-      <point x="676" y="463" type="curve" smooth="yes"/>
-      <point x="739" y="463"/>
-      <point x="779" y="411"/>
-      <point x="779" y="331" type="curve" smooth="yes"/>
-      <point x="779" y="258"/>
-      <point x="742" y="215"/>
-      <point x="681" y="215" type="curve" smooth="yes"/>
-      <point x="515" y="215"/>
-      <point x="504" y="533"/>
-      <point x="282" y="533" type="curve" smooth="yes"/>
-      <point x="170" y="533"/>
-      <point x="95" y="453"/>
-      <point x="95" y="333" type="curve" smooth="yes"/>
-      <point x="95" y="220"/>
-      <point x="163" y="145"/>
+      <point x="263" y="145" type="curve" smooth="yes"/>
+      <point x="476" y="145"/>
+      <point x="516" y="463"/>
+      <point x="673" y="463" type="curve" smooth="yes"/>
+      <point x="736" y="463"/>
+      <point x="776" y="411"/>
+      <point x="776" y="331" type="curve" smooth="yes"/>
+      <point x="776" y="258"/>
+      <point x="739" y="215"/>
+      <point x="678" y="215" type="curve" smooth="yes"/>
+      <point x="512" y="215"/>
+      <point x="501" y="533"/>
+      <point x="279" y="533" type="curve" smooth="yes"/>
+      <point x="167" y="533"/>
+      <point x="92" y="453"/>
+      <point x="92" y="333" type="curve" smooth="yes"/>
+      <point x="92" y="220"/>
+      <point x="160" y="145"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/integral.glif b/src/Cantarell-Regular.ufo/glyphs/integral.glif
index 7607cd52..9cb68266 100644
--- a/src/Cantarell-Regular.ufo/glyphs/integral.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/integral.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="integral" format="2">
-  <advance width="412"/>
+  <advance width="407"/>
   <unicode hex="222B"/>
   <outline>
     <contour>
-      <point x="158" y="-170" type="curve" smooth="yes"/>
-      <point x="256" y="-170"/>
-      <point x="319" y="-104"/>
-      <point x="319" y="0" type="curve" smooth="yes"/>
-      <point x="319" y="155"/>
-      <point x="179" y="424"/>
-      <point x="179" y="578" type="curve" smooth="yes"/>
-      <point x="179" y="643"/>
-      <point x="204" y="676"/>
-      <point x="254" y="676" type="curve" smooth="yes"/>
-      <point x="271" y="676"/>
-      <point x="290" y="674"/>
-      <point x="317" y="664" type="curve"/>
-      <point x="341" y="729" type="line"/>
-      <point x="315" y="742"/>
-      <point x="292" y="749"/>
-      <point x="263" y="749" type="curve" smooth="yes"/>
-      <point x="161" y="749"/>
-      <point x="99" y="680"/>
-      <point x="99" y="566" type="curve" smooth="yes"/>
-      <point x="99" y="394"/>
-      <point x="238" y="123"/>
-      <point x="238" y="-9" type="curve" smooth="yes"/>
-      <point x="238" y="-65"/>
-      <point x="212" y="-97"/>
-      <point x="167" y="-97" type="curve" smooth="yes"/>
-      <point x="140" y="-97"/>
-      <point x="110" y="-91"/>
-      <point x="92" y="-82" type="curve"/>
-      <point x="68" y="-148" type="line"/>
-      <point x="97" y="-162"/>
-      <point x="130" y="-170"/>
+      <point x="156" y="-170" type="curve" smooth="yes"/>
+      <point x="254" y="-170"/>
+      <point x="317" y="-104"/>
+      <point x="317" y="0" type="curve" smooth="yes"/>
+      <point x="317" y="155"/>
+      <point x="177" y="424"/>
+      <point x="177" y="578" type="curve" smooth="yes"/>
+      <point x="177" y="643"/>
+      <point x="202" y="676"/>
+      <point x="252" y="676" type="curve" smooth="yes"/>
+      <point x="269" y="676"/>
+      <point x="288" y="674"/>
+      <point x="315" y="664" type="curve"/>
+      <point x="339" y="729" type="line"/>
+      <point x="313" y="742"/>
+      <point x="290" y="749"/>
+      <point x="261" y="749" type="curve" smooth="yes"/>
+      <point x="159" y="749"/>
+      <point x="97" y="680"/>
+      <point x="97" y="566" type="curve" smooth="yes"/>
+      <point x="97" y="394"/>
+      <point x="236" y="123"/>
+      <point x="236" y="-9" type="curve" smooth="yes"/>
+      <point x="236" y="-65"/>
+      <point x="210" y="-97"/>
+      <point x="165" y="-97" type="curve" smooth="yes"/>
+      <point x="138" y="-97"/>
+      <point x="108" y="-91"/>
+      <point x="90" y="-82" type="curve"/>
+      <point x="66" y="-148" type="line"/>
+      <point x="95" y="-162"/>
+      <point x="128" y="-170"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/io-cy.glif b/src/Cantarell-Regular.ufo/glyphs/io-cy.glif
index 702c79be..fb35e7b1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/io-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/io-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="io-cy" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0451"/>
   <outline>
     <component base="ie-cy"/>
-    <component base="dieresiscomb" xOffset="32"/>
+    <component base="dieresiscomb" xOffset="38"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iogonek.glif b/src/Cantarell-Regular.ufo/glyphs/iogonek.glif
index deed47ab..9450cf1e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iogonek" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="012F"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb" xOffset="-5"/>
-    <component base="ogonekcomb.narrow" xOffset="-264"/>
+    <component base="dotaccentcomb" xOffset="-9"/>
+    <component base="ogonekcomb.narrow" xOffset="-268"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/itilde.glif b/src/Cantarell-Regular.ufo/glyphs/itilde.glif
index 305c49ec..587b10b3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/itilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/itilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="itilde" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="0129"/>
   <outline>
     <component base="idotless"/>
-    <component base="tildecomb" xOffset="-104"/>
+    <component base="tildecomb" xOffset="-108"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iu-cy.glif b/src/Cantarell-Regular.ufo/glyphs/iu-cy.glif
index 12344079..19f6e4c6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iu-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iu-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iu-cy" format="2">
-  <advance width="771"/>
+  <advance width="773"/>
   <unicode hex="044E"/>
   <anchor x="396" y="482" name="top"/>
   <outline>
@@ -56,6 +56,10 @@
         <key>width</key>
         <integer>69</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/izhitsa-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/izhitsa-cy.glif
index 2e7cff4d..73f4d1a5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/izhitsa-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/izhitsa-cy.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="izhitsa-cy" format="2">
-  <advance width="511"/>
+  <advance width="467"/>
   <unicode hex="0475"/>
   <outline>
     <contour>
-      <point x="198" y="0" type="line"/>
-      <point x="272" y="0" type="line"/>
-      <point x="382" y="323" type="line" smooth="yes"/>
-      <point x="403" y="383"/>
-      <point x="432" y="422"/>
-      <point x="490" y="422" type="curve"/>
-      <point x="481" y="492" type="line"/>
-      <point x="403" y="492"/>
-      <point x="349" y="445"/>
-      <point x="321" y="356" type="curve" smooth="yes"/>
-      <point x="223" y="44" type="line"/>
-      <point x="253" y="44" type="line"/>
-      <point x="107" y="486" type="line"/>
-      <point x="22" y="486" type="line"/>
+      <point x="188" y="0" type="line"/>
+      <point x="262" y="0" type="line"/>
+      <point x="372" y="323" type="line" smooth="yes"/>
+      <point x="393" y="383"/>
+      <point x="422" y="422"/>
+      <point x="480" y="422" type="curve"/>
+      <point x="471" y="492" type="line"/>
+      <point x="393" y="492"/>
+      <point x="339" y="445"/>
+      <point x="311" y="356" type="curve" smooth="yes"/>
+      <point x="213" y="44" type="line"/>
+      <point x="243" y="44" type="line"/>
+      <point x="97" y="486" type="line"/>
+      <point x="12" y="486" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -29,6 +29,8 @@
         <key>width</key>
         <integer>70</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>v</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/j.glif b/src/Cantarell-Regular.ufo/glyphs/j.glif
index 988c27cf..c5c6490a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/j.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/j.glif
@@ -1,12 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="j" format="2">
-  <advance width="255"/>
+  <advance width="246"/>
   <unicode hex="006A"/>
-  <note>
-j
-</note>
   <outline>
     <component base="jdotless"/>
-    <component base="dotaccentcomb" xOffset="-5"/>
+    <component base="dotaccentcomb" xOffset="-10"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/jacute.glif b/src/Cantarell-Regular.ufo/glyphs/jacute.glif
index 8182561c..2db744f5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/jacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/jacute.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jacute" format="2">
-  <advance width="255"/>
+  <advance width="246"/>
   <outline>
     <component base="jdotless"/>
-    <component base="acutecomb" xOffset="45"/>
+    <component base="acutecomb" xOffset="40"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/jcircumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/jcircumflex.glif
index de8d81d3..ee06e24f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/jcircumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/jcircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jcircumflex" format="2">
-  <advance width="255"/>
+  <advance width="246"/>
   <unicode hex="0135"/>
   <outline>
     <component base="jdotless"/>
-    <component base="circumflexcomb" xOffset="-65"/>
+    <component base="circumflexcomb" xOffset="-70"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/jdotless.glif b/src/Cantarell-Regular.ufo/glyphs/jdotless.glif
index 2169ab1f..826cb964 100644
--- a/src/Cantarell-Regular.ufo/glyphs/jdotless.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/jdotless.glif
@@ -1,24 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jdotless" format="2">
-  <advance width="255"/>
+  <advance width="246"/>
   <unicode hex="0237"/>
-  <note>
-uni0237
-</note>
-  <anchor x="128" y="0" name="bottom"/>
-  <anchor x="128" y="482" name="top"/>
+  <anchor x="123" y="0" name="bottom"/>
+  <anchor x="123" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="24" y="-227" type="line"/>
-      <point x="115" y="-187"/>
-      <point x="168" y="-111"/>
-      <point x="168" y="-23" type="curve" smooth="yes"/>
-      <point x="168" y="482" type="line"/>
-      <point x="88" y="482" type="line"/>
-      <point x="88" y="-35" type="line" smooth="yes"/>
-      <point x="88" y="-91"/>
-      <point x="52" y="-148"/>
-      <point x="-2" y="-179" type="curve"/>
+      <point x="19" y="-227" type="line"/>
+      <point x="110" y="-187"/>
+      <point x="163" y="-111"/>
+      <point x="163" y="-23" type="curve" smooth="yes"/>
+      <point x="163" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
+      <point x="83" y="-35" type="line" smooth="yes"/>
+      <point x="83" y="-91"/>
+      <point x="47" y="-148"/>
+      <point x="-7" y="-179" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/je-cy.glif b/src/Cantarell-Regular.ufo/glyphs/je-cy.glif
index b08064af..faa1d49c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/je-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/je-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="je-cy" format="2">
-  <advance width="255"/>
+  <advance width="246"/>
   <unicode hex="0458"/>
   <outline>
     <component base="j"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/k.glif b/src/Cantarell-Regular.ufo/glyphs/k.glif
index f459947a..3ad76c49 100644
--- a/src/Cantarell-Regular.ufo/glyphs/k.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/k.glif
@@ -2,18 +2,9 @@
 <glyph name="k" format="2">
   <advance width="498"/>
   <unicode hex="006B"/>
-  <note>
-k
-</note>
   <anchor x="251" y="0" name="bottom"/>
   <anchor x="231" y="739" name="top"/>
   <outline>
-    <contour>
-      <point x="83" y="0" type="line"/>
-      <point x="163" y="0" type="line"/>
-      <point x="163" y="739" type="line"/>
-      <point x="83" y="739" type="line"/>
-    </contour>
     <contour>
       <point x="388" y="0" type="line"/>
       <point x="494" y="0" type="line"/>
@@ -23,5 +14,17 @@ k
       <point x="377" y="482" type="line"/>
       <point x="161" y="257" type="line"/>
     </contour>
+    <contour>
+      <point x="83" y="0" type="line"/>
+      <point x="163" y="0" type="line"/>
+      <point x="163" y="739" type="line"/>
+      <point x="83" y="739" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ka-cy.glif b/src/Cantarell-Regular.ufo/glyphs/ka-cy.glif
index 5e6eefa0..f3a971c6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ka-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ka-cy.glif
@@ -1,30 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ka-cy" format="2">
-  <advance width="510"/>
+  <advance width="511"/>
   <unicode hex="043A"/>
-  <anchor x="445" y="0" name="bottomright"/>
-  <anchor x="262" y="482" name="top"/>
+  <anchor x="444" y="0" name="bottomright"/>
+  <anchor x="261" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="402" y="0" type="line"/>
-      <point x="496" y="0" type="line"/>
-      <point x="325" y="267" type="line"/>
-      <point x="328" y="249" type="line"/>
-      <point x="487" y="482" type="line"/>
-      <point x="398" y="482" type="line"/>
-      <point x="242" y="251" type="line"/>
+      <point x="401" y="0" type="line"/>
+      <point x="495" y="0" type="line"/>
+      <point x="324" y="267" type="line"/>
+      <point x="327" y="249" type="line"/>
+      <point x="486" y="482" type="line"/>
+      <point x="397" y="482" type="line"/>
+      <point x="241" y="251" type="line"/>
     </contour>
     <contour>
-      <point x="84" y="0" type="line"/>
-      <point x="165" y="0" type="line"/>
-      <point x="165" y="482" type="line"/>
-      <point x="84" y="482" type="line"/>
+      <point x="83" y="0" type="line"/>
+      <point x="164" y="0" type="line"/>
+      <point x="164" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
     </contour>
     <contour>
-      <point x="119" y="219" type="line"/>
-      <point x="282" y="219" type="line"/>
-      <point x="282" y="284" type="line"/>
-      <point x="119" y="284" type="line"/>
+      <point x="118" y="219" type="line"/>
+      <point x="281" y="219" type="line"/>
+      <point x="281" y="284" type="line"/>
+      <point x="118" y="284" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -36,6 +36,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/kabashkir-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/kabashkir-cy.glif
index 2b626a00..386e0820 100644
--- a/src/Cantarell-Regular.ufo/glyphs/kabashkir-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/kabashkir-cy.glif
@@ -1,38 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kabashkir-cy" format="2">
-  <advance width="607"/>
+  <advance width="622"/>
   <unicode hex="04A1"/>
   <outline>
     <contour>
-      <point x="8" y="415" type="line"/>
-      <point x="262" y="415" type="line"/>
-      <point x="262" y="482" type="line"/>
-      <point x="8" y="482" type="line"/>
+      <point x="194" y="0" type="line"/>
+      <point x="275" y="0" type="line"/>
+      <point x="275" y="482" type="line"/>
+      <point x="21" y="482" type="line"/>
+      <point x="21" y="415" type="line"/>
+      <point x="194" y="415" type="line"/>
     </contour>
     <contour>
-      <point x="499" y="0" type="line"/>
-      <point x="593" y="0" type="line"/>
-      <point x="422" y="267" type="line"/>
-      <point x="425" y="249" type="line"/>
-      <point x="584" y="482" type="line"/>
-      <point x="495" y="482" type="line"/>
-      <point x="339" y="251" type="line"/>
+      <point x="512" y="0" type="line"/>
+      <point x="606" y="0" type="line"/>
+      <point x="435" y="267" type="line"/>
+      <point x="438" y="249" type="line"/>
+      <point x="597" y="482" type="line"/>
+      <point x="508" y="482" type="line"/>
+      <point x="352" y="251" type="line"/>
     </contour>
     <contour>
-      <point x="181" y="0" type="line"/>
-      <point x="262" y="0" type="line"/>
-      <point x="262" y="482" type="line"/>
-      <point x="181" y="482" type="line"/>
-    </contour>
-    <contour>
-      <point x="216" y="219" type="line"/>
-      <point x="379" y="219" type="line"/>
-      <point x="379" y="284" type="line"/>
-      <point x="216" y="284" type="line"/>
+      <point x="229" y="219" type="line"/>
+      <point x="392" y="219" type="line"/>
+      <point x="392" y="284" type="line"/>
+      <point x="229" y="284" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|ge-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>ka-cy</string>
     </dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/kadescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/kadescender-cy.glif
index 63bf495f..95d3dd77 100644
--- a/src/Cantarell-Regular.ufo/glyphs/kadescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/kadescender-cy.glif
@@ -1,15 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kadescender-cy" format="2">
-  <advance width="544"/>
+  <advance width="535"/>
   <unicode hex="049B"/>
   <outline>
     <component base="ka-cy"/>
-    <component base="descender-cy" xOffset="338"/>
+    <component base="descender-cy" xOffset="337"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>ka-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>ka-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Regular.ufo/glyphs/kaverticalstroke-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/kaverticalstroke-cy.glif
index 0ac24b5d..2aaff7a8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/kaverticalstroke-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/kaverticalstroke-cy.glif
@@ -1,34 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kaverticalstroke-cy" format="2">
-  <advance width="519"/>
+  <advance width="520"/>
   <unicode hex="049D"/>
   <outline>
     <contour>
-      <point x="411" y="0" type="line"/>
-      <point x="505" y="0" type="line"/>
-      <point x="344" y="267" type="line"/>
-      <point x="347" y="249" type="line"/>
-      <point x="496" y="482" type="line"/>
-      <point x="407" y="482" type="line"/>
-      <point x="261" y="251" type="line"/>
+      <point x="410" y="0" type="line"/>
+      <point x="504" y="0" type="line"/>
+      <point x="343" y="267" type="line"/>
+      <point x="346" y="249" type="line"/>
+      <point x="495" y="482" type="line"/>
+      <point x="406" y="482" type="line"/>
+      <point x="260" y="251" type="line"/>
     </contour>
     <contour>
-      <point x="84" y="0" type="line"/>
-      <point x="165" y="0" type="line"/>
-      <point x="165" y="482" type="line"/>
-      <point x="84" y="482" type="line"/>
+      <point x="83" y="0" type="line"/>
+      <point x="164" y="0" type="line"/>
+      <point x="164" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
     </contour>
     <contour>
-      <point x="119" y="219" type="line"/>
-      <point x="301" y="219" type="line"/>
-      <point x="301" y="284" type="line"/>
-      <point x="119" y="284" type="line"/>
+      <point x="118" y="219" type="line"/>
+      <point x="300" y="219" type="line"/>
+      <point x="300" y="284" type="line"/>
+      <point x="118" y="284" type="line"/>
     </contour>
     <contour>
-      <point x="206" y="85" type="line"/>
-      <point x="269" y="85" type="line"/>
-      <point x="269" y="410" type="line"/>
-      <point x="206" y="410" type="line"/>
+      <point x="205" y="85" type="line"/>
+      <point x="268" y="85" type="line"/>
+      <point x="268" y="410" type="line"/>
+      <point x="205" y="410" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/kgreenlandic.glif 
b/src/Cantarell-Regular.ufo/glyphs/kgreenlandic.glif
index 95118c67..9faacdcc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/kgreenlandic.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/kgreenlandic.glif
@@ -3,12 +3,6 @@
   <advance width="498"/>
   <unicode hex="0138"/>
   <outline>
-    <contour>
-      <point x="83" y="0" type="line"/>
-      <point x="163" y="0" type="line"/>
-      <point x="163" y="482" type="line"/>
-      <point x="83" y="482" type="line"/>
-    </contour>
     <contour>
       <point x="388" y="-3" type="line"/>
       <point x="494" y="-3" type="line"/>
@@ -18,6 +12,12 @@
       <point x="377" y="479" type="line"/>
       <point x="161" y="257" type="line"/>
     </contour>
+    <contour>
+      <point x="83" y="0" type="line"/>
+      <point x="163" y="0" type="line"/>
+      <point x="163" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/kip.glif b/src/Cantarell-Regular.ufo/glyphs/kip.glif
index b6a2a600..c4436470 100644
--- a/src/Cantarell-Regular.ufo/glyphs/kip.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/kip.glif
@@ -1,28 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kip" format="2">
-  <advance width="712"/>
+  <advance width="580"/>
   <unicode hex="20AD"/>
   <outline>
     <contour>
-      <point x="72" y="329" type="line"/>
-      <point x="604" y="329" type="line"/>
-      <point x="604" y="389" type="line"/>
-      <point x="72" y="389" type="line"/>
+      <point x="441" y="0" type="line"/>
+      <point x="543" y="0" type="line"/>
+      <point x="269" y="380" type="line"/>
+      <point x="275" y="358" type="line"/>
+      <point x="534" y="694" type="line"/>
+      <point x="438" y="694" type="line"/>
+      <point x="186" y="361" type="line"/>
     </contour>
     <contour>
-      <point x="540" y="0" type="line"/>
-      <point x="642" y="0" type="line"/>
-      <point x="309" y="380" type="line"/>
-      <point x="315" y="358" type="line"/>
-      <point x="630" y="694" type="line"/>
-      <point x="534" y="694" type="line"/>
-      <point x="228" y="361" type="line"/>
+      <point x="106" y="0" type="line"/>
+      <point x="189" y="0" type="line"/>
+      <point x="189" y="694" type="line"/>
+      <point x="106" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="148" y="0" type="line"/>
-      <point x="231" y="0" type="line"/>
-      <point x="231" y="694" type="line"/>
-      <point x="148" y="694" type="line"/>
+      <point x="43" y="329" type="line"/>
+      <point x="512" y="329" type="line"/>
+      <point x="512" y="389" type="line"/>
+      <point x="43" y="389" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/kje-cy.glif b/src/Cantarell-Regular.ufo/glyphs/kje-cy.glif
index a8677339..e9c1ecca 100644
--- a/src/Cantarell-Regular.ufo/glyphs/kje-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/kje-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kje-cy" format="2">
-  <advance width="510"/>
+  <advance width="511"/>
   <unicode hex="045C"/>
   <outline>
     <component base="ka-cy"/>
-    <component base="acutecomb" xOffset="179"/>
+    <component base="acutecomb" xOffset="178"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/l.glif b/src/Cantarell-Regular.ufo/glyphs/l.glif
index 4c0dd94a..074388fe 100644
--- a/src/Cantarell-Regular.ufo/glyphs/l.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/l.glif
@@ -1,33 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="l" format="2">
-  <advance width="271"/>
+  <advance width="278"/>
   <unicode hex="006C"/>
-  <note>
-l
-</note>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="139" y="386" name="center"/>
-  <anchor x="272" y="353" name="periodcentered"/>
-  <anchor x="121" y="739" name="top"/>
-  <anchor x="268" y="482" name="topright"/>
+  <anchor x="163" y="0" name="bottom"/>
+  <anchor x="142" y="386" name="center"/>
+  <anchor x="276" y="353" name="periodcentered"/>
+  <anchor x="124" y="739" name="top"/>
+  <anchor x="271" y="482" name="topright"/>
   <outline>
     <contour>
-      <point x="189" y="-6" type="curve" smooth="yes"/>
-      <point x="215" y="-6"/>
-      <point x="246" y="0"/>
-      <point x="265" y="10" type="curve"/>
-      <point x="247" y="66" type="line"/>
-      <point x="235" y="61"/>
-      <point x="224" y="58"/>
-      <point x="212" y="58" type="curve" smooth="yes"/>
-      <point x="178" y="58"/>
-      <point x="160" y="81"/>
-      <point x="160" y="118" type="curve" smooth="yes"/>
-      <point x="160" y="739" type="line"/>
-      <point x="80" y="739" type="line"/>
-      <point x="80" y="108" type="line" smooth="yes"/>
-      <point x="80" y="39"/>
-      <point x="123" y="-6"/>
+      <point x="192" y="-6" type="curve" smooth="yes"/>
+      <point x="218" y="-6"/>
+      <point x="249" y="0"/>
+      <point x="268" y="10" type="curve"/>
+      <point x="250" y="66" type="line"/>
+      <point x="238" y="61"/>
+      <point x="227" y="58"/>
+      <point x="215" y="58" type="curve" smooth="yes"/>
+      <point x="181" y="58"/>
+      <point x="163" y="81"/>
+      <point x="163" y="118" type="curve" smooth="yes"/>
+      <point x="163" y="739" type="line"/>
+      <point x="83" y="739" type="line"/>
+      <point x="83" y="108" type="line" smooth="yes"/>
+      <point x="83" y="39"/>
+      <point x="126" y="-6"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/l.ss01.glif b/src/Cantarell-Regular.ufo/glyphs/l.ss01.glif
new file mode 100644
index 00000000..deb6f78f
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs/l.ss01.glif
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="l.ss01" format="2">
+  <advance width="246"/>
+  <anchor x="163" y="0" name="bottom"/>
+  <anchor x="142" y="386" name="center"/>
+  <anchor x="275" y="353" name="periodcentered"/>
+  <anchor x="124" y="739" name="top"/>
+  <anchor x="271" y="482" name="topright"/>
+  <outline>
+    <contour>
+      <point x="83" y="0" type="line"/>
+      <point x="163" y="0" type="line"/>
+      <point x="163" y="739" type="line"/>
+      <point x="83" y="739" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lacute.glif b/src/Cantarell-Regular.ufo/glyphs/lacute.glif
index 6581141a..6e0fcefd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lacute" format="2">
-  <advance width="271"/>
+  <advance width="278"/>
   <unicode hex="013A"/>
   <outline>
     <component base="l"/>
-    <component base="acutecomb.case" xOffset="33" yOffset="45"/>
+    <component base="acutecomb.case" xOffset="36" yOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist 
b/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
index 35e86bd1..65ffa21f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
+++ b/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
@@ -690,8 +690,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph._descenderreversed-cy</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph._o.numero</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph._slash.zero</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph._slash.zero.osf</key>
@@ -740,8 +738,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.acutecomb.loclVIET</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.acutecomb_dotaccentcomb</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.adblgrave</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.adieresis</key>
@@ -771,8 +767,6 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.apostrophemod</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.approxequal</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.approxequal.tf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.aring</key>
       <integer>0</integer>
@@ -795,7 +789,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.bar</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.be-cy</key>
-      <integer>1</integer>
+      <integer>9</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.blackCircle</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.blank</key>
@@ -822,22 +816,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb.loclVIET</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_acutecomb</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_acutecomb.case</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_gravecomb</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_gravecomb.case</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_hookabovecomb</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_hookabovecomb.case</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_tildecomb</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.brevecomb_tildecomb.case</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.breveinvertedcomb</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.breveinvertedcomb.case</key>
@@ -847,8 +825,6 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.bullet</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.bulletoperator</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.bulletoperator.tf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.c</key>
       <integer>0</integer>
@@ -864,8 +840,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.caroncomb.loclVIET</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.caroncomb_dotaccentcomb</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ccaron</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ccedilla</key>
@@ -902,22 +876,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb.loclVIET</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_acutecomb</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_acutecomb.case</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_gravecomb</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_gravecomb.case</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_hookabovecomb</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_hookabovecomb.case</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_tildecomb</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.circumflexcomb_tildecomb.case</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.colon</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.colonsign</key>
@@ -932,8 +890,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.commercialMinusSign</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.commercialMinusSign.tf</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.copyright</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.currency</key>
@@ -974,21 +930,9 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.dieresiscomb.loclVIET</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.dieresiscomb_acutecomb</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.dieresiscomb_caroncomb</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.dieresiscomb_gravecomb</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.dieresiscomb_macroncomb</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.divide</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.divide.tf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.divisionslash</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.divisionslash.tf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.dje-cy</key>
       <integer>1</integer>
@@ -1006,8 +950,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.dotaccentcomb.loclVIET</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.dotaccentcomb_macroncomb</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.dotbelowcomb</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.doubleprimemod</key>
@@ -1068,8 +1010,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.eight.tf</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.eight.tosf</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.eightinferior</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.eightsuperior</key>
@@ -1077,7 +1017,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.einvertedbreve</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.el-cy</key>
-      <integer>1</integer>
+      <integer>3</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ellipsis</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.em-cy</key>
@@ -1092,8 +1032,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.emptyset</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.emquad</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.emspace</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.en-cy</key>
@@ -1106,19 +1044,13 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.enghe-cy</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.enquad</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.enspace</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.eogonek</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.equal</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.equal.tf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.equivalence</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.equivalence.tf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.er-cy</key>
       <integer>1</integer>
@@ -1142,12 +1074,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.f</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.f_f</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.f_f_i</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.f_f_l</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.fi</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.figuredash</key>
@@ -1168,8 +1094,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.five.tf</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.five.tosf</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.fiveeighths</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.fiveinferior</key>
@@ -1192,8 +1116,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.four.tf</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.four.tosf</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.fourfifths</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.fourinferior</key>
@@ -1245,12 +1167,8 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.gravecomb.loclVIET</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.greater</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.greater.tf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.greaterequal</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.greaterequal.tf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.guarani</key>
       <integer>0</integer>
@@ -1286,8 +1204,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.hookabovecomb.loclVIET</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.horizontalbar</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.horncomb</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.hryvnia</key>
@@ -1300,8 +1216,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.hyphen</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.hyphentwo</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.i</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.i-cy</key>
@@ -1400,6 +1314,8 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.l</key>
       <integer>0</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.l.ss01</key>
+      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.lacute</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.lcaron</key>
@@ -1415,12 +1331,8 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.leftanglebracket-math</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.less</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.less.tf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.lessequal</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.lessequal.tf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.lira</key>
       <integer>0</integer>
@@ -1435,8 +1347,6 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.llinebelow</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.logicalnot</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.logicalnot.tf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.lozenge</key>
       <integer>0</integer>
@@ -1460,12 +1370,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.macroncomb.narrow.case</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.macroncomb_acutecomb</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.macroncomb_dieresiscomb</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.macroncomb_gravecomb</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.manat</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.mdotbelow</key>
@@ -1473,14 +1377,10 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.micro</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.minus</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.minus.tf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.minute</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.multiply</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.multiply.tf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.n</key>
       <integer>0</integer>
@@ -1488,8 +1388,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.naira</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.nbspace</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ncaron</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ncommaaccent</key>
@@ -1508,8 +1406,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.nine.tf</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.nine.tosf</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.nineinferior</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ninesuperior</key>
@@ -1520,15 +1416,9 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.nlinebelow</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.nonbreakinghyphen</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.notequal</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.notequal.tf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.notidentical</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.notidentical.tf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ntilde</key>
       <integer>0</integer>
@@ -1619,8 +1509,6 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.one.osf</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.one.tf</key>
-      <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.one.tosf</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.oneeighth</key>
       <integer>1</integer>
@@ -1697,12 +1585,8 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.pi</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.plus</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.plus.tf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.plusminus</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.plusminus.tf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.primeReversed</key>
       <integer>0</integer>
@@ -1826,8 +1710,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.seven.tf</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.seven.tosf</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.seveneighths</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.seveninferior</key>
@@ -1841,7 +1723,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.shha-cy</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.six</key>
-      <integer>1</integer>
+      <integer>3</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.six.dnom</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.six.numr</key>
@@ -1850,8 +1732,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.six.tf</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.six.tosf</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.sixinferior</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.sixperemspace</key>
@@ -1868,8 +1748,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.slashshortcomb.case</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.softhyphen</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.softsign-cy</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.space</key>
@@ -1916,8 +1794,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.three.tf</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.three.tosf</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.threeeighths</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.threefifths</key>
@@ -1938,12 +1814,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.tildecomb.loclVIET</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.tildecomb_acutecomb</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.tildecomb_dieresiscomb</key>
-      <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.tildecomb_macroncomb</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.tlinebelow</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.trademark</key>
@@ -1966,8 +1836,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.two.tf</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.two.tosf</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.twofifths</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.twoinferior</key>
@@ -2142,10 +2010,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.zero.tf.zero</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.zero.tosf</key>
-      <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.zero.tosf.zero</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.zero.zero</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.zeroinferior</key>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lcaron.glif b/src/Cantarell-Regular.ufo/glyphs/lcaron.glif
index 2de0a24e..d6ce68a0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lcaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lcaron.glif
@@ -4,7 +4,7 @@
   <unicode hex="013E"/>
   <outline>
     <component base="l"/>
-    <component base="caroncomb.alt" xOffset="142"/>
+    <component base="caroncomb.alt" xOffset="145"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lcommaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/lcommaaccent.glif
index c47e8250..d9996b8d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lcommaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lcommaaccent" format="2">
-  <advance width="271"/>
+  <advance width="278"/>
   <unicode hex="013C"/>
   <outline>
     <component base="l"/>
-    <component base="commaaccentcomb" xOffset="-6"/>
+    <component base="commaaccentcomb" xOffset="-3"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ldot.glif b/src/Cantarell-Regular.ufo/glyphs/ldot.glif
index 3b54bdf7..9c0a184d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ldot.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ldot.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ldot" format="2">
-  <advance width="271"/>
+  <advance width="278"/>
   <unicode hex="0140"/>
   <outline>
     <component base="l"/>
-    <component base="periodcentered.loclCAT" xOffset="272"/>
+    <component base="periodcentered.loclCAT" xOffset="276"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ldotbelow.glif b/src/Cantarell-Regular.ufo/glyphs/ldotbelow.glif
index 7f1070e3..fc21a1bd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ldotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ldotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ldotbelow" format="2">
-  <advance width="271"/>
+  <advance width="278"/>
   <unicode hex="1E37"/>
   <outline>
     <component base="l"/>
-    <component base="dotbelowcomb" xOffset="24"/>
+    <component base="dotbelowcomb" xOffset="27"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/leftA_rrow.glif 
b/src/Cantarell-Regular.ufo/glyphs/leftA_rrow.glif
index 3b6865d0..1087fcaf 100644
--- a/src/Cantarell-Regular.ufo/glyphs/leftA_rrow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/leftA_rrow.glif
@@ -1,11 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="leftArrow" format="2">
-  <advance width="690"/>
+  <advance width="677"/>
   <unicode hex="2190"/>
-  <note>
-arrowleft
-</note>
   <outline>
-    <component base="rightArrow" xScale="-1" yScale="-1" xOffset="691" yOffset="643"/>
+    <component base="rightArrow" xScale="-1" yScale="-1" xOffset="677" yOffset="643"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|rightArrow</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|rightArrow</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/leftanglebracket-math.glif 
b/src/Cantarell-Regular.ufo/glyphs/leftanglebracket-math.glif
index b4254168..92935cd6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/leftanglebracket-math.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/leftanglebracket-math.glif
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="leftanglebracket-math" format="2">
-  <advance width="312"/>
+  <advance width="327"/>
   <unicode hex="27E8"/>
   <outline>
     <contour>
-      <point x="185" y="-10" type="line"/>
-      <point x="270" y="-10" type="line"/>
+      <point x="198" y="-10" type="line"/>
+      <point x="289" y="-10" type="line"/>
       <point x="114" y="398" type="line"/>
       <point x="114" y="351" type="line"/>
-      <point x="265" y="739" type="line"/>
-      <point x="189" y="739" type="line"/>
-      <point x="45" y="372" type="line"/>
+      <point x="284" y="739" type="line"/>
+      <point x="202" y="739" type="line"/>
+      <point x="39" y="371" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/less.glif b/src/Cantarell-Regular.ufo/glyphs/less.glif
index 113cfe0f..cd2c7a3f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/less.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/less.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="less" format="2">
-  <advance width="606"/>
+  <advance width="580"/>
   <unicode hex="003C"/>
   <outline>
-    <component base="greater.tf" xScale="-1" yScale="-1" xOffset="606" yOffset="649"/>
+    <component base="greater" xScale="-1" yScale="-1" xOffset="580" yOffset="619"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|greater</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lessequal.glif b/src/Cantarell-Regular.ufo/glyphs/lessequal.glif
index 04aa06e5..72083c4e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lessequal.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lessequal.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lessequal" format="2">
-  <advance width="652"/>
+  <advance width="580"/>
   <unicode hex="2264"/>
   <outline>
-    <component base="greaterequal.tf" xScale="-1" xOffset="652"/>
+    <component base="greaterequal" xScale="-1" xOffset="580"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|greaterequal</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lira.glif b/src/Cantarell-Regular.ufo/glyphs/lira.glif
index 0ff14715..924a6cb8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lira.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lira.glif
@@ -1,46 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lira" format="2">
-  <advance width="646"/>
+  <advance width="580"/>
   <unicode hex="20A4"/>
   <outline>
     <contour>
-      <point x="90" y="0" type="line"/>
-      <point x="572" y="0" type="line"/>
-      <point x="572" y="72" type="line"/>
-      <point x="185" y="72" type="line"/>
-      <point x="229" y="90"/>
-      <point x="245" y="145"/>
-      <point x="245" y="208" type="curve" smooth="yes"/>
-      <point x="245" y="491" type="line" smooth="yes"/>
-      <point x="245" y="577"/>
-      <point x="296" y="631"/>
-      <point x="404" y="631" type="curve" smooth="yes"/>
-      <point x="442" y="631"/>
-      <point x="480" y="624"/>
-      <point x="521" y="612" type="curve"/>
-      <point x="545" y="681" type="line"/>
-      <point x="503" y="697"/>
-      <point x="463" y="704"/>
-      <point x="416" y="704" type="curve" smooth="yes"/>
-      <point x="248" y="704"/>
-      <point x="168" y="615"/>
-      <point x="168" y="481" type="curve" smooth="yes"/>
-      <point x="168" y="198" type="line" smooth="yes"/>
-      <point x="168" y="141"/>
-      <point x="143" y="90"/>
-      <point x="90" y="72" type="curve"/>
+      <point x="58" y="0" type="line"/>
+      <point x="530" y="0" type="line"/>
+      <point x="530" y="72" type="line"/>
+      <point x="153" y="72" type="line"/>
+      <point x="194" y="90"/>
+      <point x="221" y="144"/>
+      <point x="221" y="208" type="curve" smooth="yes"/>
+      <point x="221" y="491" type="line" smooth="yes"/>
+      <point x="221" y="584"/>
+      <point x="269" y="631"/>
+      <point x="366" y="631" type="curve" smooth="yes"/>
+      <point x="398" y="631"/>
+      <point x="434" y="626"/>
+      <point x="480" y="612" type="curve"/>
+      <point x="504" y="681" type="line"/>
+      <point x="463" y="697"/>
+      <point x="424" y="704"/>
+      <point x="377" y="704" type="curve" smooth="yes"/>
+      <point x="225" y="704"/>
+      <point x="144" y="626"/>
+      <point x="144" y="481" type="curve" smooth="yes"/>
+      <point x="144" y="198" type="line" smooth="yes"/>
+      <point x="144" y="141"/>
+      <point x="109" y="89"/>
+      <point x="58" y="72" type="curve"/>
     </contour>
     <contour>
-      <point x="103" y="408" type="line"/>
-      <point x="478" y="408" type="line"/>
-      <point x="478" y="468" type="line"/>
-      <point x="103" y="468" type="line"/>
+      <point x="65" y="227" type="line"/>
+      <point x="445" y="227" type="line"/>
+      <point x="445" y="294" type="line"/>
+      <point x="65" y="294" type="line"/>
     </contour>
     <contour>
-      <point x="103" y="248" type="line"/>
-      <point x="478" y="248" type="line"/>
-      <point x="478" y="308" type="line"/>
-      <point x="103" y="308" type="line"/>
+      <point x="65" y="404" type="line"/>
+      <point x="445" y="404" type="line"/>
+      <point x="445" y="471" type="line"/>
+      <point x="65" y="471" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/liraT_urkish.glif 
b/src/Cantarell-Regular.ufo/glyphs/liraT_urkish.glif
index a4c356f9..af653fa8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/liraT_urkish.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/liraT_urkish.glif
@@ -1,35 +1,38 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="liraTurkish" format="2">
-  <advance width="650"/>
+  <advance width="580"/>
   <unicode hex="20BA"/>
   <outline>
     <contour>
-      <point x="232" y="0" type="line"/>
-      <point x="437" y="0"/>
-      <point x="573" y="132"/>
-      <point x="573" y="330" type="curve"/>
-      <point x="493" y="330" type="line"/>
-      <point x="493" y="174"/>
-      <point x="393" y="70"/>
-      <point x="242" y="70" type="curve"/>
+      <point x="143" y="0" type="line"/>
+      <point x="220" y="0" type="line" smooth="yes"/>
+      <point x="398" y="0"/>
+      <point x="518" y="133"/>
+      <point x="518" y="330" type="curve"/>
+      <point x="439" y="330" type="line"/>
+      <point x="439" y="174"/>
+      <point x="352" y="70"/>
+      <point x="220" y="70" type="curve"/>
+      <point x="220" y="694" type="line"/>
+      <point x="143" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="165" y="0" type="line"/>
-      <point x="242" y="0" type="line"/>
-      <point x="242" y="694" type="line"/>
-      <point x="165" y="694" type="line"/>
+      <point x="102" y="220" type="line"/>
+      <point x="392" y="382" type="line"/>
+      <point x="363" y="436" type="line"/>
+      <point x="73" y="274" type="line"/>
     </contour>
     <contour>
-      <point x="101" y="393" type="line"/>
-      <point x="406" y="571" type="line"/>
-      <point x="378" y="625" type="line"/>
-      <point x="75" y="446" type="line"/>
-    </contour>
-    <contour>
-      <point x="116" y="252" type="line"/>
-      <point x="406" y="421" type="line"/>
-      <point x="378" y="475" type="line"/>
-      <point x="90" y="305" type="line"/>
+      <point x="87" y="392" type="line"/>
+      <point x="390" y="561" type="line"/>
+      <point x="361" y="615" type="line"/>
+      <point x="58" y="446" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/literS_ign.glif 
b/src/Cantarell-Regular.ufo/glyphs/literS_ign.glif
index ee7e277f..d08b04c4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/literS_ign.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/literS_ign.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="literSign" format="2">
-  <advance width="484"/>
+  <advance width="479"/>
   <unicode hex="2113"/>
   <outline>
     <contour>
-      <point x="309" y="-10" type="curve" smooth="yes"/>
-      <point x="341" y="-10"/>
-      <point x="371" y="-2"/>
-      <point x="397" y="14" type="curve"/>
-      <point x="379" y="69" type="line"/>
-      <point x="360" y="60"/>
-      <point x="340" y="55"/>
-      <point x="323" y="55" type="curve" smooth="yes"/>
-      <point x="279" y="55"/>
-      <point x="247" y="88"/>
-      <point x="247" y="135" type="curve" smooth="yes"/>
-      <point x="247" y="554" type="line" smooth="yes"/>
-      <point x="247" y="630"/>
-      <point x="264" y="679"/>
-      <point x="291" y="679" type="curve" smooth="yes"/>
-      <point x="312" y="679"/>
-      <point x="331" y="652"/>
-      <point x="331" y="610" type="curve" smooth="yes"/>
-      <point x="331" y="510"/>
-      <point x="259" y="390"/>
-      <point x="57" y="134" type="curve"/>
-      <point x="101" y="98" type="line"/>
-      <point x="326" y="379"/>
-      <point x="405" y="513"/>
-      <point x="405" y="622" type="curve" smooth="yes"/>
-      <point x="405" y="700"/>
-      <point x="364" y="749"/>
-      <point x="298" y="749" type="curve" smooth="yes"/>
-      <point x="215" y="749"/>
-      <point x="167" y="673"/>
-      <point x="167" y="544" type="curve" smooth="yes"/>
-      <point x="167" y="117" type="line" smooth="yes"/>
-      <point x="167" y="42"/>
-      <point x="226" y="-10"/>
+      <point x="306" y="-10" type="curve" smooth="yes"/>
+      <point x="338" y="-10"/>
+      <point x="368" y="-2"/>
+      <point x="394" y="14" type="curve"/>
+      <point x="376" y="69" type="line"/>
+      <point x="357" y="60"/>
+      <point x="337" y="55"/>
+      <point x="320" y="55" type="curve" smooth="yes"/>
+      <point x="276" y="55"/>
+      <point x="244" y="88"/>
+      <point x="244" y="135" type="curve" smooth="yes"/>
+      <point x="244" y="554" type="line" smooth="yes"/>
+      <point x="244" y="630"/>
+      <point x="261" y="679"/>
+      <point x="288" y="679" type="curve" smooth="yes"/>
+      <point x="309" y="679"/>
+      <point x="328" y="652"/>
+      <point x="328" y="610" type="curve" smooth="yes"/>
+      <point x="328" y="510"/>
+      <point x="256" y="390"/>
+      <point x="54" y="134" type="curve"/>
+      <point x="98" y="98" type="line"/>
+      <point x="323" y="379"/>
+      <point x="402" y="513"/>
+      <point x="402" y="622" type="curve" smooth="yes"/>
+      <point x="402" y="700"/>
+      <point x="361" y="749"/>
+      <point x="295" y="749" type="curve" smooth="yes"/>
+      <point x="212" y="749"/>
+      <point x="164" y="673"/>
+      <point x="164" y="544" type="curve" smooth="yes"/>
+      <point x="164" y="117" type="line" smooth="yes"/>
+      <point x="164" y="42"/>
+      <point x="223" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lj.glif b/src/Cantarell-Regular.ufo/glyphs/lj.glif
index d94af49d..6759e8cb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lj.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lj.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lj" format="2">
-  <advance width="526"/>
+  <advance width="524"/>
   <unicode hex="01C9"/>
   <outline>
     <component base="l"/>
-    <component base="j" xOffset="271"/>
+    <component base="j" xOffset="278"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lje-cy.glif b/src/Cantarell-Regular.ufo/glyphs/lje-cy.glif
index caca6746..13b94b57 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lje-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lje-cy.glif
@@ -1,55 +1,57 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lje-cy" format="2">
-  <advance width="855"/>
+  <advance width="842"/>
   <unicode hex="0459"/>
   <outline>
     <contour>
-      <point x="468" y="0" type="line"/>
-      <point x="613" y="0" type="line" smooth="yes"/>
-      <point x="739" y="0"/>
-      <point x="816" y="62"/>
-      <point x="816" y="164" type="curve" smooth="yes"/>
-      <point x="816" y="259"/>
-      <point x="746" y="320"/>
-      <point x="643" y="320" type="curve" smooth="yes"/>
-      <point x="468" y="320" type="line"/>
-      <point x="468" y="255" type="line"/>
-      <point x="630" y="255" type="line" smooth="yes"/>
-      <point x="692" y="255"/>
-      <point x="736" y="214"/>
-      <point x="736" y="156" type="curve" smooth="yes"/>
-      <point x="736" y="100"/>
-      <point x="694" y="67"/>
-      <point x="624" y="67" type="curve" smooth="yes"/>
-      <point x="468" y="67" type="line"/>
+      <point x="89" y="-11" type="curve" smooth="yes"/>
+      <point x="174" y="-11"/>
+      <point x="218" y="68"/>
+      <point x="218" y="218" type="curve" smooth="yes"/>
+      <point x="218" y="415" type="line"/>
+      <point x="410" y="415" type="line"/>
+      <point x="410" y="0" type="line"/>
+      <point x="490" y="0" type="line"/>
+      <point x="490" y="482" type="line"/>
+      <point x="143" y="482" type="line"/>
+      <point x="143" y="211" type="line" smooth="yes"/>
+      <point x="143" y="111"/>
+      <point x="121" y="60"/>
+      <point x="77" y="60" type="curve" smooth="yes"/>
+      <point x="65" y="60"/>
+      <point x="48" y="64"/>
+      <point x="28" y="73" type="curve"/>
+      <point x="11" y="13" type="line"/>
+      <point x="35" y="-3"/>
+      <point x="62" y="-11"/>
     </contour>
     <contour>
-      <point x="99" y="-11" type="curve" smooth="yes"/>
-      <point x="184" y="-11"/>
-      <point x="228" y="68"/>
-      <point x="228" y="218" type="curve" smooth="yes"/>
-      <point x="228" y="415" type="line"/>
-      <point x="420" y="415" type="line"/>
-      <point x="420" y="0" type="line"/>
-      <point x="500" y="0" type="line"/>
-      <point x="500" y="482" type="line"/>
-      <point x="153" y="482" type="line"/>
-      <point x="153" y="211" type="line" smooth="yes"/>
-      <point x="153" y="111"/>
-      <point x="131" y="60"/>
-      <point x="87" y="60" type="curve" smooth="yes"/>
-      <point x="75" y="60"/>
-      <point x="58" y="64"/>
-      <point x="38" y="73" type="curve"/>
-      <point x="21" y="13" type="line"/>
-      <point x="45" y="-3"/>
-      <point x="72" y="-11"/>
+      <point x="458" y="0" type="line"/>
+      <point x="603" y="0" type="line" smooth="yes"/>
+      <point x="729" y="0"/>
+      <point x="806" y="62"/>
+      <point x="806" y="164" type="curve" smooth="yes"/>
+      <point x="806" y="259"/>
+      <point x="736" y="320"/>
+      <point x="633" y="320" type="curve" smooth="yes"/>
+      <point x="458" y="320" type="line"/>
+      <point x="458" y="255" type="line"/>
+      <point x="620" y="255" type="line" smooth="yes"/>
+      <point x="682" y="255"/>
+      <point x="726" y="214"/>
+      <point x="726" y="156" type="curve" smooth="yes"/>
+      <point x="726" y="100"/>
+      <point x="684" y="67"/>
+      <point x="614" y="67" type="curve" smooth="yes"/>
+      <point x="458" y="67" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>el-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>softsign-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/llinebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/llinebelow.glif
index e607e009..b6cf607e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/llinebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/llinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="llinebelow" format="2">
-  <advance width="271"/>
+  <advance width="278"/>
   <unicode hex="1E3B"/>
   <outline>
     <component base="l"/>
-    <component base="macronbelowcomb.narrow" xOffset="-54"/>
+    <component base="macronbelowcomb.narrow" xOffset="-51"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/logicalnot.glif 
b/src/Cantarell-Regular.ufo/glyphs/logicalnot.glif
index 9ae534fe..c362cebb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/logicalnot.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/logicalnot.glif
@@ -1,19 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="logicalnot" format="2">
-  <advance width="681"/>
+  <advance width="580"/>
   <unicode hex="00AC"/>
   <outline>
     <contour>
-      <point x="80" y="328" type="line"/>
-      <point x="556" y="328" type="line"/>
-      <point x="556" y="395" type="line"/>
-      <point x="80" y="395" type="line"/>
+      <point x="55" y="297" type="line"/>
+      <point x="525" y="297" type="line"/>
+      <point x="525" y="371" type="line"/>
+      <point x="55" y="371" type="line"/>
     </contour>
     <contour>
-      <point x="476" y="152" type="line"/>
-      <point x="556" y="152" type="line"/>
-      <point x="556" y="353" type="line"/>
-      <point x="476" y="353" type="line"/>
+      <point x="449" y="99" type="line"/>
+      <point x="525" y="99" type="line"/>
+      <point x="525" y="323" type="line"/>
+      <point x="449" y="323" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lozenge.glif b/src/Cantarell-Regular.ufo/glyphs/lozenge.glif
index 3d5e3a37..c9afb94b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lozenge.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lozenge.glif
@@ -1,21 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lozenge" format="2">
-  <advance width="574"/>
+  <advance width="569"/>
   <unicode hex="25CA"/>
   <outline>
     <contour>
-      <point x="243" y="0" type="line"/>
-      <point x="315" y="0" type="line"/>
-      <point x="510" y="357" type="line"/>
-      <point x="315" y="694" type="line"/>
-      <point x="243" y="694" type="line"/>
-      <point x="65" y="357" type="line"/>
+      <point x="240" y="0" type="line"/>
+      <point x="312" y="0" type="line"/>
+      <point x="507" y="357" type="line"/>
+      <point x="312" y="694" type="line"/>
+      <point x="240" y="694" type="line"/>
+      <point x="62" y="357" type="line"/>
     </contour>
     <contour>
-      <point x="280" y="84" type="line"/>
-      <point x="146" y="356" type="line"/>
-      <point x="280" y="612" type="line"/>
-      <point x="427" y="356" type="line"/>
+      <point x="277" y="84" type="line"/>
+      <point x="143" y="356" type="line"/>
+      <point x="277" y="612" type="line"/>
+      <point x="424" y="356" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lslash.glif b/src/Cantarell-Regular.ufo/glyphs/lslash.glif
index ec4a6b6e..457ed162 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lslash.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lslash.glif
@@ -1,9 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lslash" format="2">
-  <advance width="271"/>
+  <advance width="328"/>
   <unicode hex="0142"/>
   <outline>
-    <component base="l"/>
-    <component base="slashshortcomb" xOffset="-40" yOffset="100"/>
+    <component base="l" xOffset="21"/>
+    <component base="slashshortcomb" xOffset="-16" yOffset="100"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>-1</integer>
+        <integer>0</integer>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/m.glif b/src/Cantarell-Regular.ufo/glyphs/m.glif
index e6c60608..f4bd196f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/m.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/m.glif
@@ -2,12 +2,27 @@
 <glyph name="m" format="2">
   <advance width="886"/>
   <unicode hex="006D"/>
-  <note>
-m
-</note>
   <anchor x="443" y="0" name="bottom"/>
   <anchor x="443" y="482" name="top"/>
   <outline>
+    <contour>
+      <point x="731" y="0" type="line"/>
+      <point x="811" y="0" type="line"/>
+      <point x="811" y="316" type="line" smooth="yes"/>
+      <point x="811" y="423"/>
+      <point x="741" y="492"/>
+      <point x="634" y="492" type="curve" smooth="yes"/>
+      <point x="565" y="492"/>
+      <point x="497" y="462"/>
+      <point x="447" y="409" type="curve"/>
+      <point x="466" y="358" type="line"/>
+      <point x="505" y="399"/>
+      <point x="557" y="422"/>
+      <point x="612" y="422" type="curve" smooth="yes"/>
+      <point x="689" y="422"/>
+      <point x="731" y="378"/>
+      <point x="731" y="300" type="curve" smooth="yes"/>
+    </contour>
     <contour>
       <point x="83" y="0" type="line"/>
       <point x="163" y="0" type="line"/>
@@ -33,23 +48,13 @@ m
       <point x="407" y="378"/>
       <point x="407" y="300" type="curve" smooth="yes"/>
     </contour>
-    <contour>
-      <point x="731" y="0" type="line"/>
-      <point x="811" y="0" type="line"/>
-      <point x="811" y="316" type="line" smooth="yes"/>
-      <point x="811" y="423"/>
-      <point x="741" y="492"/>
-      <point x="634" y="492" type="curve" smooth="yes"/>
-      <point x="565" y="492"/>
-      <point x="497" y="462"/>
-      <point x="447" y="409" type="curve"/>
-      <point x="466" y="358" type="line"/>
-      <point x="505" y="399"/>
-      <point x="557" y="422"/>
-      <point x="612" y="422" type="curve" smooth="yes"/>
-      <point x="689" y="422"/>
-      <point x="731" y="378"/>
-      <point x="731" y="300" type="curve" smooth="yes"/>
-    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/macron.glif b/src/Cantarell-Regular.ufo/glyphs/macron.glif
index 596cb229..f2d450d3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/macron.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="macron" format="2">
-  <advance width="483"/>
+  <advance width="500"/>
   <unicode hex="00AF"/>
   <outline>
-    <component base="macroncomb" xOffset="-3"/>
+    <component base="macroncomb" xOffset="6"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/manat.glif b/src/Cantarell-Regular.ufo/glyphs/manat.glif
index 795855a0..50d789d9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/manat.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/manat.glif
@@ -1,33 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="manat" format="2">
-  <advance width="727"/>
+  <advance width="580"/>
   <unicode hex="20BC"/>
   <outline>
     <contour>
-      <point x="102" y="0" type="line"/>
-      <point x="176" y="0" type="line"/>
-      <point x="176" y="228" type="line" smooth="yes"/>
-      <point x="176" y="406"/>
-      <point x="249" y="525"/>
-      <point x="358" y="525" type="curve" smooth="yes"/>
-      <point x="473" y="525"/>
-      <point x="550" y="402"/>
-      <point x="550" y="218" type="curve" smooth="yes"/>
-      <point x="550" y="0" type="line"/>
-      <point x="624" y="0" type="line"/>
-      <point x="624" y="228" type="line" smooth="yes"/>
-      <point x="624" y="448"/>
-      <point x="522" y="595"/>
-      <point x="368" y="595" type="curve" smooth="yes"/>
-      <point x="208" y="595"/>
-      <point x="102" y="444"/>
-      <point x="102" y="218" type="curve" smooth="yes"/>
+      <point x="45" y="0" type="line"/>
+      <point x="119" y="0" type="line"/>
+      <point x="119" y="228" type="line" smooth="yes"/>
+      <point x="119" y="423"/>
+      <point x="177" y="525"/>
+      <point x="287" y="525" type="curve" smooth="yes"/>
+      <point x="403" y="525"/>
+      <point x="463" y="420"/>
+      <point x="463" y="218" type="curve" smooth="yes"/>
+      <point x="463" y="0" type="line"/>
+      <point x="537" y="0" type="line"/>
+      <point x="537" y="228" type="line" smooth="yes"/>
+      <point x="537" y="469"/>
+      <point x="454" y="595"/>
+      <point x="296" y="595" type="curve" smooth="yes"/>
+      <point x="131" y="595"/>
+      <point x="45" y="466"/>
+      <point x="45" y="218" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="327" y="100" type="line"/>
-      <point x="401" y="100" type="line"/>
-      <point x="401" y="694" type="line"/>
-      <point x="327" y="694" type="line"/>
+      <point x="256" y="100" type="line"/>
+      <point x="328" y="100" type="line"/>
+      <point x="328" y="694" type="line"/>
+      <point x="256" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/micro.glif b/src/Cantarell-Regular.ufo/glyphs/micro.glif
index 2d43a474..00045890 100644
--- a/src/Cantarell-Regular.ufo/glyphs/micro.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/micro.glif
@@ -1,36 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="micro" format="2">
-  <advance width="639"/>
+  <advance width="575"/>
   <unicode hex="00B5"/>
   <outline>
     <contour>
-      <point x="323" y="-10" type="curve" smooth="yes"/>
-      <point x="380" y="-10"/>
-      <point x="428" y="14"/>
-      <point x="484" y="73" type="curve"/>
-      <point x="465" y="134" type="line"/>
-      <point x="425" y="82"/>
-      <point x="384" y="60"/>
-      <point x="332" y="60" type="curve" smooth="yes"/>
-      <point x="255" y="60"/>
-      <point x="200" y="108"/>
-      <point x="200" y="182" type="curve"/>
-      <point x="160" y="166" type="line"/>
-      <point x="160" y="60"/>
-      <point x="225" y="-10"/>
+      <point x="83" y="-217" type="line"/>
+      <point x="158" y="-217" type="line"/>
+      <point x="158" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
     </contour>
     <contour>
-      <point x="125" y="-217" type="line"/>
-      <point x="200" y="-217" type="line"/>
-      <point x="200" y="482" type="line"/>
-      <point x="125" y="482" type="line"/>
+      <point x="281" y="-10" type="curve" smooth="yes"/>
+      <point x="338" y="-10"/>
+      <point x="386" y="14"/>
+      <point x="442" y="73" type="curve"/>
+      <point x="423" y="134" type="line"/>
+      <point x="383" y="82"/>
+      <point x="342" y="60"/>
+      <point x="290" y="60" type="curve" smooth="yes"/>
+      <point x="213" y="60"/>
+      <point x="158" y="108"/>
+      <point x="158" y="182" type="curve"/>
+      <point x="118" y="166" type="line"/>
+      <point x="118" y="60"/>
+      <point x="183" y="-10"/>
     </contour>
     <contour>
-      <point x="478" y="0" type="line"/>
-      <point x="534" y="0" type="line"/>
-      <point x="534" y="482" type="line"/>
-      <point x="454" y="482" type="line"/>
-      <point x="454" y="56" type="line"/>
+      <point x="436" y="0" type="line"/>
+      <point x="492" y="0" type="line"/>
+      <point x="492" y="482" type="line"/>
+      <point x="412" y="482" type="line"/>
+      <point x="412" y="56" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/minus.glif b/src/Cantarell-Regular.ufo/glyphs/minus.glif
index e8e4a6a8..b49e8d3f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/minus.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/minus.glif
@@ -1,13 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="minus" format="2">
-  <advance width="739"/>
+  <advance width="580"/>
   <unicode hex="2212"/>
   <outline>
     <contour>
-      <point x="125" y="296" type="line"/>
-      <point x="614" y="296" type="line"/>
-      <point x="614" y="365" type="line"/>
-      <point x="125" y="365" type="line"/>
+      <point x="55" y="297" type="line"/>
+      <point x="525" y="297" type="line"/>
+      <point x="525" y="371" type="line"/>
+      <point x="55" y="371" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/minute.glif b/src/Cantarell-Regular.ufo/glyphs/minute.glif
index 66446802..be39c3e7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/minute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/minute.glif
@@ -1,11 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="minute" format="2">
-  <advance width="330"/>
+  <advance width="322"/>
   <unicode hex="2032"/>
-  <note>
-minute
-</note>
   <outline>
-    <component base="quotesingle" yxScale="0.19201" xOffset="-70"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="-68"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/multiply.glif b/src/Cantarell-Regular.ufo/glyphs/multiply.glif
index 07badd45..0c5a38fe 100644
--- a/src/Cantarell-Regular.ufo/glyphs/multiply.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/multiply.glif
@@ -1,19 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="multiply" format="2">
-  <advance width="578"/>
+  <advance width="580"/>
   <unicode hex="00D7"/>
   <outline>
     <contour>
-      <point x="455" y="90" type="line"/>
-      <point x="505" y="140" type="line"/>
-      <point x="130" y="537" type="line"/>
-      <point x="80" y="487" type="line"/>
+      <point x="430" y="142" type="line"/>
+      <point x="98" y="474" type="line"/>
+      <point x="150" y="526" type="line"/>
+      <point x="482" y="194" type="line"/>
     </contour>
     <contour>
-      <point x="122" y="96" type="line"/>
-      <point x="501" y="483" type="line"/>
-      <point x="451" y="533" type="line"/>
-      <point x="72" y="146" type="line"/>
+      <point x="150" y="142" type="line"/>
+      <point x="98" y="194" type="line"/>
+      <point x="430" y="526" type="line"/>
+      <point x="482" y="474" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/n.glif b/src/Cantarell-Regular.ufo/glyphs/n.glif
index e84316c6..2c308559 100644
--- a/src/Cantarell-Regular.ufo/glyphs/n.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/n.glif
@@ -2,19 +2,9 @@
 <glyph name="n" format="2">
   <advance width="567"/>
   <unicode hex="006E"/>
-  <note>
-n
-</note>
   <anchor x="286" y="0" name="bottom"/>
   <anchor x="286" y="482" name="top"/>
   <outline>
-    <contour>
-      <point x="83" y="0" type="line"/>
-      <point x="163" y="0" type="line"/>
-      <point x="163" y="426" type="line"/>
-      <point x="139" y="482" type="line"/>
-      <point x="83" y="482" type="line"/>
-    </contour>
     <contour>
       <point x="412" y="0" type="line"/>
       <point x="492" y="0" type="line"/>
@@ -33,5 +23,12 @@ n
       <point x="412" y="378"/>
       <point x="412" y="300" type="curve" smooth="yes"/>
     </contour>
+    <contour>
+      <point x="83" y="0" type="line"/>
+      <point x="163" y="0" type="line"/>
+      <point x="163" y="426" type="line"/>
+      <point x="139" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
+    </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/naira.glif b/src/Cantarell-Regular.ufo/glyphs/naira.glif
index d3cd3dbb..614cf24d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/naira.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/naira.glif
@@ -1,32 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="naira" format="2">
-  <advance width="922"/>
+  <advance width="580"/>
   <unicode hex="20A6"/>
   <outline>
     <contour>
-      <point x="699" y="444" type="line"/>
-      <point x="699" y="384" type="line"/>
-      <point x="834" y="384" type="line"/>
-      <point x="834" y="444" type="line"/>
+      <point x="95" y="0" type="line"/>
+      <point x="170" y="0" type="line"/>
+      <point x="170" y="605" type="line"/>
+      <point x="142" y="605" type="line"/>
+      <point x="398" y="0" type="line"/>
+      <point x="486" y="0" type="line"/>
+      <point x="486" y="694" type="line"/>
+      <point x="411" y="694" type="line"/>
+      <point x="410" y="87" type="line"/>
+      <point x="441" y="87" type="line"/>
+      <point x="186" y="694" type="line"/>
+      <point x="95" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="699" y="314" type="line"/>
-      <point x="699" y="254" type="line"/>
-      <point x="834" y="254" type="line"/>
-      <point x="834" y="314" type="line"/>
+      <point x="17" y="227" type="line"/>
+      <point x="123" y="227" type="line"/>
+      <point x="123" y="294" type="line"/>
+      <point x="17" y="294" type="line"/>
     </contour>
     <contour>
-      <point x="224" y="254" type="line"/>
-      <point x="224" y="314" type="line"/>
-      <point x="88" y="314" type="line"/>
-      <point x="88" y="254" type="line"/>
+      <point x="17" y="404" type="line"/>
+      <point x="123" y="404" type="line"/>
+      <point x="123" y="471" type="line"/>
+      <point x="17" y="471" type="line"/>
     </contour>
     <contour>
-      <point x="224" y="384" type="line"/>
-      <point x="224" y="444" type="line"/>
-      <point x="88" y="444" type="line"/>
-      <point x="88" y="384" type="line"/>
+      <point x="459" y="227" type="line"/>
+      <point x="564" y="227" type="line"/>
+      <point x="564" y="294" type="line"/>
+      <point x="459" y="294" type="line"/>
+    </contour>
+    <contour>
+      <point x="459" y="404" type="line"/>
+      <point x="564" y="404" type="line"/>
+      <point x="564" y="471" type="line"/>
+      <point x="459" y="471" type="line"/>
     </contour>
-    <component base="N" xOffset="67"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/nine.dnom.glif b/src/Cantarell-Regular.ufo/glyphs/nine.dnom.glif
index 0da8b07c..ed3de67f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/nine.dnom.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/nine.dnom.glif
@@ -1,49 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine.dnom" format="2">
-  <advance width="464"/>
-  <note>
-nine
-</note>
+  <advance width="427"/>
   <outline>
     <contour>
-      <point x="222" y="479" type="curve" smooth="yes"/>
-      <point x="120" y="479"/>
-      <point x="49" y="416"/>
-      <point x="49" y="322" type="curve" smooth="yes"/>
-      <point x="49" y="236"/>
-      <point x="110" y="179"/>
-      <point x="199" y="179" type="curve" smooth="yes"/>
-      <point x="270" y="179"/>
-      <point x="329" y="214"/>
-      <point x="362" y="279" type="curve"/>
-      <point x="343" y="312" type="line"/>
-      <point x="318" y="266"/>
-      <point x="274" y="240"/>
-      <point x="223" y="240" type="curve" smooth="yes"/>
-      <point x="164" y="240"/>
-      <point x="124" y="276"/>
-      <point x="124" y="330" type="curve" smooth="yes"/>
-      <point x="124" y="382"/>
-      <point x="159" y="416"/>
-      <point x="215" y="416" type="curve" smooth="yes"/>
-      <point x="291" y="416"/>
-      <point x="334" y="353"/>
-      <point x="334" y="243" type="curve" smooth="yes"/>
-      <point x="334" y="119"/>
-      <point x="279" y="55"/>
-      <point x="183" y="55" type="curve" smooth="yes"/>
-      <point x="147" y="55"/>
-      <point x="106" y="64"/>
-      <point x="77" y="78" type="curve"/>
-      <point x="57" y="21" type="line"/>
-      <point x="89" y="3"/>
-      <point x="134" y="-7"/>
-      <point x="181" y="-7" type="curve" smooth="yes"/>
-      <point x="329" y="-7"/>
-      <point x="411" y="88"/>
-      <point x="411" y="248" type="curve" smooth="yes"/>
-      <point x="411" y="398"/>
-      <point x="339" y="479"/>
+      <point x="172" y="-6" type="curve" smooth="yes"/>
+      <point x="301" y="-6"/>
+      <point x="371" y="77"/>
+      <point x="371" y="220" type="curve" smooth="yes"/>
+      <point x="371" y="350"/>
+      <point x="311" y="422"/>
+      <point x="208" y="422" type="curve" smooth="yes"/>
+      <point x="117" y="422"/>
+      <point x="54" y="366"/>
+      <point x="54" y="282" type="curve" smooth="yes"/>
+      <point x="54" y="205"/>
+      <point x="106" y="155"/>
+      <point x="183" y="155" type="curve" smooth="yes"/>
+      <point x="244" y="155"/>
+      <point x="292" y="185"/>
+      <point x="315" y="241" type="curve"/>
+      <point x="298" y="271" type="line"/>
+      <point x="280" y="235"/>
+      <point x="245" y="215"/>
+      <point x="205" y="215" type="curve" smooth="yes"/>
+      <point x="158" y="215"/>
+      <point x="126" y="244"/>
+      <point x="126" y="288" type="curve" smooth="yes"/>
+      <point x="126" y="331"/>
+      <point x="156" y="360"/>
+      <point x="202" y="360" type="curve" smooth="yes"/>
+      <point x="263" y="360"/>
+      <point x="298" y="307"/>
+      <point x="298" y="213" type="curve" smooth="yes"/>
+      <point x="298" y="110"/>
+      <point x="254" y="55"/>
+      <point x="170" y="55" type="curve" smooth="yes"/>
+      <point x="141" y="55"/>
+      <point x="108" y="62"/>
+      <point x="81" y="74" type="curve"/>
+      <point x="61" y="18" type="line"/>
+      <point x="93" y="3"/>
+      <point x="129" y="-6"/>
     </contour>
   </outline>
   <lib>
@@ -51,11 +48,11 @@ nine
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>68</integer>
+        <integer>60</integer>
         <key>weight</key>
         <integer>-7</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>63</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/nine.glif b/src/Cantarell-Regular.ufo/glyphs/nine.glif
index 0375c689..12e87baa 100644
--- a/src/Cantarell-Regular.ufo/glyphs/nine.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/nine.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine" format="2">
-  <advance width="598"/>
+  <advance width="583"/>
   <unicode hex="0039"/>
   <outline>
-    <component base="six" xScale="-1" yScale="-1" xOffset="597" yOffset="694"/>
+    <component base="six" xScale="-1" yScale="-1" xOffset="583" yOffset="694"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|six</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|six</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/nine.numr.glif b/src/Cantarell-Regular.ufo/glyphs/nine.numr.glif
index d4aabb38..6ed281d3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/nine.numr.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/nine.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine.numr" format="2">
-  <advance width="464"/>
+  <advance width="427"/>
   <outline>
     <component base="nine.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/nine.osf.glif b/src/Cantarell-Regular.ufo/glyphs/nine.osf.glif
index c9fd84fb..24e9f44d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/nine.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/nine.osf.glif
@@ -1,46 +1,54 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine.osf" format="2">
-  <advance width="598"/>
+  <advance width="579"/>
   <outline>
     <contour>
-      <point x="280" y="604" type="curve" smooth="yes"/>
-      <point x="149" y="604"/>
-      <point x="56" y="514"/>
-      <point x="56" y="381" type="curve" smooth="yes"/>
-      <point x="56" y="258"/>
-      <point x="138" y="171"/>
-      <point x="258" y="171" type="curve" smooth="yes"/>
-      <point x="358" y="171"/>
-      <point x="439" y="231"/>
-      <point x="484" y="337" type="curve"/>
-      <point x="464" y="380" type="line"/>
-      <point x="429" y="289"/>
-      <point x="364" y="239"/>
-      <point x="285" y="239" type="curve" smooth="yes"/>
-      <point x="197" y="239"/>
-      <point x="137" y="302"/>
-      <point x="137" y="395" type="curve" smooth="yes"/>
-      <point x="137" y="480"/>
-      <point x="187" y="535"/>
-      <point x="270" y="535" type="curve" smooth="yes"/>
-      <point x="380" y="535"/>
-      <point x="441" y="437"/>
-      <point x="441" y="261" type="curve" smooth="yes"/>
-      <point x="441" y="59"/>
-      <point x="364" y="-41"/>
-      <point x="233" y="-41" type="curve" smooth="yes"/>
-      <point x="184" y="-41"/>
-      <point x="126" y="-28"/>
-      <point x="89" y="-5" type="curve"/>
-      <point x="66" y="-66" type="line"/>
-      <point x="101" y="-93"/>
-      <point x="159" y="-110"/>
-      <point x="224" y="-110" type="curve" smooth="yes"/>
-      <point x="412" y="-110"/>
-      <point x="527" y="27"/>
-      <point x="527" y="266" type="curve" smooth="yes"/>
-      <point x="527" y="484"/>
-      <point x="430" y="604"/>
+      <point x="219" y="-110" type="curve" smooth="yes"/>
+      <point x="407" y="-110"/>
+      <point x="522" y="27"/>
+      <point x="522" y="266" type="curve" smooth="yes"/>
+      <point x="522" y="484"/>
+      <point x="425" y="604"/>
+      <point x="275" y="604" type="curve" smooth="yes"/>
+      <point x="144" y="604"/>
+      <point x="51" y="514"/>
+      <point x="51" y="381" type="curve" smooth="yes"/>
+      <point x="51" y="258"/>
+      <point x="133" y="171"/>
+      <point x="253" y="171" type="curve" smooth="yes"/>
+      <point x="353" y="171"/>
+      <point x="434" y="231"/>
+      <point x="479" y="337" type="curve"/>
+      <point x="459" y="380" type="line"/>
+      <point x="424" y="289"/>
+      <point x="359" y="239"/>
+      <point x="280" y="239" type="curve" smooth="yes"/>
+      <point x="192" y="239"/>
+      <point x="132" y="302"/>
+      <point x="132" y="395" type="curve" smooth="yes"/>
+      <point x="132" y="480"/>
+      <point x="182" y="535"/>
+      <point x="265" y="535" type="curve" smooth="yes"/>
+      <point x="375" y="535"/>
+      <point x="436" y="437"/>
+      <point x="436" y="261" type="curve" smooth="yes"/>
+      <point x="436" y="59"/>
+      <point x="359" y="-41"/>
+      <point x="228" y="-41" type="curve" smooth="yes"/>
+      <point x="179" y="-41"/>
+      <point x="121" y="-28"/>
+      <point x="84" y="-5" type="curve"/>
+      <point x="61" y="-66" type="line"/>
+      <point x="96" y="-93"/>
+      <point x="154" y="-110"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>nine</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>nine</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/nine.tf.glif b/src/Cantarell-Regular.ufo/glyphs/nine.tf.glif
index 60ef501f..ec1ce711 100644
--- a/src/Cantarell-Regular.ufo/glyphs/nine.tf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/nine.tf.glif
@@ -2,46 +2,7 @@
 <glyph name="nine.tf" format="2">
   <advance width="580"/>
   <outline>
-    <contour>
-      <point x="281" y="704" type="curve" smooth="yes"/>
-      <point x="154" y="704"/>
-      <point x="63" y="614"/>
-      <point x="63" y="481" type="curve" smooth="yes"/>
-      <point x="63" y="356"/>
-      <point x="143" y="270"/>
-      <point x="258" y="270" type="curve" smooth="yes"/>
-      <point x="356" y="270"/>
-      <point x="433" y="331"/>
-      <point x="477" y="438" type="curve"/>
-      <point x="455" y="481" type="line"/>
-      <point x="422" y="392"/>
-      <point x="362" y="342"/>
-      <point x="287" y="342" type="curve" smooth="yes"/>
-      <point x="204" y="342"/>
-      <point x="147" y="403"/>
-      <point x="147" y="495" type="curve" smooth="yes"/>
-      <point x="147" y="579"/>
-      <point x="195" y="631"/>
-      <point x="272" y="631" type="curve" smooth="yes"/>
-      <point x="376" y="631"/>
-      <point x="433" y="535"/>
-      <point x="433" y="360" type="curve" smooth="yes"/>
-      <point x="433" y="159"/>
-      <point x="359" y="63"/>
-      <point x="235" y="63" type="curve" smooth="yes"/>
-      <point x="187" y="63"/>
-      <point x="132" y="76"/>
-      <point x="96" y="99" type="curve"/>
-      <point x="73" y="34" type="line"/>
-      <point x="107" y="7"/>
-      <point x="165" y="-10"/>
-      <point x="227" y="-10" type="curve" smooth="yes"/>
-      <point x="410" y="-10"/>
-      <point x="523" y="127"/>
-      <point x="523" y="366" type="curve" smooth="yes"/>
-      <point x="523" y="583"/>
-      <point x="429" y="704"/>
-    </contour>
+    <component base="nine" xOffset="-2"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/nineinferior.glif 
b/src/Cantarell-Regular.ufo/glyphs/nineinferior.glif
index 5d7d5b1e..f76467d1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/nineinferior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/nineinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nineinferior" format="2">
-  <advance width="464"/>
+  <advance width="427"/>
   <unicode hex="2089"/>
   <outline>
     <component base="nine.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ninesuperior.glif 
b/src/Cantarell-Regular.ufo/glyphs/ninesuperior.glif
index 195b3813..ff835eda 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ninesuperior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ninesuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ninesuperior" format="2">
-  <advance width="464"/>
+  <advance width="427"/>
   <unicode hex="2079"/>
   <outline>
     <component base="nine.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/nj.glif b/src/Cantarell-Regular.ufo/glyphs/nj.glif
index 88002fee..28d93071 100644
--- a/src/Cantarell-Regular.ufo/glyphs/nj.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/nj.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nj" format="2">
-  <advance width="822"/>
+  <advance width="813"/>
   <unicode hex="01CC"/>
   <outline>
     <component base="n"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/nje-cy.glif b/src/Cantarell-Regular.ufo/glyphs/nje-cy.glif
index bf2245d2..e12706ea 100644
--- a/src/Cantarell-Regular.ufo/glyphs/nje-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/nje-cy.glif
@@ -1,13 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nje-cy" format="2">
-  <advance width="837"/>
+  <advance width="835"/>
   <unicode hex="045A"/>
   <outline>
     <contour>
-      <point x="411" y="0" type="line"/>
-      <point x="491" y="0" type="line"/>
-      <point x="491" y="486" type="line"/>
-      <point x="411" y="486" type="line"/>
+      <point x="451" y="0" type="line"/>
+      <point x="596" y="0" type="line" smooth="yes"/>
+      <point x="722" y="0"/>
+      <point x="799" y="56"/>
+      <point x="799" y="149" type="curve" smooth="yes"/>
+      <point x="799" y="235"/>
+      <point x="735" y="285"/>
+      <point x="626" y="285" type="curve" smooth="yes"/>
+      <point x="451" y="285" type="line"/>
+      <point x="451" y="220" type="line"/>
+      <point x="613" y="220" type="line" smooth="yes"/>
+      <point x="680" y="220"/>
+      <point x="719" y="192"/>
+      <point x="719" y="144" type="curve" smooth="yes"/>
+      <point x="719" y="96"/>
+      <point x="677" y="67"/>
+      <point x="607" y="67" type="curve" smooth="yes"/>
+      <point x="451" y="67" type="line"/>
     </contour>
     <contour>
       <point x="83" y="0" type="line"/>
@@ -22,24 +36,18 @@
       <point x="136" y="285" type="line"/>
     </contour>
     <contour>
-      <point x="451" y="0" type="line"/>
-      <point x="596" y="0" type="line" smooth="yes"/>
-      <point x="722" y="0"/>
-      <point x="799" y="62"/>
-      <point x="799" y="164" type="curve" smooth="yes"/>
-      <point x="799" y="259"/>
-      <point x="729" y="320"/>
-      <point x="626" y="320" type="curve" smooth="yes"/>
-      <point x="451" y="320" type="line"/>
-      <point x="451" y="255" type="line"/>
-      <point x="613" y="255" type="line" smooth="yes"/>
-      <point x="675" y="255"/>
-      <point x="719" y="214"/>
-      <point x="719" y="156" type="curve" smooth="yes"/>
-      <point x="719" y="100"/>
-      <point x="677" y="67"/>
-      <point x="607" y="67" type="curve" smooth="yes"/>
-      <point x="451" y="67" type="line"/>
+      <point x="411" y="0" type="line"/>
+      <point x="491" y="0" type="line"/>
+      <point x="491" y="486" type="line"/>
+      <point x="411" y="486" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>softsign-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/notequal.glif b/src/Cantarell-Regular.ufo/glyphs/notequal.glif
index 346071f2..afd74629 100644
--- a/src/Cantarell-Regular.ufo/glyphs/notequal.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/notequal.glif
@@ -1,25 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="notequal" format="2">
-  <advance width="647"/>
+  <advance width="580"/>
   <unicode hex="2260"/>
   <outline>
     <contour>
-      <point x="91" y="406" type="line"/>
-      <point x="556" y="406" type="line"/>
-      <point x="556" y="475" type="line"/>
-      <point x="91" y="475" type="line"/>
+      <point x="182" y="36" type="line"/>
+      <point x="449" y="571" type="line"/>
+      <point x="393" y="601" type="line"/>
+      <point x="132" y="65" type="line"/>
     </contour>
     <contour>
-      <point x="217" y="64" type="line"/>
-      <point x="490" y="547" type="line"/>
-      <point x="436" y="578" type="line"/>
-      <point x="167" y="92" type="line"/>
+      <point x="55" y="168" type="line"/>
+      <point x="525" y="168" type="line"/>
+      <point x="525" y="242" type="line"/>
+      <point x="55" y="242" type="line"/>
     </contour>
     <contour>
-      <point x="91" y="166" type="line"/>
-      <point x="556" y="166" type="line"/>
-      <point x="556" y="235" type="line"/>
-      <point x="91" y="235" type="line"/>
+      <point x="55" y="411" type="line"/>
+      <point x="525" y="411" type="line"/>
+      <point x="525" y="485" type="line"/>
+      <point x="55" y="485" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minus</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/notidentical.glif 
b/src/Cantarell-Regular.ufo/glyphs/notidentical.glif
index 309a8cb8..a5a002e2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/notidentical.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/notidentical.glif
@@ -1,31 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="notidentical" format="2">
-  <advance width="667"/>
+  <advance width="580"/>
   <unicode hex="2262"/>
   <outline>
     <contour>
-      <point x="198" y="32" type="line"/>
-      <point x="527" y="614" type="line"/>
-      <point x="473" y="645" type="line"/>
-      <point x="148" y="60" type="line"/>
+      <point x="169" y="22" type="line"/>
+      <point x="465" y="604" type="line"/>
+      <point x="415" y="635" type="line"/>
+      <point x="122" y="50" type="line"/>
     </contour>
     <contour>
-      <point x="101" y="476" type="line"/>
-      <point x="566" y="476" type="line"/>
-      <point x="566" y="545" type="line"/>
-      <point x="101" y="545" type="line"/>
+      <point x="55" y="122" type="line"/>
+      <point x="525" y="122" type="line"/>
+      <point x="525" y="191" type="line"/>
+      <point x="55" y="191" type="line"/>
     </contour>
     <contour>
-      <point x="101" y="132" type="line"/>
-      <point x="566" y="132" type="line"/>
-      <point x="566" y="201" type="line"/>
-      <point x="101" y="201" type="line"/>
+      <point x="55" y="294" type="line"/>
+      <point x="525" y="294" type="line"/>
+      <point x="525" y="363" type="line"/>
+      <point x="55" y="363" type="line"/>
     </contour>
     <contour>
-      <point x="101" y="304" type="line"/>
-      <point x="566" y="304" type="line"/>
-      <point x="566" y="373" type="line"/>
-      <point x="101" y="373" type="line"/>
+      <point x="55" y="466" type="line"/>
+      <point x="525" y="466" type="line"/>
+      <point x="525" y="535" type="line"/>
+      <point x="55" y="535" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minus</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/numbersign.glif 
b/src/Cantarell-Regular.ufo/glyphs/numbersign.glif
index 5486b408..7a5bb2e7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/numbersign.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/numbersign.glif
@@ -1,31 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="numbersign" format="2">
-  <advance width="658"/>
+  <advance width="653"/>
   <unicode hex="0023"/>
   <outline>
     <contour>
-      <point x="423" y="0" type="line"/>
-      <point x="492" y="0" type="line"/>
-      <point x="492" y="694" type="line"/>
-      <point x="423" y="694" type="line"/>
+      <point x="420" y="0" type="line"/>
+      <point x="489" y="0" type="line"/>
+      <point x="490" y="694" type="line"/>
+      <point x="421" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="36" y="181" type="line"/>
-      <point x="621" y="181" type="line"/>
-      <point x="621" y="244" type="line"/>
-      <point x="36" y="244" type="line"/>
+      <point x="34" y="183" type="line"/>
+      <point x="619" y="183" type="line"/>
+      <point x="619" y="248" type="line"/>
+      <point x="34" y="248" type="line"/>
     </contour>
     <contour>
-      <point x="168" y="0" type="line"/>
-      <point x="237" y="0" type="line"/>
-      <point x="237" y="694" type="line"/>
-      <point x="168" y="694" type="line"/>
+      <point x="165" y="0" type="line"/>
+      <point x="234" y="0" type="line"/>
+      <point x="235" y="694" type="line"/>
+      <point x="166" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="36" y="452" type="line"/>
-      <point x="621" y="452" type="line"/>
-      <point x="621" y="515" type="line"/>
-      <point x="36" y="515" type="line"/>
+      <point x="34" y="454" type="line"/>
+      <point x="619" y="454" type="line"/>
+      <point x="619" y="519" type="line"/>
+      <point x="34" y="519" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/numero.glif b/src/Cantarell-Regular.ufo/glyphs/numero.glif
index 05536d84..fe386c86 100644
--- a/src/Cantarell-Regular.ufo/glyphs/numero.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/numero.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="numero" format="2">
-  <advance width="1326"/>
+  <advance width="1211"/>
   <unicode hex="2116"/>
   <outline>
-    <component base="N" xOffset="20"/>
-    <component base="_o.numero" xOffset="723"/>
+    <component base="N"/>
+    <component base="ordmasculine" xOffset="750"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
-        <integer>-1</integer>
-        <integer>-1</integer>
+        <integer>0</integer>
+        <integer>1</integer>
       </array>
     </dict>
   </lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/o-cy.glif b/src/Cantarell-Regular.ufo/glyphs/o-cy.glif
index 0f90cc05..bbf49078 100644
--- a/src/Cantarell-Regular.ufo/glyphs/o-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/o-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="o-cy" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="043E"/>
-  <anchor x="285" y="482" name="top"/>
   <outline>
     <component base="o"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/o.glif b/src/Cantarell-Regular.ufo/glyphs/o.glif
index b41b6661..a1a068c5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/o.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/o.glif
@@ -1,43 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="o" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="006F"/>
-  <note>
-o
-</note>
-  <anchor x="283" y="0" name="bottom"/>
-  <anchor x="283" y="241" name="center"/>
-  <anchor x="368" y="10" name="ogonek"/>
-  <anchor x="283" y="482" name="top"/>
-  <anchor x="507" y="482" name="topright"/>
+  <anchor x="284" y="0" name="bottom"/>
+  <anchor x="284" y="241" name="center"/>
+  <anchor x="369" y="10" name="ogonek"/>
+  <anchor x="284" y="482" name="top"/>
+  <anchor x="508" y="482" name="topright"/>
   <outline>
     <contour>
-      <point x="276" y="-10" type="curve" smooth="yes"/>
-      <point x="418" y="-10"/>
-      <point x="514" y="93"/>
-      <point x="514" y="247" type="curve" smooth="yes"/>
-      <point x="514" y="396"/>
-      <point x="425" y="492"/>
-      <point x="288" y="492" type="curve" smooth="yes"/>
-      <point x="146" y="492"/>
-      <point x="51" y="390"/>
-      <point x="51" y="236" type="curve" smooth="yes"/>
-      <point x="51" y="87"/>
-      <point x="139" y="-10"/>
+      <point x="277" y="-10" type="curve" smooth="yes"/>
+      <point x="419" y="-10"/>
+      <point x="515" y="93"/>
+      <point x="515" y="247" type="curve" smooth="yes"/>
+      <point x="515" y="396"/>
+      <point x="426" y="492"/>
+      <point x="289" y="492" type="curve" smooth="yes"/>
+      <point x="147" y="492"/>
+      <point x="52" y="390"/>
+      <point x="52" y="236" type="curve" smooth="yes"/>
+      <point x="52" y="87"/>
+      <point x="140" y="-10"/>
     </contour>
     <contour>
-      <point x="287" y="60" type="curve" smooth="yes"/>
-      <point x="194" y="60"/>
-      <point x="131" y="135"/>
-      <point x="131" y="246" type="curve" smooth="yes"/>
-      <point x="131" y="353"/>
-      <point x="188" y="422"/>
-      <point x="277" y="422" type="curve" smooth="yes"/>
-      <point x="370" y="422"/>
-      <point x="434" y="346"/>
-      <point x="434" y="236" type="curve" smooth="yes"/>
-      <point x="434" y="130"/>
-      <point x="376" y="60"/>
+      <point x="288" y="60" type="curve" smooth="yes"/>
+      <point x="195" y="60"/>
+      <point x="132" y="135"/>
+      <point x="132" y="246" type="curve" smooth="yes"/>
+      <point x="132" y="353"/>
+      <point x="189" y="422"/>
+      <point x="278" y="422" type="curve" smooth="yes"/>
+      <point x="371" y="422"/>
+      <point x="435" y="346"/>
+      <point x="435" y="236" type="curve" smooth="yes"/>
+      <point x="435" y="130"/>
+      <point x="377" y="60"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/oacute.glif b/src/Cantarell-Regular.ufo/glyphs/oacute.glif
index d17687ab..522491c7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/oacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/oacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oacute" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="00F3"/>
   <outline>
     <component base="o"/>
-    <component base="acutecomb" xOffset="200"/>
+    <component base="acutecomb" xOffset="201"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/obarred-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/obarred-cy.glif
index 29cc0b7e..8e847772 100644
--- a/src/Cantarell-Regular.ufo/glyphs/obarred-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/obarred-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="obarred-cy" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="04E9"/>
   <outline>
     <component base="o"/>
-    <component base="strokeshortcomb" xScale="1.33574" xOffset="-22" yOffset="-57"/>
+    <component base="strokeshortcomb" xScale="1.33574" xOffset="-21" yOffset="-57"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/obreve.glif b/src/Cantarell-Regular.ufo/glyphs/obreve.glif
index 5a431270..f3b18b9f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/obreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/obreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="obreve" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="014F"/>
   <outline>
     <component base="o"/>
-    <component base="brevecomb" xOffset="75"/>
+    <component base="brevecomb" xOffset="76"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ocaron.glif b/src/Cantarell-Regular.ufo/glyphs/ocaron.glif
index 7b1e8856..7b1c9e14 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ocaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ocaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocaron" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="01D2"/>
   <outline>
     <component base="o"/>
-    <component base="caroncomb" xOffset="100"/>
+    <component base="caroncomb" xOffset="101"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ocircumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/ocircumflex.glif
index fa37acb6..f0d05b49 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ocircumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ocircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflex" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="00F4"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb" xOffset="90"/>
+    <component base="circumflexcomb" xOffset="91"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ocircumflexacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/ocircumflexacute.glif
index 8d58745c..0f68f4f9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ocircumflexacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ocircumflexacute.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflexacute" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1ED1"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb_acutecomb" xOffset="92"/>
+    <component base="circumflexcomb.loclVIET" xOffset="93"/>
+    <component base="acutecomb.loclVIET" xOffset="331" yOffset="81"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ocircumflexdotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/ocircumflexdotbelow.glif
index 90def9b0..665c3729 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ocircumflexdotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ocircumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflexdotbelow" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1ED9"/>
   <outline>
     <component base="o"/>
-    <component base="dotbelowcomb" xOffset="147"/>
-    <component base="circumflexcomb" xOffset="90"/>
+    <component base="dotbelowcomb" xOffset="148"/>
+    <component base="circumflexcomb" xOffset="91"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ocircumflexgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/ocircumflexgrave.glif
index cc91fa6c..d7fda85b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ocircumflexgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ocircumflexgrave.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflexgrave" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1ED3"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb_gravecomb" xOffset="92"/>
+    <component base="circumflexcomb.loclVIET" xOffset="93"/>
+    <component base="gravecomb.loclVIET" xOffset="244" yOffset="81"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ocircumflexhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/ocircumflexhookabove.glif
index ba31f31d..23f761e5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ocircumflexhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ocircumflexhookabove.glif
@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflexhookabove" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1ED5"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb_hookabovecomb" xOffset="115"/>
+    <component base="circumflexcomb.loclVIET" xOffset="93"/>
+    <component base="hookabovecomb.loclVIET" xOffset="280" yOffset="81"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ocircumflextilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/ocircumflextilde.glif
index 6e7f6b6a..2350b355 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ocircumflextilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ocircumflextilde.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflextilde" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1ED7"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb_tildecomb" xOffset="70"/>
+    <component base="circumflexcomb.loclVIET" xOffset="93"/>
+    <component base="tildecomb.loclVIET" xOffset="63" yOffset="98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/odblgrave.glif b/src/Cantarell-Regular.ufo/glyphs/odblgrave.glif
index 484d7751..4321083d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/odblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/odblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odblgrave" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="020D"/>
   <outline>
     <component base="o"/>
-    <component base="dblgravecomb" xOffset="29"/>
+    <component base="dblgravecomb" xOffset="30"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/odieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/odieresis-cy.glif
index 70ef562f..6c2bb069 100644
--- a/src/Cantarell-Regular.ufo/glyphs/odieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/odieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odieresis-cy" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="04E7"/>
   <outline>
     <component base="o-cy"/>
-    <component base="dieresiscomb" xOffset="52"/>
+    <component base="dieresiscomb" xOffset="51"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/odieresis.glif b/src/Cantarell-Regular.ufo/glyphs/odieresis.glif
index f471c371..a4736e62 100644
--- a/src/Cantarell-Regular.ufo/glyphs/odieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/odieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odieresis" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="00F6"/>
   <outline>
     <component base="o"/>
-    <component base="dieresiscomb" xOffset="50"/>
+    <component base="dieresiscomb" xOffset="51"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/odieresismacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/odieresismacron.glif
index dc7b92c9..62d036ad 100644
--- a/src/Cantarell-Regular.ufo/glyphs/odieresismacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/odieresismacron.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odieresismacron" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="022B"/>
   <outline>
     <component base="o"/>
-    <component base="dieresiscomb_macroncomb" xOffset="59"/>
+    <component base="dieresiscomb.loclVIET" xOffset="60"/>
+    <component base="macroncomb" xOffset="39" yOffset="122"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/odotaccentmacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/odotaccentmacron.glif
index d965a5cf..66f67cf3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/odotaccentmacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/odotaccentmacron.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odotaccentmacron" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="0231"/>
   <outline>
     <component base="o"/>
-    <component base="dotaccentcomb_macroncomb" xOffset="-2"/>
+    <component base="dotaccentcomb.loclVIET" xOffset="151"/>
+    <component base="macroncomb" xOffset="39" yOffset="122"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/odotbelow.glif b/src/Cantarell-Regular.ufo/glyphs/odotbelow.glif
index f90d10c2..d786f0fa 100644
--- a/src/Cantarell-Regular.ufo/glyphs/odotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/odotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odotbelow" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1ECD"/>
   <outline>
     <component base="o"/>
-    <component base="dotbelowcomb" xOffset="147"/>
+    <component base="dotbelowcomb" xOffset="148"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/oe.glif b/src/Cantarell-Regular.ufo/glyphs/oe.glif
index de550d6f..a357bdc3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/oe.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/oe.glif
@@ -1,70 +1,70 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oe" format="2">
-  <advance width="910"/>
+  <advance width="911"/>
   <unicode hex="0153"/>
-  <anchor x="455" y="0" name="bottom"/>
-  <anchor x="455" y="482" name="top"/>
+  <anchor x="456" y="0" name="bottom"/>
+  <anchor x="456" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="276" y="-10" type="curve" smooth="yes"/>
-      <point x="418" y="-10"/>
-      <point x="504" y="93"/>
-      <point x="504" y="247" type="curve" smooth="yes"/>
-      <point x="504" y="396"/>
-      <point x="425" y="492"/>
-      <point x="288" y="492" type="curve" smooth="yes"/>
-      <point x="146" y="492"/>
-      <point x="51" y="390"/>
-      <point x="51" y="236" type="curve" smooth="yes"/>
-      <point x="51" y="87"/>
-      <point x="139" y="-10"/>
+      <point x="277" y="-10" type="curve" smooth="yes"/>
+      <point x="419" y="-10"/>
+      <point x="505" y="93"/>
+      <point x="505" y="247" type="curve" smooth="yes"/>
+      <point x="505" y="396"/>
+      <point x="426" y="492"/>
+      <point x="289" y="492" type="curve" smooth="yes"/>
+      <point x="147" y="492"/>
+      <point x="52" y="390"/>
+      <point x="52" y="236" type="curve" smooth="yes"/>
+      <point x="52" y="87"/>
+      <point x="140" y="-10"/>
     </contour>
     <contour>
-      <point x="287" y="60" type="curve" smooth="yes"/>
-      <point x="194" y="60"/>
-      <point x="131" y="135"/>
-      <point x="131" y="246" type="curve" smooth="yes"/>
-      <point x="131" y="353"/>
-      <point x="188" y="422"/>
-      <point x="277" y="422" type="curve" smooth="yes"/>
-      <point x="370" y="422"/>
-      <point x="434" y="346"/>
-      <point x="434" y="236" type="curve" smooth="yes"/>
-      <point x="434" y="130"/>
-      <point x="376" y="60"/>
+      <point x="288" y="60" type="curve" smooth="yes"/>
+      <point x="195" y="60"/>
+      <point x="132" y="135"/>
+      <point x="132" y="246" type="curve" smooth="yes"/>
+      <point x="132" y="353"/>
+      <point x="189" y="422"/>
+      <point x="278" y="422" type="curve" smooth="yes"/>
+      <point x="371" y="422"/>
+      <point x="435" y="346"/>
+      <point x="435" y="236" type="curve" smooth="yes"/>
+      <point x="435" y="130"/>
+      <point x="377" y="60"/>
     </contour>
     <contour>
-      <point x="682" y="-10" type="curve" smooth="yes"/>
-      <point x="735" y="-10"/>
-      <point x="782" y="1"/>
-      <point x="840" y="27" type="curve"/>
-      <point x="823" y="83" type="line"/>
-      <point x="778" y="64"/>
-      <point x="736" y="55"/>
-      <point x="697" y="55" type="curve" smooth="yes"/>
-      <point x="583" y="55"/>
-      <point x="516" y="130"/>
-      <point x="516" y="255" type="curve" smooth="yes"/>
-      <point x="516" y="364"/>
-      <point x="565" y="424"/>
-      <point x="653" y="424" type="curve" smooth="yes"/>
-      <point x="735" y="424"/>
-      <point x="783" y="371"/>
-      <point x="783" y="279" type="curve"/>
-      <point x="502" y="279" type="line"/>
-      <point x="502" y="219" type="line"/>
-      <point x="854" y="219" type="line"/>
-      <point x="856" y="234"/>
-      <point x="858" y="269"/>
-      <point x="858" y="288" type="curve" smooth="yes"/>
-      <point x="858" y="409"/>
-      <point x="778" y="492"/>
-      <point x="659" y="492" type="curve" smooth="yes"/>
-      <point x="525" y="492"/>
-      <point x="434" y="388"/>
-      <point x="434" y="236" type="curve" smooth="yes"/>
-      <point x="434" y="82"/>
-      <point x="527" y="-10"/>
+      <point x="683" y="-10" type="curve" smooth="yes"/>
+      <point x="736" y="-10"/>
+      <point x="783" y="1"/>
+      <point x="841" y="27" type="curve"/>
+      <point x="824" y="83" type="line"/>
+      <point x="779" y="64"/>
+      <point x="737" y="55"/>
+      <point x="698" y="55" type="curve" smooth="yes"/>
+      <point x="584" y="55"/>
+      <point x="517" y="130"/>
+      <point x="517" y="255" type="curve" smooth="yes"/>
+      <point x="517" y="364"/>
+      <point x="566" y="424"/>
+      <point x="654" y="424" type="curve" smooth="yes"/>
+      <point x="736" y="424"/>
+      <point x="784" y="371"/>
+      <point x="784" y="279" type="curve"/>
+      <point x="503" y="279" type="line"/>
+      <point x="503" y="219" type="line"/>
+      <point x="855" y="219" type="line"/>
+      <point x="857" y="234"/>
+      <point x="859" y="269"/>
+      <point x="859" y="288" type="curve" smooth="yes"/>
+      <point x="859" y="409"/>
+      <point x="779" y="492"/>
+      <point x="660" y="492" type="curve" smooth="yes"/>
+      <point x="526" y="492"/>
+      <point x="435" y="388"/>
+      <point x="435" y="236" type="curve" smooth="yes"/>
+      <point x="435" y="82"/>
+      <point x="528" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/ogonek.glif
index 401eb8b9..31f53490 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ogonek.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ogonek" format="2">
-  <advance width="600"/>
+  <advance width="500"/>
   <unicode hex="02DB"/>
   <outline>
-    <component base="ogonekcomb"/>
+    <component base="ogonekcomb" xOffset="-100"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ograve.glif b/src/Cantarell-Regular.ufo/glyphs/ograve.glif
index 2d4758ba..63f6543d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ograve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ograve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ograve" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="00F2"/>
   <outline>
     <component base="o"/>
-    <component base="gravecomb" xOffset="105"/>
+    <component base="gravecomb" xOffset="106"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ohookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/ohookabove.glif
index 0477ce24..d06ad7ae 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ohookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ohookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohookabove" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1ECF"/>
   <outline>
     <component base="o"/>
-    <component base="hookabovecomb" xOffset="130"/>
+    <component base="hookabovecomb" xOffset="131"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ohorn.glif b/src/Cantarell-Regular.ufo/glyphs/ohorn.glif
index ae9b9237..34725ea1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ohorn.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ohorn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohorn" format="2">
-  <advance width="625"/>
+  <advance width="627"/>
   <unicode hex="01A1"/>
   <outline>
     <component base="o"/>
-    <component base="horncomb" xOffset="365"/>
+    <component base="horncomb" xOffset="366"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ohornacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/ohornacute.glif
index af9be988..bc1dee95 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ohornacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ohornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohornacute" format="2">
-  <advance width="625"/>
+  <advance width="627"/>
   <unicode hex="1EDB"/>
   <outline>
     <component base="ohorn"/>
-    <component base="acutecomb" xOffset="200"/>
+    <component base="acutecomb" xOffset="201"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ohorndotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/ohorndotbelow.glif
index 436fbb7b..8407f67a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ohorndotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ohorndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohorndotbelow" format="2">
-  <advance width="625"/>
+  <advance width="627"/>
   <unicode hex="1EE3"/>
   <outline>
     <component base="ohorn"/>
-    <component base="dotbelowcomb" xOffset="147"/>
+    <component base="dotbelowcomb" xOffset="148"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ohorngrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/ohorngrave.glif
index 030912c4..495cdb16 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ohorngrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ohorngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohorngrave" format="2">
-  <advance width="625"/>
+  <advance width="627"/>
   <unicode hex="1EDD"/>
   <outline>
     <component base="ohorn"/>
-    <component base="gravecomb" xOffset="105"/>
+    <component base="gravecomb" xOffset="106"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ohornhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/ohornhookabove.glif
index 025ed018..32b66b19 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ohornhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ohornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohornhookabove" format="2">
-  <advance width="625"/>
+  <advance width="627"/>
   <unicode hex="1EDF"/>
   <outline>
     <component base="ohorn"/>
-    <component base="hookabovecomb" xOffset="130"/>
+    <component base="hookabovecomb" xOffset="131"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ohorntilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/ohorntilde.glif
index bcef1f72..e7d78ebf 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ohorntilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ohorntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohorntilde" format="2">
-  <advance width="625"/>
+  <advance width="627"/>
   <unicode hex="1EE1"/>
   <outline>
     <component base="ohorn"/>
-    <component base="tildecomb" xOffset="51"/>
+    <component base="tildecomb" xOffset="52"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ohungarumlaut.glif 
b/src/Cantarell-Regular.ufo/glyphs/ohungarumlaut.glif
index dd2b4261..c12eb04d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ohungarumlaut.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ohungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohungarumlaut" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="0151"/>
   <outline>
     <component base="o"/>
-    <component base="hungarumlautcomb" xOffset="95"/>
+    <component base="hungarumlautcomb" xOffset="96"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/oinvertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/oinvertedbreve.glif
index 33555537..0ad80353 100644
--- a/src/Cantarell-Regular.ufo/glyphs/oinvertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/oinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oinvertedbreve" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="020F"/>
   <outline>
     <component base="o"/>
-    <component base="breveinvertedcomb" xOffset="73"/>
+    <component base="breveinvertedcomb" xOffset="74"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omacron.glif b/src/Cantarell-Regular.ufo/glyphs/omacron.glif
index 714465f8..63911fd4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omacron" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="014D"/>
   <outline>
     <component base="o"/>
-    <component base="macroncomb" xOffset="38"/>
+    <component base="macroncomb" xOffset="39"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omacronacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/omacronacute.glif
index 6daf59f7..efd4b468 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omacronacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omacronacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omacronacute" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1E53"/>
   <outline>
     <component base="o"/>
-    <component base="macroncomb_acutecomb" xOffset="38"/>
+    <component base="macroncomb.loclVIET" xOffset="39"/>
+    <component base="acutecomb" xOffset="201" yOffset="133"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omacrongrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/omacrongrave.glif
index ffe6d9ea..5e1010de 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omacrongrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omacrongrave.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omacrongrave" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1E51"/>
   <outline>
     <component base="o"/>
-    <component base="macroncomb_gravecomb" xOffset="38"/>
+    <component base="macroncomb.loclVIET" xOffset="39"/>
+    <component base="gravecomb" xOffset="106" yOffset="133"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/one.dnom.glif b/src/Cantarell-Regular.ufo/glyphs/one.dnom.glif
index 7c77163c..6b470610 100644
--- a/src/Cantarell-Regular.ufo/glyphs/one.dnom.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/one.dnom.glif
@@ -1,25 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.dnom" format="2">
-  <advance width="339"/>
-  <note>
-one
-</note>
+  <advance width="278"/>
   <outline>
     <contour>
-      <point x="151" y="53" type="line"/>
-      <point x="226" y="53" type="line"/>
-      <point x="226" y="472" type="line"/>
-      <point x="181" y="472" type="line"/>
-      <point x="34" y="385" type="line"/>
-      <point x="62" y="333" type="line"/>
-      <point x="176" y="395" type="line"/>
-      <point x="151" y="418" type="line"/>
-    </contour>
-    <contour>
-      <point x="50" y="0" type="line"/>
-      <point x="316" y="0" type="line"/>
-      <point x="316" y="64" type="line"/>
-      <point x="50" y="64" type="line"/>
+      <point x="139" y="-1" type="line"/>
+      <point x="212" y="-1" type="line"/>
+      <point x="212" y="416" type="line"/>
+      <point x="168" y="416" type="line"/>
+      <point x="5" y="337" type="line"/>
+      <point x="33" y="284" type="line"/>
+      <point x="162" y="339" type="line"/>
+      <point x="139" y="362" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -27,11 +18,11 @@ one
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>68</integer>
+        <integer>60</integer>
         <key>weight</key>
         <integer>-7</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>63</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/one.glif b/src/Cantarell-Regular.ufo/glyphs/one.glif
index c42cc877..f0ae9338 100644
--- a/src/Cantarell-Regular.ufo/glyphs/one.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/one.glif
@@ -1,23 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one" format="2">
-  <advance width="451"/>
+  <advance width="423"/>
   <unicode hex="0031"/>
   <outline>
     <contour>
-      <point x="198" y="55" type="line"/>
-      <point x="282" y="55" type="line"/>
-      <point x="282" y="694" type="line"/>
-      <point x="231" y="694" type="line"/>
-      <point x="42" y="571" type="line"/>
-      <point x="73" y="515" type="line"/>
-      <point x="228" y="610" type="line"/>
-      <point x="198" y="635" type="line"/>
-    </contour>
-    <contour>
-      <point x="61" y="0" type="line"/>
-      <point x="416" y="0" type="line"/>
-      <point x="416" y="71" type="line"/>
-      <point x="61" y="71" type="line"/>
+      <point x="223" y="-5" type="line"/>
+      <point x="302" y="-5" type="line"/>
+      <point x="302" y="694" type="line"/>
+      <point x="254" y="694" type="line"/>
+      <point x="7" y="566" type="line"/>
+      <point x="37" y="509" type="line"/>
+      <point x="249" y="610" type="line"/>
+      <point x="223" y="635" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/one.numr.glif b/src/Cantarell-Regular.ufo/glyphs/one.numr.glif
index 8bed591a..edbd29c6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/one.numr.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/one.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.numr" format="2">
-  <advance width="339"/>
+  <advance width="278"/>
   <outline>
     <component base="one.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/one.osf.glif b/src/Cantarell-Regular.ufo/glyphs/one.osf.glif
index 8d92c2dc..73f9de29 100644
--- a/src/Cantarell-Regular.ufo/glyphs/one.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/one.osf.glif
@@ -1,22 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.osf" format="2">
-  <advance width="438"/>
+  <advance width="423"/>
   <outline>
     <contour>
-      <point x="202" y="53" type="line"/>
-      <point x="280" y="53" type="line"/>
-      <point x="280" y="594" type="line"/>
-      <point x="233" y="594" type="line"/>
-      <point x="46" y="487" type="line"/>
-      <point x="75" y="434" type="line"/>
-      <point x="230" y="514" type="line"/>
-      <point x="202" y="537" type="line"/>
-    </contour>
-    <contour>
-      <point x="63" y="0" type="line"/>
-      <point x="401" y="0" type="line"/>
-      <point x="401" y="67" type="line"/>
-      <point x="63" y="67" type="line"/>
+      <point x="225" y="-5" type="line"/>
+      <point x="302" y="-5" type="line"/>
+      <point x="302" y="594" type="line"/>
+      <point x="254" y="594" type="line"/>
+      <point x="7" y="466" type="line"/>
+      <point x="37" y="409" type="line"/>
+      <point x="249" y="510" type="line"/>
+      <point x="225" y="535" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>one</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>one</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/one.tf.glif b/src/Cantarell-Regular.ufo/glyphs/one.tf.glif
index 24443e5b..4e17eefb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/one.tf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/one.tf.glif
@@ -3,20 +3,20 @@
   <advance width="580"/>
   <outline>
     <contour>
-      <point x="272" y="55" type="line"/>
-      <point x="355" y="55" type="line"/>
-      <point x="355" y="694" type="line"/>
-      <point x="305" y="694" type="line"/>
-      <point x="75" y="571" type="line"/>
-      <point x="106" y="515" type="line"/>
-      <point x="302" y="610" type="line"/>
-      <point x="272" y="635" type="line"/>
+      <point x="278" y="55" type="line"/>
+      <point x="359" y="55" type="line"/>
+      <point x="359" y="694" type="line"/>
+      <point x="311" y="694" type="line"/>
+      <point x="64" y="566" type="line"/>
+      <point x="94" y="509" type="line"/>
+      <point x="306" y="610" type="line"/>
+      <point x="278" y="635" type="line"/>
     </contour>
     <contour>
-      <point x="93" y="0" type="line"/>
-      <point x="513" y="0" type="line"/>
-      <point x="513" y="71" type="line"/>
-      <point x="93" y="71" type="line"/>
+      <point x="91" y="0" type="line"/>
+      <point x="522" y="0" type="line"/>
+      <point x="522" y="69" type="line"/>
+      <point x="91" y="69" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/oneeighth.glif b/src/Cantarell-Regular.ufo/glyphs/oneeighth.glif
index dcb19124..97f237ce 100644
--- a/src/Cantarell-Regular.ufo/glyphs/oneeighth.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/oneeighth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneeighth" format="2">
-  <advance width="1104"/>
+  <advance width="877"/>
   <unicode hex="215B"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="339"/>
-    <component base="eight.dnom" xOffset="638"/>
+    <component base="fraction" xOffset="278"/>
+    <component base="eight.dnom" xOffset="448"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/onefifth.glif b/src/Cantarell-Regular.ufo/glyphs/onefifth.glif
index 344a40c4..d9797430 100644
--- a/src/Cantarell-Regular.ufo/glyphs/onefifth.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/onefifth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onefifth" format="2">
-  <advance width="1079"/>
+  <advance width="857"/>
   <unicode hex="2155"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="339"/>
-    <component base="five.dnom" xOffset="638"/>
+    <component base="fraction" xOffset="278"/>
+    <component base="five.dnom" xOffset="448"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/onefraction.glif 
b/src/Cantarell-Regular.ufo/glyphs/onefraction.glif
index 80c7c1cc..941d8ef0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/onefraction.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/onefraction.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onefraction" format="2">
-  <advance width="638"/>
+  <advance width="448"/>
   <unicode hex="215F"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="339"/>
+    <component base="fraction" xOffset="278"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/onehalf.glif b/src/Cantarell-Regular.ufo/glyphs/onehalf.glif
index a7ac9988..eb36740b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/onehalf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/onehalf.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onehalf" format="2">
-  <advance width="1058"/>
+  <advance width="838"/>
   <unicode hex="00BD"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="339"/>
-    <component base="two.dnom" xOffset="638"/>
+    <component base="fraction" xOffset="278"/>
+    <component base="two.dnom" xOffset="448"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/oneinferior.glif 
b/src/Cantarell-Regular.ufo/glyphs/oneinferior.glif
index 0f74da49..57ea34ad 100644
--- a/src/Cantarell-Regular.ufo/glyphs/oneinferior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/oneinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneinferior" format="2">
-  <advance width="339"/>
+  <advance width="278"/>
   <unicode hex="2081"/>
   <outline>
     <component base="one.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/oneninth.glif b/src/Cantarell-Regular.ufo/glyphs/oneninth.glif
index eceec4e4..e49141b3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/oneninth.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/oneninth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneninth" format="2">
-  <advance width="1102"/>
+  <advance width="875"/>
   <unicode hex="2151"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="339"/>
-    <component base="nine.dnom" xOffset="638"/>
+    <component base="fraction" xOffset="278"/>
+    <component base="nine.dnom" xOffset="448"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/onequarter.glif 
b/src/Cantarell-Regular.ufo/glyphs/onequarter.glif
index 5caf7a3f..43f94163 100644
--- a/src/Cantarell-Regular.ufo/glyphs/onequarter.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/onequarter.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onequarter" format="2">
-  <advance width="1105"/>
+  <advance width="868"/>
   <unicode hex="00BC"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="339"/>
-    <component base="four.dnom" xOffset="638"/>
+    <component base="fraction" xOffset="278"/>
+    <component base="four.dnom" xOffset="448"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/oneseventh.glif 
b/src/Cantarell-Regular.ufo/glyphs/oneseventh.glif
index ec92905a..6f6c3343 100644
--- a/src/Cantarell-Regular.ufo/glyphs/oneseventh.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/oneseventh.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneseventh" format="2">
-  <advance width="1038"/>
+  <advance width="808"/>
   <unicode hex="2150"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="339"/>
-    <component base="seven.dnom" xOffset="638"/>
+    <component base="fraction" xOffset="278"/>
+    <component base="seven.dnom" xOffset="448"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/onesixth.glif b/src/Cantarell-Regular.ufo/glyphs/onesixth.glif
index 3b0cfbd1..3d6d8005 100644
--- a/src/Cantarell-Regular.ufo/glyphs/onesixth.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/onesixth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onesixth" format="2">
-  <advance width="1102"/>
+  <advance width="874"/>
   <unicode hex="2159"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="339"/>
-    <component base="six.dnom" xOffset="638"/>
+    <component base="fraction" xOffset="278"/>
+    <component base="six.dnom" xOffset="448"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/onesuperior.glif 
b/src/Cantarell-Regular.ufo/glyphs/onesuperior.glif
index c0f11b7f..d28ee263 100644
--- a/src/Cantarell-Regular.ufo/glyphs/onesuperior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/onesuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onesuperior" format="2">
-  <advance width="339"/>
+  <advance width="278"/>
   <unicode hex="00B9"/>
   <outline>
     <component base="one.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/onetenth.glif b/src/Cantarell-Regular.ufo/glyphs/onetenth.glif
index 1bff9d30..cd76d412 100644
--- a/src/Cantarell-Regular.ufo/glyphs/onetenth.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/onetenth.glif
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onetenth" format="2">
-  <advance width="1465"/>
+  <advance width="1171"/>
   <unicode hex="2152"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="339"/>
-    <component base="one.dnom" xOffset="638"/>
-    <component base="zero.dnom" xOffset="977"/>
+    <component base="fraction" xOffset="278"/>
+    <component base="one.dnom" xOffset="448"/>
+    <component base="zero.dnom" xOffset="726"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/onethird.glif b/src/Cantarell-Regular.ufo/glyphs/onethird.glif
index 6de349d1..c8f9ed9a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/onethird.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/onethird.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onethird" format="2">
-  <advance width="1081"/>
+  <advance width="853"/>
   <unicode hex="2153"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="339"/>
-    <component base="three.dnom" xOffset="638"/>
+    <component base="fraction" xOffset="278"/>
+    <component base="three.dnom" xOffset="448"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/oogonek.glif b/src/Cantarell-Regular.ufo/glyphs/oogonek.glif
index ed2e46da..06fa61b8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/oogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/oogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oogonek" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="01EB"/>
   <outline>
     <component base="o"/>
-    <component base="ogonekcomb.tall" xOffset="-64" yOffset="-1"/>
+    <component base="ogonekcomb.tall" xOffset="-63" yOffset="-1"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/oslash.glif b/src/Cantarell-Regular.ufo/glyphs/oslash.glif
index 18fcec56..5f0a6f06 100644
--- a/src/Cantarell-Regular.ufo/glyphs/oslash.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/oslash.glif
@@ -1,42 +1,50 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oslash" format="2">
-  <advance width="570"/>
+  <advance width="567"/>
   <unicode hex="00F8"/>
-  <anchor x="286" y="482" name="top"/>
+  <anchor x="284" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="279" y="-10" type="curve" smooth="yes"/>
-      <point x="421" y="-10"/>
-      <point x="517" y="93"/>
-      <point x="517" y="247" type="curve" smooth="yes"/>
-      <point x="517" y="396"/>
-      <point x="428" y="492"/>
-      <point x="291" y="492" type="curve" smooth="yes"/>
-      <point x="149" y="492"/>
-      <point x="54" y="390"/>
-      <point x="54" y="236" type="curve" smooth="yes"/>
-      <point x="54" y="87"/>
-      <point x="142" y="-10"/>
+      <point x="109" y="-58" type="line"/>
+      <point x="495" y="513" type="line"/>
+      <point x="448" y="542" type="line"/>
+      <point x="66" y="-29" type="line"/>
     </contour>
     <contour>
-      <point x="290" y="60" type="curve" smooth="yes"/>
-      <point x="197" y="60"/>
-      <point x="134" y="135"/>
-      <point x="134" y="246" type="curve" smooth="yes"/>
-      <point x="134" y="353"/>
-      <point x="191" y="422"/>
-      <point x="280" y="422" type="curve" smooth="yes"/>
-      <point x="373" y="422"/>
-      <point x="437" y="346"/>
-      <point x="437" y="236" type="curve" smooth="yes"/>
-      <point x="437" y="130"/>
-      <point x="379" y="60"/>
+      <point x="277" y="-10" type="curve" smooth="yes"/>
+      <point x="419" y="-10"/>
+      <point x="515" y="93"/>
+      <point x="515" y="247" type="curve" smooth="yes"/>
+      <point x="515" y="396"/>
+      <point x="426" y="492"/>
+      <point x="289" y="492" type="curve" smooth="yes"/>
+      <point x="147" y="492"/>
+      <point x="52" y="390"/>
+      <point x="52" y="236" type="curve" smooth="yes"/>
+      <point x="52" y="87"/>
+      <point x="140" y="-10"/>
     </contour>
     <contour>
-      <point x="111" y="-58" type="line"/>
-      <point x="497" y="513" type="line"/>
-      <point x="450" y="542" type="line"/>
-      <point x="68" y="-29" type="line"/>
+      <point x="288" y="60" type="curve" smooth="yes"/>
+      <point x="195" y="60"/>
+      <point x="132" y="135"/>
+      <point x="132" y="246" type="curve" smooth="yes"/>
+      <point x="132" y="353"/>
+      <point x="189" y="422"/>
+      <point x="278" y="422" type="curve" smooth="yes"/>
+      <point x="371" y="422"/>
+      <point x="435" y="346"/>
+      <point x="435" y="236" type="curve" smooth="yes"/>
+      <point x="435" y="130"/>
+      <point x="377" y="60"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/oslashacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/oslashacute.glif
index 371f8a1f..ad734f89 100644
--- a/src/Cantarell-Regular.ufo/glyphs/oslashacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/oslashacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oslashacute" format="2">
-  <advance width="570"/>
+  <advance width="567"/>
   <unicode hex="01FF"/>
   <outline>
     <component base="oslash"/>
-    <component base="acutecomb" xOffset="203"/>
+    <component base="acutecomb" xOffset="201"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/otilde.glif b/src/Cantarell-Regular.ufo/glyphs/otilde.glif
index 62eb86b8..2147bce6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/otilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/otilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="otilde" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="00F5"/>
   <outline>
     <component base="o"/>
-    <component base="tildecomb" xOffset="51"/>
+    <component base="tildecomb" xOffset="52"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/otildeacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/otildeacute.glif
index 6492e8ef..73c5a970 100644
--- a/src/Cantarell-Regular.ufo/glyphs/otildeacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/otildeacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="otildeacute" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1E4D"/>
   <outline>
     <component base="o"/>
-    <component base="tildecomb_acutecomb" xOffset="51"/>
+    <component base="tildecomb" xOffset="52"/>
+    <component base="acutecomb" xOffset="201" yOffset="159"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/otildedieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/otildedieresis.glif
index 76f48c7d..62ed1c92 100644
--- a/src/Cantarell-Regular.ufo/glyphs/otildedieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/otildedieresis.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="otildedieresis" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1E4F"/>
   <outline>
     <component base="o"/>
-    <component base="tildecomb_dieresiscomb" xOffset="51"/>
+    <component base="tildecomb" xOffset="52"/>
+    <component base="dieresiscomb" xOffset="51" yOffset="159"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/otildemacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/otildemacron.glif
index 8ec218f3..a6a7688a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/otildemacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/otildemacron.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="otildemacron" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="022D"/>
   <outline>
     <component base="o"/>
-    <component base="tildecomb_macroncomb" xOffset="51"/>
+    <component base="tildecomb" xOffset="52"/>
+    <component base="macroncomb" xOffset="39" yOffset="159"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/p.glif b/src/Cantarell-Regular.ufo/glyphs/p.glif
index 06b65c05..4839a253 100644
--- a/src/Cantarell-Regular.ufo/glyphs/p.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/p.glif
@@ -2,19 +2,9 @@
 <glyph name="p" format="2">
   <advance width="571"/>
   <unicode hex="0070"/>
-  <note>
-p
-</note>
   <anchor x="284" y="0" name="bottom"/>
   <anchor x="284" y="482" name="top"/>
   <outline>
-    <contour>
-      <point x="83" y="-217" type="line"/>
-      <point x="163" y="-217" type="line"/>
-      <point x="163" y="426" type="line"/>
-      <point x="139" y="482" type="line"/>
-      <point x="83" y="482" type="line"/>
-    </contour>
     <contour>
       <point x="295" y="-10" type="curve" smooth="yes"/>
       <point x="429" y="-10"/>
@@ -43,5 +33,20 @@ p
       <point x="139" y="39"/>
       <point x="208" y="-10"/>
     </contour>
+    <contour>
+      <point x="83" y="-217" type="line"/>
+      <point x="163" y="-217" type="line"/>
+      <point x="163" y="426" type="line"/>
+      <point x="139" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/palochka-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/palochka-cy.glif
index 1d0fac51..99215010 100644
--- a/src/Cantarell-Regular.ufo/glyphs/palochka-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/palochka-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="palochka-cy" format="2">
-  <advance width="291"/>
+  <advance width="267"/>
   <unicode hex="04CF"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/paragraph.glif b/src/Cantarell-Regular.ufo/glyphs/paragraph.glif
index 027e0132..3c78716c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/paragraph.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/paragraph.glif
@@ -1,23 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="paragraph" format="2">
-  <advance width="725"/>
+  <advance width="660"/>
   <unicode hex="00B6"/>
   <outline>
     <contour>
-      <point x="287" y="-170" type="line"/>
-      <point x="365" y="-170" type="line"/>
-      <point x="365" y="625" type="line"/>
-      <point x="522" y="625" type="line"/>
-      <point x="522" y="-170" type="line"/>
-      <point x="600" y="-170" type="line"/>
-      <point x="600" y="694" type="line"/>
-      <point x="307" y="694" type="line" smooth="yes"/>
-      <point x="165" y="694"/>
-      <point x="70" y="610"/>
-      <point x="70" y="484" type="curve" smooth="yes"/>
-      <point x="70" y="349"/>
-      <point x="157" y="259"/>
-      <point x="287" y="259" type="curve"/>
+      <point x="255" y="-170" type="line"/>
+      <point x="333" y="-170" type="line"/>
+      <point x="333" y="625" type="line"/>
+      <point x="490" y="625" type="line"/>
+      <point x="490" y="-170" type="line"/>
+      <point x="568" y="-170" type="line"/>
+      <point x="568" y="694" type="line"/>
+      <point x="275" y="694" type="line" smooth="yes"/>
+      <point x="133" y="694"/>
+      <point x="38" y="610"/>
+      <point x="38" y="484" type="curve" smooth="yes"/>
+      <point x="38" y="349"/>
+      <point x="125" y="259"/>
+      <point x="255" y="259" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|P</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/parenleft.glif b/src/Cantarell-Regular.ufo/glyphs/parenleft.glif
index 7d04c09c..5ffb29b9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/parenleft.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/parenleft.glif
@@ -5,19 +5,19 @@
   <outline>
     <contour>
       <point x="203" y="-179" type="curve"/>
-      <point x="261" y="-148" type="line"/>
+      <point x="261" y="-144" type="line"/>
       <point x="177" y="1"/>
       <point x="143" y="124"/>
       <point x="143" y="299" type="curve" smooth="yes"/>
       <point x="143" y="448"/>
-      <point x="176" y="566"/>
-      <point x="259" y="718" type="curve"/>
-      <point x="201" y="749" type="line"/>
-      <point x="102" y="582"/>
+      <point x="177" y="566"/>
+      <point x="260" y="714" type="curve"/>
+      <point x="200" y="749" type="line"/>
+      <point x="99" y="582"/>
       <point x="63" y="452"/>
       <point x="63" y="292" type="curve" smooth="yes"/>
       <point x="63" y="106"/>
-      <point x="103" y="-23"/>
+      <point x="101" y="-23"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/parenright.glif 
b/src/Cantarell-Regular.ufo/glyphs/parenright.glif
index ea253725..a99d9e3a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/parenright.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/parenright.glif
@@ -3,6 +3,14 @@
   <advance width="301"/>
   <unicode hex="0029"/>
   <outline>
-    <component base="parenleft" xScale="-1" xOffset="304"/>
+    <component base="parenleft" xScale="-1" xOffset="301"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|parenleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>parenleft</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/partialdiff.glif 
b/src/Cantarell-Regular.ufo/glyphs/partialdiff.glif
index 2c37ec1a..5a998b91 100644
--- a/src/Cantarell-Regular.ufo/glyphs/partialdiff.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/partialdiff.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="partialdiff" format="2">
-  <advance width="649"/>
+  <advance width="639"/>
   <unicode hex="2202"/>
   <outline>
     <contour>
-      <point x="290" y="-12" type="curve" smooth="yes"/>
-      <point x="459" y="-12"/>
-      <point x="558" y="128"/>
-      <point x="558" y="365" type="curve" smooth="yes"/>
-      <point x="558" y="584"/>
-      <point x="472" y="701"/>
-      <point x="312" y="701" type="curve" smooth="yes"/>
-      <point x="250" y="701"/>
-      <point x="184" y="684"/>
-      <point x="134" y="655" type="curve"/>
-      <point x="153" y="594" type="line"/>
-      <point x="202" y="617"/>
-      <point x="258" y="631"/>
-      <point x="303" y="631" type="curve" smooth="yes"/>
-      <point x="418" y="631"/>
-      <point x="478" y="534"/>
-      <point x="478" y="349" type="curve" smooth="yes"/>
-      <point x="478" y="160"/>
-      <point x="416" y="58"/>
-      <point x="300" y="58" type="curve" smooth="yes"/>
-      <point x="211" y="58"/>
-      <point x="155" y="117"/>
-      <point x="155" y="211" type="curve" smooth="yes"/>
-      <point x="155" y="302"/>
-      <point x="207" y="359"/>
-      <point x="292" y="359" type="curve" smooth="yes"/>
-      <point x="366" y="359"/>
-      <point x="438" y="316"/>
-      <point x="480" y="249" type="curve"/>
-      <point x="486" y="342" type="line"/>
-      <point x="444" y="399"/>
-      <point x="382" y="429"/>
-      <point x="306" y="429" type="curve" smooth="yes"/>
-      <point x="171" y="429"/>
-      <point x="75" y="332"/>
-      <point x="75" y="197" type="curve" smooth="yes"/>
-      <point x="75" y="70"/>
-      <point x="160" y="-12"/>
+      <point x="284" y="-12" type="curve" smooth="yes"/>
+      <point x="453" y="-12"/>
+      <point x="552" y="128"/>
+      <point x="552" y="365" type="curve" smooth="yes"/>
+      <point x="552" y="584"/>
+      <point x="466" y="701"/>
+      <point x="306" y="701" type="curve" smooth="yes"/>
+      <point x="244" y="701"/>
+      <point x="178" y="684"/>
+      <point x="128" y="655" type="curve"/>
+      <point x="147" y="594" type="line"/>
+      <point x="196" y="617"/>
+      <point x="252" y="631"/>
+      <point x="297" y="631" type="curve" smooth="yes"/>
+      <point x="412" y="631"/>
+      <point x="472" y="534"/>
+      <point x="472" y="349" type="curve" smooth="yes"/>
+      <point x="472" y="160"/>
+      <point x="410" y="58"/>
+      <point x="294" y="58" type="curve" smooth="yes"/>
+      <point x="205" y="58"/>
+      <point x="149" y="117"/>
+      <point x="149" y="211" type="curve" smooth="yes"/>
+      <point x="149" y="302"/>
+      <point x="201" y="359"/>
+      <point x="286" y="359" type="curve" smooth="yes"/>
+      <point x="360" y="359"/>
+      <point x="432" y="316"/>
+      <point x="474" y="249" type="curve"/>
+      <point x="480" y="342" type="line"/>
+      <point x="438" y="399"/>
+      <point x="376" y="429"/>
+      <point x="300" y="429" type="curve" smooth="yes"/>
+      <point x="165" y="429"/>
+      <point x="69" y="332"/>
+      <point x="69" y="197" type="curve" smooth="yes"/>
+      <point x="69" y="70"/>
+      <point x="154" y="-12"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/pe-cy.glif b/src/Cantarell-Regular.ufo/glyphs/pe-cy.glif
index e6050608..df4e07cb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/pe-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/pe-cy.glif
@@ -26,6 +26,10 @@
         <key>width</key>
         <integer>79</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/percent.glif b/src/Cantarell-Regular.ufo/glyphs/percent.glif
index e73e1c17..e47c439a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/percent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/percent.glif
@@ -1,69 +1,75 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="percent" format="2">
-  <advance width="991"/>
+  <advance width="987"/>
   <unicode hex="0025"/>
   <outline>
     <contour>
-      <point x="265" y="0" type="line"/>
-      <point x="342" y="0" type="line"/>
-      <point x="724" y="694" type="line"/>
-      <point x="641" y="694" type="line"/>
+      <point x="263" y="0" type="line"/>
+      <point x="340" y="0" type="line"/>
+      <point x="722" y="694" type="line"/>
+      <point x="639" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="244" y="262" type="curve" smooth="yes"/>
-      <point x="345" y="262"/>
-      <point x="411" y="349"/>
-      <point x="411" y="485" type="curve" smooth="yes"/>
-      <point x="411" y="618"/>
-      <point x="347" y="704"/>
-      <point x="247" y="704" type="curve" smooth="yes"/>
-      <point x="144" y="704"/>
-      <point x="78" y="617"/>
-      <point x="78" y="481" type="curve" smooth="yes"/>
-      <point x="78" y="347"/>
-      <point x="143" y="262"/>
+      <point x="242" y="262" type="curve" smooth="yes"/>
+      <point x="343" y="262"/>
+      <point x="409" y="349"/>
+      <point x="409" y="485" type="curve" smooth="yes"/>
+      <point x="409" y="618"/>
+      <point x="345" y="704"/>
+      <point x="245" y="704" type="curve" smooth="yes"/>
+      <point x="142" y="704"/>
+      <point x="76" y="617"/>
+      <point x="76" y="481" type="curve" smooth="yes"/>
+      <point x="76" y="347"/>
+      <point x="141" y="262"/>
     </contour>
     <contour>
-      <point x="246" y="328" type="curve" smooth="yes"/>
-      <point x="192" y="328"/>
-      <point x="157" y="389"/>
-      <point x="157" y="485" type="curve" smooth="yes"/>
-      <point x="157" y="579"/>
-      <point x="191" y="638"/>
-      <point x="244" y="638" type="curve" smooth="yes"/>
-      <point x="298" y="638"/>
-      <point x="333" y="577"/>
-      <point x="333" y="480" type="curve" smooth="yes"/>
-      <point x="333" y="387"/>
-      <point x="299" y="328"/>
+      <point x="244" y="328" type="curve" smooth="yes"/>
+      <point x="190" y="328"/>
+      <point x="155" y="389"/>
+      <point x="155" y="485" type="curve" smooth="yes"/>
+      <point x="155" y="579"/>
+      <point x="189" y="638"/>
+      <point x="242" y="638" type="curve" smooth="yes"/>
+      <point x="296" y="638"/>
+      <point x="331" y="577"/>
+      <point x="331" y="480" type="curve" smooth="yes"/>
+      <point x="331" y="387"/>
+      <point x="297" y="328"/>
     </contour>
     <contour>
-      <point x="746" y="-6" type="curve" smooth="yes"/>
-      <point x="847" y="-6"/>
-      <point x="913" y="81"/>
-      <point x="913" y="217" type="curve" smooth="yes"/>
-      <point x="913" y="350"/>
-      <point x="849" y="436"/>
-      <point x="749" y="436" type="curve" smooth="yes"/>
-      <point x="646" y="436"/>
-      <point x="580" y="349"/>
-      <point x="580" y="213" type="curve" smooth="yes"/>
-      <point x="580" y="79"/>
-      <point x="645" y="-6"/>
+      <point x="744" y="-6" type="curve" smooth="yes"/>
+      <point x="845" y="-6"/>
+      <point x="911" y="81"/>
+      <point x="911" y="217" type="curve" smooth="yes"/>
+      <point x="911" y="350"/>
+      <point x="847" y="436"/>
+      <point x="747" y="436" type="curve" smooth="yes"/>
+      <point x="644" y="436"/>
+      <point x="578" y="349"/>
+      <point x="578" y="213" type="curve" smooth="yes"/>
+      <point x="578" y="79"/>
+      <point x="643" y="-6"/>
     </contour>
     <contour>
-      <point x="748" y="60" type="curve" smooth="yes"/>
-      <point x="694" y="60"/>
-      <point x="659" y="121"/>
-      <point x="659" y="217" type="curve" smooth="yes"/>
-      <point x="659" y="311"/>
-      <point x="693" y="370"/>
-      <point x="746" y="370" type="curve" smooth="yes"/>
-      <point x="800" y="370"/>
-      <point x="835" y="309"/>
-      <point x="835" y="212" type="curve" smooth="yes"/>
-      <point x="835" y="119"/>
-      <point x="801" y="60"/>
+      <point x="746" y="60" type="curve" smooth="yes"/>
+      <point x="692" y="60"/>
+      <point x="657" y="121"/>
+      <point x="657" y="217" type="curve" smooth="yes"/>
+      <point x="657" y="311"/>
+      <point x="691" y="370"/>
+      <point x="744" y="370" type="curve" smooth="yes"/>
+      <point x="798" y="370"/>
+      <point x="833" y="309"/>
+      <point x="833" y="212" type="curve" smooth="yes"/>
+      <point x="833" y="119"/>
+      <point x="799" y="60"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/period.glif b/src/Cantarell-Regular.ufo/glyphs/period.glif
index 6c2ebe73..121873e7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/period.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/period.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="period" format="2">
-  <advance width="272"/>
+  <advance width="256"/>
   <unicode hex="002E"/>
   <outline>
     <contour>
-      <point x="136" y="-10" type="curve" smooth="yes"/>
-      <point x="174" y="-10"/>
-      <point x="200" y="17"/>
-      <point x="200" y="54" type="curve" smooth="yes"/>
-      <point x="200" y="91"/>
-      <point x="174" y="118"/>
-      <point x="136" y="118" type="curve" smooth="yes"/>
-      <point x="98" y="118"/>
-      <point x="72" y="91"/>
-      <point x="72" y="54" type="curve" smooth="yes"/>
-      <point x="72" y="17"/>
-      <point x="98" y="-10"/>
+      <point x="128" y="-10" type="curve" smooth="yes"/>
+      <point x="166" y="-10"/>
+      <point x="192" y="17"/>
+      <point x="192" y="54" type="curve" smooth="yes"/>
+      <point x="192" y="91"/>
+      <point x="166" y="118"/>
+      <point x="128" y="118" type="curve" smooth="yes"/>
+      <point x="90" y="118"/>
+      <point x="64" y="91"/>
+      <point x="64" y="54" type="curve" smooth="yes"/>
+      <point x="64" y="17"/>
+      <point x="90" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/periodcentered.glif 
b/src/Cantarell-Regular.ufo/glyphs/periodcentered.glif
index a197cf1e..69324987 100644
--- a/src/Cantarell-Regular.ufo/glyphs/periodcentered.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/periodcentered.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="periodcentered" format="2">
-  <advance width="274"/>
+  <advance width="256"/>
   <unicode hex="00B7"/>
   <outline>
     <component base="period" yOffset="210"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>period</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>period</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/periodcentered.loclC_A_T_.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/periodcentered.loclC_A_T_.case.glif
index 46fc7740..a1302e1e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/periodcentered.loclC_A_T_.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/periodcentered.loclC_A_T_.case.glif
@@ -2,6 +2,6 @@
 <glyph name="periodcentered.loclCAT.case" format="2">
   <anchor x="0" y="352" name="_periodcentered"/>
   <outline>
-    <component base="period" xOffset="-252" yOffset="304"/>
+    <component base="period" xOffset="-272" yOffset="304"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/perthousand.glif 
b/src/Cantarell-Regular.ufo/glyphs/perthousand.glif
index 68b70594..c03a93af 100644
--- a/src/Cantarell-Regular.ufo/glyphs/perthousand.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/perthousand.glif
@@ -1,97 +1,105 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="perthousand" format="2">
-  <advance width="1383"/>
+  <advance width="1379"/>
   <unicode hex="2030"/>
   <outline>
     <contour>
-      <point x="265" y="0" type="line"/>
-      <point x="342" y="0" type="line"/>
-      <point x="724" y="694" type="line"/>
-      <point x="641" y="694" type="line"/>
+      <point x="263" y="0" type="line"/>
+      <point x="340" y="0" type="line"/>
+      <point x="722" y="694" type="line"/>
+      <point x="639" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="244" y="262" type="curve" smooth="yes"/>
-      <point x="345" y="262"/>
-      <point x="411" y="349"/>
-      <point x="411" y="485" type="curve" smooth="yes"/>
-      <point x="411" y="618"/>
-      <point x="347" y="704"/>
-      <point x="247" y="704" type="curve" smooth="yes"/>
-      <point x="144" y="704"/>
-      <point x="78" y="617"/>
-      <point x="78" y="481" type="curve" smooth="yes"/>
-      <point x="78" y="347"/>
-      <point x="143" y="262"/>
+      <point x="242" y="262" type="curve" smooth="yes"/>
+      <point x="343" y="262"/>
+      <point x="409" y="349"/>
+      <point x="409" y="485" type="curve" smooth="yes"/>
+      <point x="409" y="618"/>
+      <point x="345" y="704"/>
+      <point x="245" y="704" type="curve" smooth="yes"/>
+      <point x="142" y="704"/>
+      <point x="76" y="617"/>
+      <point x="76" y="481" type="curve" smooth="yes"/>
+      <point x="76" y="347"/>
+      <point x="141" y="262"/>
     </contour>
     <contour>
-      <point x="246" y="328" type="curve" smooth="yes"/>
-      <point x="192" y="328"/>
-      <point x="157" y="389"/>
-      <point x="157" y="485" type="curve" smooth="yes"/>
-      <point x="157" y="579"/>
-      <point x="191" y="638"/>
-      <point x="244" y="638" type="curve" smooth="yes"/>
-      <point x="298" y="638"/>
-      <point x="333" y="577"/>
-      <point x="333" y="480" type="curve" smooth="yes"/>
-      <point x="333" y="387"/>
-      <point x="299" y="328"/>
+      <point x="244" y="328" type="curve" smooth="yes"/>
+      <point x="190" y="328"/>
+      <point x="155" y="389"/>
+      <point x="155" y="485" type="curve" smooth="yes"/>
+      <point x="155" y="579"/>
+      <point x="189" y="638"/>
+      <point x="242" y="638" type="curve" smooth="yes"/>
+      <point x="296" y="638"/>
+      <point x="331" y="577"/>
+      <point x="331" y="480" type="curve" smooth="yes"/>
+      <point x="331" y="387"/>
+      <point x="297" y="328"/>
     </contour>
     <contour>
-      <point x="746" y="-6" type="curve" smooth="yes"/>
-      <point x="847" y="-6"/>
-      <point x="913" y="81"/>
-      <point x="913" y="217" type="curve" smooth="yes"/>
-      <point x="913" y="350"/>
-      <point x="849" y="436"/>
-      <point x="749" y="436" type="curve" smooth="yes"/>
-      <point x="646" y="436"/>
-      <point x="580" y="349"/>
-      <point x="580" y="213" type="curve" smooth="yes"/>
-      <point x="580" y="79"/>
-      <point x="645" y="-6"/>
+      <point x="744" y="-6" type="curve" smooth="yes"/>
+      <point x="845" y="-6"/>
+      <point x="911" y="81"/>
+      <point x="911" y="217" type="curve" smooth="yes"/>
+      <point x="911" y="350"/>
+      <point x="847" y="436"/>
+      <point x="747" y="436" type="curve" smooth="yes"/>
+      <point x="644" y="436"/>
+      <point x="578" y="349"/>
+      <point x="578" y="213" type="curve" smooth="yes"/>
+      <point x="578" y="79"/>
+      <point x="643" y="-6"/>
     </contour>
     <contour>
-      <point x="748" y="60" type="curve" smooth="yes"/>
-      <point x="694" y="60"/>
-      <point x="659" y="121"/>
-      <point x="659" y="217" type="curve" smooth="yes"/>
-      <point x="659" y="311"/>
-      <point x="693" y="370"/>
-      <point x="746" y="370" type="curve" smooth="yes"/>
-      <point x="800" y="370"/>
-      <point x="835" y="309"/>
-      <point x="835" y="212" type="curve" smooth="yes"/>
-      <point x="835" y="119"/>
-      <point x="801" y="60"/>
+      <point x="746" y="60" type="curve" smooth="yes"/>
+      <point x="692" y="60"/>
+      <point x="657" y="121"/>
+      <point x="657" y="217" type="curve" smooth="yes"/>
+      <point x="657" y="311"/>
+      <point x="691" y="370"/>
+      <point x="744" y="370" type="curve" smooth="yes"/>
+      <point x="798" y="370"/>
+      <point x="833" y="309"/>
+      <point x="833" y="212" type="curve" smooth="yes"/>
+      <point x="833" y="119"/>
+      <point x="799" y="60"/>
     </contour>
     <contour>
-      <point x="1138" y="-6" type="curve" smooth="yes"/>
-      <point x="1239" y="-6"/>
-      <point x="1305" y="81"/>
-      <point x="1305" y="217" type="curve" smooth="yes"/>
-      <point x="1305" y="350"/>
-      <point x="1241" y="436"/>
-      <point x="1141" y="436" type="curve" smooth="yes"/>
-      <point x="1038" y="436"/>
-      <point x="972" y="349"/>
-      <point x="972" y="213" type="curve" smooth="yes"/>
-      <point x="972" y="79"/>
-      <point x="1037" y="-6"/>
+      <point x="1136" y="-6" type="curve" smooth="yes"/>
+      <point x="1237" y="-6"/>
+      <point x="1303" y="81"/>
+      <point x="1303" y="217" type="curve" smooth="yes"/>
+      <point x="1303" y="350"/>
+      <point x="1239" y="436"/>
+      <point x="1139" y="436" type="curve" smooth="yes"/>
+      <point x="1036" y="436"/>
+      <point x="970" y="349"/>
+      <point x="970" y="213" type="curve" smooth="yes"/>
+      <point x="970" y="79"/>
+      <point x="1035" y="-6"/>
     </contour>
     <contour>
-      <point x="1140" y="60" type="curve" smooth="yes"/>
-      <point x="1086" y="60"/>
-      <point x="1051" y="121"/>
-      <point x="1051" y="217" type="curve" smooth="yes"/>
-      <point x="1051" y="311"/>
-      <point x="1085" y="370"/>
-      <point x="1138" y="370" type="curve" smooth="yes"/>
-      <point x="1192" y="370"/>
-      <point x="1227" y="309"/>
-      <point x="1227" y="212" type="curve" smooth="yes"/>
-      <point x="1227" y="119"/>
-      <point x="1193" y="60"/>
+      <point x="1138" y="60" type="curve" smooth="yes"/>
+      <point x="1084" y="60"/>
+      <point x="1049" y="121"/>
+      <point x="1049" y="217" type="curve" smooth="yes"/>
+      <point x="1049" y="311"/>
+      <point x="1083" y="370"/>
+      <point x="1136" y="370" type="curve" smooth="yes"/>
+      <point x="1190" y="370"/>
+      <point x="1225" y="309"/>
+      <point x="1225" y="212" type="curve" smooth="yes"/>
+      <point x="1225" y="119"/>
+      <point x="1191" y="60"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>percent</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>percent</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/peseta.glif b/src/Cantarell-Regular.ufo/glyphs/peseta.glif
index bfdc87bb..3eb6889a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/peseta.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/peseta.glif
@@ -1,20 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="peseta" format="2">
-  <advance width="794"/>
+  <advance width="580"/>
   <unicode hex="20A7"/>
   <outline>
     <contour>
-      <point x="587" y="494" type="line"/>
-      <point x="587" y="434" type="line"/>
-      <point x="718" y="434" type="line"/>
-      <point x="718" y="494" type="line"/>
+      <point x="99" y="0" type="line"/>
+      <point x="181" y="0" type="line"/>
+      <point x="181" y="242" type="line"/>
+      <point x="268" y="242" type="line" smooth="yes"/>
+      <point x="400" y="242"/>
+      <point x="489" y="334"/>
+      <point x="489" y="473" type="curve" smooth="yes"/>
+      <point x="489" y="606"/>
+      <point x="407" y="694"/>
+      <point x="283" y="694" type="curve" smooth="yes"/>
+      <point x="99" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="207" y="434" type="line"/>
-      <point x="207" y="494" type="line"/>
-      <point x="76" y="494" type="line"/>
-      <point x="76" y="434" type="line"/>
+      <point x="21" y="421" type="line"/>
+      <point x="128" y="421" type="line"/>
+      <point x="128" y="488" type="line"/>
+      <point x="21" y="488" type="line"/>
+    </contour>
+    <contour>
+      <point x="181" y="314" type="line"/>
+      <point x="181" y="622" type="line"/>
+      <point x="274" y="622" type="line" smooth="yes"/>
+      <point x="352" y="622"/>
+      <point x="404" y="556"/>
+      <point x="404" y="458" type="curve" smooth="yes"/>
+      <point x="404" y="365"/>
+      <point x="361" y="314"/>
+      <point x="283" y="314" type="curve" smooth="yes"/>
+    </contour>
+    <contour>
+      <point x="452" y="421" type="line"/>
+      <point x="569" y="421" type="line"/>
+      <point x="569" y="488" type="line"/>
+      <point x="452" y="488" type="line"/>
     </contour>
-    <component base="P" xOffset="60"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/peso.glif b/src/Cantarell-Regular.ufo/glyphs/peso.glif
index 27830b5e..6a9c95a2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/peso.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/peso.glif
@@ -1,57 +1,61 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="peso" format="2">
-  <advance width="800"/>
+  <advance width="580"/>
   <unicode hex="20B1"/>
   <outline>
     <contour>
-      <point x="595" y="564" type="line"/>
-      <point x="595" y="504" type="line"/>
-      <point x="716" y="504" type="line"/>
-      <point x="716" y="564" type="line"/>
+      <point x="99" y="0" type="line"/>
+      <point x="181" y="0" type="line"/>
+      <point x="181" y="242" type="line"/>
+      <point x="268" y="242" type="line" smooth="yes"/>
+      <point x="400" y="242"/>
+      <point x="489" y="334"/>
+      <point x="489" y="473" type="curve" smooth="yes"/>
+      <point x="489" y="606"/>
+      <point x="407" y="694"/>
+      <point x="283" y="694" type="curve" smooth="yes"/>
+      <point x="99" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="215" y="504" type="line"/>
-      <point x="215" y="564" type="line"/>
-      <point x="84" y="564" type="line"/>
-      <point x="84" y="504" type="line"/>
+      <point x="21" y="344" type="line"/>
+      <point x="128" y="344" type="line"/>
+      <point x="128" y="411" type="line"/>
+      <point x="21" y="411" type="line"/>
     </contour>
     <contour>
-      <point x="595" y="424" type="line"/>
-      <point x="595" y="364" type="line"/>
-      <point x="716" y="364" type="line"/>
-      <point x="716" y="424" type="line"/>
+      <point x="21" y="521" type="line"/>
+      <point x="128" y="521" type="line"/>
+      <point x="128" y="588" type="line"/>
+      <point x="21" y="588" type="line"/>
     </contour>
     <contour>
-      <point x="215" y="364" type="line"/>
-      <point x="215" y="424" type="line"/>
-      <point x="84" y="424" type="line"/>
-      <point x="84" y="364" type="line"/>
+      <point x="181" y="314" type="line"/>
+      <point x="181" y="622" type="line"/>
+      <point x="274" y="622" type="line" smooth="yes"/>
+      <point x="352" y="622"/>
+      <point x="404" y="556"/>
+      <point x="404" y="458" type="curve" smooth="yes"/>
+      <point x="404" y="365"/>
+      <point x="361" y="314"/>
+      <point x="283" y="314" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="174" y="0" type="line"/>
-      <point x="257" y="0" type="line"/>
-      <point x="257" y="694" type="line"/>
-      <point x="174" y="694" type="line"/>
+      <point x="452" y="344" type="line"/>
+      <point x="559" y="344" type="line"/>
+      <point x="559" y="411" type="line"/>
+      <point x="452" y="411" type="line"/>
     </contour>
     <contour>
-      <point x="227" y="242" type="line"/>
-      <point x="375" y="242" type="line" smooth="yes"/>
-      <point x="530" y="242"/>
-      <point x="634" y="334"/>
-      <point x="634" y="473" type="curve" smooth="yes"/>
-      <point x="634" y="606"/>
-      <point x="536" y="694"/>
-      <point x="390" y="694" type="curve" smooth="yes"/>
-      <point x="227" y="694" type="line"/>
-      <point x="227" y="622" type="line"/>
-      <point x="380" y="622" type="line" smooth="yes"/>
-      <point x="481" y="622"/>
-      <point x="549" y="556"/>
-      <point x="549" y="458" type="curve" smooth="yes"/>
-      <point x="549" y="364"/>
-      <point x="493" y="314"/>
-      <point x="390" y="314" type="curve" smooth="yes"/>
-      <point x="227" y="314" type="line"/>
+      <point x="452" y="521" type="line"/>
+      <point x="559" y="521" type="line"/>
+      <point x="559" y="588" type="line"/>
+      <point x="452" y="588" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/plus.glif b/src/Cantarell-Regular.ufo/glyphs/plus.glif
index 9ffc331e..ab17858e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/plus.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/plus.glif
@@ -1,19 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="plus" format="2">
-  <advance width="642"/>
+  <advance width="580"/>
   <unicode hex="002B"/>
   <outline>
     <contour>
-      <point x="289" y="62" type="line"/>
-      <point x="359" y="62" type="line"/>
-      <point x="359" y="590" type="line"/>
-      <point x="289" y="590" type="line"/>
+      <point x="252" y="99" type="line"/>
+      <point x="328" y="99" type="line"/>
+      <point x="328" y="569" type="line"/>
+      <point x="252" y="569" type="line"/>
     </contour>
     <contour>
-      <point x="69" y="296" type="line"/>
-      <point x="573" y="296" type="line"/>
-      <point x="573" y="365" type="line"/>
-      <point x="69" y="365" type="line"/>
+      <point x="55" y="297" type="line"/>
+      <point x="525" y="297" type="line"/>
+      <point x="525" y="371" type="line"/>
+      <point x="55" y="371" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minus</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/plusminus.glif b/src/Cantarell-Regular.ufo/glyphs/plusminus.glif
index 83af0144..99e4d358 100644
--- a/src/Cantarell-Regular.ufo/glyphs/plusminus.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/plusminus.glif
@@ -1,25 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="plusminus" format="2">
-  <advance width="631"/>
+  <advance width="580"/>
   <unicode hex="00B1"/>
   <outline>
     <contour>
-      <point x="280" y="147" type="line"/>
-      <point x="350" y="147" type="line"/>
-      <point x="350" y="623" type="line"/>
-      <point x="280" y="623" type="line"/>
+      <point x="251" y="153" type="line"/>
+      <point x="327" y="153" type="line"/>
+      <point x="327" y="623" type="line"/>
+      <point x="251" y="623" type="line"/>
     </contour>
     <contour>
-      <point x="81" y="39" type="line"/>
-      <point x="550" y="39" type="line"/>
-      <point x="550" y="104" type="line"/>
-      <point x="81" y="104" type="line"/>
+      <point x="56" y="35" type="line"/>
+      <point x="526" y="35" type="line"/>
+      <point x="526" y="109" type="line"/>
+      <point x="56" y="109" type="line"/>
     </contour>
     <contour>
-      <point x="81" y="355" type="line"/>
-      <point x="550" y="355" type="line"/>
-      <point x="550" y="424" type="line"/>
-      <point x="81" y="424" type="line"/>
+      <point x="54" y="351" type="line"/>
+      <point x="524" y="351" type="line"/>
+      <point x="524" y="425" type="line"/>
+      <point x="54" y="425" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/primeR_eversed.glif 
b/src/Cantarell-Regular.ufo/glyphs/primeR_eversed.glif
index 3f93601f..2aa8b3d4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/primeR_eversed.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/primeR_eversed.glif
@@ -2,9 +2,6 @@
 <glyph name="primeReversed" format="2">
   <advance width="276"/>
   <unicode hex="2035"/>
-  <note>
-uni2035
-</note>
   <outline>
     <component base="quotesingle" xScale="-1" yxScale="-0.19201" xOffset="368"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/primemod.glif b/src/Cantarell-Regular.ufo/glyphs/primemod.glif
index 27542f11..05f62a17 100644
--- a/src/Cantarell-Regular.ufo/glyphs/primemod.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/primemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="primemod" format="2">
-  <advance width="330"/>
+  <advance width="161"/>
   <unicode hex="02B9"/>
   <outline>
-    <component base="minute"/>
+    <component base="minute" xOffset="-81"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/product.glif b/src/Cantarell-Regular.ufo/glyphs/product.glif
index 3a10dc81..2f29ffef 100644
--- a/src/Cantarell-Regular.ufo/glyphs/product.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/product.glif
@@ -1,17 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="product" format="2">
-  <advance width="786"/>
+  <advance width="720"/>
   <unicode hex="220F"/>
   <outline>
     <contour>
-      <point x="125" y="-95" type="line"/>
-      <point x="208" y="-95" type="line"/>
-      <point x="208" y="622" type="line"/>
-      <point x="578" y="622" type="line"/>
-      <point x="578" y="-95" type="line"/>
-      <point x="661" y="-95" type="line"/>
-      <point x="661" y="694" type="line"/>
-      <point x="125" y="694" type="line"/>
+      <point x="92" y="-95" type="line"/>
+      <point x="175" y="-95" type="line"/>
+      <point x="175" y="622" type="line"/>
+      <point x="545" y="622" type="line"/>
+      <point x="545" y="-95" type="line"/>
+      <point x="628" y="-95" type="line"/>
+      <point x="628" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/punctuationspace.glif 
b/src/Cantarell-Regular.ufo/glyphs/punctuationspace.glif
index fdcc0636..a7a87ae6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/punctuationspace.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/punctuationspace.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="punctuationspace" format="2">
-  <advance width="220"/>
+  <advance width="256"/>
   <unicode hex="2008"/>
   <outline>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
-      <string>space</string>
+      <string>period</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/q.glif b/src/Cantarell-Regular.ufo/glyphs/q.glif
index 14bed816..6408ff02 100644
--- a/src/Cantarell-Regular.ufo/glyphs/q.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/q.glif
@@ -2,19 +2,9 @@
 <glyph name="q" format="2">
   <advance width="570"/>
   <unicode hex="0071"/>
-  <note>
-q
-</note>
   <anchor x="287" y="0" name="bottom"/>
   <anchor x="287" y="482" name="top"/>
   <outline>
-    <contour>
-      <point x="407" y="-217" type="line"/>
-      <point x="487" y="-217" type="line"/>
-      <point x="487" y="482" type="line"/>
-      <point x="431" y="482" type="line"/>
-      <point x="407" y="426" type="line"/>
-    </contour>
     <contour>
       <point x="267" y="-10" type="curve" smooth="yes"/>
       <point x="348" y="-10"/>
@@ -43,5 +33,20 @@ q
       <point x="52" y="89"/>
       <point x="138" y="-10"/>
     </contour>
+    <contour>
+      <point x="407" y="-217" type="line"/>
+      <point x="487" y="-217" type="line"/>
+      <point x="487" y="482" type="line"/>
+      <point x="431" y="482" type="line"/>
+      <point x="407" y="426" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/question.glif b/src/Cantarell-Regular.ufo/glyphs/question.glif
index 9251bec4..ddceec64 100644
--- a/src/Cantarell-Regular.ufo/glyphs/question.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/question.glif
@@ -28,18 +28,18 @@
       <point x="157" y="248" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="199" y="-10" type="curve" smooth="yes"/>
-      <point x="237" y="-10"/>
-      <point x="263" y="17"/>
-      <point x="263" y="54" type="curve" smooth="yes"/>
-      <point x="263" y="91"/>
-      <point x="237" y="118"/>
-      <point x="199" y="118" type="curve" smooth="yes"/>
-      <point x="161" y="118"/>
-      <point x="135" y="91"/>
-      <point x="135" y="54" type="curve" smooth="yes"/>
-      <point x="135" y="17"/>
-      <point x="161" y="-10"/>
+      <point x="196" y="-10" type="curve" smooth="yes"/>
+      <point x="234" y="-10"/>
+      <point x="260" y="17"/>
+      <point x="260" y="54" type="curve" smooth="yes"/>
+      <point x="260" y="91"/>
+      <point x="234" y="118"/>
+      <point x="196" y="118" type="curve" smooth="yes"/>
+      <point x="158" y="118"/>
+      <point x="132" y="91"/>
+      <point x="132" y="54" type="curve" smooth="yes"/>
+      <point x="132" y="17"/>
+      <point x="158" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/questiondown.glif 
b/src/Cantarell-Regular.ufo/glyphs/questiondown.glif
index 2d591674..b79b3b32 100644
--- a/src/Cantarell-Regular.ufo/glyphs/questiondown.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/questiondown.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="questiondown" format="2">
-  <advance width="425"/>
+  <advance width="422"/>
   <unicode hex="00BF"/>
   <outline>
-    <component base="question" xScale="-1" yScale="-1" xOffset="440" yOffset="479"/>
+    <component base="question" xScale="-1" yScale="-1" xOffset="422" yOffset="479"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|question</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|question</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/quotedbl.glif b/src/Cantarell-Regular.ufo/glyphs/quotedbl.glif
index c19cbba9..96ba63b7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/quotedbl.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/quotedbl.glif
@@ -1,9 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotedbl" format="2">
-  <advance width="456"/>
+  <advance width="424"/>
   <unicode hex="0022"/>
   <outline>
-    <component base="quotesingle" xOffset="15"/>
-    <component base="quotesingle" xOffset="195"/>
+    <component base="quotesingle"/>
+    <component base="quotesingle" xOffset="180"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>quotesingle</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>quotesingle</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/quotedblbase.glif 
b/src/Cantarell-Regular.ufo/glyphs/quotedblbase.glif
index 0028f0d8..05cb81b5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/quotedblbase.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/quotedblbase.glif
@@ -1,13 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotedblbase" format="2">
-  <advance width="461"/>
+  <advance width="433"/>
   <unicode hex="201E"/>
   <outline>
-    <component base="_typoquote" xOffset="172"/>
-    <component base="_typoquote" xOffset="-8"/>
+    <component base="_typoquote" xOffset="149"/>
+    <component base="_typoquote" xOffset="-36"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>quoteright</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>quoteright</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Regular.ufo/glyphs/quotedblleft.glif 
b/src/Cantarell-Regular.ufo/glyphs/quotedblleft.glif
index f5a3cc2b..56e8ff7d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/quotedblleft.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/quotedblleft.glif
@@ -1,9 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotedblleft" format="2">
-  <advance width="466"/>
+  <advance width="433"/>
   <unicode hex="201C"/>
   <outline>
     <component base="quoteleft" xOffset="185"/>
     <component base="quoteleft"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>quoteleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>quoteleft</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/quotedblright.glif 
b/src/Cantarell-Regular.ufo/glyphs/quotedblright.glif
index 93f1197b..ff56c615 100644
--- a/src/Cantarell-Regular.ufo/glyphs/quotedblright.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/quotedblright.glif
@@ -1,9 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotedblright" format="2">
-  <advance width="461"/>
+  <advance width="433"/>
   <unicode hex="201D"/>
   <outline>
-    <component base="quoteright" xOffset="179" yOffset="-2"/>
-    <component base="quoteright" xOffset="-1" yOffset="-2"/>
+    <component base="quoteright" xOffset="185" yOffset="-2"/>
+    <component base="quoteright" yOffset="-2"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>quoteright</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>quoteright</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/quoteleft.glif b/src/Cantarell-Regular.ufo/glyphs/quoteleft.glif
index cd54cdb3..e6fbc932 100644
--- a/src/Cantarell-Regular.ufo/glyphs/quoteleft.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/quoteleft.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quoteleft" format="2">
-  <advance width="281"/>
+  <advance width="248"/>
   <unicode hex="2018"/>
   <outline>
-    <component base="_typoquote" xScale="-1" yScale="-1" xOffset="289" yOffset="587"/>
+    <component base="_typoquote" xScale="-1" yScale="-1" xOffset="284" yOffset="587"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/quoteright.glif 
b/src/Cantarell-Regular.ufo/glyphs/quoteright.glif
index 01b32827..d255428b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/quoteright.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/quoteright.glif
@@ -1,12 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quoteright" format="2">
-  <advance width="281"/>
+  <advance width="248"/>
   <unicode hex="2019"/>
   <outline>
-    <component base="_typoquote" xOffset="-8" yOffset="634"/>
+    <component base="_typoquote" xOffset="-36" yOffset="634"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|quoteleft</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>quoteleft</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Regular.ufo/glyphs/quotesinglbase.glif 
b/src/Cantarell-Regular.ufo/glyphs/quotesinglbase.glif
index a368055f..8db6b220 100644
--- a/src/Cantarell-Regular.ufo/glyphs/quotesinglbase.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/quotesinglbase.glif
@@ -1,12 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotesinglbase" format="2">
-  <advance width="281"/>
+  <advance width="248"/>
   <unicode hex="201A"/>
   <outline>
-    <component base="_typoquote" xOffset="-8"/>
+    <component base="_typoquote" xOffset="-36"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>quoteright</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>quoteleft</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Regular.ufo/glyphs/quotesingle.glif 
b/src/Cantarell-Regular.ufo/glyphs/quotesingle.glif
index 22424683..27b05aaa 100644
--- a/src/Cantarell-Regular.ufo/glyphs/quotesingle.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/quotesingle.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotesingle" format="2">
-  <advance width="276"/>
+  <advance width="244"/>
   <unicode hex="0027"/>
   <outline>
     <contour>
-      <point x="105" y="422" type="line"/>
-      <point x="171" y="422" type="line"/>
-      <point x="181" y="694" type="line"/>
-      <point x="95" y="694" type="line"/>
+      <point x="89" y="422" type="line"/>
+      <point x="155" y="422" type="line"/>
+      <point x="165" y="694" type="line"/>
+      <point x="79" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/r.glif b/src/Cantarell-Regular.ufo/glyphs/r.glif
index 8a262ac9..f3292a27 100644
--- a/src/Cantarell-Regular.ufo/glyphs/r.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/r.glif
@@ -2,9 +2,6 @@
 <glyph name="r" format="2">
   <advance width="377"/>
   <unicode hex="0072"/>
-  <note>
-r
-</note>
   <anchor x="122" y="0" name="bottom"/>
   <anchor x="227" y="482" name="top"/>
   <outline>
@@ -32,4 +29,10 @@ r
       <point x="145" y="394" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/radical.glif b/src/Cantarell-Regular.ufo/glyphs/radical.glif
index bef91794..eba9da75 100644
--- a/src/Cantarell-Regular.ufo/glyphs/radical.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/radical.glif
@@ -1,18 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="radical" format="2">
-  <advance width="582"/>
+  <advance width="576"/>
   <unicode hex="221A"/>
   <outline>
     <contour>
-      <point x="284" y="-59" type="line"/>
-      <point x="364" y="-59" type="line"/>
-      <point x="514" y="739" type="line"/>
-      <point x="427" y="739" type="line"/>
-      <point x="316" y="59" type="line"/>
-      <point x="240" y="303" type="line"/>
-      <point x="62" y="303" type="line"/>
-      <point x="62" y="231" type="line"/>
-      <point x="178" y="231" type="line"/>
+      <point x="281" y="-59" type="line"/>
+      <point x="361" y="-59" type="line"/>
+      <point x="511" y="739" type="line"/>
+      <point x="424" y="739" type="line"/>
+      <point x="313" y="59" type="line"/>
+      <point x="237" y="303" type="line"/>
+      <point x="59" y="303" type="line"/>
+      <point x="59" y="231" type="line"/>
+      <point x="175" y="231" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ratio.glif b/src/Cantarell-Regular.ufo/glyphs/ratio.glif
index c48478f5..9450dfa7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ratio.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ratio.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ratio" format="2">
-  <advance width="336"/>
+  <advance width="256"/>
   <unicode hex="2236"/>
   <outline>
-    <component base="colon" xOffset="76" yOffset="100"/>
+    <component base="colon" yOffset="100"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>colon</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>colon</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/registered.glif 
b/src/Cantarell-Regular.ufo/glyphs/registered.glif
index 1f4503a2..efb448c9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/registered.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/registered.glif
@@ -1,67 +1,73 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="registered" format="2">
-  <advance width="659"/>
+  <advance width="655"/>
   <unicode hex="00AE"/>
   <outline>
     <contour>
-      <point x="327" y="279" type="curve" smooth="yes"/>
-      <point x="469" y="279"/>
-      <point x="570" y="377"/>
-      <point x="570" y="515" type="curve" smooth="yes"/>
-      <point x="570" y="652"/>
-      <point x="471" y="749"/>
-      <point x="332" y="749" type="curve" smooth="yes"/>
-      <point x="190" y="749"/>
-      <point x="89" y="649"/>
-      <point x="89" y="510" type="curve" smooth="yes"/>
-      <point x="89" y="374"/>
-      <point x="187" y="279"/>
+      <point x="325" y="279" type="curve" smooth="yes"/>
+      <point x="467" y="279"/>
+      <point x="568" y="377"/>
+      <point x="568" y="515" type="curve" smooth="yes"/>
+      <point x="568" y="652"/>
+      <point x="469" y="749"/>
+      <point x="330" y="749" type="curve" smooth="yes"/>
+      <point x="188" y="749"/>
+      <point x="87" y="649"/>
+      <point x="87" y="510" type="curve" smooth="yes"/>
+      <point x="87" y="374"/>
+      <point x="185" y="279"/>
     </contour>
     <contour>
-      <point x="333" y="325" type="curve" smooth="yes"/>
-      <point x="218" y="325"/>
-      <point x="136" y="405"/>
-      <point x="136" y="516" type="curve" smooth="yes"/>
-      <point x="136" y="625"/>
-      <point x="215" y="703"/>
-      <point x="327" y="703" type="curve" smooth="yes"/>
-      <point x="441" y="703"/>
-      <point x="523" y="622"/>
-      <point x="523" y="510" type="curve" smooth="yes"/>
-      <point x="523" y="401"/>
-      <point x="445" y="325"/>
+      <point x="235" y="380" type="line"/>
+      <point x="296" y="380" type="line"/>
+      <point x="296" y="658" type="line"/>
+      <point x="235" y="658" type="line"/>
     </contour>
     <contour>
-      <point x="237" y="380" type="line"/>
-      <point x="298" y="380" type="line"/>
-      <point x="298" y="658" type="line"/>
-      <point x="237" y="658" type="line"/>
+      <point x="393" y="380" type="line"/>
+      <point x="458" y="380" type="line"/>
+      <point x="397" y="501" type="line"/>
+      <point x="338" y="501" type="line"/>
     </contour>
     <contour>
-      <point x="280" y="476" type="line"/>
-      <point x="328" y="476" type="line" smooth="yes"/>
-      <point x="395" y="476"/>
-      <point x="440" y="513"/>
-      <point x="440" y="569" type="curve" smooth="yes"/>
-      <point x="440" y="622"/>
-      <point x="396" y="658"/>
-      <point x="331" y="658" type="curve" smooth="yes"/>
-      <point x="280" y="658" type="line"/>
-      <point x="280" y="605" type="line"/>
-      <point x="328" y="605" type="line" smooth="yes"/>
-      <point x="357" y="605"/>
-      <point x="376" y="589"/>
-      <point x="376" y="566" type="curve" smooth="yes"/>
-      <point x="376" y="542"/>
-      <point x="362" y="528"/>
-      <point x="331" y="528" type="curve" smooth="yes"/>
-      <point x="280" y="528" type="line"/>
+      <point x="331" y="325" type="curve" smooth="yes"/>
+      <point x="216" y="325"/>
+      <point x="134" y="405"/>
+      <point x="134" y="516" type="curve" smooth="yes"/>
+      <point x="134" y="625"/>
+      <point x="213" y="703"/>
+      <point x="325" y="703" type="curve" smooth="yes"/>
+      <point x="439" y="703"/>
+      <point x="521" y="622"/>
+      <point x="521" y="510" type="curve" smooth="yes"/>
+      <point x="521" y="401"/>
+      <point x="443" y="325"/>
     </contour>
     <contour>
-      <point x="395" y="380" type="line"/>
-      <point x="460" y="380" type="line"/>
-      <point x="399" y="501" type="line"/>
-      <point x="340" y="501" type="line"/>
+      <point x="278" y="476" type="line"/>
+      <point x="326" y="476" type="line" smooth="yes"/>
+      <point x="393" y="476"/>
+      <point x="438" y="513"/>
+      <point x="438" y="569" type="curve" smooth="yes"/>
+      <point x="438" y="622"/>
+      <point x="394" y="658"/>
+      <point x="329" y="658" type="curve" smooth="yes"/>
+      <point x="278" y="658" type="line"/>
+      <point x="278" y="605" type="line"/>
+      <point x="326" y="605" type="line" smooth="yes"/>
+      <point x="355" y="605"/>
+      <point x="374" y="589"/>
+      <point x="374" y="566" type="curve" smooth="yes"/>
+      <point x="374" y="542"/>
+      <point x="360" y="528"/>
+      <point x="329" y="528" type="curve" smooth="yes"/>
+      <point x="278" y="528" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/rightA_rrow.glif 
b/src/Cantarell-Regular.ufo/glyphs/rightA_rrow.glif
index 79c5123d..8c7d1ea7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/rightA_rrow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/rightA_rrow.glif
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rightArrow" format="2">
-  <advance width="681"/>
+  <advance width="677"/>
   <unicode hex="2192"/>
-  <note>
-arrowright
-</note>
   <outline>
     <contour>
-      <point x="350" y="54" type="line"/>
-      <point x="621" y="319" type="line"/>
-      <point x="621" y="329" type="line"/>
-      <point x="353" y="590" type="line"/>
-      <point x="299" y="535" type="line"/>
-      <point x="506" y="355" type="line"/>
-      <point x="68" y="355" type="line"/>
-      <point x="68" y="288" type="line"/>
-      <point x="505" y="288" type="line"/>
-      <point x="299" y="105" type="line"/>
+      <point x="348" y="54" type="line"/>
+      <point x="619" y="319" type="line"/>
+      <point x="619" y="329" type="line"/>
+      <point x="351" y="590" type="line"/>
+      <point x="297" y="535" type="line"/>
+      <point x="504" y="355" type="line"/>
+      <point x="66" y="355" type="line"/>
+      <point x="66" y="288" type="line"/>
+      <point x="503" y="288" type="line"/>
+      <point x="297" y="105" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/rightanglebracket-math.glif 
b/src/Cantarell-Regular.ufo/glyphs/rightanglebracket-math.glif
index c46bbc8d..d9ba7c8a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/rightanglebracket-math.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/rightanglebracket-math.glif
@@ -1,16 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rightanglebracket-math" format="2">
-  <advance width="313"/>
+  <advance width="329"/>
   <unicode hex="27E9"/>
   <outline>
     <contour>
-      <point x="50" y="-10" type="line"/>
-      <point x="128" y="-10" type="line"/>
-      <point x="269" y="371" type="line"/>
-      <point x="127" y="739" type="line"/>
-      <point x="42" y="739" type="line"/>
-      <point x="200" y="345" type="line"/>
-      <point x="200" y="392" type="line"/>
+      <point x="45" y="-10" type="line"/>
+      <point x="130" y="-10" type="line"/>
+      <point x="290" y="370" type="line"/>
+      <point x="129" y="739" type="line"/>
+      <point x="38" y="739" type="line"/>
+      <point x="216" y="344" type="line"/>
+      <point x="216" y="391" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|leftanglebracket-math</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|leftanglebracket-math</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ring.glif b/src/Cantarell-Regular.ufo/glyphs/ring.glif
index d88b8d24..8d239714 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ring.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ring.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ring" format="2">
-  <advance width="341"/>
+  <advance width="500"/>
   <unicode hex="02DA"/>
   <outline>
-    <component base="ringcomb" xOffset="-3"/>
+    <component base="ringcomb" xOffset="77"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ringhalfleft.glif 
b/src/Cantarell-Regular.ufo/glyphs/ringhalfleft.glif
index a5ebcaf1..f593101d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ringhalfleft.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ringhalfleft.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ringhalfleft" format="2">
-  <advance width="260"/>
+  <advance width="177"/>
   <unicode hex="02BF"/>
   <outline>
-    <component base="ringhalfright" xScale="-1" xOffset="260"/>
+    <component base="ringhalfright" xScale="-1" xOffset="177"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|ringhalfright</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|ringhalfright</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ringhalfright.glif 
b/src/Cantarell-Regular.ufo/glyphs/ringhalfright.glif
index 4fa0908c..6736cbee 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ringhalfright.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ringhalfright.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ringhalfright" format="2">
-  <advance width="258"/>
+  <advance width="177"/>
   <unicode hex="02BE"/>
   <outline>
     <contour>
-      <point x="76" y="556" type="line"/>
-      <point x="154" y="557"/>
-      <point x="195" y="593"/>
-      <point x="195" y="660" type="curve" smooth="yes"/>
-      <point x="195" y="726"/>
-      <point x="154" y="760"/>
-      <point x="76" y="760" type="curve"/>
-      <point x="76" y="700" type="line"/>
-      <point x="113" y="700"/>
-      <point x="133" y="686"/>
-      <point x="133" y="659" type="curve" smooth="yes"/>
-      <point x="133" y="632"/>
-      <point x="113" y="617"/>
-      <point x="76" y="616" type="curve"/>
+      <point x="33" y="556" type="line"/>
+      <point x="111" y="557"/>
+      <point x="152" y="593"/>
+      <point x="152" y="660" type="curve" smooth="yes"/>
+      <point x="152" y="726"/>
+      <point x="111" y="760"/>
+      <point x="33" y="760" type="curve"/>
+      <point x="33" y="700" type="line"/>
+      <point x="70" y="700"/>
+      <point x="90" y="686"/>
+      <point x="90" y="659" type="curve" smooth="yes"/>
+      <point x="90" y="632"/>
+      <point x="70" y="617"/>
+      <point x="33" y="616" type="curve"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ruble.glif b/src/Cantarell-Regular.ufo/glyphs/ruble.glif
index 51c39226..0cb3959b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ruble.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ruble.glif
@@ -1,39 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ruble" format="2">
-  <advance width="735"/>
+  <advance width="580"/>
   <unicode hex="20BD"/>
   <outline>
     <contour>
-      <point x="192" y="0" type="line"/>
-      <point x="275" y="0" type="line"/>
-      <point x="275" y="694" type="line"/>
-      <point x="192" y="694" type="line"/>
+      <point x="48" y="265" type="line"/>
+      <point x="308" y="265" type="line" smooth="yes"/>
+      <point x="445" y="265"/>
+      <point x="534" y="364"/>
+      <point x="534" y="490" type="curve" smooth="yes"/>
+      <point x="534" y="613"/>
+      <point x="450" y="694"/>
+      <point x="322" y="694" type="curve" smooth="yes"/>
+      <point x="177" y="694" type="line"/>
+      <point x="177" y="622" type="line"/>
+      <point x="314" y="622" type="line" smooth="yes"/>
+      <point x="394" y="622"/>
+      <point x="449" y="563"/>
+      <point x="449" y="474" type="curve" smooth="yes"/>
+      <point x="449" y="394"/>
+      <point x="404" y="337"/>
+      <point x="323" y="337" type="curve" smooth="yes"/>
+      <point x="48" y="337" type="line"/>
     </contour>
     <contour>
-      <point x="86" y="100" type="line"/>
-      <point x="439" y="100" type="line"/>
-      <point x="439" y="160" type="line"/>
-      <point x="86" y="160" type="line"/>
+      <point x="48" y="88" type="line"/>
+      <point x="356" y="88" type="line"/>
+      <point x="356" y="155" type="line"/>
+      <point x="48" y="155" type="line"/>
     </contour>
     <contour>
-      <point x="86" y="242" type="line"/>
-      <point x="393" y="242" type="line" smooth="yes"/>
-      <point x="548" y="242"/>
-      <point x="652" y="334"/>
-      <point x="652" y="473" type="curve" smooth="yes"/>
-      <point x="652" y="606"/>
-      <point x="554" y="694"/>
-      <point x="408" y="694" type="curve" smooth="yes"/>
-      <point x="245" y="694" type="line"/>
-      <point x="245" y="622" type="line"/>
-      <point x="398" y="622" type="line" smooth="yes"/>
-      <point x="499" y="622"/>
-      <point x="567" y="556"/>
-      <point x="567" y="458" type="curve" smooth="yes"/>
-      <point x="567" y="364"/>
-      <point x="511" y="314"/>
-      <point x="408" y="314" type="curve" smooth="yes"/>
-      <point x="86" y="314" type="line"/>
+      <point x="129" y="0" type="line"/>
+      <point x="212" y="0" type="line"/>
+      <point x="212" y="694" type="line"/>
+      <point x="129" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/rupeeI_ndian.glif 
b/src/Cantarell-Regular.ufo/glyphs/rupeeI_ndian.glif
index 00fc6127..de999803 100644
--- a/src/Cantarell-Regular.ufo/glyphs/rupeeI_ndian.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/rupeeI_ndian.glif
@@ -1,45 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rupeeIndian" format="2">
-  <advance width="673"/>
+  <advance width="580"/>
   <unicode hex="20B9"/>
   <outline>
     <contour>
-      <point x="96" y="295" type="line"/>
-      <point x="263" y="295" type="line" smooth="yes"/>
-      <point x="406" y="295"/>
-      <point x="505" y="372"/>
-      <point x="505" y="499" type="curve" smooth="yes"/>
-      <point x="505" y="625"/>
-      <point x="407" y="694"/>
-      <point x="273" y="694" type="curve" smooth="yes"/>
-      <point x="96" y="694" type="line"/>
-      <point x="96" y="632" type="line"/>
-      <point x="263" y="632" type="line" smooth="yes"/>
-      <point x="360" y="632"/>
-      <point x="420" y="584"/>
-      <point x="420" y="491" type="curve" smooth="yes"/>
-      <point x="420" y="401"/>
-      <point x="364" y="359"/>
-      <point x="273" y="359" type="curve" smooth="yes"/>
-      <point x="96" y="359" type="line"/>
+      <point x="50" y="270" type="line"/>
+      <point x="217" y="270" type="line" smooth="yes"/>
+      <point x="360" y="270"/>
+      <point x="459" y="342"/>
+      <point x="459" y="481" type="curve" smooth="yes"/>
+      <point x="459" y="620"/>
+      <point x="361" y="694"/>
+      <point x="227" y="694" type="curve" smooth="yes"/>
+      <point x="50" y="694" type="line"/>
+      <point x="50" y="632" type="line"/>
+      <point x="217" y="632" type="line" smooth="yes"/>
+      <point x="314" y="632"/>
+      <point x="374" y="579"/>
+      <point x="374" y="473" type="curve" smooth="yes"/>
+      <point x="374" y="371"/>
+      <point x="318" y="334"/>
+      <point x="227" y="334" type="curve" smooth="yes"/>
+      <point x="50" y="334" type="line"/>
     </contour>
     <contour>
-      <point x="476" y="0" type="line"/>
-      <point x="575" y="0" type="line"/>
-      <point x="360" y="310" type="line"/>
-      <point x="265" y="310" type="line"/>
+      <point x="430" y="0" type="line"/>
+      <point x="529" y="0" type="line"/>
+      <point x="314" y="285" type="line"/>
+      <point x="219" y="285" type="line"/>
     </contour>
     <contour>
-      <point x="96" y="466" type="line"/>
-      <point x="588" y="466" type="line"/>
-      <point x="588" y="526" type="line"/>
-      <point x="96" y="526" type="line"/>
+      <point x="50" y="451" type="line"/>
+      <point x="542" y="451" type="line"/>
+      <point x="542" y="515" type="line"/>
+      <point x="50" y="515" type="line"/>
     </contour>
     <contour>
-      <point x="96" y="638" type="line"/>
-      <point x="588" y="638" type="line"/>
-      <point x="588" y="698" type="line"/>
-      <point x="96" y="698" type="line"/>
+      <point x="50" y="638" type="line"/>
+      <point x="542" y="638" type="line"/>
+      <point x="542" y="698" type="line"/>
+      <point x="50" y="698" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/s.glif b/src/Cantarell-Regular.ufo/glyphs/s.glif
index e736ee10..177e080d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/s.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/s.glif
@@ -2,9 +2,6 @@
 <glyph name="s" format="2">
   <advance width="464"/>
   <unicode hex="0073"/>
-  <note>
-s
-</note>
   <anchor x="236" y="0" name="bottom"/>
   <anchor x="231" y="482" name="top"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/sacutedotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/sacutedotaccent.glif
index 7b1d69db..59ad07a3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/sacutedotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/sacutedotaccent.glif
@@ -4,6 +4,22 @@
   <unicode hex="1E65"/>
   <outline>
     <component base="s"/>
-    <component base="acutecomb_dotaccentcomb" xOffset="148"/>
+    <component base="acutecomb.loclVIET" xOffset="148"/>
+    <component base="dotaccentcomb.loclVIET" xOffset="56" yOffset="145"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_dot</string>
+          <key>index</key>
+          <integer>2</integer>
+          <key>name</key>
+          <string>dotaccentcomb.loclVIET</string>
+        </dict>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/saltillo.glif b/src/Cantarell-Regular.ufo/glyphs/saltillo.glif
index 1f5abdc5..6ee8673b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/saltillo.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/saltillo.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="saltillo" format="2">
-  <advance width="141"/>
+  <advance width="252"/>
   <unicode hex="A78C"/>
   <outline>
-    <component base="quotesingle" yScale="1.40024" xOffset="-53" yOffset="-278"/>
+    <component base="quotesingle" yScale="1.40024" xOffset="4" yOffset="-278"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/scarondotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/scarondotaccent.glif
index 24efc300..7c3a0fa3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/scarondotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/scarondotaccent.glif
@@ -4,6 +4,7 @@
   <unicode hex="1E67"/>
   <outline>
     <component base="s"/>
-    <component base="caroncomb_dotaccentcomb" xOffset="47"/>
+    <component base="caroncomb.loclVIET" xOffset="47"/>
+    <component base="dotaccentcomb.loclVIET" xOffset="98" yOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/schwa-cy.glif b/src/Cantarell-Regular.ufo/glyphs/schwa-cy.glif
index f0aa5894..86cdf830 100644
--- a/src/Cantarell-Regular.ufo/glyphs/schwa-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/schwa-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="schwa-cy" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="04D9"/>
   <outline>
     <component base="schwa"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/schwa.glif b/src/Cantarell-Regular.ufo/glyphs/schwa.glif
index f96bacf2..6412e17e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/schwa.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/schwa.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="schwa" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0259"/>
   <outline>
-    <component base="e" xScale="-1" yScale="-1" xOffset="527" yOffset="482"/>
+    <component base="e" xScale="-1" yScale="-1" xOffset="528" yOffset="482"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/second.glif b/src/Cantarell-Regular.ufo/glyphs/second.glif
index 4eb4eb16..441ad2b2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/second.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/second.glif
@@ -1,12 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="second" format="2">
-  <advance width="510"/>
+  <advance width="502"/>
   <unicode hex="2033"/>
-  <note>
-second
-</note>
   <outline>
-    <component base="quotesingle" yxScale="0.19201" xOffset="-70"/>
-    <component base="quotesingle" yxScale="0.19201" xOffset="110"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="-68"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="112"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minute</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>minute</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/secondtonechinese.glif 
b/src/Cantarell-Regular.ufo/glyphs/secondtonechinese.glif
index f518b3e9..910ecaee 100644
--- a/src/Cantarell-Regular.ufo/glyphs/secondtonechinese.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/secondtonechinese.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="secondtonechinese" format="2">
-  <advance width="255"/>
+  <advance width="158"/>
   <unicode hex="02CA"/>
   <outline>
-    <component base="acutecomb"/>
+    <component base="acutecomb" xOffset="-55"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/section.glif b/src/Cantarell-Regular.ufo/glyphs/section.glif
index 5ac9625c..0cf25866 100644
--- a/src/Cantarell-Regular.ufo/glyphs/section.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/section.glif
@@ -1,63 +1,63 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="section" format="2">
-  <advance width="554"/>
+  <advance width="550"/>
   <unicode hex="00A7"/>
   <outline>
     <contour>
-      <point x="265" y="-60" type="curve" smooth="yes"/>
-      <point x="387" y="-60"/>
-      <point x="465" y="0"/>
-      <point x="465" y="95" type="curve" smooth="yes"/>
-      <point x="465" y="282"/>
-      <point x="177" y="219"/>
-      <point x="177" y="331" type="curve" smooth="yes"/>
-      <point x="177" y="376"/>
-      <point x="225" y="413"/>
-      <point x="282" y="413" type="curve"/>
-      <point x="296" y="454" type="line"/>
-      <point x="177" y="454"/>
-      <point x="97" y="401"/>
-      <point x="97" y="317" type="curve" smooth="yes"/>
-      <point x="97" y="151"/>
-      <point x="385" y="214"/>
-      <point x="385" y="86" type="curve" smooth="yes"/>
-      <point x="385" y="38"/>
-      <point x="344" y="10"/>
-      <point x="274" y="10" type="curve" smooth="yes"/>
-      <point x="219" y="10"/>
-      <point x="153" y="26"/>
-      <point x="108" y="48" type="curve"/>
-      <point x="89" y="-19" type="line"/>
-      <point x="143" y="-44"/>
-      <point x="206" y="-60"/>
+      <point x="263" y="-60" type="curve" smooth="yes"/>
+      <point x="385" y="-60"/>
+      <point x="463" y="0"/>
+      <point x="463" y="95" type="curve" smooth="yes"/>
+      <point x="463" y="282"/>
+      <point x="175" y="219"/>
+      <point x="175" y="331" type="curve" smooth="yes"/>
+      <point x="175" y="376"/>
+      <point x="223" y="413"/>
+      <point x="280" y="413" type="curve"/>
+      <point x="294" y="454" type="line"/>
+      <point x="175" y="454"/>
+      <point x="95" y="401"/>
+      <point x="95" y="317" type="curve" smooth="yes"/>
+      <point x="95" y="151"/>
+      <point x="383" y="214"/>
+      <point x="383" y="86" type="curve" smooth="yes"/>
+      <point x="383" y="38"/>
+      <point x="342" y="10"/>
+      <point x="272" y="10" type="curve" smooth="yes"/>
+      <point x="217" y="10"/>
+      <point x="151" y="26"/>
+      <point x="106" y="48" type="curve"/>
+      <point x="87" y="-19" type="line"/>
+      <point x="141" y="-44"/>
+      <point x="204" y="-60"/>
     </contour>
     <contour>
-      <point x="264" y="191" type="line"/>
-      <point x="385" y="191"/>
-      <point x="465" y="250"/>
-      <point x="465" y="338" type="curve" smooth="yes"/>
-      <point x="465" y="505"/>
-      <point x="177" y="445"/>
-      <point x="177" y="562" type="curve" smooth="yes"/>
-      <point x="177" y="606"/>
-      <point x="218" y="634"/>
-      <point x="282" y="634" type="curve" smooth="yes"/>
-      <point x="324" y="634"/>
-      <point x="379" y="623"/>
-      <point x="420" y="607" type="curve"/>
-      <point x="439" y="672" type="line"/>
-      <point x="396" y="693"/>
-      <point x="346" y="704"/>
-      <point x="295" y="704" type="curve" smooth="yes"/>
-      <point x="175" y="704"/>
-      <point x="97" y="644"/>
-      <point x="97" y="553" type="curve" smooth="yes"/>
-      <point x="97" y="376"/>
-      <point x="385" y="441"/>
-      <point x="385" y="316" type="curve" smooth="yes"/>
-      <point x="385" y="269"/>
-      <point x="346" y="241"/>
-      <point x="278" y="241" type="curve"/>
+      <point x="262" y="191" type="line"/>
+      <point x="383" y="191"/>
+      <point x="463" y="250"/>
+      <point x="463" y="338" type="curve" smooth="yes"/>
+      <point x="463" y="505"/>
+      <point x="175" y="445"/>
+      <point x="175" y="562" type="curve" smooth="yes"/>
+      <point x="175" y="606"/>
+      <point x="216" y="634"/>
+      <point x="280" y="634" type="curve" smooth="yes"/>
+      <point x="322" y="634"/>
+      <point x="377" y="623"/>
+      <point x="418" y="607" type="curve"/>
+      <point x="437" y="672" type="line"/>
+      <point x="394" y="693"/>
+      <point x="344" y="704"/>
+      <point x="293" y="704" type="curve" smooth="yes"/>
+      <point x="173" y="704"/>
+      <point x="95" y="644"/>
+      <point x="95" y="553" type="curve" smooth="yes"/>
+      <point x="95" y="376"/>
+      <point x="383" y="441"/>
+      <point x="383" y="316" type="curve" smooth="yes"/>
+      <point x="383" y="269"/>
+      <point x="344" y="241"/>
+      <point x="276" y="241" type="curve"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/semicolon.glif b/src/Cantarell-Regular.ufo/glyphs/semicolon.glif
index 4088603a..aa1da507 100644
--- a/src/Cantarell-Regular.ufo/glyphs/semicolon.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/semicolon.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="semicolon" format="2">
-  <advance width="272"/>
+  <advance width="256"/>
   <unicode hex="003B"/>
   <outline>
-    <component base="comma" xOffset="-3"/>
-    <component base="period" xOffset="-5" yOffset="364"/>
+    <component base="comma"/>
+    <component base="period" yOffset="364"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/seven.dnom.glif 
b/src/Cantarell-Regular.ufo/glyphs/seven.dnom.glif
index cd5e3b54..3c6fff57 100644
--- a/src/Cantarell-Regular.ufo/glyphs/seven.dnom.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/seven.dnom.glif
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven.dnom" format="2">
-  <advance width="400"/>
-  <note>
-seven
-</note>
+  <advance width="360"/>
   <outline>
     <contour>
-      <point x="84" y="0" type="line"/>
-      <point x="163" y="0" type="line"/>
-      <point x="374" y="430" type="line"/>
-      <point x="374" y="472" type="line"/>
-      <point x="23" y="472" type="line"/>
-      <point x="23" y="407" type="line"/>
-      <point x="311" y="407" type="line"/>
-      <point x="297" y="429" type="line"/>
+      <point x="75" y="0" type="line"/>
+      <point x="153" y="0" type="line"/>
+      <point x="332" y="381" type="line"/>
+      <point x="332" y="416" type="line"/>
+      <point x="27" y="416" type="line"/>
+      <point x="27" y="352" type="line"/>
+      <point x="267" y="352" type="line"/>
+      <point x="252" y="373" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -21,11 +18,11 @@ seven
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>68</integer>
+        <integer>60</integer>
         <key>weight</key>
         <integer>-7</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>63</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/seven.glif b/src/Cantarell-Regular.ufo/glyphs/seven.glif
index a0e5709d..d446735f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/seven.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/seven.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven" format="2">
-  <advance width="537"/>
+  <advance width="521"/>
   <unicode hex="0037"/>
   <outline>
     <contour>
-      <point x="125" y="0" type="line"/>
-      <point x="212" y="0" type="line"/>
-      <point x="500" y="654" type="line"/>
-      <point x="500" y="694" type="line"/>
-      <point x="35" y="694" type="line"/>
-      <point x="35" y="622" type="line"/>
-      <point x="435" y="622" type="line"/>
-      <point x="414" y="652" type="line"/>
+      <point x="119" y="0" type="line"/>
+      <point x="204" y="0" type="line"/>
+      <point x="492" y="654" type="line"/>
+      <point x="492" y="694" type="line"/>
+      <point x="27" y="694" type="line"/>
+      <point x="27" y="622" type="line"/>
+      <point x="425" y="622" type="line"/>
+      <point x="408" y="652" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/seven.numr.glif 
b/src/Cantarell-Regular.ufo/glyphs/seven.numr.glif
index 128e18de..daa138f8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/seven.numr.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/seven.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven.numr" format="2">
-  <advance width="400"/>
+  <advance width="360"/>
   <outline>
     <component base="seven.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/seven.osf.glif b/src/Cantarell-Regular.ufo/glyphs/seven.osf.glif
index a77cefb4..1d2b953e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/seven.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/seven.osf.glif
@@ -1,16 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven.osf" format="2">
-  <advance width="541"/>
+  <advance width="519"/>
   <outline>
     <contour>
-      <point x="129" y="-100" type="line"/>
-      <point x="213" y="-100" type="line"/>
-      <point x="501" y="555" type="line"/>
-      <point x="501" y="594" type="line"/>
-      <point x="38" y="594" type="line"/>
-      <point x="38" y="525" type="line"/>
-      <point x="438" y="525" type="line"/>
-      <point x="418" y="554" type="line"/>
+      <point x="118" y="-100" type="line"/>
+      <point x="202" y="-100" type="line"/>
+      <point x="490" y="555" type="line"/>
+      <point x="490" y="594" type="line"/>
+      <point x="27" y="594" type="line"/>
+      <point x="27" y="525" type="line"/>
+      <point x="427" y="525" type="line"/>
+      <point x="407" y="554" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>seven</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>seven</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/seven.tf.glif b/src/Cantarell-Regular.ufo/glyphs/seven.tf.glif
index 946e0aa7..df1d1cd4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/seven.tf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/seven.tf.glif
@@ -3,14 +3,14 @@
   <advance width="580"/>
   <outline>
     <contour>
-      <point x="142" y="0" type="line"/>
-      <point x="229" y="0" type="line"/>
-      <point x="531" y="654" type="line"/>
-      <point x="531" y="694" type="line"/>
-      <point x="46" y="694" type="line"/>
-      <point x="46" y="622" type="line"/>
-      <point x="466" y="622" type="line"/>
-      <point x="445" y="652" type="line"/>
+      <point x="147" y="0" type="line"/>
+      <point x="232" y="0" type="line"/>
+      <point x="527" y="654" type="line"/>
+      <point x="527" y="694" type="line"/>
+      <point x="52" y="694" type="line"/>
+      <point x="52" y="622" type="line"/>
+      <point x="460" y="622" type="line"/>
+      <point x="443" y="652" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/seveneighths.glif 
b/src/Cantarell-Regular.ufo/glyphs/seveneighths.glif
index 8f1606c6..53ed35b8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/seveneighths.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/seveneighths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seveneighths" format="2">
-  <advance width="1165"/>
+  <advance width="959"/>
   <unicode hex="215E"/>
   <outline>
     <component base="seven.numr"/>
-    <component base="fraction" xOffset="400"/>
-    <component base="eight.dnom" xOffset="699"/>
+    <component base="fraction" xOffset="360"/>
+    <component base="eight.dnom" xOffset="530"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/seveninferior.glif 
b/src/Cantarell-Regular.ufo/glyphs/seveninferior.glif
index ef98b3e6..e5b83c65 100644
--- a/src/Cantarell-Regular.ufo/glyphs/seveninferior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/seveninferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seveninferior" format="2">
-  <advance width="400"/>
+  <advance width="360"/>
   <unicode hex="2087"/>
   <outline>
     <component base="seven.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/sevensuperior.glif 
b/src/Cantarell-Regular.ufo/glyphs/sevensuperior.glif
index c708e3d7..ffc6d679 100644
--- a/src/Cantarell-Regular.ufo/glyphs/sevensuperior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/sevensuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sevensuperior" format="2">
-  <advance width="400"/>
+  <advance width="360"/>
   <unicode hex="2077"/>
   <outline>
     <component base="seven.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/sha-cy.glif b/src/Cantarell-Regular.ufo/glyphs/sha-cy.glif
index 0d77b535..b96da7f6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/sha-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/sha-cy.glif
@@ -2,6 +2,7 @@
 <glyph name="sha-cy" format="2">
   <advance width="807"/>
   <unicode hex="0448"/>
+  <anchor x="717" y="0" name="bottomright"/>
   <outline>
     <contour>
       <point x="83" y="0" type="line"/>
@@ -29,6 +30,10 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/shcha-cy.glif b/src/Cantarell-Regular.ufo/glyphs/shcha-cy.glif
index 99b35926..ee5db52b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/shcha-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/shcha-cy.glif
@@ -1,30 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="shcha-cy" format="2">
-  <advance width="822"/>
+  <advance width="820"/>
   <unicode hex="0449"/>
   <outline>
-    <contour>
-      <point x="730" y="-126" type="line"/>
-      <point x="805" y="-126" type="line"/>
-      <point x="805" y="66" type="line"/>
-      <point x="163" y="66" type="line"/>
-      <point x="163" y="482" type="line"/>
-      <point x="83" y="482" type="line"/>
-      <point x="83" y="0" type="line"/>
-      <point x="730" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="365" y="32" type="line"/>
-      <point x="444" y="32" type="line"/>
-      <point x="444" y="482" type="line"/>
-      <point x="365" y="482" type="line"/>
-    </contour>
-    <contour>
-      <point x="646" y="32" type="line"/>
-      <point x="726" y="32" type="line"/>
-      <point x="726" y="482" type="line"/>
-      <point x="646" y="482" type="line"/>
-    </contour>
+    <component base="sha-cy"/>
+    <component base="descender-cy" xOffset="610"/>
   </outline>
   <lib>
     <dict>
@@ -35,6 +15,15 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>tse-cy</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>-1</integer>
+        <integer>0</integer>
+      </array>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/six.dnom.glif b/src/Cantarell-Regular.ufo/glyphs/six.dnom.glif
index 2c155447..32098129 100644
--- a/src/Cantarell-Regular.ufo/glyphs/six.dnom.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/six.dnom.glif
@@ -1,49 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six.dnom" format="2">
-  <advance width="464"/>
-  <note>
-six
-</note>
+  <advance width="426"/>
   <outline>
     <contour>
-      <point x="241" y="-7" type="curve" smooth="yes"/>
-      <point x="343" y="-7"/>
-      <point x="415" y="56"/>
-      <point x="415" y="149" type="curve" smooth="yes"/>
-      <point x="415" y="236"/>
-      <point x="353" y="293"/>
-      <point x="264" y="293" type="curve" smooth="yes"/>
-      <point x="193" y="293"/>
-      <point x="135" y="258"/>
-      <point x="102" y="192" type="curve"/>
-      <point x="120" y="160" type="line"/>
-      <point x="145" y="206"/>
-      <point x="190" y="232"/>
-      <point x="240" y="232" type="curve" smooth="yes"/>
-      <point x="300" y="232"/>
-      <point x="340" y="196"/>
-      <point x="340" y="141" type="curve" smooth="yes"/>
-      <point x="340" y="90"/>
-      <point x="304" y="56"/>
-      <point x="248" y="56" type="curve" smooth="yes"/>
-      <point x="173" y="56"/>
-      <point x="130" y="119"/>
-      <point x="130" y="229" type="curve" smooth="yes"/>
-      <point x="130" y="353"/>
-      <point x="185" y="416"/>
-      <point x="281" y="416" type="curve" smooth="yes"/>
-      <point x="316" y="416"/>
-      <point x="358" y="408"/>
-      <point x="386" y="394" type="curve"/>
-      <point x="407" y="450" type="line"/>
-      <point x="376" y="468"/>
-      <point x="332" y="479"/>
-      <point x="283" y="479" type="curve" smooth="yes"/>
-      <point x="137" y="479"/>
-      <point x="53" y="386"/>
-      <point x="53" y="223" type="curve" smooth="yes"/>
-      <point x="53" y="75"/>
-      <point x="124" y="-7"/>
+      <point x="219" y="-6" type="curve" smooth="yes"/>
+      <point x="311" y="-6"/>
+      <point x="373" y="51"/>
+      <point x="373" y="135" type="curve" smooth="yes"/>
+      <point x="373" y="211"/>
+      <point x="321" y="261"/>
+      <point x="244" y="261" type="curve" smooth="yes"/>
+      <point x="182" y="261"/>
+      <point x="135" y="231"/>
+      <point x="112" y="176" type="curve"/>
+      <point x="129" y="145" type="line"/>
+      <point x="148" y="183"/>
+      <point x="183" y="202"/>
+      <point x="222" y="202" type="curve" smooth="yes"/>
+      <point x="269" y="202"/>
+      <point x="301" y="173"/>
+      <point x="301" y="128" type="curve" smooth="yes"/>
+      <point x="301" y="85"/>
+      <point x="271" y="56"/>
+      <point x="225" y="56" type="curve" smooth="yes"/>
+      <point x="164" y="56"/>
+      <point x="129" y="110"/>
+      <point x="129" y="203" type="curve" smooth="yes"/>
+      <point x="129" y="306"/>
+      <point x="173" y="361"/>
+      <point x="257" y="361" type="curve" smooth="yes"/>
+      <point x="286" y="361"/>
+      <point x="320" y="354"/>
+      <point x="346" y="342" type="curve"/>
+      <point x="366" y="398" type="line"/>
+      <point x="333" y="414"/>
+      <point x="296" y="422"/>
+      <point x="255" y="422" type="curve" smooth="yes"/>
+      <point x="126" y="422"/>
+      <point x="56" y="340"/>
+      <point x="56" y="196" type="curve" smooth="yes"/>
+      <point x="56" y="66"/>
+      <point x="116" y="-6"/>
     </contour>
   </outline>
   <lib>
@@ -51,11 +48,11 @@ six
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>68</integer>
+        <integer>60</integer>
         <key>weight</key>
         <integer>-7</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>63</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/six.glif b/src/Cantarell-Regular.ufo/glyphs/six.glif
index 6f6af3ab..464a70ef 100644
--- a/src/Cantarell-Regular.ufo/glyphs/six.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/six.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six" format="2">
-  <advance width="597"/>
+  <advance width="583"/>
   <unicode hex="0036"/>
   <outline>
     <contour>
-      <point x="313" y="-10" type="curve" smooth="yes"/>
-      <point x="445" y="-10"/>
-      <point x="538" y="80"/>
-      <point x="538" y="213" type="curve" smooth="yes"/>
-      <point x="538" y="338"/>
-      <point x="456" y="424"/>
-      <point x="336" y="424" type="curve" smooth="yes"/>
-      <point x="235" y="424"/>
-      <point x="155" y="364"/>
-      <point x="109" y="256" type="curve"/>
-      <point x="131" y="213" type="line"/>
-      <point x="165" y="302"/>
-      <point x="228" y="352"/>
-      <point x="307" y="352" type="curve" smooth="yes"/>
-      <point x="394" y="352"/>
-      <point x="453" y="291"/>
-      <point x="453" y="199" type="curve" smooth="yes"/>
-      <point x="453" y="115"/>
-      <point x="404" y="63"/>
-      <point x="323" y="63" type="curve" smooth="yes"/>
-      <point x="214" y="63"/>
-      <point x="154" y="159"/>
-      <point x="154" y="334" type="curve" smooth="yes"/>
-      <point x="154" y="535"/>
-      <point x="231" y="631"/>
-      <point x="360" y="631" type="curve" smooth="yes"/>
-      <point x="411" y="631"/>
-      <point x="467" y="618"/>
-      <point x="504" y="595" type="curve"/>
-      <point x="528" y="660" type="line"/>
-      <point x="493" y="687"/>
-      <point x="434" y="704"/>
-      <point x="369" y="704" type="curve" smooth="yes"/>
-      <point x="180" y="704"/>
-      <point x="64" y="567"/>
-      <point x="64" y="328" type="curve" smooth="yes"/>
-      <point x="64" y="110"/>
-      <point x="161" y="-10"/>
+      <point x="303" y="-10" type="curve" smooth="yes"/>
+      <point x="437" y="-10"/>
+      <point x="532" y="84"/>
+      <point x="532" y="219" type="curve" smooth="yes"/>
+      <point x="532" y="344"/>
+      <point x="450" y="427"/>
+      <point x="330" y="427" type="curve" smooth="yes"/>
+      <point x="226" y="427"/>
+      <point x="144" y="366"/>
+      <point x="120" y="269" type="curve"/>
+      <point x="137" y="227" type="line"/>
+      <point x="159" y="310"/>
+      <point x="224" y="358"/>
+      <point x="307" y="358" type="curve" smooth="yes"/>
+      <point x="397" y="358"/>
+      <point x="453" y="300"/>
+      <point x="453" y="209" type="curve" smooth="yes"/>
+      <point x="453" y="121"/>
+      <point x="400" y="62"/>
+      <point x="313" y="62" type="curve" smooth="yes"/>
+      <point x="199" y="62"/>
+      <point x="138" y="158"/>
+      <point x="138" y="338" type="curve" smooth="yes"/>
+      <point x="138" y="533"/>
+      <point x="209" y="631"/>
+      <point x="356" y="631" type="curve" smooth="yes"/>
+      <point x="404" y="631"/>
+      <point x="455" y="620"/>
+      <point x="499" y="597" type="curve"/>
+      <point x="523" y="662" type="line"/>
+      <point x="468" y="691"/>
+      <point x="416" y="704"/>
+      <point x="360" y="704" type="curve" smooth="yes"/>
+      <point x="168" y="704"/>
+      <point x="57" y="563"/>
+      <point x="57" y="327" type="curve" smooth="yes"/>
+      <point x="57" y="114"/>
+      <point x="147" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/six.numr.glif b/src/Cantarell-Regular.ufo/glyphs/six.numr.glif
index ebe12375..76b22c45 100644
--- a/src/Cantarell-Regular.ufo/glyphs/six.numr.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/six.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six.numr" format="2">
-  <advance width="464"/>
+  <advance width="426"/>
   <outline>
     <component base="six.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/six.osf.glif b/src/Cantarell-Regular.ufo/glyphs/six.osf.glif
index 2404f829..14ef78c8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/six.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/six.osf.glif
@@ -1,46 +1,54 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six.osf" format="2">
-  <advance width="599"/>
+  <advance width="580"/>
   <outline>
     <contour>
-      <point x="319" y="-10" type="curve" smooth="yes"/>
-      <point x="450" y="-10"/>
-      <point x="543" y="80"/>
-      <point x="543" y="213" type="curve" smooth="yes"/>
-      <point x="543" y="338"/>
-      <point x="460" y="424"/>
-      <point x="341" y="424" type="curve" smooth="yes"/>
-      <point x="238" y="424"/>
-      <point x="159" y="361"/>
-      <point x="114" y="256" type="curve"/>
-      <point x="135" y="214" type="line"/>
-      <point x="169" y="303"/>
-      <point x="234" y="354"/>
-      <point x="314" y="354" type="curve" smooth="yes"/>
-      <point x="401" y="354"/>
-      <point x="461" y="292"/>
-      <point x="461" y="199" type="curve" smooth="yes"/>
-      <point x="461" y="114"/>
-      <point x="410" y="60"/>
-      <point x="329" y="60" type="curve" smooth="yes"/>
-      <point x="218" y="60"/>
-      <point x="158" y="159"/>
-      <point x="158" y="334" type="curve" smooth="yes"/>
-      <point x="158" y="535"/>
-      <point x="235" y="634"/>
-      <point x="366" y="634" type="curve" smooth="yes"/>
-      <point x="412" y="634"/>
-      <point x="471" y="622"/>
-      <point x="510" y="598" type="curve"/>
-      <point x="533" y="660" type="line"/>
-      <point x="497" y="687"/>
-      <point x="439" y="704"/>
-      <point x="374" y="704" type="curve" smooth="yes"/>
-      <point x="187" y="704"/>
-      <point x="71" y="567"/>
-      <point x="71" y="328" type="curve" smooth="yes"/>
-      <point x="71" y="110"/>
-      <point x="168" y="-10"/>
+      <point x="305" y="-10" type="curve" smooth="yes"/>
+      <point x="436" y="-10"/>
+      <point x="529" y="80"/>
+      <point x="529" y="213" type="curve" smooth="yes"/>
+      <point x="529" y="338"/>
+      <point x="446" y="424"/>
+      <point x="327" y="424" type="curve" smooth="yes"/>
+      <point x="224" y="424"/>
+      <point x="145" y="361"/>
+      <point x="100" y="256" type="curve"/>
+      <point x="121" y="214" type="line"/>
+      <point x="155" y="303"/>
+      <point x="220" y="354"/>
+      <point x="300" y="354" type="curve" smooth="yes"/>
+      <point x="387" y="354"/>
+      <point x="447" y="292"/>
+      <point x="447" y="199" type="curve" smooth="yes"/>
+      <point x="447" y="114"/>
+      <point x="396" y="60"/>
+      <point x="315" y="60" type="curve" smooth="yes"/>
+      <point x="204" y="60"/>
+      <point x="144" y="159"/>
+      <point x="144" y="334" type="curve" smooth="yes"/>
+      <point x="144" y="535"/>
+      <point x="221" y="634"/>
+      <point x="352" y="634" type="curve" smooth="yes"/>
+      <point x="398" y="634"/>
+      <point x="457" y="622"/>
+      <point x="496" y="598" type="curve"/>
+      <point x="519" y="660" type="line"/>
+      <point x="483" y="687"/>
+      <point x="425" y="704"/>
+      <point x="360" y="704" type="curve" smooth="yes"/>
+      <point x="173" y="704"/>
+      <point x="57" y="567"/>
+      <point x="57" y="328" type="curve" smooth="yes"/>
+      <point x="57" y="110"/>
+      <point x="154" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>six</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>six</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/six.tf.glif b/src/Cantarell-Regular.ufo/glyphs/six.tf.glif
index 3b3d7de2..5feef052 100644
--- a/src/Cantarell-Regular.ufo/glyphs/six.tf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/six.tf.glif
@@ -2,46 +2,7 @@
 <glyph name="six.tf" format="2">
   <advance width="580"/>
   <outline>
-    <contour>
-      <point x="305" y="-10" type="curve" smooth="yes"/>
-      <point x="432" y="-10"/>
-      <point x="523" y="80"/>
-      <point x="523" y="213" type="curve" smooth="yes"/>
-      <point x="523" y="338"/>
-      <point x="443" y="424"/>
-      <point x="328" y="424" type="curve" smooth="yes"/>
-      <point x="231" y="424"/>
-      <point x="153" y="364"/>
-      <point x="109" y="256" type="curve"/>
-      <point x="131" y="213" type="line"/>
-      <point x="163" y="302"/>
-      <point x="225" y="352"/>
-      <point x="299" y="352" type="curve" smooth="yes"/>
-      <point x="382" y="352"/>
-      <point x="439" y="291"/>
-      <point x="439" y="199" type="curve" smooth="yes"/>
-      <point x="439" y="115"/>
-      <point x="391" y="63"/>
-      <point x="314" y="63" type="curve" smooth="yes"/>
-      <point x="210" y="63"/>
-      <point x="152" y="159"/>
-      <point x="152" y="334" type="curve" smooth="yes"/>
-      <point x="152" y="534"/>
-      <point x="226" y="631"/>
-      <point x="351" y="631" type="curve" smooth="yes"/>
-      <point x="399" y="631"/>
-      <point x="454" y="618"/>
-      <point x="490" y="595" type="curve"/>
-      <point x="514" y="660" type="line"/>
-      <point x="479" y="687"/>
-      <point x="422" y="704"/>
-      <point x="359" y="704" type="curve" smooth="yes"/>
-      <point x="176" y="704"/>
-      <point x="63" y="567"/>
-      <point x="63" y="328" type="curve" smooth="yes"/>
-      <point x="63" y="110"/>
-      <point x="157" y="-10"/>
-    </contour>
+    <component base="six" xOffset="-2"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/sixinferior.glif 
b/src/Cantarell-Regular.ufo/glyphs/sixinferior.glif
index 20bdfc6e..c8b7feb2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/sixinferior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/sixinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sixinferior" format="2">
-  <advance width="464"/>
+  <advance width="426"/>
   <unicode hex="2086"/>
   <outline>
     <component base="six.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/sixsuperior.glif 
b/src/Cantarell-Regular.ufo/glyphs/sixsuperior.glif
index aeeea0b3..4984b26b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/sixsuperior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/sixsuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sixsuperior" format="2">
-  <advance width="464"/>
+  <advance width="426"/>
   <unicode hex="2076"/>
   <outline>
     <component base="six.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/softsign-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/softsign-cy.glif
index bda78b9a..a45735d5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/softsign-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/softsign-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="softsign-cy" format="2">
-  <advance width="510"/>
+  <advance width="508"/>
   <unicode hex="044C"/>
   <outline>
     <contour>
@@ -35,6 +35,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/space.glif b/src/Cantarell-Regular.ufo/glyphs/space.glif
index c75cc7ac..d87c31d1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/space.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/space.glif
@@ -2,9 +2,7 @@
 <glyph name="space" format="2">
   <advance width="220"/>
   <unicode hex="0020"/>
-  <note>
-space
-</note>
+  <unicode hex="00A0"/>
   <outline>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/sterling.glif b/src/Cantarell-Regular.ufo/glyphs/sterling.glif
index 1bac7373..fb547011 100644
--- a/src/Cantarell-Regular.ufo/glyphs/sterling.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/sterling.glif
@@ -1,40 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sterling" format="2">
-  <advance width="637"/>
+  <advance width="580"/>
   <unicode hex="00A3"/>
   <outline>
     <contour>
-      <point x="81" y="0" type="line"/>
-      <point x="563" y="0" type="line"/>
-      <point x="563" y="72" type="line"/>
-      <point x="176" y="72" type="line"/>
-      <point x="220" y="90"/>
-      <point x="236" y="145"/>
-      <point x="236" y="208" type="curve" smooth="yes"/>
-      <point x="236" y="491" type="line" smooth="yes"/>
-      <point x="236" y="577"/>
-      <point x="287" y="631"/>
-      <point x="395" y="631" type="curve" smooth="yes"/>
-      <point x="433" y="631"/>
-      <point x="471" y="624"/>
-      <point x="512" y="612" type="curve"/>
-      <point x="536" y="681" type="line"/>
-      <point x="494" y="697"/>
-      <point x="454" y="704"/>
-      <point x="407" y="704" type="curve" smooth="yes"/>
-      <point x="239" y="704"/>
-      <point x="159" y="615"/>
-      <point x="159" y="481" type="curve" smooth="yes"/>
-      <point x="159" y="198" type="line" smooth="yes"/>
-      <point x="159" y="141"/>
-      <point x="134" y="90"/>
-      <point x="81" y="72" type="curve"/>
+      <point x="58" y="0" type="line"/>
+      <point x="530" y="0" type="line"/>
+      <point x="530" y="72" type="line"/>
+      <point x="153" y="72" type="line"/>
+      <point x="194" y="90"/>
+      <point x="221" y="144"/>
+      <point x="221" y="208" type="curve" smooth="yes"/>
+      <point x="221" y="491" type="line" smooth="yes"/>
+      <point x="221" y="584"/>
+      <point x="269" y="631"/>
+      <point x="366" y="631" type="curve" smooth="yes"/>
+      <point x="398" y="631"/>
+      <point x="434" y="626"/>
+      <point x="480" y="612" type="curve"/>
+      <point x="504" y="681" type="line"/>
+      <point x="463" y="697"/>
+      <point x="424" y="704"/>
+      <point x="377" y="704" type="curve" smooth="yes"/>
+      <point x="225" y="704"/>
+      <point x="144" y="626"/>
+      <point x="144" y="481" type="curve" smooth="yes"/>
+      <point x="144" y="198" type="line" smooth="yes"/>
+      <point x="144" y="141"/>
+      <point x="109" y="89"/>
+      <point x="58" y="72" type="curve"/>
     </contour>
     <contour>
-      <point x="89" y="318" type="line"/>
-      <point x="454" y="318" type="line"/>
-      <point x="454" y="378" type="line"/>
-      <point x="89" y="378" type="line"/>
+      <point x="66" y="315" type="line"/>
+      <point x="424" y="315" type="line"/>
+      <point x="424" y="382" type="line"/>
+      <point x="66" y="382" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/summation.glif b/src/Cantarell-Regular.ufo/glyphs/summation.glif
index a0a33d0d..551e4892 100644
--- a/src/Cantarell-Regular.ufo/glyphs/summation.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/summation.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="summation" format="2">
-  <advance width="647"/>
+  <advance width="641"/>
   <unicode hex="2211"/>
   <outline>
     <contour>
-      <point x="68" y="-95" type="line"/>
-      <point x="578" y="-95" type="line"/>
-      <point x="578" y="-24" type="line"/>
-      <point x="169" y="-24" type="line"/>
-      <point x="453" y="299" type="line"/>
-      <point x="172" y="622" type="line"/>
-      <point x="578" y="622" type="line"/>
-      <point x="578" y="694" type="line"/>
-      <point x="68" y="694" type="line"/>
-      <point x="68" y="638" type="line"/>
-      <point x="357" y="299" type="line"/>
-      <point x="68" y="-39" type="line"/>
+      <point x="65" y="-95" type="line"/>
+      <point x="575" y="-95" type="line"/>
+      <point x="575" y="-24" type="line"/>
+      <point x="166" y="-24" type="line"/>
+      <point x="450" y="299" type="line"/>
+      <point x="169" y="622" type="line"/>
+      <point x="575" y="622" type="line"/>
+      <point x="575" y="694" type="line"/>
+      <point x="65" y="694" type="line"/>
+      <point x="65" y="638" type="line"/>
+      <point x="354" y="299" type="line"/>
+      <point x="65" y="-39" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/t.glif b/src/Cantarell-Regular.ufo/glyphs/t.glif
index 95d19404..66c2444c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/t.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/t.glif
@@ -2,37 +2,34 @@
 <glyph name="t" format="2">
   <advance width="361"/>
   <unicode hex="0074"/>
-  <note>
-t
-</note>
-  <anchor x="204" y="5" name="bottom"/>
-  <anchor x="168" y="246" name="center"/>
-  <anchor x="132" y="623" name="top"/>
-  <anchor x="289" y="482" name="topright"/>
+  <anchor x="211" y="5" name="bottom"/>
+  <anchor x="175" y="246" name="center"/>
+  <anchor x="139" y="623" name="top"/>
+  <anchor x="296" y="482" name="topright"/>
   <outline>
     <contour>
-      <point x="241" y="-5" type="curve" smooth="yes"/>
-      <point x="274" y="-5"/>
-      <point x="307" y="3"/>
-      <point x="330" y="13" type="curve"/>
-      <point x="312" y="71" type="line"/>
-      <point x="297" y="64"/>
-      <point x="275" y="60"/>
-      <point x="258" y="60" type="curve" smooth="yes"/>
-      <point x="208" y="60"/>
-      <point x="175" y="92"/>
-      <point x="175" y="140" type="curve" smooth="yes"/>
-      <point x="175" y="623" type="line"/>
-      <point x="95" y="623" type="line"/>
-      <point x="95" y="129" type="line" smooth="yes"/>
-      <point x="95" y="49"/>
-      <point x="153" y="-5"/>
+      <point x="248" y="-5" type="curve" smooth="yes"/>
+      <point x="281" y="-5"/>
+      <point x="314" y="3"/>
+      <point x="337" y="13" type="curve"/>
+      <point x="319" y="71" type="line"/>
+      <point x="304" y="64"/>
+      <point x="282" y="60"/>
+      <point x="265" y="60" type="curve" smooth="yes"/>
+      <point x="215" y="60"/>
+      <point x="182" y="92"/>
+      <point x="182" y="140" type="curve" smooth="yes"/>
+      <point x="182" y="623" type="line"/>
+      <point x="102" y="623" type="line"/>
+      <point x="102" y="129" type="line" smooth="yes"/>
+      <point x="102" y="49"/>
+      <point x="160" y="-5"/>
     </contour>
     <contour>
-      <point x="30" y="415" type="line"/>
-      <point x="307" y="415" type="line"/>
-      <point x="307" y="482" type="line"/>
-      <point x="30" y="482" type="line"/>
+      <point x="37" y="415" type="line"/>
+      <point x="314" y="415" type="line"/>
+      <point x="314" y="482" type="line"/>
+      <point x="37" y="482" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tbar.glif b/src/Cantarell-Regular.ufo/glyphs/tbar.glif
index a2a4acca..5c030a0b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tbar.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tbar.glif
@@ -4,6 +4,6 @@
   <unicode hex="0167"/>
   <outline>
     <component base="t"/>
-    <component base="strokeshortcomb" xOffset="-60" yOffset="-52"/>
+    <component base="strokeshortcomb" xOffset="-53" yOffset="-52"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tcaron.glif b/src/Cantarell-Regular.ufo/glyphs/tcaron.glif
index d87b3ee7..c3b04ebe 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tcaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tcaron.glif
@@ -4,6 +4,6 @@
   <unicode hex="0165"/>
   <outline>
     <component base="t"/>
-    <component base="caroncomb.alt" xOffset="163"/>
+    <component base="caroncomb.alt" xOffset="170"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tcedilla.glif b/src/Cantarell-Regular.ufo/glyphs/tcedilla.glif
index a28e13bf..8d6f6dc3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tcedilla.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tcedilla.glif
@@ -4,6 +4,6 @@
   <unicode hex="0163"/>
   <outline>
     <component base="t"/>
-    <component base="cedillacomb" xOffset="57" yOffset="5"/>
+    <component base="cedillacomb" xOffset="64" yOffset="5"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tcommaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/tcommaaccent.glif
index 778254c9..90a39508 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tcommaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tcommaaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="021B"/>
   <outline>
     <component base="t"/>
-    <component base="commaaccentcomb" xOffset="38" yOffset="5"/>
+    <component base="commaaccentcomb" xOffset="45" yOffset="5"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tdieresis.glif b/src/Cantarell-Regular.ufo/glyphs/tdieresis.glif
index 95fc61d3..15b84613 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tdieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tdieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E97"/>
   <outline>
     <component base="t"/>
-    <component base="dieresiscomb" xOffset="-101" yOffset="141"/>
+    <component base="dieresiscomb" xOffset="-94" yOffset="141"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tdotbelow.glif b/src/Cantarell-Regular.ufo/glyphs/tdotbelow.glif
index e14c13f2..1311d300 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tdotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tdotbelow.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E6D"/>
   <outline>
     <component base="t"/>
-    <component base="dotbelowcomb" xOffset="68" yOffset="5"/>
+    <component base="dotbelowcomb" xOffset="75" yOffset="5"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/te-cy.glif b/src/Cantarell-Regular.ufo/glyphs/te-cy.glif
index 019f095e..44bdcec8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/te-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/te-cy.glif
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="te-cy" format="2">
-  <advance width="465"/>
+  <advance width="487"/>
   <unicode hex="0442"/>
-  <anchor x="463" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="192" y="0" type="line"/>
-      <point x="271" y="0" type="line"/>
-      <point x="271" y="460" type="line"/>
-      <point x="192" y="460" type="line"/>
-    </contour>
-    <contour>
-      <point x="10" y="415" type="line"/>
-      <point x="455" y="415" type="line"/>
-      <point x="455" y="482" type="line"/>
-      <point x="10" y="482" type="line"/>
+      <point x="203" y="0" type="line"/>
+      <point x="282" y="0" type="line"/>
+      <point x="282" y="415" type="line"/>
+      <point x="466" y="415" type="line"/>
+      <point x="466" y="482" type="line"/>
+      <point x="21" y="482" type="line"/>
+      <point x="21" y="415" type="line"/>
+      <point x="203" y="415" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -28,6 +25,10 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|ge-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>ge-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tenge.glif b/src/Cantarell-Regular.ufo/glyphs/tenge.glif
index a067c2d7..3056ce13 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tenge.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tenge.glif
@@ -1,7 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tenge" format="2">
-  <advance width="600"/>
+  <advance width="580"/>
   <unicode hex="20B8"/>
   <outline>
+    <contour>
+      <point x="249" y="0" type="line"/>
+      <point x="332" y="0" type="line"/>
+      <point x="332" y="450" type="line"/>
+      <point x="536" y="450" type="line"/>
+      <point x="536" y="517" type="line"/>
+      <point x="44" y="517" type="line"/>
+      <point x="44" y="450" type="line"/>
+      <point x="249" y="450" type="line"/>
+    </contour>
+    <contour>
+      <point x="44" y="627" type="line"/>
+      <point x="536" y="627" type="line"/>
+      <point x="536" y="694" type="line"/>
+      <point x="44" y="694" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/thorn.glif b/src/Cantarell-Regular.ufo/glyphs/thorn.glif
index 9cd2af3c..ef40ed15 100644
--- a/src/Cantarell-Regular.ufo/glyphs/thorn.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/thorn.glif
@@ -3,12 +3,6 @@
   <advance width="568"/>
   <unicode hex="00FE"/>
   <outline>
-    <contour>
-      <point x="83" y="-217" type="line"/>
-      <point x="161" y="-217" type="line"/>
-      <point x="161" y="739" type="line"/>
-      <point x="83" y="739" type="line"/>
-    </contour>
     <contour>
       <point x="286" y="-10" type="curve" smooth="yes"/>
       <point x="424" y="-10"/>
@@ -37,6 +31,12 @@
       <point x="135" y="33"/>
       <point x="198" y="-10"/>
     </contour>
+    <contour>
+      <point x="83" y="-217" type="line"/>
+      <point x="161" y="-217" type="line"/>
+      <point x="161" y="739" type="line"/>
+      <point x="83" y="739" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/three.dnom.glif 
b/src/Cantarell-Regular.ufo/glyphs/three.dnom.glif
index 0e4ecfac..6b31308d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/three.dnom.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/three.dnom.glif
@@ -1,51 +1,50 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three.dnom" format="2">
-  <advance width="443"/>
-  <note>
-three
-</note>
+  <advance width="405"/>
   <outline>
     <contour>
-      <point x="198" y="-7" type="curve" smooth="yes"/>
-      <point x="317" y="-7"/>
-      <point x="398" y="46"/>
-      <point x="398" y="126" type="curve" smooth="yes"/>
-      <point x="398" y="193"/>
-      <point x="340" y="243"/>
-      <point x="250" y="251" type="curve"/>
-      <point x="244" y="243" type="line"/>
-      <point x="319" y="245"/>
-      <point x="370" y="292"/>
-      <point x="370" y="356" type="curve" smooth="yes"/>
-      <point x="370" y="430"/>
-      <point x="304" y="479"/>
-      <point x="205" y="479" type="curve" smooth="yes"/>
-      <point x="150" y="479"/>
-      <point x="93" y="464"/>
-      <point x="46" y="439" type="curve"/>
-      <point x="63" y="383" type="line"/>
-      <point x="108" y="403"/>
-      <point x="152" y="414"/>
-      <point x="190" y="414" type="curve" smooth="yes"/>
-      <point x="251" y="414"/>
-      <point x="292" y="387"/>
-      <point x="292" y="345" type="curve" smooth="yes"/>
-      <point x="292" y="296"/>
-      <point x="237" y="268"/>
-      <point x="137" y="268" type="curve"/>
-      <point x="137" y="210" type="line"/>
-      <point x="253" y="210"/>
-      <point x="321" y="178"/>
-      <point x="321" y="125" type="curve" smooth="yes"/>
-      <point x="321" y="83"/>
-      <point x="277" y="58"/>
-      <point x="203" y="58" type="curve" smooth="yes"/>
-      <point x="157" y="58"/>
-      <point x="101" y="68"/>
-      <point x="54" y="88" type="curve"/>
-      <point x="37" y="29" type="line"/>
-      <point x="90" y="4"/>
-      <point x="145" y="-7"/>
+      <point x="179" y="-6" type="curve" smooth="yes"/>
+      <point x="283" y="-6"/>
+      <point x="354" y="41"/>
+      <point x="354" y="113" type="curve" smooth="yes"/>
+      <point x="354" y="172"/>
+      <point x="308" y="215"/>
+      <point x="233" y="220" type="curve"/>
+      <point x="222" y="214" type="line"/>
+      <point x="286" y="215"/>
+      <point x="331" y="253"/>
+      <point x="331" y="313" type="curve" smooth="yes"/>
+      <point x="331" y="380"/>
+      <point x="274" y="422"/>
+      <point x="186" y="422" type="curve" smooth="yes"/>
+      <point x="140" y="422"/>
+      <point x="89" y="410"/>
+      <point x="47" y="386" type="curve"/>
+      <point x="64" y="331" type="line"/>
+      <point x="103" y="349"/>
+      <point x="141" y="358"/>
+      <point x="171" y="358" type="curve" smooth="yes"/>
+      <point x="221" y="358"/>
+      <point x="255" y="336"/>
+      <point x="255" y="302" type="curve" smooth="yes"/>
+      <point x="255" y="265"/>
+      <point x="215" y="239"/>
+      <point x="157" y="239" type="curve" smooth="yes"/>
+      <point x="126" y="239" type="line"/>
+      <point x="126" y="182" type="line"/>
+      <point x="162" y="182" type="line" smooth="yes"/>
+      <point x="231" y="182"/>
+      <point x="277" y="156"/>
+      <point x="277" y="115" type="curve" smooth="yes"/>
+      <point x="277" y="79"/>
+      <point x="241" y="58"/>
+      <point x="182" y="58" type="curve" smooth="yes"/>
+      <point x="142" y="58"/>
+      <point x="96" y="67"/>
+      <point x="58" y="84" type="curve"/>
+      <point x="41" y="25" type="line"/>
+      <point x="87" y="3"/>
+      <point x="133" y="-6"/>
     </contour>
   </outline>
   <lib>
@@ -53,11 +52,11 @@ three
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>68</integer>
+        <integer>60</integer>
         <key>weight</key>
         <integer>-7</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>63</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/three.glif b/src/Cantarell-Regular.ufo/glyphs/three.glif
index 95208bb1..9625a72a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/three.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/three.glif
@@ -1,51 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three" format="2">
-  <advance width="574"/>
+  <advance width="562"/>
   <unicode hex="0033"/>
   <outline>
     <contour>
-      <point x="262" y="-10" type="curve" smooth="yes"/>
-      <point x="415" y="-10"/>
-      <point x="520" y="68"/>
-      <point x="520" y="183" type="curve" smooth="yes"/>
-      <point x="520" y="285"/>
-      <point x="438" y="361"/>
-      <point x="317" y="373" type="curve"/>
-      <point x="316" y="358" type="line"/>
-      <point x="414" y="361"/>
-      <point x="482" y="436"/>
-      <point x="482" y="527" type="curve" smooth="yes"/>
-      <point x="482" y="632"/>
-      <point x="394" y="704"/>
-      <point x="267" y="704" type="curve" smooth="yes"/>
-      <point x="197" y="704"/>
-      <point x="121" y="683"/>
-      <point x="58" y="647" type="curve"/>
-      <point x="77" y="586" type="line"/>
-      <point x="137" y="614"/>
-      <point x="199" y="631"/>
-      <point x="250" y="631" type="curve" smooth="yes"/>
-      <point x="339" y="631"/>
-      <point x="397" y="585"/>
-      <point x="397" y="514" type="curve" smooth="yes"/>
-      <point x="397" y="436"/>
-      <point x="329" y="388"/>
-      <point x="218" y="388" type="curve" smooth="yes"/>
-      <point x="178" y="388" type="line"/>
-      <point x="178" y="316" type="line"/>
-      <point x="216" y="316" type="line" smooth="yes"/>
-      <point x="349" y="316"/>
-      <point x="435" y="261"/>
-      <point x="435" y="176" type="curve" smooth="yes"/>
-      <point x="435" y="105"/>
-      <point x="374" y="63"/>
-      <point x="270" y="63" type="curve" smooth="yes"/>
-      <point x="204" y="63"/>
-      <point x="126" y="80"/>
-      <point x="63" y="111" type="curve"/>
-      <point x="44" y="44" type="line"/>
-      <point x="110" y="10"/>
-      <point x="187" y="-10"/>
+      <point x="258" y="-11" type="curve" smooth="yes"/>
+      <point x="410" y="-11"/>
+      <point x="515" y="69"/>
+      <point x="515" y="189" type="curve" smooth="yes"/>
+      <point x="515" y="291"/>
+      <point x="437" y="362"/>
+      <point x="319" y="365" type="curve"/>
+      <point x="304" y="353" type="line"/>
+      <point x="408" y="356"/>
+      <point x="479" y="426"/>
+      <point x="479" y="522" type="curve" smooth="yes"/>
+      <point x="479" y="632"/>
+      <point x="390" y="703"/>
+      <point x="261" y="703" type="curve" smooth="yes"/>
+      <point x="189" y="703"/>
+      <point x="109" y="680"/>
+      <point x="50" y="646" type="curve"/>
+      <point x="69" y="584" type="line"/>
+      <point x="131" y="615"/>
+      <point x="196" y="631"/>
+      <point x="247" y="631" type="curve" smooth="yes"/>
+      <point x="336" y="631"/>
+      <point x="401" y="585"/>
+      <point x="401" y="514" type="curve" smooth="yes"/>
+      <point x="401" y="438"/>
+      <point x="327" y="387"/>
+      <point x="225" y="387" type="curve" smooth="yes"/>
+      <point x="171" y="387" type="line"/>
+      <point x="171" y="316" type="line"/>
+      <point x="243" y="316" type="line" smooth="yes"/>
+      <point x="359" y="316"/>
+      <point x="432" y="266"/>
+      <point x="432" y="184" type="curve" smooth="yes"/>
+      <point x="432" y="106"/>
+      <point x="364" y="63"/>
+      <point x="261" y="63" type="curve" smooth="yes"/>
+      <point x="200" y="63"/>
+      <point x="119" y="78"/>
+      <point x="54" y="110" type="curve"/>
+      <point x="36" y="43" type="line"/>
+      <point x="103" y="9"/>
+      <point x="185" y="-11"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/three.numr.glif 
b/src/Cantarell-Regular.ufo/glyphs/three.numr.glif
index e0ad8588..e069a898 100644
--- a/src/Cantarell-Regular.ufo/glyphs/three.numr.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/three.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three.numr" format="2">
-  <advance width="443"/>
+  <advance width="405"/>
   <outline>
     <component base="three.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/three.osf.glif b/src/Cantarell-Regular.ufo/glyphs/three.osf.glif
index 0610dca4..865c96d8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/three.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/three.osf.glif
@@ -1,48 +1,56 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three.osf" format="2">
-  <advance width="558"/>
+  <advance width="557"/>
   <outline>
     <contour>
-      <point x="246" y="-110" type="curve" smooth="yes"/>
-      <point x="397" y="-110"/>
-      <point x="502" y="-32"/>
-      <point x="502" y="82" type="curve" smooth="yes"/>
-      <point x="502" y="181"/>
-      <point x="424" y="259"/>
-      <point x="298" y="272" type="curve"/>
-      <point x="297" y="258" type="line"/>
-      <point x="396" y="261"/>
-      <point x="464" y="337"/>
-      <point x="464" y="427" type="curve" smooth="yes"/>
-      <point x="464" y="532"/>
-      <point x="376" y="604"/>
-      <point x="250" y="604" type="curve" smooth="yes"/>
-      <point x="181" y="604"/>
-      <point x="105" y="583"/>
-      <point x="42" y="547" type="curve"/>
-      <point x="61" y="488" type="line"/>
-      <point x="121" y="517"/>
-      <point x="185" y="534"/>
-      <point x="234" y="534" type="curve" smooth="yes"/>
-      <point x="322" y="534"/>
-      <point x="383" y="487"/>
-      <point x="383" y="414" type="curve" smooth="yes"/>
-      <point x="383" y="332"/>
-      <point x="304" y="285"/>
-      <point x="162" y="285" type="curve"/>
-      <point x="162" y="219" type="line"/>
-      <point x="325" y="219"/>
-      <point x="421" y="165"/>
-      <point x="421" y="75" type="curve" smooth="yes"/>
-      <point x="421" y="3"/>
-      <point x="357" y="-40"/>
-      <point x="254" y="-40" type="curve" smooth="yes"/>
-      <point x="184" y="-40"/>
-      <point x="106" y="-21"/>
-      <point x="47" y="8" type="curve"/>
-      <point x="28" y="-56" type="line"/>
-      <point x="94" y="-90"/>
-      <point x="170" y="-110"/>
+      <point x="254" y="-110" type="curve" smooth="yes"/>
+      <point x="405" y="-110"/>
+      <point x="510" y="-32"/>
+      <point x="510" y="82" type="curve" smooth="yes"/>
+      <point x="510" y="181"/>
+      <point x="432" y="259"/>
+      <point x="306" y="272" type="curve"/>
+      <point x="305" y="258" type="line"/>
+      <point x="404" y="261"/>
+      <point x="472" y="337"/>
+      <point x="472" y="427" type="curve" smooth="yes"/>
+      <point x="472" y="532"/>
+      <point x="384" y="604"/>
+      <point x="258" y="604" type="curve" smooth="yes"/>
+      <point x="189" y="604"/>
+      <point x="113" y="583"/>
+      <point x="50" y="547" type="curve"/>
+      <point x="69" y="488" type="line"/>
+      <point x="129" y="517"/>
+      <point x="193" y="534"/>
+      <point x="242" y="534" type="curve" smooth="yes"/>
+      <point x="330" y="534"/>
+      <point x="391" y="487"/>
+      <point x="391" y="414" type="curve" smooth="yes"/>
+      <point x="391" y="332"/>
+      <point x="312" y="285"/>
+      <point x="170" y="285" type="curve"/>
+      <point x="170" y="219" type="line"/>
+      <point x="333" y="219"/>
+      <point x="429" y="165"/>
+      <point x="429" y="75" type="curve" smooth="yes"/>
+      <point x="429" y="3"/>
+      <point x="365" y="-40"/>
+      <point x="262" y="-40" type="curve" smooth="yes"/>
+      <point x="192" y="-40"/>
+      <point x="114" y="-21"/>
+      <point x="55" y="8" type="curve"/>
+      <point x="36" y="-56" type="line"/>
+      <point x="102" y="-90"/>
+      <point x="178" y="-110"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>three</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>three</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/three.tf.glif b/src/Cantarell-Regular.ufo/glyphs/three.tf.glif
index 0a4628fd..757d0220 100644
--- a/src/Cantarell-Regular.ufo/glyphs/three.tf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/three.tf.glif
@@ -2,48 +2,7 @@
 <glyph name="three.tf" format="2">
   <advance width="580"/>
   <outline>
-    <contour>
-      <point x="266" y="-10" type="curve" smooth="yes"/>
-      <point x="418" y="-10"/>
-      <point x="523" y="68"/>
-      <point x="523" y="182" type="curve" smooth="yes"/>
-      <point x="523" y="283"/>
-      <point x="442" y="361"/>
-      <point x="321" y="373" type="curve"/>
-      <point x="320" y="358" type="line"/>
-      <point x="418" y="361"/>
-      <point x="485" y="437"/>
-      <point x="485" y="527" type="curve" smooth="yes"/>
-      <point x="485" y="632"/>
-      <point x="397" y="704"/>
-      <point x="271" y="704" type="curve" smooth="yes"/>
-      <point x="201" y="704"/>
-      <point x="126" y="683"/>
-      <point x="63" y="647" type="curve"/>
-      <point x="82" y="586" type="line"/>
-      <point x="142" y="614"/>
-      <point x="203" y="631"/>
-      <point x="254" y="631" type="curve" smooth="yes"/>
-      <point x="342" y="631"/>
-      <point x="400" y="585"/>
-      <point x="400" y="514" type="curve" smooth="yes"/>
-      <point x="400" y="432"/>
-      <point x="323" y="386"/>
-      <point x="182" y="386" type="curve"/>
-      <point x="182" y="318" type="line"/>
-      <point x="344" y="318"/>
-      <point x="438" y="265"/>
-      <point x="438" y="175" type="curve" smooth="yes"/>
-      <point x="438" y="105"/>
-      <point x="377" y="63"/>
-      <point x="274" y="63" type="curve" smooth="yes"/>
-      <point x="208" y="63"/>
-      <point x="131" y="80"/>
-      <point x="68" y="111" type="curve"/>
-      <point x="49" y="44" type="line"/>
-      <point x="115" y="10"/>
-      <point x="192" y="-10"/>
-    </contour>
+    <component base="three" xOffset="9"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/threeeighths.glif 
b/src/Cantarell-Regular.ufo/glyphs/threeeighths.glif
index 84118444..238f5466 100644
--- a/src/Cantarell-Regular.ufo/glyphs/threeeighths.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/threeeighths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="threeeighths" format="2">
-  <advance width="1208"/>
+  <advance width="1004"/>
   <unicode hex="215C"/>
   <outline>
     <component base="three.numr"/>
-    <component base="fraction" xOffset="443"/>
-    <component base="eight.dnom" xOffset="742"/>
+    <component base="fraction" xOffset="405"/>
+    <component base="eight.dnom" xOffset="575"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/threefifths.glif 
b/src/Cantarell-Regular.ufo/glyphs/threefifths.glif
index d9cb779d..4f121461 100644
--- a/src/Cantarell-Regular.ufo/glyphs/threefifths.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/threefifths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="threefifths" format="2">
-  <advance width="1183"/>
+  <advance width="984"/>
   <unicode hex="2157"/>
   <outline>
     <component base="three.numr"/>
-    <component base="fraction" xOffset="443"/>
-    <component base="five.dnom" xOffset="742"/>
+    <component base="fraction" xOffset="405"/>
+    <component base="five.dnom" xOffset="575"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/threeinferior.glif 
b/src/Cantarell-Regular.ufo/glyphs/threeinferior.glif
index ec52272d..8c551b53 100644
--- a/src/Cantarell-Regular.ufo/glyphs/threeinferior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/threeinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="threeinferior" format="2">
-  <advance width="443"/>
+  <advance width="405"/>
   <unicode hex="2083"/>
   <outline>
     <component base="three.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/threequarters.glif 
b/src/Cantarell-Regular.ufo/glyphs/threequarters.glif
index 34339acf..8036be14 100644
--- a/src/Cantarell-Regular.ufo/glyphs/threequarters.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/threequarters.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="threequarters" format="2">
-  <advance width="1209"/>
+  <advance width="995"/>
   <unicode hex="00BE"/>
   <outline>
     <component base="three.numr"/>
-    <component base="fraction" xOffset="443"/>
-    <component base="four.dnom" xOffset="742"/>
+    <component base="fraction" xOffset="405"/>
+    <component base="four.dnom" xOffset="575"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/threesuperior.glif 
b/src/Cantarell-Regular.ufo/glyphs/threesuperior.glif
index 7c6c40b8..2ef07508 100644
--- a/src/Cantarell-Regular.ufo/glyphs/threesuperior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/threesuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="threesuperior" format="2">
-  <advance width="443"/>
+  <advance width="405"/>
   <unicode hex="00B3"/>
   <outline>
     <component base="three.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tilde.glif b/src/Cantarell-Regular.ufo/glyphs/tilde.glif
index 9c4873f6..c6851135 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tilde.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tilde" format="2">
-  <advance width="470"/>
+  <advance width="500"/>
   <unicode hex="02DC"/>
   <outline>
-    <component base="tildecomb" xOffset="-3"/>
+    <component base="tildecomb" xOffset="13"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tlinebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/tlinebelow.glif
index 2767f12b..7e870c6d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tlinebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tlinebelow.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E6F"/>
   <outline>
     <component base="t"/>
-    <component base="macronbelowcomb" xOffset="-41" yOffset="5"/>
+    <component base="macronbelowcomb" xOffset="-34" yOffset="5"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/trademark.glif b/src/Cantarell-Regular.ufo/glyphs/trademark.glif
index 40f29438..21d7cea5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/trademark.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/trademark.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="trademark" format="2">
-  <advance width="811"/>
+  <advance width="806"/>
   <unicode hex="2122"/>
   <outline>
     <contour>
-      <point x="173" y="382" type="line"/>
-      <point x="228" y="382" type="line"/>
-      <point x="228" y="693" type="line"/>
-      <point x="173" y="693" type="line"/>
+      <point x="356" y="382" type="line"/>
+      <point x="406" y="382" type="line"/>
+      <point x="406" y="621" type="line"/>
+      <point x="399" y="614" type="line"/>
+      <point x="508" y="427" type="line"/>
+      <point x="532" y="427" type="line"/>
+      <point x="639" y="616" type="line"/>
+      <point x="633" y="621" type="line"/>
+      <point x="633" y="382" type="line"/>
+      <point x="683" y="382" type="line"/>
+      <point x="683" y="694" type="line"/>
+      <point x="627" y="694" type="line"/>
+      <point x="510" y="482" type="line"/>
+      <point x="534" y="482" type="line"/>
+      <point x="415" y="694" type="line"/>
+      <point x="356" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="69" y="645" type="line"/>
-      <point x="332" y="645" type="line"/>
-      <point x="332" y="694" type="line"/>
-      <point x="69" y="694" type="line"/>
+      <point x="170" y="382" type="line"/>
+      <point x="225" y="382" type="line"/>
+      <point x="225" y="693" type="line"/>
+      <point x="170" y="693" type="line"/>
     </contour>
     <contour>
-      <point x="359" y="382" type="line"/>
-      <point x="409" y="382" type="line"/>
-      <point x="409" y="621" type="line"/>
-      <point x="402" y="614" type="line"/>
-      <point x="511" y="427" type="line"/>
-      <point x="535" y="427" type="line"/>
-      <point x="642" y="616" type="line"/>
-      <point x="636" y="621" type="line"/>
-      <point x="636" y="382" type="line"/>
-      <point x="686" y="382" type="line"/>
-      <point x="686" y="694" type="line"/>
-      <point x="630" y="694" type="line"/>
-      <point x="513" y="482" type="line"/>
-      <point x="537" y="482" type="line"/>
-      <point x="418" y="694" type="line"/>
-      <point x="359" y="694" type="line"/>
+      <point x="66" y="645" type="line"/>
+      <point x="329" y="645" type="line"/>
+      <point x="329" y="694" type="line"/>
+      <point x="66" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tripleprime.glif 
b/src/Cantarell-Regular.ufo/glyphs/tripleprime.glif
index bdac60c2..f7701c55 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tripleprime.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tripleprime.glif
@@ -2,9 +2,6 @@
 <glyph name="tripleprime" format="2">
   <advance width="656"/>
   <unicode hex="2034"/>
-  <note>
-uni2034
-</note>
   <outline>
     <component base="quotesingle" yxScale="0.19201" xOffset="-107"/>
     <component base="quotesingle" yxScale="0.19201" xOffset="83"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tse-cy.glif b/src/Cantarell-Regular.ufo/glyphs/tse-cy.glif
index 1a35861c..440c8d66 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tse-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tse-cy.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tse-cy" format="2">
-  <advance width="582"/>
+  <advance width="556"/>
   <unicode hex="0446"/>
   <outline>
     <contour>
-      <point x="479" y="-126" type="line"/>
-      <point x="551" y="-126" type="line"/>
-      <point x="551" y="66" type="line"/>
+      <point x="456" y="-126" type="line"/>
+      <point x="528" y="-126" type="line"/>
+      <point x="528" y="66" type="line"/>
       <point x="162" y="66" type="line"/>
       <point x="162" y="482" type="line"/>
       <point x="83" y="482" type="line"/>
       <point x="83" y="0" type="line"/>
-      <point x="479" y="0" type="line"/>
+      <point x="456" y="0" type="line"/>
     </contour>
     <contour>
       <point x="383" y="32" type="line"/>
@@ -31,6 +31,10 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>de-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tugrik.glif b/src/Cantarell-Regular.ufo/glyphs/tugrik.glif
index f5d41ab5..564dc5ee 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tugrik.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tugrik.glif
@@ -1,7 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tugrik" format="2">
-  <advance width="600"/>
+  <advance width="580"/>
   <unicode hex="20AE"/>
   <outline>
+    <contour>
+      <point x="248" y="0" type="line"/>
+      <point x="331" y="0" type="line"/>
+      <point x="331" y="622" type="line"/>
+      <point x="513" y="622" type="line"/>
+      <point x="513" y="694" type="line"/>
+      <point x="67" y="694" type="line"/>
+      <point x="67" y="622" type="line"/>
+      <point x="248" y="622" type="line"/>
+    </contour>
+    <contour>
+      <point x="154" y="129" type="line"/>
+      <point x="465" y="270" type="line"/>
+      <point x="437" y="325" type="line"/>
+      <point x="129" y="184" type="line"/>
+    </contour>
+    <contour>
+      <point x="139" y="291" type="line"/>
+      <point x="465" y="440" type="line"/>
+      <point x="437" y="495" type="line"/>
+      <point x="114" y="346" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/two.dnom.glif b/src/Cantarell-Regular.ufo/glyphs/two.dnom.glif
index 0cd9d3f5..36278742 100644
--- a/src/Cantarell-Regular.ufo/glyphs/two.dnom.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/two.dnom.glif
@@ -1,35 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two.dnom" format="2">
-  <advance width="420"/>
-  <note>
-two
-</note>
+  <advance width="390"/>
   <outline>
     <contour>
-      <point x="46" y="0" type="line"/>
-      <point x="376" y="0" type="line"/>
-      <point x="376" y="65" type="line"/>
-      <point x="129" y="65" type="line"/>
-      <point x="132" y="47" type="line"/>
-      <point x="295" y="180"/>
-      <point x="357" y="259"/>
-      <point x="357" y="341" type="curve" smooth="yes"/>
-      <point x="357" y="425"/>
-      <point x="294" y="479"/>
-      <point x="193" y="479" type="curve" smooth="yes"/>
-      <point x="132" y="479"/>
-      <point x="75" y="459"/>
-      <point x="35" y="424" type="curve"/>
-      <point x="56" y="371" type="line"/>
-      <point x="94" y="398"/>
-      <point x="137" y="413"/>
-      <point x="179" y="413" type="curve" smooth="yes"/>
-      <point x="240" y="413"/>
-      <point x="280" y="380"/>
-      <point x="280" y="329" type="curve" smooth="yes"/>
-      <point x="280" y="265"/>
-      <point x="217" y="195"/>
-      <point x="46" y="51" type="curve"/>
+      <point x="50" y="0" type="line"/>
+      <point x="339" y="0" type="line"/>
+      <point x="339" y="65" type="line"/>
+      <point x="135" y="65" type="line"/>
+      <point x="138" y="48" type="line"/>
+      <point x="276" y="159"/>
+      <point x="325" y="229"/>
+      <point x="325" y="298" type="curve" smooth="yes"/>
+      <point x="325" y="374"/>
+      <point x="267" y="422"/>
+      <point x="178" y="422" type="curve" smooth="yes"/>
+      <point x="122" y="422"/>
+      <point x="74" y="404"/>
+      <point x="39" y="374" type="curve"/>
+      <point x="59" y="320" type="line"/>
+      <point x="93" y="345"/>
+      <point x="130" y="357"/>
+      <point x="163" y="357" type="curve" smooth="yes"/>
+      <point x="215" y="357"/>
+      <point x="248" y="329"/>
+      <point x="248" y="287" type="curve" smooth="yes"/>
+      <point x="248" y="231"/>
+      <point x="189" y="170"/>
+      <point x="50" y="51" type="curve"/>
     </contour>
   </outline>
   <lib>
@@ -37,11 +34,11 @@ two
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>68</integer>
+        <integer>60</integer>
         <key>weight</key>
         <integer>-7</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>63</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/two.glif b/src/Cantarell-Regular.ufo/glyphs/two.glif
index 2807520f..050a92a1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/two.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/two.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two" format="2">
-  <advance width="539"/>
+  <advance width="528"/>
   <unicode hex="0032"/>
   <outline>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="490" y="0" type="line"/>
-      <point x="490" y="72" type="line"/>
-      <point x="140" y="72" type="line"/>
-      <point x="147" y="48" type="line"/>
-      <point x="371" y="266"/>
-      <point x="461" y="383"/>
-      <point x="461" y="510" type="curve" smooth="yes"/>
-      <point x="461" y="630"/>
-      <point x="382" y="704"/>
-      <point x="253" y="704" type="curve" smooth="yes"/>
-      <point x="172" y="704"/>
-      <point x="93" y="674"/>
-      <point x="43" y="625" type="curve"/>
-      <point x="68" y="567" type="line"/>
-      <point x="117" y="607"/>
-      <point x="180" y="631"/>
-      <point x="237" y="631" type="curve" smooth="yes"/>
-      <point x="322" y="631"/>
-      <point x="376" y="579"/>
-      <point x="376" y="496" type="curve" smooth="yes"/>
-      <point x="376" y="396"/>
-      <point x="298" y="291"/>
-      <point x="55" y="55" type="curve"/>
+      <point x="46" y="0" type="line"/>
+      <point x="486" y="0" type="line"/>
+      <point x="486" y="72" type="line"/>
+      <point x="131" y="72" type="line"/>
+      <point x="142" y="48" type="line"/>
+      <point x="379" y="271"/>
+      <point x="459" y="387"/>
+      <point x="459" y="508" type="curve" smooth="yes"/>
+      <point x="459" y="630"/>
+      <point x="376" y="704"/>
+      <point x="248" y="704" type="curve" smooth="yes"/>
+      <point x="165" y="704"/>
+      <point x="86" y="674"/>
+      <point x="35" y="625" type="curve"/>
+      <point x="58" y="567" type="line"/>
+      <point x="111" y="610"/>
+      <point x="177" y="631"/>
+      <point x="231" y="631" type="curve" smooth="yes"/>
+      <point x="320" y="631"/>
+      <point x="375" y="578"/>
+      <point x="375" y="495" type="curve" smooth="yes"/>
+      <point x="375" y="394"/>
+      <point x="294" y="289"/>
+      <point x="46" y="55" type="curve"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/two.numr.glif b/src/Cantarell-Regular.ufo/glyphs/two.numr.glif
index 538a1e33..be5d9f6b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/two.numr.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/two.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two.numr" format="2">
-  <advance width="420"/>
+  <advance width="390"/>
   <outline>
     <component base="two.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/two.osf.glif b/src/Cantarell-Regular.ufo/glyphs/two.osf.glif
index 37b32652..52c97b0b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/two.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/two.osf.glif
@@ -1,32 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two.osf" format="2">
-  <advance width="543"/>
+  <advance width="522"/>
   <outline>
     <contour>
-      <point x="59" y="0" type="line"/>
-      <point x="492" y="0" type="line"/>
-      <point x="492" y="70" type="line"/>
-      <point x="142" y="70" type="line"/>
-      <point x="149" y="48" type="line"/>
-      <point x="370" y="223"/>
-      <point x="463" y="325"/>
-      <point x="463" y="434" type="curve" smooth="yes"/>
-      <point x="463" y="538"/>
-      <point x="383" y="602"/>
-      <point x="255" y="602" type="curve" smooth="yes"/>
-      <point x="176" y="602"/>
-      <point x="97" y="577"/>
-      <point x="47" y="534" type="curve"/>
-      <point x="72" y="478" type="line"/>
-      <point x="121" y="512"/>
-      <point x="185" y="532"/>
-      <point x="241" y="532" type="curve" smooth="yes"/>
-      <point x="325" y="532"/>
-      <point x="380" y="488"/>
-      <point x="380" y="420" type="curve" smooth="yes"/>
-      <point x="380" y="337"/>
-      <point x="302" y="246"/>
-      <point x="59" y="54" type="curve"/>
+      <point x="47" y="0" type="line"/>
+      <point x="480" y="0" type="line"/>
+      <point x="480" y="70" type="line"/>
+      <point x="130" y="70" type="line"/>
+      <point x="137" y="48" type="line"/>
+      <point x="358" y="223"/>
+      <point x="451" y="325"/>
+      <point x="451" y="434" type="curve" smooth="yes"/>
+      <point x="451" y="538"/>
+      <point x="371" y="602"/>
+      <point x="243" y="602" type="curve" smooth="yes"/>
+      <point x="164" y="602"/>
+      <point x="85" y="577"/>
+      <point x="35" y="534" type="curve"/>
+      <point x="60" y="478" type="line"/>
+      <point x="109" y="512"/>
+      <point x="173" y="532"/>
+      <point x="229" y="532" type="curve" smooth="yes"/>
+      <point x="313" y="532"/>
+      <point x="368" y="488"/>
+      <point x="368" y="420" type="curve" smooth="yes"/>
+      <point x="368" y="337"/>
+      <point x="290" y="246"/>
+      <point x="47" y="54" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>two</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>two</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/two.tf.glif b/src/Cantarell-Regular.ufo/glyphs/two.tf.glif
index cf06229d..bc74a23c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/two.tf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/two.tf.glif
@@ -2,32 +2,7 @@
 <glyph name="two.tf" format="2">
   <advance width="580"/>
   <outline>
-    <contour>
-      <point x="64" y="0" type="line"/>
-      <point x="522" y="0" type="line"/>
-      <point x="522" y="72" type="line"/>
-      <point x="149" y="72" type="line"/>
-      <point x="156" y="48" type="line"/>
-      <point x="399" y="266"/>
-      <point x="492" y="383"/>
-      <point x="492" y="510" type="curve" smooth="yes"/>
-      <point x="492" y="630"/>
-      <point x="408" y="704"/>
-      <point x="272" y="704" type="curve" smooth="yes"/>
-      <point x="187" y="704"/>
-      <point x="105" y="674"/>
-      <point x="52" y="625" type="curve"/>
-      <point x="77" y="567" type="line"/>
-      <point x="129" y="607"/>
-      <point x="196" y="631"/>
-      <point x="256" y="631" type="curve" smooth="yes"/>
-      <point x="348" y="631"/>
-      <point x="407" y="579"/>
-      <point x="407" y="496" type="curve" smooth="yes"/>
-      <point x="407" y="397"/>
-      <point x="326" y="291"/>
-      <point x="64" y="55" type="curve"/>
-    </contour>
+    <component base="two" xOffset="26"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/twofifths.glif b/src/Cantarell-Regular.ufo/glyphs/twofifths.glif
index 8b853582..13e4e1d7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/twofifths.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/twofifths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="twofifths" format="2">
-  <advance width="1160"/>
+  <advance width="969"/>
   <unicode hex="2156"/>
   <outline>
     <component base="two.numr"/>
-    <component base="fraction" xOffset="420"/>
-    <component base="five.dnom" xOffset="719"/>
+    <component base="fraction" xOffset="390"/>
+    <component base="five.dnom" xOffset="560"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/twoinferior.glif 
b/src/Cantarell-Regular.ufo/glyphs/twoinferior.glif
index 092f68d7..6b33d923 100644
--- a/src/Cantarell-Regular.ufo/glyphs/twoinferior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/twoinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="twoinferior" format="2">
-  <advance width="420"/>
+  <advance width="390"/>
   <unicode hex="2082"/>
   <outline>
     <component base="two.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/twosuperior.glif 
b/src/Cantarell-Regular.ufo/glyphs/twosuperior.glif
index 5fdd4773..945b886a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/twosuperior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/twosuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="twosuperior" format="2">
-  <advance width="420"/>
+  <advance width="390"/>
   <unicode hex="00B2"/>
   <outline>
     <component base="two.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/twothirds.glif b/src/Cantarell-Regular.ufo/glyphs/twothirds.glif
index 1b630e51..e4de47ab 100644
--- a/src/Cantarell-Regular.ufo/glyphs/twothirds.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/twothirds.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="twothirds" format="2">
-  <advance width="1162"/>
+  <advance width="965"/>
   <unicode hex="2154"/>
   <outline>
     <component base="two.numr"/>
-    <component base="fraction" xOffset="420"/>
-    <component base="three.dnom" xOffset="719"/>
+    <component base="fraction" xOffset="390"/>
+    <component base="three.dnom" xOffset="560"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/u-cy.glif b/src/Cantarell-Regular.ufo/glyphs/u-cy.glif
index a52bc3f4..1604de11 100644
--- a/src/Cantarell-Regular.ufo/glyphs/u-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/u-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="u-cy" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="0443"/>
-  <anchor x="255" y="482" name="top"/>
   <outline>
     <component base="y"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/u.glif b/src/Cantarell-Regular.ufo/glyphs/u.glif
index d0ed59a3..cb63e34b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/u.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/u.glif
@@ -1,39 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="u" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="0075"/>
-  <note>
-u
-</note>
-  <anchor x="273" y="0" name="bottom"/>
-  <anchor x="452" y="10" name="ogonek"/>
-  <anchor x="273" y="482" name="top"/>
-  <anchor x="531" y="482" name="topright"/>
+  <anchor x="274" y="0" name="bottom"/>
+  <anchor x="453" y="10" name="ogonek"/>
+  <anchor x="274" y="482" name="top"/>
+  <anchor x="532" y="482" name="topright"/>
   <outline>
     <contour>
-      <point x="474" y="482" type="line"/>
-      <point x="394" y="482" type="line"/>
-      <point x="394" y="56" type="line"/>
-      <point x="418" y="0" type="line"/>
-      <point x="474" y="0" type="line"/>
+      <point x="249" y="-10" type="curve" smooth="yes"/>
+      <point x="317" y="-10"/>
+      <point x="386" y="20"/>
+      <point x="435" y="73" type="curve"/>
+      <point x="416" y="124" type="line"/>
+      <point x="378" y="83"/>
+      <point x="325" y="60"/>
+      <point x="273" y="60" type="curve" smooth="yes"/>
+      <point x="198" y="60"/>
+      <point x="155" y="104"/>
+      <point x="155" y="182" type="curve" smooth="yes"/>
+      <point x="155" y="482" type="line"/>
+      <point x="75" y="482" type="line"/>
+      <point x="75" y="166" type="line" smooth="yes"/>
+      <point x="75" y="59"/>
+      <point x="146" y="-10"/>
     </contour>
     <contour>
-      <point x="154" y="482" type="line"/>
-      <point x="74" y="482" type="line"/>
-      <point x="74" y="166" type="line" smooth="yes"/>
-      <point x="74" y="59"/>
-      <point x="145" y="-10"/>
-      <point x="248" y="-10" type="curve" smooth="yes"/>
-      <point x="316" y="-10"/>
-      <point x="385" y="20"/>
-      <point x="434" y="73" type="curve"/>
-      <point x="415" y="124" type="line"/>
-      <point x="377" y="83"/>
-      <point x="324" y="60"/>
-      <point x="272" y="60" type="curve" smooth="yes"/>
-      <point x="197" y="60"/>
-      <point x="154" y="104"/>
-      <point x="154" y="182" type="curve" smooth="yes"/>
+      <point x="419" y="0" type="line"/>
+      <point x="475" y="0" type="line"/>
+      <point x="475" y="482" type="line"/>
+      <point x="395" y="482" type="line"/>
+      <point x="395" y="56" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uacute.glif b/src/Cantarell-Regular.ufo/glyphs/uacute.glif
index 41a6e7fa..bc6a57d3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uacute" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="00FA"/>
   <outline>
     <component base="u"/>
-    <component base="acutecomb" xOffset="190"/>
+    <component base="acutecomb" xOffset="191"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ubreve.glif b/src/Cantarell-Regular.ufo/glyphs/ubreve.glif
index e7c54b0b..406d7443 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ubreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ubreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ubreve" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="016D"/>
   <outline>
     <component base="u"/>
-    <component base="brevecomb" xOffset="65"/>
+    <component base="brevecomb" xOffset="66"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ucaron.glif b/src/Cantarell-Regular.ufo/glyphs/ucaron.glif
index e2155d0d..a4591a06 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ucaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ucaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ucaron" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="01D4"/>
   <outline>
     <component base="u"/>
-    <component base="caroncomb" xOffset="90"/>
+    <component base="caroncomb" xOffset="91"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ucircumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/ucircumflex.glif
index 485051ac..20d734b1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ucircumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ucircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ucircumflex" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="00FB"/>
   <outline>
     <component base="u"/>
-    <component base="circumflexcomb" xOffset="80"/>
+    <component base="circumflexcomb" xOffset="81"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/udblgrave.glif b/src/Cantarell-Regular.ufo/glyphs/udblgrave.glif
index 67df8264..80bef4d7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/udblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/udblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udblgrave" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="0215"/>
   <outline>
     <component base="u"/>
-    <component base="dblgravecomb" xOffset="19"/>
+    <component base="dblgravecomb" xOffset="20"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/udieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/udieresis-cy.glif
index dbe50c94..ed1c3904 100644
--- a/src/Cantarell-Regular.ufo/glyphs/udieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/udieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresis-cy" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="04F1"/>
   <outline>
     <component base="u-cy"/>
-    <component base="dieresiscomb" xOffset="22"/>
+    <component base="dieresiscomb" xOffset="-3"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/udieresis.glif b/src/Cantarell-Regular.ufo/glyphs/udieresis.glif
index 26e60356..3d6fa94c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/udieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/udieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresis" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="00FC"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb" xOffset="40"/>
+    <component base="dieresiscomb" xOffset="41"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/udieresisacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/udieresisacute.glif
index 5c62f212..5a2bf2dc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/udieresisacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/udieresisacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresisacute" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="01D8"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_acutecomb" xOffset="49"/>
+    <component base="dieresiscomb.loclVIET" xOffset="50"/>
+    <component base="acutecomb" xOffset="191" yOffset="122"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/udieresiscaron.glif 
b/src/Cantarell-Regular.ufo/glyphs/udieresiscaron.glif
index 0a2e92b5..fe1984b1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/udieresiscaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/udieresiscaron.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresiscaron" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="01DA"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_caroncomb" xOffset="49"/>
+    <component base="dieresiscomb.loclVIET" xOffset="50"/>
+    <component base="caroncomb" xOffset="91" yOffset="122"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/udieresisgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/udieresisgrave.glif
index 5d6e6106..7354488e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/udieresisgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/udieresisgrave.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresisgrave" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="01DC"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_gravecomb" xOffset="49"/>
+    <component base="dieresiscomb.loclVIET" xOffset="50"/>
+    <component base="gravecomb" xOffset="96" yOffset="122"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/udieresismacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/udieresismacron.glif
index 6c4c4917..e3c4649d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/udieresismacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/udieresismacron.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresismacron" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="01D6"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_macroncomb" xOffset="49"/>
+    <component base="dieresiscomb.loclVIET" xOffset="50"/>
+    <component base="macroncomb" xOffset="29" yOffset="122"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/udotbelow.glif b/src/Cantarell-Regular.ufo/glyphs/udotbelow.glif
index a5669ec6..54a9d13a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/udotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/udotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udotbelow" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="1EE5"/>
   <outline>
     <component base="u"/>
-    <component base="dotbelowcomb" xOffset="137"/>
+    <component base="dotbelowcomb" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ugrave.glif b/src/Cantarell-Regular.ufo/glyphs/ugrave.glif
index d480c593..599a1739 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ugrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ugrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ugrave" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="00F9"/>
   <outline>
     <component base="u"/>
-    <component base="gravecomb" xOffset="95"/>
+    <component base="gravecomb" xOffset="96"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/uhookabove.glif
index 69aedb55..06250994 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhookabove" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="1EE7"/>
   <outline>
     <component base="u"/>
-    <component base="hookabovecomb" xOffset="120"/>
+    <component base="hookabovecomb" xOffset="121"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uhorn.glif b/src/Cantarell-Regular.ufo/glyphs/uhorn.glif
index 60c82121..a0a86f5a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uhorn.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uhorn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorn" format="2">
-  <advance width="650"/>
+  <advance width="651"/>
   <unicode hex="01B0"/>
   <outline>
     <component base="u"/>
-    <component base="horncomb" xOffset="389"/>
+    <component base="horncomb" xOffset="390"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uhornacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/uhornacute.glif
index 19a34a5c..36d9a798 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uhornacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uhornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhornacute" format="2">
-  <advance width="650"/>
+  <advance width="651"/>
   <unicode hex="1EE9"/>
   <outline>
     <component base="uhorn"/>
-    <component base="acutecomb" xOffset="190"/>
+    <component base="acutecomb" xOffset="191"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uhorndotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/uhorndotbelow.glif
index f3f2fc74..501ba9ec 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uhorndotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uhorndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorndotbelow" format="2">
-  <advance width="650"/>
+  <advance width="651"/>
   <unicode hex="1EF1"/>
   <outline>
     <component base="uhorn"/>
-    <component base="dotbelowcomb" xOffset="137"/>
+    <component base="dotbelowcomb" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uhorngrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/uhorngrave.glif
index a810716b..ae617e3f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uhorngrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uhorngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorngrave" format="2">
-  <advance width="650"/>
+  <advance width="651"/>
   <unicode hex="1EEB"/>
   <outline>
     <component base="uhorn"/>
-    <component base="gravecomb" xOffset="95"/>
+    <component base="gravecomb" xOffset="96"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uhornhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/uhornhookabove.glif
index 92206852..1c47470c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uhornhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uhornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhornhookabove" format="2">
-  <advance width="650"/>
+  <advance width="651"/>
   <unicode hex="1EED"/>
   <outline>
     <component base="uhorn"/>
-    <component base="hookabovecomb" xOffset="120"/>
+    <component base="hookabovecomb" xOffset="121"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uhorntilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/uhorntilde.glif
index 82704732..1f27c639 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uhorntilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uhorntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorntilde" format="2">
-  <advance width="650"/>
+  <advance width="651"/>
   <unicode hex="1EEF"/>
   <outline>
     <component base="uhorn"/>
-    <component base="tildecomb" xOffset="41"/>
+    <component base="tildecomb" xOffset="42"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uhungarumlaut-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/uhungarumlaut-cy.glif
index 558126e2..d20f43fc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uhungarumlaut-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uhungarumlaut-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhungarumlaut-cy" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="04F3"/>
   <outline>
     <component base="u-cy"/>
-    <component base="hungarumlautcomb" xOffset="67"/>
+    <component base="hungarumlautcomb" xOffset="42"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uhungarumlaut.glif 
b/src/Cantarell-Regular.ufo/glyphs/uhungarumlaut.glif
index 1a2c7e9d..5ef1be3f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uhungarumlaut.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uhungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhungarumlaut" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="0171"/>
   <outline>
     <component base="u"/>
-    <component base="hungarumlautcomb" xOffset="85"/>
+    <component base="hungarumlautcomb" xOffset="86"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uinvertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/uinvertedbreve.glif
index 621289bb..ae7162b9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uinvertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uinvertedbreve" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="0217"/>
   <outline>
     <component base="u"/>
-    <component base="breveinvertedcomb" xOffset="63"/>
+    <component base="breveinvertedcomb" xOffset="64"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/umacron-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/umacron-cy.glif
index d0d6484d..9a58e784 100644
--- a/src/Cantarell-Regular.ufo/glyphs/umacron-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/umacron-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="umacron-cy" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="04EF"/>
   <outline>
     <component base="u-cy"/>
-    <component base="macroncomb" xOffset="10"/>
+    <component base="macroncomb" xOffset="-15"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/umacron.glif b/src/Cantarell-Regular.ufo/glyphs/umacron.glif
index 1934defb..69910a33 100644
--- a/src/Cantarell-Regular.ufo/glyphs/umacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/umacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="umacron" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="016B"/>
   <outline>
     <component base="u"/>
-    <component base="macroncomb" xOffset="28"/>
+    <component base="macroncomb" xOffset="29"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/umacrondieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/umacrondieresis.glif
index aef4d91c..8c3faab7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/umacrondieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/umacrondieresis.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="umacrondieresis" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="1E7B"/>
   <outline>
     <component base="u"/>
-    <component base="macroncomb_dieresiscomb" xOffset="-2"/>
+    <component base="macroncomb.loclVIET" xOffset="29"/>
+    <component base="dieresiscomb" xOffset="41" yOffset="133"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/underscore.glif 
b/src/Cantarell-Regular.ufo/glyphs/underscore.glif
index b6ae36a2..837b8513 100644
--- a/src/Cantarell-Regular.ufo/glyphs/underscore.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/underscore.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="underscore" format="2">
-  <advance width="604"/>
+  <advance width="500"/>
   <unicode hex="005F"/>
   <outline>
     <contour>
-      <point x="83" y="-69" type="line"/>
-      <point x="521" y="-69" type="line"/>
-      <point x="521" y="0" type="line"/>
-      <point x="83" y="0" type="line"/>
+      <point x="-10" y="-119" type="line"/>
+      <point x="510" y="-119" type="line"/>
+      <point x="510" y="-50" type="line"/>
+      <point x="-10" y="-50" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uogonek.glif b/src/Cantarell-Regular.ufo/glyphs/uogonek.glif
index 2e6f24d3..84c1d127 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uogonek" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="0173"/>
   <outline>
     <component base="u"/>
-    <component base="ogonekcomb" xOffset="20"/>
+    <component base="ogonekcomb" xOffset="21"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upA_rrow.glif b/src/Cantarell-Regular.ufo/glyphs/upA_rrow.glif
index 76f014ba..d6fc18ae 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upA_rrow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upA_rrow.glif
@@ -1,22 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upArrow" format="2">
-  <advance width="646"/>
+  <advance width="640"/>
   <unicode hex="2191"/>
-  <note>
-arrowup
-</note>
   <outline>
     <contour>
-      <point x="284" y="44" type="line"/>
-      <point x="360" y="44" type="line"/>
-      <point x="358" y="464" type="line"/>
-      <point x="536" y="278" type="line"/>
-      <point x="587" y="329" type="line"/>
-      <point x="324" y="598" type="line"/>
-      <point x="320" y="598" type="line"/>
-      <point x="59" y="329" type="line"/>
-      <point x="110" y="279" type="line"/>
-      <point x="286" y="466" type="line"/>
+      <point x="281" y="44" type="line"/>
+      <point x="357" y="44" type="line"/>
+      <point x="355" y="464" type="line"/>
+      <point x="533" y="278" type="line"/>
+      <point x="584" y="329" type="line"/>
+      <point x="321" y="598" type="line"/>
+      <point x="317" y="598" type="line"/>
+      <point x="56" y="329" type="line"/>
+      <point x="107" y="279" type="line"/>
+      <point x="283" y="466" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uring.glif b/src/Cantarell-Regular.ufo/glyphs/uring.glif
index 3caccf20..bc5d18e6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uring.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uring" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="016F"/>
   <outline>
     <component base="u"/>
-    <component base="ringcomb" xOffset="100"/>
+    <component base="ringcomb" xOffset="101"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ushort-cy.glif b/src/Cantarell-Regular.ufo/glyphs/ushort-cy.glif
index 1530c046..6fb95817 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ushort-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ushort-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ushort-cy" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="045E"/>
   <outline>
     <component base="u-cy"/>
-    <component base="brevecomb-cy" xOffset="33"/>
+    <component base="brevecomb-cy" xOffset="8"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ustraight-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/ustraight-cy.glif
index b37f8421..01e99df2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ustraight-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ustraight-cy.glif
@@ -1,15 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ustraight-cy" format="2">
-  <advance width="502"/>
+  <advance width="480"/>
   <unicode hex="04AF"/>
-  <anchor x="264" y="-24" name="center"/>
+  <anchor x="239" y="-24" name="center"/>
   <outline>
     <contour>
-      <point x="227" y="-217" type="line"/>
-      <point x="305" y="-217" type="line"/>
-      <point x="305" y="0" type="line"/>
-      <point x="227" y="0" type="line"/>
+      <point x="202" y="-217" type="line"/>
+      <point x="280" y="-217" type="line"/>
+      <point x="280" y="0" type="line"/>
+      <point x="202" y="0" type="line"/>
     </contour>
-    <component base="v" xOffset="11"/>
+    <component base="v"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>v</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>v</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ustraightstroke-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/ustraightstroke-cy.glif
index f8589953..a1c8e453 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ustraightstroke-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ustraightstroke-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ustraightstroke-cy" format="2">
-  <advance width="502"/>
+  <advance width="480"/>
   <unicode hex="04B1"/>
   <outline>
     <component base="ustraight-cy"/>
-    <component base="strokeshortcomb" xOffset="36" yOffset="-322"/>
+    <component base="strokeshortcomb" xOffset="11" yOffset="-322"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/utilde.glif b/src/Cantarell-Regular.ufo/glyphs/utilde.glif
index cece19af..0266c5e2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/utilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/utilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="utilde" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="0169"/>
   <outline>
     <component base="u"/>
-    <component base="tildecomb" xOffset="41"/>
+    <component base="tildecomb" xOffset="42"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/utildeacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/utildeacute.glif
index c8bf3cda..aab5e8f0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/utildeacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/utildeacute.glif
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="utildeacute" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="1E79"/>
   <outline>
     <component base="u"/>
-    <component base="tildecomb_acutecomb" xOffset="41"/>
+    <component base="tildecomb" xOffset="42"/>
+    <component base="acutecomb" xOffset="191" yOffset="159"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/v.glif b/src/Cantarell-Regular.ufo/glyphs/v.glif
index 3ade6926..01435fc6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/v.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/v.glif
@@ -2,9 +2,6 @@
 <glyph name="v" format="2">
   <advance width="480"/>
   <unicode hex="0076"/>
-  <note>
-v
-</note>
   <anchor x="240" y="0" name="bottom"/>
   <anchor x="240" y="482" name="top"/>
   <outline>
@@ -19,4 +16,10 @@ v
       <point x="12" y="482" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ve-cy.glif b/src/Cantarell-Regular.ufo/glyphs/ve-cy.glif
index b978a260..de64e15a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ve-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ve-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ve-cy" format="2">
-  <advance width="526"/>
+  <advance width="525"/>
   <unicode hex="0432"/>
   <outline>
     <contour>
@@ -15,29 +15,29 @@
       <point x="134" y="283" type="line"/>
       <point x="134" y="220" type="line"/>
       <point x="292" y="220" type="line" smooth="yes"/>
-      <point x="353" y="220"/>
-      <point x="391" y="187"/>
-      <point x="391" y="136" type="curve" smooth="yes"/>
-      <point x="391" y="71"/>
-      <point x="324" y="67"/>
+      <point x="352" y="220"/>
+      <point x="391" y="188"/>
+      <point x="391" y="139" type="curve" smooth="yes"/>
+      <point x="391" y="92"/>
+      <point x="355" y="67"/>
       <point x="285" y="67" type="curve" smooth="yes"/>
       <point x="163" y="67" type="line"/>
-      <point x="163" y="415" type="line"/>
-      <point x="264" y="415" type="line" smooth="yes"/>
-      <point x="333" y="415"/>
-      <point x="370" y="390"/>
-      <point x="370" y="345" type="curve" smooth="yes"/>
-      <point x="370" y="310"/>
-      <point x="342" y="286"/>
-      <point x="282" y="267" type="curve"/>
-      <point x="379" y="260" type="line"/>
-      <point x="423" y="276"/>
-      <point x="453" y="319"/>
-      <point x="453" y="366" type="curve" smooth="yes"/>
-      <point x="453" y="440"/>
-      <point x="387" y="482"/>
-      <point x="272" y="482" type="curve" smooth="yes"/>
-      <point x="83" y="482" type="line"/>
+      <point x="163" y="417" type="line"/>
+      <point x="264" y="417" type="line" smooth="yes"/>
+      <point x="332" y="417"/>
+      <point x="370" y="393"/>
+      <point x="370" y="350" type="curve" smooth="yes"/>
+      <point x="370" y="313"/>
+      <point x="343" y="288"/>
+      <point x="282" y="269" type="curve"/>
+      <point x="379" y="262" type="line"/>
+      <point x="423" y="278"/>
+      <point x="453" y="321"/>
+      <point x="453" y="368" type="curve" smooth="yes"/>
+      <point x="453" y="442"/>
+      <point x="387" y="484"/>
+      <point x="272" y="484" type="curve" smooth="yes"/>
+      <point x="83" y="484" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -49,6 +49,8 @@
         <key>width</key>
         <integer>82</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/verticallineabovecomb.glif 
b/src/Cantarell-Regular.ufo/glyphs/verticallineabovecomb.glif
index f65f7cd2..a85969b4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/verticallineabovecomb.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/verticallineabovecomb.glif
@@ -5,10 +5,10 @@
   <anchor x="125" y="750" name="top"/>
   <outline>
     <contour>
-      <point x="160" y="750" type="line"/>
-      <point x="90" y="750" type="line"/>
       <point x="96" y="566" type="line"/>
       <point x="154" y="566" type="line"/>
+      <point x="160" y="750" type="line"/>
+      <point x="90" y="750" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/verticallinelowmod.glif 
b/src/Cantarell-Regular.ufo/glyphs/verticallinelowmod.glif
index c0c43941..a3c02e6b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/verticallinelowmod.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/verticallinelowmod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="verticallinelowmod" format="2">
-  <advance width="250"/>
+  <advance width="148"/>
   <unicode hex="02CC"/>
   <outline>
-    <component base="verticallinebelowcomb"/>
+    <component base="verticallinebelowcomb" xOffset="-50"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/verticallinemod.glif 
b/src/Cantarell-Regular.ufo/glyphs/verticallinemod.glif
index 2f89be6e..4bd39b41 100644
--- a/src/Cantarell-Regular.ufo/glyphs/verticallinemod.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/verticallinemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="verticallinemod" format="2">
-  <advance width="250"/>
+  <advance width="148"/>
   <unicode hex="02C8"/>
   <outline>
-    <component base="verticallineabovecomb"/>
+    <component base="verticallineabovecomb" xOffset="-51"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/w.glif b/src/Cantarell-Regular.ufo/glyphs/w.glif
index a6f837a8..307b3641 100644
--- a/src/Cantarell-Regular.ufo/glyphs/w.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/w.glif
@@ -1,30 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="w" format="2">
-  <advance width="787"/>
+  <advance width="783"/>
   <unicode hex="0077"/>
-  <note>
-w
-</note>
   <anchor x="401" y="0" name="bottom"/>
   <anchor x="401" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="190" y="0" type="line"/>
-      <point x="266" y="0" type="line"/>
-      <point x="407" y="440" type="line"/>
-      <point x="374" y="440" type="line"/>
-      <point x="521" y="0" type="line"/>
-      <point x="602" y="0" type="line"/>
-      <point x="772" y="482" type="line"/>
-      <point x="692" y="482" type="line"/>
-      <point x="549" y="35" type="line"/>
-      <point x="582" y="35" type="line"/>
-      <point x="442" y="480" type="line"/>
-      <point x="352" y="480" type="line"/>
-      <point x="215" y="35" type="line"/>
-      <point x="247" y="35" type="line"/>
+      <point x="180" y="0" type="line"/>
+      <point x="259" y="0" type="line"/>
+      <point x="408" y="440" type="line"/>
+      <point x="372" y="440" type="line"/>
+      <point x="529" y="0" type="line"/>
+      <point x="610" y="0" type="line"/>
+      <point x="769" y="482" type="line"/>
+      <point x="689" y="482" type="line"/>
+      <point x="553" y="35" type="line"/>
+      <point x="589" y="35" type="line"/>
+      <point x="439" y="480" type="line"/>
+      <point x="351" y="480" type="line"/>
+      <point x="206" y="35" type="line"/>
+      <point x="237" y="35" type="line"/>
       <point x="105" y="482" type="line"/>
       <point x="14" y="482" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/wacute.glif b/src/Cantarell-Regular.ufo/glyphs/wacute.glif
index 8ffab1a4..2803ca31 100644
--- a/src/Cantarell-Regular.ufo/glyphs/wacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/wacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wacute" format="2">
-  <advance width="787"/>
+  <advance width="783"/>
   <unicode hex="1E83"/>
   <outline>
     <component base="w"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/wcircumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/wcircumflex.glif
index 66d7f3de..9cb4c37e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/wcircumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/wcircumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wcircumflex" format="2">
-  <advance width="787"/>
+  <advance width="783"/>
   <unicode hex="0175"/>
   <outline>
     <component base="w"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/wdieresis.glif b/src/Cantarell-Regular.ufo/glyphs/wdieresis.glif
index 2e2725d5..8dc27ba6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/wdieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/wdieresis.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wdieresis" format="2">
-  <advance width="787"/>
+  <advance width="783"/>
   <unicode hex="1E85"/>
   <outline>
     <component base="w"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/we-cy.glif b/src/Cantarell-Regular.ufo/glyphs/we-cy.glif
index d151685c..ed22895c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/we-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/we-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="we-cy" format="2">
-  <advance width="787"/>
+  <advance width="783"/>
   <unicode hex="051D"/>
   <outline>
     <component base="w"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/wgrave.glif b/src/Cantarell-Regular.ufo/glyphs/wgrave.glif
index ed415999..220dd776 100644
--- a/src/Cantarell-Regular.ufo/glyphs/wgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/wgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wgrave" format="2">
-  <advance width="787"/>
+  <advance width="783"/>
   <unicode hex="1E81"/>
   <outline>
     <component base="w"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/whiteC_ircle.glif 
b/src/Cantarell-Regular.ufo/glyphs/whiteC_ircle.glif
index b77b0224..c7aa3c81 100644
--- a/src/Cantarell-Regular.ufo/glyphs/whiteC_ircle.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/whiteC_ircle.glif
@@ -1,38 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="whiteCircle" format="2">
-  <advance width="664"/>
+  <advance width="662"/>
   <unicode hex="25CB"/>
-  <note>
-circle
-</note>
   <outline>
     <contour>
-      <point x="330" y="110" type="curve" smooth="yes"/>
-      <point x="474" y="110"/>
-      <point x="575" y="207"/>
-      <point x="575" y="349" type="curve" smooth="yes"/>
-      <point x="575" y="488"/>
-      <point x="476" y="584"/>
-      <point x="334" y="584" type="curve" smooth="yes"/>
-      <point x="189" y="584"/>
-      <point x="89" y="485"/>
-      <point x="89" y="343" type="curve" smooth="yes"/>
-      <point x="89" y="205"/>
-      <point x="188" y="110"/>
+      <point x="329" y="110" type="curve" smooth="yes"/>
+      <point x="473" y="110"/>
+      <point x="574" y="207"/>
+      <point x="574" y="349" type="curve" smooth="yes"/>
+      <point x="574" y="488"/>
+      <point x="475" y="584"/>
+      <point x="333" y="584" type="curve" smooth="yes"/>
+      <point x="188" y="584"/>
+      <point x="88" y="485"/>
+      <point x="88" y="343" type="curve" smooth="yes"/>
+      <point x="88" y="205"/>
+      <point x="187" y="110"/>
     </contour>
     <contour>
-      <point x="335" y="178" type="curve" smooth="yes"/>
-      <point x="236" y="178"/>
-      <point x="167" y="248"/>
-      <point x="167" y="349" type="curve" smooth="yes"/>
-      <point x="167" y="447"/>
-      <point x="233" y="516"/>
-      <point x="330" y="516" type="curve" smooth="yes"/>
-      <point x="428" y="516"/>
-      <point x="497" y="445"/>
-      <point x="497" y="343" type="curve" smooth="yes"/>
-      <point x="497" y="245"/>
-      <point x="430" y="178"/>
+      <point x="334" y="178" type="curve" smooth="yes"/>
+      <point x="235" y="178"/>
+      <point x="166" y="248"/>
+      <point x="166" y="349" type="curve" smooth="yes"/>
+      <point x="166" y="447"/>
+      <point x="232" y="516"/>
+      <point x="329" y="516" type="curve" smooth="yes"/>
+      <point x="427" y="516"/>
+      <point x="496" y="445"/>
+      <point x="496" y="343" type="curve" smooth="yes"/>
+      <point x="496" y="245"/>
+      <point x="429" y="178"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>blackCircle</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>blackCircle</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/won.glif b/src/Cantarell-Regular.ufo/glyphs/won.glif
index dde068cc..ae7ecb36 100644
--- a/src/Cantarell-Regular.ufo/glyphs/won.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/won.glif
@@ -1,32 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="won" format="2">
-  <advance width="1180"/>
+  <advance width="580"/>
   <unicode hex="20A9"/>
   <outline>
     <contour>
-      <point x="94" y="252" type="line"/>
-      <point x="266" y="252" type="line"/>
-      <point x="266" y="312" type="line"/>
-      <point x="94" y="312" type="line"/>
+      <point x="129" y="0" type="line"/>
+      <point x="202" y="0" type="line"/>
+      <point x="304" y="649" type="line"/>
+      <point x="271" y="649" type="line"/>
+      <point x="381" y="0" type="line"/>
+      <point x="452" y="0" type="line"/>
+      <point x="565" y="694" type="line"/>
+      <point x="496" y="694" type="line"/>
+      <point x="403" y="38" type="line"/>
+      <point x="435" y="38" type="line"/>
+      <point x="330" y="684" type="line"/>
+      <point x="253" y="684" type="line"/>
+      <point x="154" y="38" type="line"/>
+      <point x="180" y="38" type="line"/>
+      <point x="93" y="694" type="line"/>
+      <point x="14" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="94" y="392" type="line"/>
-      <point x="616" y="392" type="line"/>
-      <point x="616" y="452" type="line"/>
-      <point x="94" y="452" type="line"/>
+      <point x="0" y="227" type="line"/>
+      <point x="112" y="227" type="line"/>
+      <point x="112" y="294" type="line"/>
+      <point x="0" y="294" type="line"/>
     </contour>
     <contour>
-      <point x="1084" y="252" type="line"/>
-      <point x="1084" y="312" type="line"/>
-      <point x="912" y="312" type="line"/>
-      <point x="912" y="252" type="line"/>
+      <point x="0" y="404" type="line"/>
+      <point x="580" y="404" type="line"/>
+      <point x="580" y="468" type="line"/>
+      <point x="0" y="468" type="line"/>
     </contour>
     <contour>
-      <point x="1084" y="392" type="line"/>
-      <point x="1084" y="452" type="line"/>
-      <point x="592" y="452" type="line"/>
-      <point x="592" y="392" type="line"/>
+      <point x="468" y="227" type="line"/>
+      <point x="580" y="227" type="line"/>
+      <point x="580" y="294" type="line"/>
+      <point x="468" y="294" type="line"/>
     </contour>
-    <component base="W" xOffset="76"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/x.glif b/src/Cantarell-Regular.ufo/glyphs/x.glif
index b5bf735b..9960528d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/x.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/x.glif
@@ -2,9 +2,6 @@
 <glyph name="x" format="2">
   <advance width="469"/>
   <unicode hex="0078"/>
-  <note>
-x
-</note>
   <anchor x="234" y="0" name="bottom"/>
   <anchor x="234" y="482" name="top"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/y.glif b/src/Cantarell-Regular.ufo/glyphs/y.glif
index 91d85c8a..f27c5036 100644
--- a/src/Cantarell-Regular.ufo/glyphs/y.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/y.glif
@@ -1,28 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="y" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="0079"/>
-  <note>
-y
-</note>
-  <anchor x="381" y="0" name="bottom"/>
-  <anchor x="231" y="482" name="top"/>
+  <anchor x="380" y="0" name="bottom"/>
+  <anchor x="230" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="203" y="0" type="line"/>
-      <point x="281" y="0" type="line"/>
-      <point x="469" y="482" type="line"/>
-      <point x="389" y="482" type="line"/>
-      <point x="222" y="16" type="line"/>
-      <point x="266" y="16" type="line"/>
-      <point x="102" y="482" type="line"/>
-      <point x="13" y="482" type="line"/>
-    </contour>
-    <contour>
-      <point x="116" y="-217" type="line"/>
-      <point x="201" y="-217" type="line"/>
-      <point x="281" y="0" type="line"/>
-      <point x="203" y="0" type="line"/>
+      <point x="115" y="-217" type="line"/>
+      <point x="200" y="-217" type="line"/>
+      <point x="280" y="0" type="line"/>
+      <point x="468" y="482" type="line"/>
+      <point x="388" y="482" type="line"/>
+      <point x="232" y="48" type="line"/>
+      <point x="253" y="48" type="line"/>
+      <point x="101" y="482" type="line"/>
+      <point x="12" y="482" type="line"/>
+      <point x="202" y="0" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>v</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>v</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/yacute.glif b/src/Cantarell-Regular.ufo/glyphs/yacute.glif
index 84807077..ac98a551 100644
--- a/src/Cantarell-Regular.ufo/glyphs/yacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/yacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yacute" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="00FD"/>
   <outline>
     <component base="y"/>
-    <component base="acutecomb" xOffset="148"/>
+    <component base="acutecomb" xOffset="147"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/yat-cy.glif b/src/Cantarell-Regular.ufo/glyphs/yat-cy.glif
index 460828c7..19c4dc6c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/yat-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/yat-cy.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yat-cy" format="2">
-  <advance width="514"/>
+  <advance width="512"/>
   <unicode hex="0463"/>
   <outline>
     <contour>
-      <point x="91" y="0" type="line"/>
+      <point x="92" y="0" type="line"/>
       <point x="273" y="0" type="line" smooth="yes"/>
       <point x="399" y="0"/>
       <point x="476" y="62"/>
@@ -23,13 +23,19 @@
       <point x="284" y="67" type="curve" smooth="yes"/>
       <point x="167" y="67" type="line"/>
       <point x="167" y="739" type="line"/>
-      <point x="91" y="739" type="line"/>
+      <point x="92" y="739" type="line"/>
     </contour>
     <contour>
-      <point x="23" y="457" type="line"/>
-      <point x="310" y="457" type="line"/>
-      <point x="310" y="524" type="line"/>
-      <point x="23" y="524" type="line"/>
+      <point x="23" y="458" type="line"/>
+      <point x="310" y="458" type="line"/>
+      <point x="310" y="523" type="line"/>
+      <point x="23" y="523" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>softsign-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ycircumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/ycircumflex.glif
index 18a08fff..4c121cb3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ycircumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ycircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ycircumflex" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="0177"/>
   <outline>
     <component base="y"/>
-    <component base="circumflexcomb" xOffset="38"/>
+    <component base="circumflexcomb" xOffset="37"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ydieresis.glif b/src/Cantarell-Regular.ufo/glyphs/ydieresis.glif
index a843b9c1..895a4fde 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ydieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ydieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ydieresis" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="00FF"/>
   <outline>
     <component base="y"/>
-    <component base="dieresiscomb" xOffset="-2"/>
+    <component base="dieresiscomb" xOffset="-3"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ydotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/ydotaccent.glif
index b507acbc..a14f78fa 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ydotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ydotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ydotaccent" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="1E8F"/>
   <outline>
     <component base="y"/>
-    <component base="dotaccentcomb" xOffset="98"/>
+    <component base="dotaccentcomb" xOffset="97"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ydotbelow.glif b/src/Cantarell-Regular.ufo/glyphs/ydotbelow.glif
index e48b4188..78c41f3c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ydotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ydotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ydotbelow" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="1EF5"/>
   <outline>
     <component base="y"/>
-    <component base="dotbelowcomb" xOffset="245"/>
+    <component base="dotbelowcomb" xOffset="244"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/yen.glif b/src/Cantarell-Regular.ufo/glyphs/yen.glif
index ee6754d3..f661c836 100644
--- a/src/Cantarell-Regular.ufo/glyphs/yen.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/yen.glif
@@ -1,31 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yen" format="2">
-  <advance width="711"/>
+  <advance width="580"/>
   <unicode hex="00A5"/>
   <outline>
     <contour>
-      <point x="121" y="128" type="line"/>
-      <point x="594" y="128" type="line"/>
-      <point x="594" y="188" type="line"/>
-      <point x="121" y="188" type="line"/>
+      <point x="251" y="0" type="line"/>
+      <point x="334" y="0" type="line"/>
+      <point x="334" y="309" type="line"/>
+      <point x="539" y="694" type="line"/>
+      <point x="448" y="694" type="line"/>
+      <point x="290" y="372" type="line"/>
+      <point x="301" y="372" type="line"/>
+      <point x="138" y="694" type="line"/>
+      <point x="41" y="694" type="line"/>
+      <point x="251" y="309" type="line"/>
     </contour>
     <contour>
-      <point x="121" y="298" type="line"/>
-      <point x="594" y="298" type="line"/>
-      <point x="594" y="358" type="line"/>
-      <point x="121" y="358" type="line"/>
+      <point x="87" y="121" type="line"/>
+      <point x="498" y="121" type="line"/>
+      <point x="498" y="188" type="line"/>
+      <point x="87" y="188" type="line"/>
     </contour>
     <contour>
-      <point x="316" y="0" type="line"/>
-      <point x="399" y="0" type="line"/>
-      <point x="399" y="309" type="line"/>
-      <point x="639" y="694" type="line"/>
-      <point x="548" y="694" type="line"/>
-      <point x="355" y="372" type="line"/>
-      <point x="366" y="372" type="line"/>
-      <point x="168" y="694" type="line"/>
-      <point x="71" y="694" type="line"/>
-      <point x="316" y="309" type="line"/>
+      <point x="87" y="298" type="line"/>
+      <point x="498" y="298" type="line"/>
+      <point x="498" y="365" type="line"/>
+      <point x="87" y="365" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/yeru-cy.glif b/src/Cantarell-Regular.ufo/glyphs/yeru-cy.glif
index ee38d157..473676be 100644
--- a/src/Cantarell-Regular.ufo/glyphs/yeru-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/yeru-cy.glif
@@ -1,15 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yeru-cy" format="2">
-  <advance width="709"/>
+  <advance width="699"/>
   <unicode hex="044B"/>
   <anchor x="355" y="482" name="top"/>
   <outline>
-    <contour>
-      <point x="546" y="-1" type="line"/>
-      <point x="626" y="-1" type="line"/>
-      <point x="626" y="482" type="line"/>
-      <point x="546" y="482" type="line"/>
-    </contour>
     <contour>
       <point x="83" y="0" type="line"/>
       <point x="255" y="0" type="line" smooth="yes"/>
@@ -32,6 +26,12 @@
       <point x="163" y="482" type="line"/>
       <point x="83" y="482" type="line"/>
     </contour>
+    <contour>
+      <point x="536" y="-1" type="line"/>
+      <point x="616" y="-1" type="line"/>
+      <point x="616" y="482" type="line"/>
+      <point x="536" y="482" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
@@ -42,6 +42,10 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|en-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/yerudieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/yerudieresis-cy.glif
index bffca2c7..ed16637a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/yerudieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/yerudieresis-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yerudieresis-cy" format="2">
-  <advance width="709"/>
+  <advance width="699"/>
   <unicode hex="04F9"/>
   <outline>
     <component base="yeru-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ygrave.glif b/src/Cantarell-Regular.ufo/glyphs/ygrave.glif
index 141d9f18..375d5639 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ygrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ygrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ygrave" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="1EF3"/>
   <outline>
     <component base="y"/>
-    <component base="gravecomb" xOffset="53"/>
+    <component base="gravecomb" xOffset="52"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/yhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/yhookabove.glif
index d7108156..a8d3d41f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/yhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/yhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yhookabove" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="1EF7"/>
   <outline>
     <component base="y"/>
-    <component base="hookabovecomb" xOffset="78"/>
+    <component base="hookabovecomb" xOffset="77"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/yi-cy.glif b/src/Cantarell-Regular.ufo/glyphs/yi-cy.glif
index 0a3a525b..63cd692e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/yi-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/yi-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yi-cy" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="0457"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb" xOffset="-105"/>
+    <component base="dieresiscomb" xOffset="-109"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ymacron.glif b/src/Cantarell-Regular.ufo/glyphs/ymacron.glif
index 2a43f1f3..ea0a8022 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ymacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ymacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ymacron" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="0233"/>
   <outline>
     <component base="y"/>
-    <component base="macroncomb" xOffset="-14"/>
+    <component base="macroncomb" xOffset="-15"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ytilde.glif b/src/Cantarell-Regular.ufo/glyphs/ytilde.glif
index 0e4ecf89..4590e633 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ytilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ytilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ytilde" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="1EF9"/>
   <outline>
     <component base="y"/>
-    <component base="tildecomb" xOffset="-1"/>
+    <component base="tildecomb" xOffset="-2"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/yusbig-cy.glif b/src/Cantarell-Regular.ufo/glyphs/yusbig-cy.glif
index aa48da63..39f7fc0b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/yusbig-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/yusbig-cy.glif
@@ -4,26 +4,7 @@
   <unicode hex="046B"/>
   <outline>
     <contour>
-      <point x="245" y="267" type="line"/>
-      <point x="332" y="267" type="line"/>
-      <point x="155" y="444" type="line"/>
-      <point x="145" y="416" type="line"/>
-      <point x="483" y="416" type="line"/>
-      <point x="470" y="444" type="line"/>
-      <point x="300" y="276" type="line"/>
-      <point x="384" y="276" type="line"/>
-      <point x="541" y="415" type="line"/>
-      <point x="541" y="482" type="line"/>
-      <point x="85" y="482" type="line"/>
-      <point x="85" y="415" type="line"/>
-    </contour>
-    <contour>
-      <point x="352" y="235" type="line"/>
-      <point x="275" y="235" type="line"/>
-      <point x="275" y="0" type="line"/>
-      <point x="352" y="0" type="line"/>
-    </contour>
-    <contour>
+      <point x="38" y="0" type="curve"/>
       <point x="113" y="0" type="line"/>
       <point x="113" y="154"/>
       <point x="175" y="224"/>
@@ -37,7 +18,26 @@
       <point x="317" y="286" type="curve" smooth="yes"/>
       <point x="126" y="286"/>
       <point x="38" y="196"/>
-      <point x="38" y="0" type="curve"/>
+    </contour>
+    <contour>
+      <point x="275" y="0" type="line"/>
+      <point x="352" y="0" type="line"/>
+      <point x="352" y="235" type="line"/>
+      <point x="275" y="235" type="line"/>
+    </contour>
+    <contour>
+      <point x="245" y="267" type="line"/>
+      <point x="332" y="267" type="line"/>
+      <point x="155" y="444" type="line"/>
+      <point x="145" y="416" type="line"/>
+      <point x="483" y="416" type="line"/>
+      <point x="470" y="444" type="line"/>
+      <point x="300" y="276" type="line"/>
+      <point x="384" y="276" type="line"/>
+      <point x="541" y="415" type="line"/>
+      <point x="541" y="482" type="line"/>
+      <point x="85" y="482" type="line"/>
+      <point x="85" y="415" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -49,6 +49,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/z.glif b/src/Cantarell-Regular.ufo/glyphs/z.glif
index 54e33344..e1657fbf 100644
--- a/src/Cantarell-Regular.ufo/glyphs/z.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/z.glif
@@ -2,9 +2,6 @@
 <glyph name="z" format="2">
   <advance width="464"/>
   <unicode hex="007A"/>
-  <note>
-z
-</note>
   <anchor x="232" y="0" name="bottom"/>
   <anchor x="232" y="482" name="top"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ze-cy.glif b/src/Cantarell-Regular.ufo/glyphs/ze-cy.glif
index 837fad9d..a31307bc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ze-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ze-cy.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ze-cy" format="2">
-  <advance width="479"/>
+  <advance width="475"/>
   <unicode hex="0437"/>
-  <anchor x="239" y="0" name="bottom"/>
-  <anchor x="239" y="482" name="top"/>
+  <anchor x="237" y="0" name="bottom"/>
+  <anchor x="237" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="212" y="-7" type="curve" smooth="yes"/>
-      <point x="340" y="-7"/>
-      <point x="426" y="52"/>
-      <point x="426" y="142" type="curve" smooth="yes"/>
-      <point x="426" y="213"/>
-      <point x="366" y="258"/>
-      <point x="269" y="263" type="curve"/>
-      <point x="284" y="254" type="line"/>
-      <point x="360" y="256"/>
-      <point x="412" y="298"/>
-      <point x="412" y="365" type="curve" smooth="yes"/>
-      <point x="412" y="443"/>
-      <point x="339" y="492"/>
-      <point x="224" y="492" type="curve" smooth="yes"/>
-      <point x="163" y="492"/>
-      <point x="100" y="479"/>
-      <point x="47" y="451" type="curve"/>
-      <point x="65" y="388" type="line"/>
-      <point x="117" y="409"/>
-      <point x="166" y="420"/>
-      <point x="208" y="420" type="curve" smooth="yes"/>
-      <point x="281" y="420"/>
-      <point x="329" y="392"/>
-      <point x="329" y="351" type="curve" smooth="yes"/>
-      <point x="329" y="309"/>
-      <point x="278" y="281"/>
-      <point x="207" y="281" type="curve" smooth="yes"/>
-      <point x="134" y="281" type="line"/>
-      <point x="134" y="214" type="line"/>
-      <point x="192" y="214" type="line" smooth="yes"/>
-      <point x="287" y="214"/>
-      <point x="341" y="187"/>
-      <point x="341" y="139" type="curve" smooth="yes"/>
-      <point x="341" y="93"/>
-      <point x="295" y="66"/>
-      <point x="217" y="66" type="curve" smooth="yes"/>
-      <point x="167" y="66"/>
-      <point x="102" y="78"/>
-      <point x="57" y="96" type="curve"/>
-      <point x="37" y="30" type="line"/>
-      <point x="91" y="5"/>
-      <point x="150" y="-7"/>
+      <point x="210" y="-7" type="curve" smooth="yes"/>
+      <point x="338" y="-7"/>
+      <point x="424" y="52"/>
+      <point x="424" y="142" type="curve" smooth="yes"/>
+      <point x="424" y="213"/>
+      <point x="364" y="258"/>
+      <point x="267" y="263" type="curve"/>
+      <point x="282" y="254" type="line"/>
+      <point x="358" y="256"/>
+      <point x="410" y="298"/>
+      <point x="410" y="365" type="curve" smooth="yes"/>
+      <point x="410" y="443"/>
+      <point x="337" y="492"/>
+      <point x="222" y="492" type="curve" smooth="yes"/>
+      <point x="161" y="492"/>
+      <point x="98" y="479"/>
+      <point x="45" y="451" type="curve"/>
+      <point x="63" y="388" type="line"/>
+      <point x="115" y="409"/>
+      <point x="164" y="421"/>
+      <point x="206" y="421" type="curve" smooth="yes"/>
+      <point x="279" y="421"/>
+      <point x="328" y="393"/>
+      <point x="328" y="351" type="curve" smooth="yes"/>
+      <point x="328" y="309"/>
+      <point x="279" y="281"/>
+      <point x="205" y="281" type="curve" smooth="yes"/>
+      <point x="132" y="281" type="line"/>
+      <point x="132" y="214" type="line"/>
+      <point x="190" y="214" type="line" smooth="yes"/>
+      <point x="285" y="214"/>
+      <point x="339" y="187"/>
+      <point x="339" y="139" type="curve" smooth="yes"/>
+      <point x="339" y="93"/>
+      <point x="293" y="66"/>
+      <point x="215" y="66" type="curve" smooth="yes"/>
+      <point x="165" y="66"/>
+      <point x="100" y="78"/>
+      <point x="55" y="96" type="curve"/>
+      <point x="35" y="30" type="line"/>
+      <point x="89" y="5"/>
+      <point x="148" y="-7"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zedescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/zedescender-cy.glif
index e0e3cd0c..7b50702c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zedescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zedescender-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zedescender-cy" format="2">
-  <advance width="479"/>
+  <advance width="475"/>
   <unicode hex="0499"/>
   <outline>
     <component base="ze-cy"/>
-    <component base="cedillacomb" xOffset="92"/>
+    <component base="cedillacomb" xOffset="90"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zedieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/zedieresis-cy.glif
index a00931d7..83d0d34c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zedieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zedieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zedieresis-cy" format="2">
-  <advance width="479"/>
+  <advance width="475"/>
   <unicode hex="04DF"/>
   <outline>
     <component base="ze-cy"/>
-    <component base="dieresiscomb" xOffset="6"/>
+    <component base="dieresiscomb" xOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zero.dnom.glif b/src/Cantarell-Regular.ufo/glyphs/zero.dnom.glif
index 4025c4d1..078ae264 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zero.dnom.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zero.dnom.glif
@@ -1,38 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.dnom" format="2">
-  <advance width="488"/>
-  <note>
-zero
-</note>
-  <anchor x="246" y="237" name="slash"/>
+  <advance width="445"/>
+  <anchor x="224" y="208" name="slash"/>
   <outline>
     <contour>
-      <point x="242" y="-7" type="curve" smooth="yes"/>
-      <point x="360" y="-7"/>
-      <point x="435" y="88"/>
-      <point x="435" y="238" type="curve" smooth="yes"/>
-      <point x="435" y="384"/>
-      <point x="362" y="478"/>
-      <point x="246" y="478" type="curve" smooth="yes"/>
-      <point x="130" y="478"/>
-      <point x="53" y="384"/>
-      <point x="53" y="233" type="curve" smooth="yes"/>
-      <point x="53" y="87"/>
-      <point x="126" y="-7"/>
+      <point x="222" y="-6" type="curve" smooth="yes"/>
+      <point x="323" y="-6"/>
+      <point x="390" y="79"/>
+      <point x="390" y="210" type="curve" smooth="yes"/>
+      <point x="390" y="338"/>
+      <point x="324" y="422"/>
+      <point x="225" y="422" type="curve" smooth="yes"/>
+      <point x="122" y="422"/>
+      <point x="55" y="335"/>
+      <point x="55" y="206" type="curve" smooth="yes"/>
+      <point x="55" y="78"/>
+      <point x="121" y="-6"/>
     </contour>
     <contour>
-      <point x="246" y="57" type="curve" smooth="yes"/>
-      <point x="175" y="57"/>
-      <point x="130" y="127"/>
-      <point x="130" y="238" type="curve" smooth="yes"/>
-      <point x="130" y="346"/>
-      <point x="174" y="414"/>
-      <point x="243" y="414" type="curve" smooth="yes"/>
-      <point x="314" y="414"/>
-      <point x="358" y="343"/>
-      <point x="358" y="233" type="curve" smooth="yes"/>
-      <point x="358" y="126"/>
-      <point x="315" y="57"/>
+      <point x="224" y="58" type="curve" smooth="yes"/>
+      <point x="168" y="58"/>
+      <point x="131" y="118"/>
+      <point x="131" y="209" type="curve" smooth="yes"/>
+      <point x="131" y="300"/>
+      <point x="168" y="358"/>
+      <point x="222" y="358" type="curve" smooth="yes"/>
+      <point x="277" y="358"/>
+      <point x="314" y="298"/>
+      <point x="314" y="205" type="curve" smooth="yes"/>
+      <point x="314" y="116"/>
+      <point x="278" y="58"/>
     </contour>
   </outline>
   <lib>
@@ -40,11 +37,11 @@ zero
       <key>RMXScaler</key>
       <dict>
         <key>height</key>
-        <integer>68</integer>
+        <integer>60</integer>
         <key>weight</key>
         <integer>-7</integer>
         <key>width</key>
-        <integer>74</integer>
+        <integer>63</integer>
       </dict>
     </dict>
   </lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zero.glif b/src/Cantarell-Regular.ufo/glyphs/zero.glif
index 1f899159..8e1edc41 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zero.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zero.glif
@@ -1,36 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero" format="2">
-  <advance width="631"/>
+  <advance width="614"/>
   <unicode hex="0030"/>
-  <anchor x="316" y="350" name="slash"/>
+  <anchor x="308" y="350" name="slash"/>
   <outline>
     <contour>
-      <point x="313" y="-10" type="curve" smooth="yes"/>
-      <point x="471" y="-10"/>
-      <point x="565" y="125"/>
-      <point x="565" y="352" type="curve" smooth="yes"/>
-      <point x="565" y="573"/>
-      <point x="474" y="704"/>
-      <point x="321" y="704" type="curve" smooth="yes"/>
-      <point x="161" y="704"/>
-      <point x="66" y="570"/>
-      <point x="66" y="342" type="curve" smooth="yes"/>
-      <point x="66" y="121"/>
-      <point x="158" y="-10"/>
+      <point x="305" y="-10" type="curve" smooth="yes"/>
+      <point x="460" y="-10"/>
+      <point x="556" y="126"/>
+      <point x="556" y="352" type="curve" smooth="yes"/>
+      <point x="556" y="570"/>
+      <point x="463" y="704"/>
+      <point x="312" y="704" type="curve" smooth="yes"/>
+      <point x="155" y="704"/>
+      <point x="58" y="567"/>
+      <point x="58" y="342" type="curve" smooth="yes"/>
+      <point x="58" y="123"/>
+      <point x="152" y="-10"/>
     </contour>
     <contour>
-      <point x="320" y="62" type="curve" smooth="yes"/>
-      <point x="214" y="62"/>
-      <point x="151" y="170"/>
-      <point x="151" y="352" type="curve" smooth="yes"/>
-      <point x="151" y="528"/>
-      <point x="212" y="632"/>
-      <point x="314" y="632" type="curve" smooth="yes"/>
-      <point x="418" y="632"/>
-      <point x="480" y="524"/>
-      <point x="480" y="342" type="curve" smooth="yes"/>
-      <point x="480" y="166"/>
-      <point x="421" y="62"/>
+      <point x="311" y="61" type="curve" smooth="yes"/>
+      <point x="207" y="61"/>
+      <point x="142" y="170"/>
+      <point x="142" y="352" type="curve" smooth="yes"/>
+      <point x="142" y="527"/>
+      <point x="205" y="633"/>
+      <point x="306" y="633" type="curve" smooth="yes"/>
+      <point x="408" y="633"/>
+      <point x="472" y="523"/>
+      <point x="472" y="342" type="curve" smooth="yes"/>
+      <point x="472" y="167"/>
+      <point x="411" y="61"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zero.numr.glif b/src/Cantarell-Regular.ufo/glyphs/zero.numr.glif
index d0e557b1..16f65047 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zero.numr.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zero.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.numr" format="2">
-  <advance width="488"/>
+  <advance width="445"/>
   <outline>
     <component base="zero.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zero.osf.glif b/src/Cantarell-Regular.ufo/glyphs/zero.osf.glif
index 9043f14e..e2a65a8e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zero.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zero.osf.glif
@@ -1,35 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.osf" format="2">
-  <advance width="628"/>
-  <anchor x="315" y="300" name="slash"/>
+  <advance width="612"/>
+  <anchor x="307" y="300" name="slash"/>
   <outline>
     <contour>
-      <point x="311" y="-9" type="curve" smooth="yes"/>
-      <point x="468" y="-9"/>
-      <point x="562" y="109"/>
-      <point x="562" y="302" type="curve" smooth="yes"/>
-      <point x="562" y="488"/>
-      <point x="471" y="604"/>
-      <point x="319" y="604" type="curve" smooth="yes"/>
-      <point x="161" y="604"/>
-      <point x="66" y="485"/>
-      <point x="66" y="294" type="curve" smooth="yes"/>
-      <point x="66" y="106"/>
-      <point x="158" y="-9"/>
+      <point x="303" y="-9" type="curve" smooth="yes"/>
+      <point x="460" y="-9"/>
+      <point x="554" y="109"/>
+      <point x="554" y="302" type="curve" smooth="yes"/>
+      <point x="554" y="488"/>
+      <point x="463" y="604"/>
+      <point x="311" y="604" type="curve" smooth="yes"/>
+      <point x="153" y="604"/>
+      <point x="58" y="485"/>
+      <point x="58" y="294" type="curve" smooth="yes"/>
+      <point x="58" y="106"/>
+      <point x="150" y="-9"/>
     </contour>
     <contour>
-      <point x="318" y="60" type="curve" smooth="yes"/>
-      <point x="212" y="60"/>
-      <point x="148" y="152"/>
-      <point x="148" y="302" type="curve" smooth="yes"/>
-      <point x="148" y="447"/>
-      <point x="210" y="536"/>
-      <point x="312" y="536" type="curve" smooth="yes"/>
-      <point x="417" y="536"/>
-      <point x="480" y="442"/>
-      <point x="480" y="294" type="curve" smooth="yes"/>
-      <point x="480" y="149"/>
-      <point x="420" y="60"/>
+      <point x="310" y="60" type="curve" smooth="yes"/>
+      <point x="204" y="60"/>
+      <point x="140" y="152"/>
+      <point x="140" y="302" type="curve" smooth="yes"/>
+      <point x="140" y="447"/>
+      <point x="202" y="536"/>
+      <point x="304" y="536" type="curve" smooth="yes"/>
+      <point x="409" y="536"/>
+      <point x="472" y="442"/>
+      <point x="472" y="294" type="curve" smooth="yes"/>
+      <point x="472" y="149"/>
+      <point x="412" y="60"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>zero</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>zero</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zero.osf.zero.glif 
b/src/Cantarell-Regular.ufo/glyphs/zero.osf.zero.glif
index 83419109..a7f9f954 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zero.osf.zero.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zero.osf.zero.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.osf.zero" format="2">
-  <advance width="628"/>
+  <advance width="612"/>
   <outline>
     <component base="zero.osf"/>
-    <component base="_slash.zero.osf" xOffset="92" yOffset="59"/>
+    <component base="_slash.zero.osf" xOffset="84" yOffset="59"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zero.tf.glif b/src/Cantarell-Regular.ufo/glyphs/zero.tf.glif
index 1bbc25aa..bfbf1c8d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zero.tf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zero.tf.glif
@@ -1,36 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.tf" format="2">
   <advance width="580"/>
-  <anchor x="290" y="350" name="slash"/>
   <outline>
-    <contour>
-      <point x="287" y="-10" type="curve" smooth="yes"/>
-      <point x="433" y="-10"/>
-      <point x="521" y="125"/>
-      <point x="521" y="352" type="curve" smooth="yes"/>
-      <point x="521" y="572"/>
-      <point x="436" y="704"/>
-      <point x="294" y="704" type="curve" smooth="yes"/>
-      <point x="146" y="704"/>
-      <point x="57" y="570"/>
-      <point x="57" y="342" type="curve" smooth="yes"/>
-      <point x="57" y="122"/>
-      <point x="143" y="-10"/>
-    </contour>
-    <contour>
-      <point x="293" y="62" type="curve" smooth="yes"/>
-      <point x="198" y="62"/>
-      <point x="141" y="170"/>
-      <point x="141" y="352" type="curve" smooth="yes"/>
-      <point x="141" y="527"/>
-      <point x="196" y="632"/>
-      <point x="288" y="632" type="curve" smooth="yes"/>
-      <point x="381" y="632"/>
-      <point x="437" y="524"/>
-      <point x="437" y="342" type="curve" smooth="yes"/>
-      <point x="437" y="167"/>
-      <point x="384" y="62"/>
-    </contour>
+    <component base="zero" xOffset="-17"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zero.tf.zero.glif 
b/src/Cantarell-Regular.ufo/glyphs/zero.tf.zero.glif
index 24f98e05..09865bcf 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zero.tf.zero.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zero.tf.zero.glif
@@ -3,7 +3,7 @@
   <advance width="580"/>
   <outline>
     <component base="zero.tf"/>
-    <component base="_slash.zero" xOffset="67" yOffset="109"/>
+    <component base="_slash.zero" xOffset="68" yOffset="109"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zero.zero.glif b/src/Cantarell-Regular.ufo/glyphs/zero.zero.glif
index 781c00b8..4b70134f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zero.zero.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zero.zero.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.zero" format="2">
-  <advance width="631"/>
+  <advance width="614"/>
   <outline>
     <component base="zero"/>
-    <component base="_slash.zero" xOffset="93" yOffset="109"/>
+    <component base="_slash.zero" xOffset="85" yOffset="109"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zeroinferior.glif 
b/src/Cantarell-Regular.ufo/glyphs/zeroinferior.glif
index 79ec5980..962f1672 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zeroinferior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zeroinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zeroinferior" format="2">
-  <advance width="488"/>
+  <advance width="445"/>
   <unicode hex="2080"/>
   <outline>
     <component base="zero.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zerosuperior.glif 
b/src/Cantarell-Regular.ufo/glyphs/zerosuperior.glif
index d6c75c5b..e37ec415 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zerosuperior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zerosuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zerosuperior" format="2">
-  <advance width="488"/>
+  <advance width="445"/>
   <unicode hex="2070"/>
   <outline>
     <component base="zero.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zerothird.glif b/src/Cantarell-Regular.ufo/glyphs/zerothird.glif
index 126a65f0..93009ade 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zerothird.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zerothird.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zerothird" format="2">
-  <advance width="1230"/>
+  <advance width="1020"/>
   <unicode hex="2189"/>
   <outline>
     <component base="zero.numr"/>
-    <component base="fraction" xOffset="488"/>
-    <component base="three.dnom" xOffset="787"/>
+    <component base="fraction" xOffset="445"/>
+    <component base="three.dnom" xOffset="615"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zhe-cy.glif b/src/Cantarell-Regular.ufo/glyphs/zhe-cy.glif
index 9e025372..b73f6c09 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zhe-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zhe-cy.glif
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zhe-cy" format="2">
-  <advance width="753"/>
+  <advance width="768"/>
   <unicode hex="0436"/>
-  <anchor x="684" y="0" name="bottomright"/>
-  <anchor x="377" y="482" name="top"/>
+  <anchor x="692" y="0" name="bottomright"/>
+  <anchor x="385" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="647" y="0" type="line"/>
-      <point x="740" y="0" type="line"/>
-      <point x="566" y="266" type="line"/>
-      <point x="567" y="250" type="line"/>
-      <point x="731" y="482" type="line"/>
-      <point x="640" y="482" type="line"/>
-      <point x="481" y="253" type="line"/>
+      <point x="20" y="0" type="line"/>
+      <point x="110" y="0" type="line"/>
+      <point x="280" y="253" type="line"/>
+      <point x="124" y="482" type="line"/>
+      <point x="31" y="482" type="line"/>
+      <point x="197" y="240" type="line"/>
+      <point x="195" y="255" type="line"/>
     </contour>
     <contour>
-      <point x="12" y="0" type="line"/>
-      <point x="102" y="0" type="line"/>
-      <point x="272" y="253" type="line"/>
-      <point x="116" y="482" type="line"/>
-      <point x="23" y="482" type="line"/>
-      <point x="189" y="240" type="line"/>
-      <point x="187" y="255" type="line"/>
+      <point x="345" y="0" type="line"/>
+      <point x="425" y="0" type="line"/>
+      <point x="425" y="482" type="line"/>
+      <point x="345" y="482" type="line"/>
     </contour>
     <contour>
-      <point x="227" y="219" type="line"/>
-      <point x="516" y="219" type="line"/>
-      <point x="516" y="286" type="line"/>
-      <point x="227" y="286" type="line"/>
+      <point x="235" y="219" type="line"/>
+      <point x="524" y="219" type="line"/>
+      <point x="524" y="286" type="line"/>
+      <point x="235" y="286" type="line"/>
     </contour>
     <contour>
-      <point x="337" y="0" type="line"/>
-      <point x="417" y="0" type="line"/>
-      <point x="417" y="482" type="line"/>
-      <point x="337" y="482" type="line"/>
+      <point x="655" y="0" type="line"/>
+      <point x="748" y="0" type="line"/>
+      <point x="574" y="266" type="line"/>
+      <point x="575" y="250" type="line"/>
+      <point x="739" y="482" type="line"/>
+      <point x="648" y="482" type="line"/>
+      <point x="489" y="253" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -47,6 +47,8 @@
         <key>width</key>
         <integer>80</integer>
       </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zhebreve-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/zhebreve-cy.glif
index d1db5247..533a44f1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zhebreve-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zhebreve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zhebreve-cy" format="2">
-  <advance width="753"/>
+  <advance width="768"/>
   <unicode hex="04C2"/>
   <outline>
     <component base="zhe-cy"/>
-    <component base="brevecomb-cy" xOffset="155"/>
+    <component base="brevecomb-cy" xOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zhedescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/zhedescender-cy.glif
index 83c7e25d..7155cca7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zhedescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zhedescender-cy.glif
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zhedescender-cy" format="2">
-  <advance width="786"/>
+  <advance width="768"/>
   <unicode hex="0497"/>
   <outline>
     <component base="zhe-cy"/>
-    <component base="descender-cy" xOffset="577"/>
+    <component base="descender-cy" xOffset="585"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>zhe-cy</string>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>0</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>zhe-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zhedieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/zhedieresis-cy.glif
index ac893299..616a64e6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zhedieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zhedieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zhedieresis-cy" format="2">
-  <advance width="753"/>
+  <advance width="768"/>
   <unicode hex="04DD"/>
   <outline>
     <component base="zhe-cy"/>
-    <component base="dieresiscomb" xOffset="144"/>
+    <component base="dieresiscomb" xOffset="152"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/layercontents.plist b/src/Cantarell-Regular.ufo/layercontents.plist
index b6bbd64d..a8a6cf97 100644
--- a/src/Cantarell-Regular.ufo/layercontents.plist
+++ b/src/Cantarell-Regular.ufo/layercontents.plist
@@ -10,5 +10,41 @@
       <string>Template</string>
       <string>glyphs.T_emplate</string>
     </array>
+    <array>
+      <string>Outline</string>
+      <string>glyphs.O_utline</string>
+    </array>
+    <array>
+      <string>Wavy</string>
+      <string>glyphs.W_avy</string>
+    </array>
+    <array>
+      <string>Final Bent</string>
+      <string>glyphs.F_inal B_ent</string>
+    </array>
+    <array>
+      <string>Steeper</string>
+      <string>glyphs.S_teeper</string>
+    </array>
+    <array>
+      <string>Slanted</string>
+      <string>glyphs.S_lanted</string>
+    </array>
+    <array>
+      <string>May 5 19, 13:08</string>
+      <string>glyphs.M_ay 5 19, 13_08</string>
+    </array>
+    <array>
+      <string>May 5 19, 18:34</string>
+      <string>glyphs.M_ay 5 19, 18_34</string>
+    </array>
+    <array>
+      <string>Jun 8 19, 20:55</string>
+      <string>glyphs.J_un 8 19, 20_55</string>
+    </array>
+    <array>
+      <string>Jun 8 19, 20:47</string>
+      <string>glyphs.J_un 8 19, 20_47</string>
+    </array>
   </array>
 </plist>
diff --git a/src/Cantarell-Regular.ufo/lib.plist b/src/Cantarell-Regular.ufo/lib.plist
index 58d80892..cb790d6f 100644
--- a/src/Cantarell-Regular.ufo/lib.plist
+++ b/src/Cantarell-Regular.ufo/lib.plist
@@ -362,7 +362,6 @@
           <string>acutecomb</string>
           <string>acutecomb.case</string>
           <string>acutecomb.loclVIET</string>
-          <string>acutecomb_dotaccentcomb</string>
           <string>adblgrave</string>
           <string>adieresis</string>
           <string>adieresis-cy</string>
@@ -387,14 +386,6 @@
           <string>brevecomb-cy.case</string>
           <string>brevecomb.case</string>
           <string>brevecomb.loclVIET</string>
-          <string>brevecomb_acutecomb</string>
-          <string>brevecomb_acutecomb.case</string>
-          <string>brevecomb_gravecomb</string>
-          <string>brevecomb_gravecomb.case</string>
-          <string>brevecomb_hookabovecomb</string>
-          <string>brevecomb_hookabovecomb.case</string>
-          <string>brevecomb_tildecomb</string>
-          <string>brevecomb_tildecomb.case</string>
           <string>breveinvertedcomb</string>
           <string>breveinvertedcomb.case</string>
           <string>c</string>
@@ -404,7 +395,6 @@
           <string>caroncomb.alt</string>
           <string>caroncomb.case</string>
           <string>caroncomb.loclVIET</string>
-          <string>caroncomb_dotaccentcomb</string>
           <string>ccaron</string>
           <string>ccedilla</string>
           <string>ccedillaacute</string>
@@ -420,14 +410,6 @@
           <string>circumflexcomb</string>
           <string>circumflexcomb.case</string>
           <string>circumflexcomb.loclVIET</string>
-          <string>circumflexcomb_acutecomb</string>
-          <string>circumflexcomb_acutecomb.case</string>
-          <string>circumflexcomb_gravecomb</string>
-          <string>circumflexcomb_gravecomb.case</string>
-          <string>circumflexcomb_hookabovecomb</string>
-          <string>circumflexcomb_hookabovecomb.case</string>
-          <string>circumflexcomb_tildecomb</string>
-          <string>circumflexcomb_tildecomb.case</string>
           <string>commaaccentcomb</string>
           <string>commaturnedabovecomb</string>
           <string>commaturnedmod</string>
@@ -445,16 +427,11 @@
           <string>dieresiscomb</string>
           <string>dieresiscomb.case</string>
           <string>dieresiscomb.loclVIET</string>
-          <string>dieresiscomb_acutecomb</string>
-          <string>dieresiscomb_caroncomb</string>
-          <string>dieresiscomb_gravecomb</string>
-          <string>dieresiscomb_macroncomb</string>
           <string>dje-cy</string>
           <string>dlinebelow</string>
           <string>dotaccentcomb</string>
           <string>dotaccentcomb.case</string>
           <string>dotaccentcomb.loclVIET</string>
-          <string>dotaccentcomb_macroncomb</string>
           <string>dotbelowcomb</string>
           <string>doubleprimemod</string>
           <string>dze-cy</string>
@@ -576,6 +553,7 @@
           <string>kgreenlandic</string>
           <string>kje-cy</string>
           <string>l</string>
+          <string>l.ss01</string>
           <string>lacute</string>
           <string>lcaron</string>
           <string>lcommaaccent</string>
@@ -591,9 +569,6 @@
           <string>macroncomb.loclVIET</string>
           <string>macroncomb.narrow</string>
           <string>macroncomb.narrow.case</string>
-          <string>macroncomb_acutecomb</string>
-          <string>macroncomb_dieresiscomb</string>
-          <string>macroncomb_gravecomb</string>
           <string>mdotbelow</string>
           <string>n</string>
           <string>nacute</string>
@@ -708,9 +683,6 @@
           <string>tildecomb</string>
           <string>tildecomb.case</string>
           <string>tildecomb.loclVIET</string>
-          <string>tildecomb_acutecomb</string>
-          <string>tildecomb_dieresiscomb</string>
-          <string>tildecomb_macroncomb</string>
           <string>tlinebelow</string>
           <string>tse-cy</string>
           <string>tshe-cy</string>
@@ -793,7 +765,7 @@
         <key>name</key>
         <string>propagateAnchors</string>
         <key>pre</key>
-        <true/>
+        <integer>1</integer>
       </dict>
     </array>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.Schwa</key>
@@ -876,14 +848,6 @@
         <string>eight.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.eight.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>eight.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.el-cy</key>
     <dict>
       <key>RMXScaler</key>
@@ -932,14 +896,6 @@
         <string>five.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.five.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>five.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.four.dnom</key>
     <dict>
       <key>RMXScaler</key>
@@ -956,14 +912,6 @@
         <string>four.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.four.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>four.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.ge-cy</key>
     <dict>
       <key>RMXScaler</key>
@@ -1060,20 +1008,12 @@
         <string>nine.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.nine.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>nine</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.one.dnom</key>
     <dict>
       <key>RMXScaler</key>
       <dict>
         <key>source</key>
-        <string>one.lf</string>
+        <string>one</string>
       </dict>
     </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.one.tf</key>
@@ -1084,14 +1024,6 @@
         <string>one.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.one.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>one.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.ordfeminine</key>
     <dict>
       <key>RMXScaler</key>
@@ -1132,14 +1064,6 @@
         <string>seven.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.seven.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>seven.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.sha-cy</key>
     <dict>
       <key>RMXScaler</key>
@@ -1172,14 +1096,6 @@
         <string>six.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.six.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>six</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.softsign-cy</key>
     <dict>
       <key>RMXScaler</key>
@@ -1212,14 +1128,6 @@
         <string>three.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.three.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>three.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.tildecomb.loclVIET</key>
     <dict>
       <key>RMXScaler</key>
@@ -1252,14 +1160,6 @@
         <string>two.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.two.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>two.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.ve-cy</key>
     <dict>
       <key>RMXScaler</key>
@@ -1308,14 +1208,6 @@
         <string>zero.lf</string>
       </dict>
     </dict>
-    <key>com.schriftgestaltung.Glyphs.glyphUserData.zero.tosf</key>
-    <dict>
-      <key>RMXScaler</key>
-      <dict>
-        <key>source</key>
-        <string>zero.osf</string>
-      </dict>
-    </dict>
     <key>com.schriftgestaltung.Glyphs.glyphUserData.zhe-cy</key>
     <dict>
       <key>RMXScaler</key>
@@ -1325,7 +1217,7 @@
       </dict>
     </dict>
     <key>com.schriftgestaltung.appVersion</key>
-    <string>1230</string>
+    <string>1271</string>
     <key>com.schriftgestaltung.customParameter.GSFont.Family Alignment Zones</key>
     <array>
       <string>{739, 10}</string>
@@ -1335,7 +1227,7 @@
       <string>{-217, -12}</string>
     </array>
     <key>com.schriftgestaltung.customParameter.GSFont.disablesAutomaticAlignment</key>
-    <true/>
+    <false/>
     <key>com.schriftgestaltung.customParameter.GSFont.disablesLastChange</key>
     <true/>
     <key>com.schriftgestaltung.customParameter.GSFont.useNiceNames</key>
@@ -1867,9 +1759,7 @@
       <string>zcaron</string>
       <string>zdotaccent</string>
       <string>zdotbelow</string>
-      <string>f_f</string>
-      <string>f_f_i</string>
-      <string>f_f_l</string>
+      <string>l.ss01</string>
       <string>fi</string>
       <string>fl</string>
       <string>ordfeminine</string>
@@ -2067,6 +1957,7 @@
       <string>seven</string>
       <string>eight</string>
       <string>nine</string>
+      <string>zero.zero</string>
       <string>zero.osf</string>
       <string>one.osf</string>
       <string>two.osf</string>
@@ -2089,18 +1980,6 @@
       <string>eight.tf</string>
       <string>nine.tf</string>
       <string>zero.tf.zero</string>
-      <string>zero.tosf</string>
-      <string>one.tosf</string>
-      <string>two.tosf</string>
-      <string>three.tosf</string>
-      <string>four.tosf</string>
-      <string>five.tosf</string>
-      <string>six.tosf</string>
-      <string>seven.tosf</string>
-      <string>eight.tosf</string>
-      <string>nine.tosf</string>
-      <string>zero.tosf.zero</string>
-      <string>zero.zero</string>
       <string>zeroinferior</string>
       <string>oneinferior</string>
       <string>twoinferior</string>
@@ -2186,13 +2065,9 @@
       <string>bracketleft</string>
       <string>bracketright</string>
       <string>hyphen</string>
-      <string>softhyphen</string>
       <string>endash</string>
       <string>emdash</string>
       <string>figuredash</string>
-      <string>horizontalbar</string>
-      <string>hyphentwo</string>
-      <string>nonbreakinghyphen</string>
       <string>underscore</string>
       <string>quotesinglbase</string>
       <string>quotedblbase</string>
@@ -2210,9 +2085,7 @@
       <string>quotesingle</string>
       <string>leftanglebracket-math</string>
       <string>rightanglebracket-math</string>
-      <string>emquad</string>
       <string>emspace</string>
-      <string>enquad</string>
       <string>enspace</string>
       <string>figurespace</string>
       <string>fourperemspace</string>
@@ -2220,7 +2093,6 @@
       <string>punctuationspace</string>
       <string>sixperemspace</string>
       <string>space</string>
-      <string>nbspace</string>
       <string>thinspace</string>
       <string>threeperemspace</string>
       <string>zerowidthspace</string>
@@ -2234,6 +2106,7 @@
       <string>florin</string>
       <string>franc</string>
       <string>guarani</string>
+      <string>hryvnia</string>
       <string>kip</string>
       <string>lira</string>
       <string>liraTurkish</string>
@@ -2244,11 +2117,10 @@
       <string>ruble</string>
       <string>rupeeIndian</string>
       <string>sterling</string>
-      <string>won</string>
-      <string>yen</string>
-      <string>hryvnia</string>
       <string>tenge</string>
       <string>tugrik</string>
+      <string>won</string>
+      <string>yen</string>
       <string>bulletoperator</string>
       <string>commercialMinusSign</string>
       <string>divisionslash</string>
@@ -2266,8 +2138,8 @@
       <string>lessequal</string>
       <string>plusminus</string>
       <string>approxequal</string>
-      <string>logicalnot</string>
       <string>asciitilde</string>
+      <string>logicalnot</string>
       <string>asciicircum</string>
       <string>emptyset</string>
       <string>infinity</string>
@@ -2282,24 +2154,6 @@
       <string>percent</string>
       <string>perthousand</string>
       <string>ratio</string>
-      <string>bulletoperator.tf</string>
-      <string>commercialMinusSign.tf</string>
-      <string>divisionslash.tf</string>
-      <string>equivalence.tf</string>
-      <string>notidentical.tf</string>
-      <string>plus.tf</string>
-      <string>minus.tf</string>
-      <string>multiply.tf</string>
-      <string>divide.tf</string>
-      <string>equal.tf</string>
-      <string>notequal.tf</string>
-      <string>greater.tf</string>
-      <string>less.tf</string>
-      <string>greaterequal.tf</string>
-      <string>lessequal.tf</string>
-      <string>plusminus.tf</string>
-      <string>approxequal.tf</string>
-      <string>logicalnot.tf</string>
       <string>upArrow</string>
       <string>rightArrow</string>
       <string>downArrow</string>
@@ -2337,31 +2191,18 @@
       <string>verticallinelowmod</string>
       <string>verticallinemod</string>
       <string>dieresiscomb</string>
-      <string>dieresiscomb_gravecomb</string>
-      <string>dieresiscomb_acutecomb</string>
-      <string>dieresiscomb_caroncomb</string>
-      <string>dieresiscomb_macroncomb</string>
       <string>dotaccentcomb</string>
-      <string>dotaccentcomb_macroncomb</string>
       <string>gravecomb</string>
       <string>acutecomb</string>
-      <string>acutecomb_dotaccentcomb</string>
       <string>hungarumlautcomb</string>
       <string>caroncomb.alt</string>
       <string>circumflexcomb</string>
       <string>caroncomb</string>
-      <string>caroncomb_dotaccentcomb</string>
       <string>brevecomb</string>
       <string>ringcomb</string>
       <string>ringcomb_acutecomb</string>
       <string>tildecomb</string>
-      <string>tildecomb_dieresiscomb</string>
-      <string>tildecomb_acutecomb</string>
-      <string>tildecomb_macroncomb</string>
       <string>macroncomb</string>
-      <string>macroncomb_dieresiscomb</string>
-      <string>macroncomb_gravecomb</string>
-      <string>macroncomb_acutecomb</string>
       <string>hookabovecomb</string>
       <string>verticallineabovecomb</string>
       <string>dblgravecomb</string>
@@ -2380,19 +2221,19 @@
       <string>strokelongcomb</string>
       <string>slashshortcomb</string>
       <string>slashlongcomb</string>
-      <string>acute</string>
-      <string>breve</string>
-      <string>caron</string>
-      <string>cedilla</string>
-      <string>circumflex</string>
       <string>dieresis</string>
       <string>dotaccent</string>
       <string>grave</string>
+      <string>acute</string>
       <string>hungarumlaut</string>
-      <string>macron</string>
-      <string>ogonek</string>
+      <string>circumflex</string>
+      <string>caron</string>
+      <string>breve</string>
       <string>ring</string>
       <string>tilde</string>
+      <string>macron</string>
+      <string>cedilla</string>
+      <string>ogonek</string>
       <string>dieresiscomb.case</string>
       <string>dotaccentcomb.case</string>
       <string>gravecomb.case</string>
@@ -2432,28 +2273,11 @@
       <string>brevecomb-cy.case</string>
       <string>descender-cy.case</string>
       <string>descender-cy.strait</string>
-      <string>brevecomb_acutecomb</string>
-      <string>brevecomb_gravecomb</string>
-      <string>brevecomb_hookabovecomb</string>
-      <string>brevecomb_tildecomb</string>
-      <string>circumflexcomb_acutecomb</string>
-      <string>circumflexcomb_gravecomb</string>
-      <string>circumflexcomb_hookabovecomb</string>
-      <string>circumflexcomb_tildecomb</string>
-      <string>brevecomb_acutecomb.case</string>
-      <string>brevecomb_gravecomb.case</string>
-      <string>brevecomb_hookabovecomb.case</string>
-      <string>brevecomb_tildecomb.case</string>
-      <string>circumflexcomb_acutecomb.case</string>
-      <string>circumflexcomb_gravecomb.case</string>
-      <string>circumflexcomb_hookabovecomb.case</string>
-      <string>circumflexcomb_tildecomb.case</string>
       <string>_descenderreversed-cy</string>
       <string>_bar-cy</string>
       <string>_descender-cy.case.straight</string>
       <string>_descenderreverse-cy.case</string>
       <string>_bottomhook</string>
-      <string>_o.numero</string>
       <string>_slash.zero</string>
       <string>_typoquote</string>
       <string>_commaaccent</string>
@@ -2922,8 +2746,6 @@
       <string>uni1EA9</string>
       <key>acircumflextilde</key>
       <string>uni1EAB</string>
-      <key>acutecomb_dotaccentcomb</key>
-      <string>uni03010307</string>
       <key>adblgrave</key>
       <string>uni0201</string>
       <key>adieresis-cy</key>
@@ -2956,29 +2778,11 @@
       <string>uni0306.case</string>
       <key>brevecomb.loclVIET</key>
       <string>uni0306.loclVIET</string>
-      <key>brevecomb_acutecomb</key>
-      <string>uni03060301</string>
-      <key>brevecomb_acutecomb.case</key>
-      <string>uni03060301.case</string>
-      <key>brevecomb_gravecomb</key>
-      <string>uni03060300</string>
-      <key>brevecomb_gravecomb.case</key>
-      <string>uni03060300.case</string>
-      <key>brevecomb_hookabovecomb</key>
-      <string>uni03060309</string>
-      <key>brevecomb_hookabovecomb.case</key>
-      <string>uni03060309.case</string>
-      <key>brevecomb_tildecomb</key>
-      <string>uni03060303</string>
-      <key>brevecomb_tildecomb.case</key>
-      <string>uni03060303.case</string>
       <key>breveinvertedcomb</key>
       <string>uni0311</string>
       <key>breveinvertedcomb.case</key>
       <string>uni0311.case</string>
       <key>bulletoperator</key>
-      <string>uni2219</string>
-      <key>bulletoperator.tf</key>
       <string>uni2219.tf</string>
       <key>caroncomb</key>
       <string>uni030C</string>
@@ -2988,8 +2792,6 @@
       <string>uni030C.case</string>
       <key>caroncomb.loclVIET</key>
       <string>uni030C.loclVIET</string>
-      <key>caroncomb_dotaccentcomb</key>
-      <string>uni030C0307</string>
       <key>ccedillaacute</key>
       <string>uni1E09</string>
       <key>cedi</key>
@@ -3012,22 +2814,6 @@
       <string>uni0302.case</string>
       <key>circumflexcomb.loclVIET</key>
       <string>uni0302.loclVIET</string>
-      <key>circumflexcomb_acutecomb</key>
-      <string>uni03020301</string>
-      <key>circumflexcomb_acutecomb.case</key>
-      <string>uni03020301.case</string>
-      <key>circumflexcomb_gravecomb</key>
-      <string>uni03020300</string>
-      <key>circumflexcomb_gravecomb.case</key>
-      <string>uni03020300.case</string>
-      <key>circumflexcomb_hookabovecomb</key>
-      <string>uni03020309</string>
-      <key>circumflexcomb_hookabovecomb.case</key>
-      <string>uni03020309.case</string>
-      <key>circumflexcomb_tildecomb</key>
-      <string>uni03020303</string>
-      <key>circumflexcomb_tildecomb.case</key>
-      <string>uni03020303.case</string>
       <key>colonsign</key>
       <string>colonmonetary</string>
       <key>commaaccentcomb</key>
@@ -3037,8 +2823,6 @@
       <key>commaturnedmod</key>
       <string>uni02BB</string>
       <key>commercialMinusSign</key>
-      <string>uni2052</string>
-      <key>commercialMinusSign.tf</key>
       <string>uni2052.tf</string>
       <key>dblgravecomb</key>
       <string>uni030F</string>
@@ -3062,17 +2846,7 @@
       <string>uni0308.case</string>
       <key>dieresiscomb.loclVIET</key>
       <string>uni0308.loclVIET</string>
-      <key>dieresiscomb_acutecomb</key>
-      <string>uni03080301</string>
-      <key>dieresiscomb_caroncomb</key>
-      <string>uni0308030C</string>
-      <key>dieresiscomb_gravecomb</key>
-      <string>uni03080300</string>
-      <key>dieresiscomb_macroncomb</key>
-      <string>uni03080304</string>
       <key>divisionslash</key>
-      <string>uni2215</string>
-      <key>divisionslash.tf</key>
       <string>uni2215.tf</string>
       <key>dje-cy</key>
       <string>uni0452</string>
@@ -3084,8 +2858,6 @@
       <string>uni0307.case</string>
       <key>dotaccentcomb.loclVIET</key>
       <string>uni0307.loclVIET</string>
-      <key>dotaccentcomb_macroncomb</key>
-      <string>uni03070304</string>
       <key>doubleprimemod</key>
       <string>uni02BA</string>
       <key>downArrow</key>
@@ -3132,8 +2904,6 @@
       <string>uni1E17</string>
       <key>emacrongrave</key>
       <string>uni1E15</string>
-      <key>emquad</key>
-      <string>uni2001</string>
       <key>emspace</key>
       <string>uni2003</string>
       <key>en-cy</key>
@@ -3142,8 +2912,6 @@
       <string>uni04A3</string>
       <key>enghe-cy</key>
       <string>uni04A5</string>
-      <key>enquad</key>
-      <string>uni2000</string>
       <key>enspace</key>
       <string>uni2002</string>
       <key>er-cy</key>
@@ -3214,8 +2982,6 @@
       <string>uni1E2B</string>
       <key>hdotbelow</key>
       <string>uni1E25</string>
-      <key>horizontalbar</key>
-      <string>uni2015</string>
       <key>horncomb</key>
       <string>uni031B</string>
       <key>hryvnia</key>
@@ -3224,8 +2990,6 @@
       <string>uni030B</string>
       <key>hungarumlautcomb.case</key>
       <string>uni030B.case</string>
-      <key>hyphentwo</key>
-      <string>uni2010</string>
       <key>i-cy</key>
       <string>uni0456</string>
       <key>ia-cy</key>
@@ -3324,12 +3088,6 @@
       <string>uni0304.narrow</string>
       <key>macroncomb.narrow.case</key>
       <string>uni0304.narrow.case</string>
-      <key>macroncomb_acutecomb</key>
-      <string>uni03040301</string>
-      <key>macroncomb_dieresiscomb</key>
-      <string>uni03040308</string>
-      <key>macroncomb_gravecomb</key>
-      <string>uni03040300</string>
       <key>manat</key>
       <string>uni20BC</string>
       <key>mdotbelow</key>
@@ -3338,8 +3096,6 @@
       <string>uni00B5</string>
       <key>naira</key>
       <string>uni20A6</string>
-      <key>nbspace</key>
-      <string>uni00A0</string>
       <key>ncommaaccent</key>
       <string>uni0146</string>
       <key>ndotaccent</key>
@@ -3356,11 +3112,7 @@
       <string>uni045A</string>
       <key>nlinebelow</key>
       <string>uni1E49</string>
-      <key>nonbreakinghyphen</key>
-      <string>uni2011</string>
       <key>notidentical</key>
-      <string>uni2262</string>
-      <key>notidentical.tf</key>
       <string>uni2262.tf</string>
       <key>numero</key>
       <string>uni2116</string>
@@ -3532,8 +3284,6 @@
       <string>uni0337</string>
       <key>slashshortcomb.case</key>
       <string>uni0337.case</string>
-      <key>softhyphen</key>
-      <string>uni00AD</string>
       <key>softsign-cy</key>
       <string>uni044C</string>
       <key>strokelongcomb</key>
@@ -3564,10 +3314,6 @@
       <string>uni2004</string>
       <key>threesuperior</key>
       <string>uni00B3</string>
-      <key>tildecomb_dieresiscomb</key>
-      <string>uni03030308</string>
-      <key>tildecomb_macroncomb</key>
-      <string>uni03030304</string>
       <key>tlinebelow</key>
       <string>uni1E6F</string>
       <key>tripleprime</key>
@@ -3704,13 +3450,9 @@
       <string>_descender-cy.case.straight</string>
       <string>_descenderreverse-cy.case</string>
       <string>_descenderreversed-cy</string>
-      <string>_o.numero</string>
       <string>_slash.zero</string>
       <string>_slash.zero.osf</string>
       <string>_typoquote</string>
-      <string>hryvnia</string>
-      <string>tenge</string>
-      <string>tugrik</string>
     </array>
     <key>width</key>
     <integer>30</integer>
diff --git a/src/Cantarell.designspace b/src/Cantarell.designspace
index 8ac6cb18..62f14ce6 100644
--- a/src/Cantarell.designspace
+++ b/src/Cantarell.designspace
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<designspace format="4.0">
+<designspace format="4.1">
   <axes>
     <axis tag="wght" name="Weight" minimum="100" maximum="800" default="400">
       <map input="100" output="20"/>
@@ -16,6 +16,10 @@
       </location>
     </source>
     <source filename="Cantarell-Regular.ufo">
+      <lib copy="1"/>
+      <groups copy="1"/>
+      <features copy="1"/>
+      <info copy="1"/>
       <location>
         <dimension name="Weight" xvalue="80"/>
       </location>
@@ -41,6 +45,17 @@
       <location>
         <dimension name="Weight" xvalue="80"/>
       </location>
+      <lib>
+        <dict>
+          <key>com.schriftgestaltung.customParameters</key>
+          <array>
+            <array>
+              <string>ShowInterpolation</string>
+              <string>-</string>
+            </array>
+          </array>
+        </dict>
+      </lib>
     </instance>
     <instance stylename="Regular Interpolated For Testing">
       <location>
@@ -56,6 +71,10 @@
                 <string>Regular</string>
               </array>
             </array>
+            <array>
+              <string>ShowInterpolation</string>
+              <string>-</string>
+            </array>
           </array>
           <key>com.schriftgestaltung.export</key>
           <false/>
@@ -105,9 +124,9 @@
           <key>HV</key>
           <string>176</string>
           <key>OH</key>
-          <string>150</string>
+          <string>152</string>
           <key>OV</key>
-          <string>180</string>
+          <string>182</string>
           <key>nV</key>
           <string>173</string>
           <key>nd</key>
@@ -150,13 +169,9 @@
         <string>_descender-cy.case.straight</string>
         <string>_descenderreverse-cy.case</string>
         <string>_descenderreversed-cy</string>
-        <string>_o.numero</string>
         <string>_slash.zero</string>
         <string>_slash.zero.osf</string>
         <string>_typoquote</string>
-        <string>hryvnia</string>
-        <string>tenge</string>
-        <string>tugrik</string>
       </array>
     </dict>
   </lib>
diff --git a/src/Cantarell.stylespace b/src/Cantarell.stylespace
index 6c9ffa85..d7c45683 100644
--- a/src/Cantarell.stylespace
+++ b/src/Cantarell.stylespace
@@ -19,6 +19,13 @@
             <integer>100</integer>
           </dict>
 
+          <dict>
+            <key>name</key>
+            <string>Extra Light</string>
+            <key>value</key>
+            <integer>200</integer>
+          </dict>
+
           <dict>
             <key>name</key>
             <string>Light</string>
diff --git a/src/Cantarell_autospace.py b/src/Cantarell_autospace.py
index 970a05f4..e83a74c7 100644
--- a/src/Cantarell_autospace.py
+++ b/src/Cantarell_autospace.py
@@ -4,14 +4,14 @@
 # Script, Category, Subcategory, value, referenceGlyph, filter
 
 # Letters
-*,Letter,Uppercase,1.25,H,*,
+*,Letter,Uppercase,1.15,H,*,
 *,Letter,Smallcaps,1.1,h.sc,*,
 *,Letter,Lowercase,1,x,*,
 *,Letter,Lowercase,0.7,m.sups,.sups,
 
 # Numbers
-*,Number,Decimal Digit,1.2,one,*,
-*,Number,Decimal Digit,1.2,zero.osf,.osf,
+*,Number,Decimal Digit,1.1,one,*,
+*,Number,Decimal Digit,1.1,zero.osf,.osf,
 *,Number,Fraction,1.3,*,*,
 *,Number,*,1.0,*,.dnom,
 *,Number,*,1.0,*,.numr,
@@ -20,9 +20,12 @@
 
 # Punctuation
 *,Punctuation,Other,1,*,*,
+*,Punctuation,Other,1.1,*,exclam,
+*,Punctuation,Other,0.9,*,period,
 *,Punctuation,Parenthesis,1.2,*,*,
 *,Punctuation,Quote,1.2,*,*,
-*,Punctuation,Dash,1,*,*,
+*,Punctuation,Quote,1,*,quote,
+*,Punctuation,Dash,0.8,*,*,
 *,Punctuation,*,1,*,slash,
 *,Punctuation,*,1.2,*,*,
 
diff --git a/src/meson.build b/src/meson.build
index 45a23cda..236aff85 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -16,12 +16,13 @@ custom_target(
 custom_target(
     'cantarell-variable-font',
     input: 'Cantarell.designspace',
-    output: 'Cantarell-VF.ttf',
+    output: 'Cantarell-VF.otf',
     command: [
         python3,
         make_variable_font,
         '@INPUT@',
         join_paths(meson.current_source_dir(), 'Cantarell.stylespace'),
+        psautohint,
         '@OUTPUT@'
     ],
     install: true,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]