[cantarell-fonts/respacing] Respace Cyrillics, pass 1



commit 42ad1dd49d3862f4777af055df85141dd86f16a1
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Sun Oct 13 23:59:45 2019 +0100

    Respace Cyrillics, pass 1
    
    Need to refine Upper-to-lowercase spacing

 proofs/test.html                                   |  44 ++++++++
 src/Cantarell-Bold.ufo/glyphs/B_e-cy.glif          |  52 +++++----
 src/Cantarell-Bold.ufo/glyphs/C_he-cy.glif         |  52 +++++----
 .../glyphs/C_hedescender-cy.glif                   |   6 +-
 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_e-cy.glif          |  46 ++++----
 src/Cantarell-Bold.ufo/glyphs/D_je-cy.glif         |  64 ++++++-----
 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_f-cy.glif          |  58 +++++-----
 src/Cantarell-Bold.ufo/glyphs/E_l-cy.glif          |  48 ++++----
 src/Cantarell-Bold.ufo/glyphs/E_ndescender-cy.glif |   4 +-
 src/Cantarell-Bold.ufo/glyphs/E_nghe-cy.glif       |  42 ++++---
 src/Cantarell-Bold.ufo/glyphs/E_reversed-cy.glif   |  72 ++++++------
 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   |  28 +++--
 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/H_adescender-cy.glif |   8 +-
 src/Cantarell-Bold.ufo/glyphs/H_ardsign-cy.glif    |  56 ++++++----
 src/Cantarell-Bold.ufo/glyphs/I_a-cy.glif          |  62 ++++++-----
 src/Cantarell-Bold.ufo/glyphs/I_dieresis-cy.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_ishort-cy.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/I_macron-cy.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/K_a-cy.glif          |  42 ++++---
 src/Cantarell-Bold.ufo/glyphs/K_abashkir-cy.glif   |  42 +++----
 src/Cantarell-Bold.ufo/glyphs/K_adescender-cy.glif |   6 +-
 .../glyphs/K_averticalstroke-cy.glif               |  46 ++++----
 src/Cantarell-Bold.ufo/glyphs/K_je-cy.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/L_je-cy.glif         |  80 +++++++-------
 src/Cantarell-Bold.ufo/glyphs/N_je-cy.glif         |  70 ++++++------
 src/Cantarell-Bold.ufo/glyphs/P_e-cy.glif          |  28 +++--
 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_ha-cy.glif         |  34 +++---
 src/Cantarell-Bold.ufo/glyphs/S_hcha-cy.glif       |  42 ++++---
 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_se-cy.glif         |  32 +++---
 src/Cantarell-Bold.ufo/glyphs/T_she-cy.glif        |  56 +++++-----
 src/Cantarell-Bold.ufo/glyphs/U_-cy.glif           |  24 ++--
 src/Cantarell-Bold.ufo/glyphs/U_dieresis-cy.glif   |   4 +-
 .../glyphs/U_hungarumlaut-cy.glif                  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/U_macron-cy.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/U_short-cy.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/Y_at-cy.glif         |   8 +-
 src/Cantarell-Bold.ufo/glyphs/Y_eru-cy.glif        |  60 +++++-----
 .../glyphs/Y_erudieresis-cy.glif                   |   4 +-
 src/Cantarell-Bold.ufo/glyphs/Y_usbig-cy.glif      |  68 ++++++------
 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                   |   8 +-
 src/Cantarell-Bold.ufo/glyphs/Z_hedieresis-cy.glif |   4 +-
 src/Cantarell-Bold.ufo/glyphs/be-cy.glif           |  70 ++++++------
 src/Cantarell-Bold.ufo/glyphs/che-cy.glif          |  48 ++++----
 src/Cantarell-Bold.ufo/glyphs/chedescender-cy.glif |   4 +-
 src/Cantarell-Bold.ufo/glyphs/chedieresis-cy.glif  |   4 +-
 .../glyphs/chekhakassian-cy.glif                   |   4 +-
 .../glyphs/cheverticalstroke-cy.glif               |   8 +-
 src/Cantarell-Bold.ufo/glyphs/de-cy.glif           |  46 ++++----
 src/Cantarell-Bold.ufo/glyphs/dzhe-cy.glif         |  30 ++---
 src/Cantarell-Bold.ufo/glyphs/e-cy.glif            |  74 +++++++------
 src/Cantarell-Bold.ufo/glyphs/ef-cy.glif           | 122 +++++++++++----------
 src/Cantarell-Bold.ufo/glyphs/el-cy.glif           |  44 ++++----
 src/Cantarell-Bold.ufo/glyphs/em-cy.glif           |  38 ++++---
 src/Cantarell-Bold.ufo/glyphs/en-cy.glif           |  32 +++---
 src/Cantarell-Bold.ufo/glyphs/endescender-cy.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/enghe-cy.glif        |  42 ++++---
 src/Cantarell-Bold.ufo/glyphs/ereversed-cy.glif    |  68 ++++++------
 src/Cantarell-Bold.ufo/glyphs/ge-cy.glif           |  20 ++--
 src/Cantarell-Bold.ufo/glyphs/gedescender-cy.glif  |   4 +-
 .../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/hardsign-cy.glif     |  54 ++++-----
 src/Cantarell-Bold.ufo/glyphs/ia-cy.glif           |  58 +++++-----
 src/Cantarell-Bold.ufo/glyphs/idieresis-cy.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/iishort-cy.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/imacron-cy.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/iu-cy.glif           |  72 ++++++------
 src/Cantarell-Bold.ufo/glyphs/izhitsa-cy.glif      |   2 +-
 src/Cantarell-Bold.ufo/glyphs/ka-cy.glif           |  38 ++++---
 src/Cantarell-Bold.ufo/glyphs/kabashkir-cy.glif    |  42 +++----
 src/Cantarell-Bold.ufo/glyphs/kadescender-cy.glif  |   4 +-
 .../glyphs/kaverticalstroke-cy.glif                |  40 +++----
 src/Cantarell-Bold.ufo/glyphs/kje-cy.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/lje-cy.glif          |  80 +++++++-------
 src/Cantarell-Bold.ufo/glyphs/nje-cy.glif          |  70 ++++++------
 src/Cantarell-Bold.ufo/glyphs/oslash.glif          |  68 +++++++-----
 src/Cantarell-Bold.ufo/glyphs/oslashacute.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/pe-cy.glif           |  24 ++--
 src/Cantarell-Bold.ufo/glyphs/sha-cy.glif          |  30 ++---
 src/Cantarell-Bold.ufo/glyphs/shcha-cy.glif        |  38 ++++---
 src/Cantarell-Bold.ufo/glyphs/softsign-cy.glif     |  44 ++++----
 src/Cantarell-Bold.ufo/glyphs/te-cy.glif           |  24 ++--
 src/Cantarell-Bold.ufo/glyphs/tse-cy.glif          |  28 ++---
 src/Cantarell-Bold.ufo/glyphs/ve-cy.glif           |  72 ++++++------
 src/Cantarell-Bold.ufo/glyphs/yat-cy.glif          |  56 +++++-----
 src/Cantarell-Bold.ufo/glyphs/yeru-cy.glif         |  56 +++++-----
 src/Cantarell-Bold.ufo/glyphs/yerudieresis-cy.glif |   4 +-
 src/Cantarell-Bold.ufo/glyphs/yusbig-cy.glif       |  64 +++++------
 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/zhe-cy.glif          |  52 ++++-----
 src/Cantarell-Bold.ufo/glyphs/zhebreve-cy.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/zhedescender-cy.glif |   4 +-
 src/Cantarell-Bold.ufo/glyphs/zhedieresis-cy.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/B_e-cy.glif         |  52 +++++----
 src/Cantarell-Light.ufo/glyphs/C_he-cy.glif        |   8 +-
 .../glyphs/C_hedescender-cy.glif                   |   2 +
 .../glyphs/C_hedieresis-cy.glif                    |   2 +-
 .../glyphs/C_hekhakassian-cy.glif                  |   2 +-
 .../glyphs/C_heverticalstroke-cy.glif              |  10 +-
 src/Cantarell-Light.ufo/glyphs/D_je-cy.glif        |  64 ++++++-----
 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_l-cy.glif         |   8 +-
 .../glyphs/E_ndescender-cy.glif                    |   2 +
 src/Cantarell-Light.ufo/glyphs/E_nghe-cy.glif      |  42 ++++---
 src/Cantarell-Light.ufo/glyphs/E_reversed-cy.glif  |  72 ++++++------
 src/Cantarell-Light.ufo/glyphs/G_e-cy.glif         |  24 ++--
 .../glyphs/G_edescender-cy.glif                    |   4 +-
 .../glyphs/G_hemiddlehook-cy.glif                  |  60 +++++-----
 src/Cantarell-Light.ufo/glyphs/G_hestroke-cy.glif  |   6 +
 src/Cantarell-Light.ufo/glyphs/G_heupturn-cy.glif  |  26 +++--
 src/Cantarell-Light.ufo/glyphs/G_je-cy.glif        |   4 +-
 .../glyphs/H_adescender-cy.glif                    |   8 +-
 src/Cantarell-Light.ufo/glyphs/H_ardsign-cy.glif   |  56 ++++++----
 src/Cantarell-Light.ufo/glyphs/I_a-cy.glif         |   8 +-
 src/Cantarell-Light.ufo/glyphs/I_dieresis-cy.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_i-cy.glif         |  38 ++++---
 src/Cantarell-Light.ufo/glyphs/I_igrave-cy.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_u-cy.glif         |  76 +++++++------
 src/Cantarell-Light.ufo/glyphs/I_zhitsa-cy.glif    |  36 +++---
 src/Cantarell-Light.ufo/glyphs/K_a-cy.glif         |  42 ++++---
 src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif  |  42 +++----
 .../glyphs/K_adescender-cy.glif                    |   8 +-
 .../glyphs/K_averticalstroke-cy.glif               |  46 ++++----
 src/Cantarell-Light.ufo/glyphs/K_je-cy.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_je-cy.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/N_je-cy.glif        |  70 ++++++------
 src/Cantarell-Light.ufo/glyphs/P_e-cy.glif         |  28 +++--
 src/Cantarell-Light.ufo/glyphs/S_chwa-cy.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/S_chwa.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/S_ha-cy.glif        |  34 +++---
 src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif      |  42 ++++---
 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_se-cy.glif        |  32 +++---
 src/Cantarell-Light.ufo/glyphs/T_she-cy.glif       |  56 +++++-----
 src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif        |   8 +-
 src/Cantarell-Light.ufo/glyphs/Y_eru-cy.glif       |  60 +++++-----
 .../glyphs/Y_erudieresis-cy.glif                   |   4 +-
 src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif     |   6 +
 .../glyphs/Z_hedescender-cy.glif                   |   8 +-
 src/Cantarell-Light.ufo/glyphs/che-cy.glif         |   2 +
 .../glyphs/cheverticalstroke-cy.glif               |   6 +
 src/Cantarell-Light.ufo/glyphs/dzhe-cy.glif        |   4 +
 src/Cantarell-Light.ufo/glyphs/e-cy.glif           |  74 +++++++------
 src/Cantarell-Light.ufo/glyphs/ef-cy.glif          | 116 +++++++++++---------
 src/Cantarell-Light.ufo/glyphs/el-cy.glif          |   2 +
 src/Cantarell-Light.ufo/glyphs/em-cy.glif          |   4 +
 src/Cantarell-Light.ufo/glyphs/en-cy.glif          |   4 +
 src/Cantarell-Light.ufo/glyphs/enghe-cy.glif       |   8 ++
 src/Cantarell-Light.ufo/glyphs/ereversed-cy.glif   |  68 ++++++------
 src/Cantarell-Light.ufo/glyphs/ge-cy.glif          |   2 +
 src/Cantarell-Light.ufo/glyphs/germandbls.glif     |   2 +-
 .../glyphs/ghemiddlehook-cy.glif                   |   2 +
 src/Cantarell-Light.ufo/glyphs/ghestroke-cy.glif   |   6 +
 src/Cantarell-Light.ufo/glyphs/gheupturn-cy.glif   |   8 ++
 src/Cantarell-Light.ufo/glyphs/hardsign-cy.glif    |  54 ++++-----
 src/Cantarell-Light.ufo/glyphs/ia-cy.glif          |   2 +
 src/Cantarell-Light.ufo/glyphs/ii-cy.glif          |   4 +
 src/Cantarell-Light.ufo/glyphs/iu-cy.glif          |   4 +
 src/Cantarell-Light.ufo/glyphs/ka-cy.glif          |   2 +
 src/Cantarell-Light.ufo/glyphs/kabashkir-cy.glif   |  42 +++----
 src/Cantarell-Light.ufo/glyphs/lje-cy.glif         |   2 +
 src/Cantarell-Light.ufo/glyphs/nje-cy.glif         |   8 ++
 src/Cantarell-Light.ufo/glyphs/oslash.glif         |  68 +++++++-----
 src/Cantarell-Light.ufo/glyphs/oslashacute.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/pe-cy.glif          |   4 +
 src/Cantarell-Light.ufo/glyphs/sha-cy.glif         |   4 +
 src/Cantarell-Light.ufo/glyphs/shcha-cy.glif       |   6 +-
 src/Cantarell-Light.ufo/glyphs/softsign-cy.glif    |   2 +
 src/Cantarell-Light.ufo/glyphs/te-cy.glif          |   4 +
 src/Cantarell-Light.ufo/glyphs/tse-cy.glif         |   2 +
 src/Cantarell-Light.ufo/glyphs/ve-cy.glif          |   2 +
 src/Cantarell-Light.ufo/glyphs/yat-cy.glif         |   6 +
 src/Cantarell-Light.ufo/glyphs/yeru-cy.glif        |   4 +
 src/Cantarell-Light.ufo/glyphs/yusbig-cy.glif      |   2 +
 src/Cantarell-Light.ufo/glyphs/zhe-cy.glif         |   2 +
 src/Cantarell-Regular.ufo/glyphs/B_e-cy.glif       |  52 +++++----
 src/Cantarell-Regular.ufo/glyphs/C_he-cy.glif      |  52 +++++----
 .../glyphs/C_hedescender-cy.glif                   |   6 +-
 .../glyphs/C_hedieresis-cy.glif                    |   4 +-
 .../glyphs/C_hekhakassian-cy.glif                  |   4 +-
 .../glyphs/C_heverticalstroke-cy.glif              |  58 +++++-----
 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_zhe-cy.glif     |  34 +++---
 src/Cantarell-Regular.ufo/glyphs/E_-cy.glif        |  70 ++++++------
 src/Cantarell-Regular.ufo/glyphs/E_f-cy.glif       |  58 +++++-----
 src/Cantarell-Regular.ufo/glyphs/E_l-cy.glif       |  48 ++++----
 .../glyphs/E_ndescender-cy.glif                    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_nghe-cy.glif    |  42 ++++---
 .../glyphs/E_reversed-cy.glif                      |  72 ++++++------
 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                      |  28 +++--
 .../glyphs/G_heupturn-cy.glif                      |  26 +++--
 src/Cantarell-Regular.ufo/glyphs/G_je-cy.glif      |   4 +-
 .../glyphs/H_adescender-cy.glif                    |   8 +-
 src/Cantarell-Regular.ufo/glyphs/H_ardsign-cy.glif |  56 ++++++----
 src/Cantarell-Regular.ufo/glyphs/I_a-cy.glif       |  62 ++++++-----
 .../glyphs/I_dieresis-cy.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_i-cy.glif       |  38 ++++---
 src/Cantarell-Regular.ufo/glyphs/I_igrave-cy.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_u-cy.glif       |  76 +++++++------
 src/Cantarell-Regular.ufo/glyphs/I_zhitsa-cy.glif  |  36 +++---
 src/Cantarell-Regular.ufo/glyphs/K_a-cy.glif       |  42 ++++---
 .../glyphs/K_abashkir-cy.glif                      |  42 +++----
 .../glyphs/K_adescender-cy.glif                    |   8 +-
 .../glyphs/K_averticalstroke-cy.glif               |  46 ++++----
 src/Cantarell-Regular.ufo/glyphs/K_je-cy.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/L_je-cy.glif      |  80 +++++++-------
 src/Cantarell-Regular.ufo/glyphs/N_je-cy.glif      |  70 ++++++------
 src/Cantarell-Regular.ufo/glyphs/P_e-cy.glif       |  28 +++--
 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_ha-cy.glif      |  34 +++---
 src/Cantarell-Regular.ufo/glyphs/S_hcha-cy.glif    |  42 ++++---
 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_se-cy.glif      |  32 +++---
 src/Cantarell-Regular.ufo/glyphs/T_she-cy.glif     |  56 +++++-----
 src/Cantarell-Regular.ufo/glyphs/U_-cy.glif        |  24 ++--
 .../glyphs/U_dieresis-cy.glif                      |   4 +-
 .../glyphs/U_hungarumlaut-cy.glif                  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/U_macron-cy.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/U_short-cy.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_at-cy.glif      |  56 +++++-----
 src/Cantarell-Regular.ufo/glyphs/Y_eru-cy.glif     |  60 +++++-----
 .../glyphs/Y_erudieresis-cy.glif                   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_usbig-cy.glif   |  68 ++++++------
 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                   |   8 +-
 .../glyphs/Z_hedieresis-cy.glif                    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/be-cy.glif        |  70 ++++++------
 src/Cantarell-Regular.ufo/glyphs/che-cy.glif       |  48 ++++----
 .../glyphs/chedescender-cy.glif                    |   4 +-
 .../glyphs/chedieresis-cy.glif                     |   4 +-
 .../glyphs/chekhakassian-cy.glif                   |   4 +-
 .../glyphs/cheverticalstroke-cy.glif               |   6 +
 src/Cantarell-Regular.ufo/glyphs/de-cy.glif        |  46 ++++----
 src/Cantarell-Regular.ufo/glyphs/dzhe-cy.glif      |   4 +
 src/Cantarell-Regular.ufo/glyphs/e-cy.glif         |  74 +++++++------
 src/Cantarell-Regular.ufo/glyphs/ef-cy.glif        | 116 +++++++++++---------
 src/Cantarell-Regular.ufo/glyphs/el-cy.glif        |  44 ++++----
 src/Cantarell-Regular.ufo/glyphs/em-cy.glif        |   4 +
 src/Cantarell-Regular.ufo/glyphs/en-cy.glif        |   4 +
 .../glyphs/endescender-cy.glif                     |   2 +-
 src/Cantarell-Regular.ufo/glyphs/enghe-cy.glif     |  10 +-
 src/Cantarell-Regular.ufo/glyphs/ereversed-cy.glif |  68 ++++++------
 src/Cantarell-Regular.ufo/glyphs/ge-cy.glif        |   4 +-
 .../glyphs/gedescender-cy.glif                     |   2 +-
 .../glyphs/ghemiddlehook-cy.glif                   |   4 +-
 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/hardsign-cy.glif  |  54 ++++-----
 src/Cantarell-Regular.ufo/glyphs/ia-cy.glif        |  58 +++++-----
 src/Cantarell-Regular.ufo/glyphs/ii-cy.glif        |   4 +
 src/Cantarell-Regular.ufo/glyphs/iu-cy.glif        |   6 +-
 src/Cantarell-Regular.ufo/glyphs/izhitsa-cy.glif   |   2 +-
 src/Cantarell-Regular.ufo/glyphs/ka-cy.glif        |  38 ++++---
 src/Cantarell-Regular.ufo/glyphs/kabashkir-cy.glif |  42 +++----
 .../glyphs/kadescender-cy.glif                     |   4 +-
 .../glyphs/kaverticalstroke-cy.glif                |  40 +++----
 src/Cantarell-Regular.ufo/glyphs/kje-cy.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/lje-cy.glif       |  80 +++++++-------
 src/Cantarell-Regular.ufo/glyphs/nje-cy.glif       |  10 +-
 src/Cantarell-Regular.ufo/glyphs/oslash.glif       |  68 +++++++-----
 src/Cantarell-Regular.ufo/glyphs/oslashacute.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/pe-cy.glif        |   4 +
 src/Cantarell-Regular.ufo/glyphs/sha-cy.glif       |   4 +
 src/Cantarell-Regular.ufo/glyphs/shcha-cy.glif     |   6 +-
 src/Cantarell-Regular.ufo/glyphs/softsign-cy.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/te-cy.glif        |  24 ++--
 src/Cantarell-Regular.ufo/glyphs/tse-cy.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ve-cy.glif        |  24 ++--
 src/Cantarell-Regular.ufo/glyphs/yat-cy.glif       |   8 +-
 src/Cantarell-Regular.ufo/glyphs/yeru-cy.glif      |   4 +
 src/Cantarell-Regular.ufo/glyphs/yusbig-cy.glif    |   2 +
 src/Cantarell-Regular.ufo/glyphs/ze-cy.glif        |  90 +++++++--------
 .../glyphs/zedescender-cy.glif                     |   4 +-
 .../glyphs/zedieresis-cy.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/zhe-cy.glif       |  52 ++++-----
 src/Cantarell-Regular.ufo/glyphs/zhebreve-cy.glif  |   4 +-
 .../glyphs/zhedescender-cy.glif                    |   2 +-
 .../glyphs/zhedieresis-cy.glif                     |   4 +-
 326 files changed, 5267 insertions(+), 4113 deletions(-)
---
diff --git a/proofs/test.html b/proofs/test.html
index ed270baf..db4aae10 100644
--- a/proofs/test.html
+++ b/proofs/test.html
@@ -105,6 +105,50 @@
         HH⟨HHOO⟨OO HH⟩HHOO⟩OO
       </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>
+
       <h2>500 Digits of Pi</h2>
 
       <p class="proof" contenteditable="true">
diff --git a/src/Cantarell-Bold.ufo/glyphs/B_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/B_e-cy.glif
index f4d7a745..b6ee8bd5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/B_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/B_e-cy.glif
@@ -1,31 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Be-cy" format="2">
-  <advance width="637"/>
+  <advance width="645"/>
   <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>
+    </dict>
+  </lib>
 </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..b51b7dff 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="558" 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..3b71883f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_hedescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_hedescender-cy.glif
@@ -1,13 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chedescender-cy" format="2">
-  <advance width="728"/>
+  <advance width="729"/>
   <unicode hex="04B6"/>
   <outline>
     <component base="Che-cy"/>
-    <component base="descender-cy.case" xOffset="458"/>
+    <component base="descender-cy.case" xOffset="462"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Che-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..5f4e832c 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="357"/>
   </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_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/D_e-cy.glif
index c3e6736b..d57ba2a6 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="782"/>
+  <advance width="802"/>
   <unicode hex="0414"/>
   <outline>
     <contour>
-      <point x="72" y="89" type="line"/>
-      <point x="237" y="90"/>
-      <point x="324" y="185"/>
-      <point x="324" y="364" type="curve" smooth="yes"/>
-      <point x="324" y="545" type="line"/>
-      <point x="507" y="545" type="line"/>
-      <point x="507" y="70" type="line"/>
-      <point x="678" y="70" type="line"/>
-      <point x="678" y="694" type="line"/>
-      <point x="158" y="694" type="line"/>
-      <point x="158" y="360" type="line" smooth="yes"/>
-      <point x="158" y="225"/>
-      <point x="119" y="151"/>
-      <point x="46" 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="4" y="-187" type="line"/>
-      <point x="166" y="-187" type="line"/>
-      <point x="166" y="0" type="line"/>
-      <point x="617" y="0" type="line"/>
-      <point x="615" y="-187" type="line"/>
-      <point x="778" y="-187" type="line"/>
-      <point x="778" y="151" type="line"/>
-      <point x="4" 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="627" y="0" type="line"/>
+      <point x="625" y="-187" type="line"/>
+      <point x="788" y="-187" type="line"/>
+      <point x="788" 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_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..08213de0 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="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>
     <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="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>
   </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_f-cy.glif b/src/Cantarell-Bold.ufo/glyphs/E_f-cy.glif
index 8f037547..174857c0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_f-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_f-cy.glif
@@ -1,41 +1,41 @@
 <?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="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="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="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>
     <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="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>
   </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_ndescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_ndescender-cy.glif
index 47b9a487..bc4e5700 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_ndescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_ndescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Endescender-cy" format="2">
-  <advance width="810"/>
+  <advance width="822"/>
   <unicode hex="04A2"/>
   <outline>
     <component base="En-cy"/>
@@ -8,6 +8,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_nghe-cy.glif b/src/Cantarell-Bold.ufo/glyphs/E_nghe-cy.glif
index 57a5ad68..baac6e84 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_nghe-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_nghe-cy.glif
@@ -1,31 +1,39 @@
 <?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="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"/>
+      <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="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="516" 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>
   </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_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/G_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/G_e-cy.glif
index bdd1eb2a..f3883ff6 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="190" 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..134c6858 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="94"/>
   </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..b1e2bf53 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_hestroke-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_hestroke-cy.glif
@@ -1,21 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ghestroke-cy" format="2">
-  <advance width="579"/>
+  <advance width="607"/>
   <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="118" y="0" type="line"/>
+      <point x="294" y="0" type="line"/>
+      <point x="294" y="542" type="line"/>
+      <point x="593" y="542" type="line"/>
+      <point x="593" y="694" type="line"/>
+      <point x="118" 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="15" y="267" type="line"/>
+      <point x="446" y="267" type="line"/>
+      <point x="446" y="387" type="line"/>
+      <point x="15" y="387" 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/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/H_adescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/H_adescender-cy.glif
index fb193094..d2429043 100644
--- a/src/Cantarell-Bold.ufo/glyphs/H_adescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/H_adescender-cy.glif
@@ -1,13 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hadescender-cy" format="2">
-  <advance width="712"/>
+  <advance width="704"/>
   <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="436"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Ha-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/I_a-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_a-cy.glif
index a703a365..9d7162b2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_a-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_a-cy.glif
@@ -1,40 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ia-cy" format="2">
-  <advance width="659"/>
+  <advance width="668"/>
   <unicode hex="042F"/>
-  <anchor x="327" y="694" name="top"/>
+  <anchor x="333" 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="296" y="231" type="curve" smooth="yes"/>
+      <point x="476" y="231" type="line"/>
+      <point x="476" y="368" type="line"/>
+      <point x="320" y="368" type="line" smooth="yes"/>
+      <point x="263" y="368"/>
+      <point x="222" y="408"/>
+      <point x="222" y="466" type="curve" smooth="yes"/>
+      <point x="222" y="514"/>
+      <point x="251" y="543"/>
+      <point x="296" y="543" type="curve" smooth="yes"/>
+      <point x="476" y="543" type="line"/>
+      <point x="476" y="694" type="line"/>
+      <point x="320" y="694" type="line" smooth="yes"/>
+      <point x="154" y="694"/>
+      <point x="42" y="593"/>
+      <point x="42" y="443" type="curve" smooth="yes"/>
+      <point x="42" y="307"/>
+      <point x="133" y="231"/>
     </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"/>
+      <point x="14" y="0" type="line"/>
+      <point x="222" y="0" type="line"/>
+      <point x="396" y="277" type="line"/>
+      <point x="213" 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="424" y="0" type="line"/>
+      <point x="597" y="0" type="line"/>
+      <point x="597" y="694" type="line"/>
+      <point x="424" 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/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_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_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_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/K_a-cy.glif b/src/Cantarell-Bold.ufo/glyphs/K_a-cy.glif
index a6aab2a1..5902d263 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="558" 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..197cf564 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_abashkir-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_abashkir-cy.glif
@@ -1,38 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kabashkir-cy" format="2">
-  <advance width="774"/>
+  <advance width="864"/>
   <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="71" y="542" type="line"/>
+      <point x="409" y="542" type="line"/>
+      <point x="409" y="694" type="line"/>
+      <point x="71" y="694" 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="661" y="0" type="line"/>
+      <point x="858" y="0" type="line"/>
+      <point x="633" y="393" type="line"/>
+      <point x="636" y="360" type="line"/>
+      <point x="850" y="694" type="line"/>
+      <point x="660" y="694" type="line"/>
+      <point x="455" y="363" 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"/>
+      <point x="234" y="0" type="line"/>
+      <point x="409" y="0" type="line"/>
+      <point x="409" y="694" type="line"/>
+      <point x="234" 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="307" y="285" type="line"/>
+      <point x="511" y="285" type="line"/>
+      <point x="511" y="437" type="line"/>
+      <point x="307" 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_adescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/K_adescender-cy.glif
index d091308c..c2f7f879 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_adescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_adescender-cy.glif
@@ -1,13 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kadescender-cy" format="2">
-  <advance width="730"/>
+  <advance width="732"/>
   <unicode hex="049A"/>
   <outline>
     <component base="Ka-cy"/>
-    <component base="descender-cy.case" xOffset="458"/>
+    <component base="descender-cy.case" xOffset="462"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</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..e554ac6c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_averticalstroke-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_averticalstroke-cy.glif
@@ -1,34 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kaverticalstroke-cy" format="2">
-  <advance width="719"/>
+  <advance width="732"/>
   <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>
+    </dict>
+  </lib>
 </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_je-cy.glif b/src/Cantarell-Bold.ufo/glyphs/L_je-cy.glif
index 5c549035..97536dcb 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="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>
     <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.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/N_je-cy.glif b/src/Cantarell-Bold.ufo/glyphs/N_je-cy.glif
index c3f65b9e..32ebd62e 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="951" y="0"/>
+      <point x="1071" y="98"/>
+      <point x="1071" y="237" type="curve" smooth="yes"/>
+      <point x="1071" y="364"/>
+      <point x="978" y="444"/>
+      <point x="831" y="444" type="curve" smooth="yes"/>
+      <point x="629" y="444" type="line"/>
+      <point x="629" y="312" type="line"/>
+      <point x="793" y="312" type="line" smooth="yes"/>
+      <point x="851" y="312"/>
+      <point x="891" y="274"/>
+      <point x="891" y="220" type="curve" smooth="yes"/>
+      <point x="891" y="168"/>
+      <point x="858" y="136"/>
+      <point x="803" y="136" type="curve" smooth="yes"/>
+      <point x="651" y="136" 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/P_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/P_e-cy.glif
index 5265ab31..179438af 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="543" type="line"/>
+      <point x="502" y="543" 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/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..482c2426 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="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"/>
+      <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"/>
     </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_ha-cy.glif b/src/Cantarell-Bold.ufo/glyphs/S_ha-cy.glif
index d8fd96e4..501ef127 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_ha-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_ha-cy.glif
@@ -1,23 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sha-cy" format="2">
-  <advance width="1065"/>
+  <advance width="1073"/>
   <unicode hex="0428"/>
   <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..b7b0448a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_hcha-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_hcha-cy.glif
@@ -1,29 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Shcha-cy" format="2">
-  <advance width="1141"/>
+  <advance width="1142"/>
   <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"/>
+      <point x="973" y="-187" type="line"/>
+      <point x="1135" y="-187" type="line"/>
+      <point x="1135" 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="973" 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"/>
+      <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="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"/>
+      <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/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_se-cy.glif b/src/Cantarell-Bold.ufo/glyphs/T_se-cy.glif
index 82be5a5f..25f6f8c3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_se-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_se-cy.glif
@@ -1,23 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tse-cy" format="2">
-  <advance width="799"/>
+  <advance width="800"/>
   <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="631" y="-187" type="line"/>
+      <point x="793" y="-187" type="line"/>
+      <point x="793" 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="631" 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>
+    </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..281e2914 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="807"/>
   <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="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>
     <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"/>
+      <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"/>
     </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="14" 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"/>
     </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/U_-cy.glif b/src/Cantarell-Bold.ufo/glyphs/U_-cy.glif
index e635efab..f54497e4 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="315" y="0" type="line"/>
+      <point x="662" 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_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_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_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_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/Y_at-cy.glif b/src/Cantarell-Bold.ufo/glyphs/Y_at-cy.glif
index 3ab4c46d..f69be460 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_at-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_at-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yat-cy" format="2">
-  <advance width="700"/>
+  <advance width="705"/>
   <unicode hex="0462"/>
   <outline>
     <contour>
@@ -32,4 +32,10 @@
       <point x="12" y="621" 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/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_usbig-cy.glif b/src/Cantarell-Bold.ufo/glyphs/Y_usbig-cy.glif
index 3a1fa3fa..6663f1e4 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="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>
     <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="485" y="304" type="line"/>
+      <point x="318" y="304" type="line"/>
+      <point x="318" y="0" type="line"/>
+      <point x="485" y="0" 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="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"/>
+      <point x="19" y="0" type="curve"/>
     </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_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..b35d4316 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="907" 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="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>
     <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="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>
   </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..632b5b52 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_hedescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_hedescender-cy.glif
@@ -1,13 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhedescender-cy" format="2">
-  <advance width="1086"/>
+  <advance width="1082"/>
   <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="811"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</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/be-cy.glif b/src/Cantarell-Bold.ufo/glyphs/be-cy.glif
index ef70055b..3b93beb3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/be-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/be-cy.glif
@@ -1,43 +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="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="506"/>
-      <point x="227" y="550"/>
-      <point x="369" y="575" type="curve" smooth="yes"/>
-      <point x="471" y="593" type="line"/>
-      <point x="447" y="743" type="line"/>
-      <point x="334" y="726" type="line" smooth="yes"/>
-      <point x="117" y="693"/>
-      <point x="30" y="587"/>
-      <point x="30" y="354" type="curve" smooth="yes"/>
-      <point x="30" y="112"/>
-      <point x="120" y="-10"/>
+      <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="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="506"/>
+      <point x="234" y="550"/>
+      <point x="376" y="575" type="curve" smooth="yes"/>
+      <point x="478" y="593" 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/che-cy.glif b/src/Cantarell-Bold.ufo/glyphs/che-cy.glif
index 86deba07..42d2beb7 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="574"/>
   <unicode hex="0447"/>
-  <anchor x="435" y="0" name="bottomright"/>
-  <anchor x="280" y="490" name="top"/>
+  <anchor x="443" y="0" name="bottomright"/>
+  <anchor x="288" 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="209" y="162" type="curve" smooth="yes"/>
+      <point x="277" y="162"/>
+      <point x="341" y="184"/>
+      <point x="385" y="229" type="curve"/>
+      <point x="363" y="331" type="line"/>
+      <point x="339" y="318"/>
+      <point x="300" y="310"/>
+      <point x="271" y="310" type="curve" smooth="yes"/>
+      <point x="228" y="310"/>
+      <point x="192" y="329"/>
+      <point x="192" y="354" type="curve" smooth="yes"/>
+      <point x="192" y="490" type="line"/>
+      <point x="27" y="490" type="line"/>
+      <point x="27" y="315" type="line" smooth="yes"/>
+      <point x="27" y="220"/>
+      <point x="99" 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="344" y="0" type="line"/>
+      <point x="512" y="0" type="line"/>
+      <point x="512" y="490" type="line"/>
+      <point x="344" 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..0a1686f8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/chedescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/chedescender-cy.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="chedescender-cy" format="2">
-  <advance width="599"/>
+  <advance width="604"/>
   <unicode hex="04B7"/>
   <outline>
     <component base="che-cy"/>
-    <component base="descender-cy" xOffset="339"/>
+    <component base="descender-cy" xOffset="347"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/chedieresis-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/chedieresis-cy.glif
index ec3b4e46..1e76297e 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="574"/>
   <unicode hex="04F5"/>
   <outline>
     <component base="che-cy"/>
-    <component base="dieresiscomb" xOffset="11"/>
+    <component base="dieresiscomb" xOffset="19"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/chekhakassian-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/chekhakassian-cy.glif
index bbf84a74..edb23802 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="574"/>
   <unicode hex="04CC"/>
   <outline>
     <component base="che-cy"/>
-    <component base="_descenderreversed-cy" xOffset="192"/>
+    <component base="_descenderreversed-cy" xOffset="200"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/cheverticalstroke-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/cheverticalstroke-cy.glif
index b60abfe6..9652f818 100644
--- a/src/Cantarell-Bold.ufo/glyphs/cheverticalstroke-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/cheverticalstroke-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cheverticalstroke-cy" format="2">
-  <advance width="557"/>
+  <advance width="565"/>
   <unicode hex="04B9"/>
   <outline>
     <contour>
@@ -34,4 +34,10 @@
       <point x="218" y="418" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>en-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/de-cy.glif b/src/Cantarell-Bold.ufo/glyphs/de-cy.glif
index 7582cf71..5885d7e5 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="603"/>
+  <advance width="621"/>
   <unicode hex="0434"/>
   <outline>
     <contour>
-      <point x="64" y="81" type="line"/>
-      <point x="187" y="81"/>
-      <point x="251" y="152"/>
-      <point x="251" y="289" type="curve" smooth="yes"/>
-      <point x="251" y="355" type="line"/>
-      <point x="366" y="355" type="line"/>
-      <point x="366" y="70" type="line"/>
-      <point x="526" y="70" type="line"/>
-      <point x="526" y="490" type="line"/>
-      <point x="106" y="490" type="line"/>
-      <point x="106" y="285" type="line" smooth="yes"/>
-      <point x="106" y="186"/>
-      <point x="80" y="130"/>
-      <point x="30" 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="2" y="-135" type="line"/>
-      <point x="153" y="-135" type="line"/>
-      <point x="153" y="0" type="line"/>
-      <point x="449" y="0" type="line"/>
-      <point x="449" y="-135" type="line"/>
-      <point x="600" y="-135" type="line"/>
-      <point x="600" y="131" type="line"/>
-      <point x="2" 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="457" y="0" type="line"/>
+      <point x="457" y="-135" type="line"/>
+      <point x="608" y="-135" type="line"/>
+      <point x="608" y="131" type="line"/>
+      <point x="10" y="131" type="line"/>
     </contour>
   </outline>
   <lib>
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/ef-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ef-cy.glif
index bf29f814..7237cc2f 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="332" y="-217" type="line"/>
+      <point x="488" y="-217" type="line"/>
+      <point x="488" y="739" type="line"/>
+      <point x="332" y="739" type="line"/>
     </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="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>
   </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/el-cy.glif b/src/Cantarell-Bold.ufo/glyphs/el-cy.glif
index e1741f0d..825a4365 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="612"/>
   <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="98" y="-17" type="curve" smooth="yes"/>
+      <point x="209" y="-17"/>
+      <point x="275" y="90"/>
+      <point x="275" y="200" type="curve" smooth="yes"/>
+      <point x="275" y="351" type="line"/>
+      <point x="384" y="351" type="line"/>
+      <point x="384" y="0" type="line"/>
+      <point x="550" y="0" type="line"/>
+      <point x="550" y="491" type="line"/>
+      <point x="122" y="491" type="line"/>
+      <point x="122" y="194" type="line" smooth="yes"/>
+      <point x="122" y="176"/>
+      <point x="110" y="115"/>
+      <point x="68" y="115" type="curve" smooth="yes"/>
+      <point x="60" y="115"/>
+      <point x="39" y="122"/>
+      <point x="25" y="131" type="curve"/>
+      <point x="-2" y="15" type="line"/>
+      <point x="23" y="-5"/>
+      <point x="59" y="-17"/>
     </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/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/en-cy.glif b/src/Cantarell-Bold.ufo/glyphs/en-cy.glif
index 82133814..d41458d5 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="481" 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/endescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/endescender-cy.glif
index 5e8c6693..4e2cb155 100644
--- a/src/Cantarell-Bold.ufo/glyphs/endescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/endescender-cy.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="endescender-cy" format="2">
-  <advance width="630"/>
+  <advance width="642"/>
   <unicode hex="04A3"/>
   <outline>
     <component base="en-cy"/>
-    <component base="descender-cy" xOffset="377"/>
+    <component base="descender-cy" xOffset="385"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/enghe-cy.glif b/src/Cantarell-Bold.ufo/glyphs/enghe-cy.glif
index bf570738..1d786f32 100644
--- a/src/Cantarell-Bold.ufo/glyphs/enghe-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/enghe-cy.glif
@@ -1,31 +1,39 @@
 <?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="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"/>
+      <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="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="512" y="357" type="line"/>
+      <point x="724" y="357" type="line"/>
+      <point x="724" y="490" type="line"/>
+      <point x="512" 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/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/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/ghemiddlehook-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/ghemiddlehook-cy.glif
index 6fe6619f..ad49fd2d 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="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>
     <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="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"/>
+      <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"/>
     </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/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/ia-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ia-cy.glif
index a7f6590c..e369a870 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ia-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ia-cy.glif
@@ -1,40 +1,40 @@
 <?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="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="378" y="355" type="line"/>
+      <point x="378" 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"/>
     </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"/>
+      <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>
     <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="331" y="0" type="line"/>
+      <point x="489" y="0" type="line"/>
+      <point x="489" y="490" type="line"/>
+      <point x="331" y="490" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -48,6 +48,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/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/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/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/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 42a0061a..3be32549 100644
--- a/src/Cantarell-Bold.ufo/glyphs/izhitsa-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/izhitsa-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="izhitsa-cy" format="2">
-  <advance width="527"/>
+  <advance width="530"/>
   <unicode hex="0475"/>
   <outline>
     <contour>
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..f2f16eeb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/kabashkir-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/kabashkir-cy.glif
@@ -1,38 +1,40 @@
 <?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="10" y="357" type="line"/>
+      <point x="332" y="357" type="line"/>
+      <point x="332" y="490" type="line"/>
+      <point x="10" y="490" 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"/>
+      <point x="167" y="0" type="line"/>
+      <point x="332" y="0" type="line"/>
+      <point x="332" y="490" type="line"/>
+      <point x="167" 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/kadescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/kadescender-cy.glif
index 12c6593f..6be8811a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/kadescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/kadescender-cy.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kadescender-cy" format="2">
-  <advance width="595"/>
+  <advance width="607"/>
   <unicode hex="049B"/>
   <outline>
     <component base="ka-cy"/>
-    <component base="descender-cy" xOffset="336"/>
+    <component base="descender-cy" xOffset="343"/>
   </outline>
   <lib>
     <dict>
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/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/lje-cy.glif b/src/Cantarell-Bold.ufo/glyphs/lje-cy.glif
index bafea7b3..ffaae287 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="871"/>
   <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="447" y="0" type="line"/>
+      <point x="617" y="0" type="line" smooth="yes"/>
+      <point x="767" y="0"/>
+      <point x="855" y="70"/>
+      <point x="855" y="187" type="curve" smooth="yes"/>
+      <point x="855" y="281"/>
+      <point x="777" y="344"/>
+      <point x="662" y="344" type="curve" smooth="yes"/>
+      <point x="447" y="344" type="line"/>
+      <point x="447" y="220" type="line"/>
+      <point x="626" y="220" type="line" smooth="yes"/>
+      <point x="660" y="220"/>
+      <point x="686" y="202"/>
+      <point x="686" y="173" type="curve" smooth="yes"/>
+      <point x="686" y="144"/>
+      <point x="667" y="126"/>
+      <point x="638" y="126" type="curve" smooth="yes"/>
+      <point x="447" y="126" type="line"/>
     </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="98" y="-17" type="curve" smooth="yes"/>
+      <point x="209" y="-17"/>
+      <point x="275" y="90"/>
+      <point x="275" y="200" type="curve" smooth="yes"/>
+      <point x="275" y="351" type="line"/>
+      <point x="384" y="351" type="line"/>
+      <point x="384" y="0" type="line"/>
+      <point x="550" y="0" type="line"/>
+      <point x="550" y="491" type="line"/>
+      <point x="122" y="491" type="line"/>
+      <point x="122" y="194" type="line" smooth="yes"/>
+      <point x="122" y="176"/>
+      <point x="110" y="115"/>
+      <point x="68" y="115" type="curve" smooth="yes"/>
+      <point x="60" y="115"/>
+      <point x="39" y="122"/>
+      <point x="25" y="131" type="curve"/>
+      <point x="-2" y="15" type="line"/>
+      <point x="23" y="-5"/>
+      <point x="59" y="-17"/>
     </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/nje-cy.glif b/src/Cantarell-Bold.ufo/glyphs/nje-cy.glif
index 865a9dc6..93cca4ae 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="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>
     <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="449" y="0" type="line"/>
+      <point x="619" y="0" type="line" smooth="yes"/>
+      <point x="769" y="0"/>
+      <point x="857" y="70"/>
+      <point x="857" y="187" type="curve" smooth="yes"/>
+      <point x="857" y="281"/>
+      <point x="779" y="344"/>
+      <point x="664" y="344" type="curve" smooth="yes"/>
+      <point x="449" y="344" type="line"/>
+      <point x="449" y="220" type="line"/>
+      <point x="628" y="220" type="line" smooth="yes"/>
+      <point x="662" y="220"/>
+      <point x="688" y="202"/>
+      <point x="688" y="173" type="curve" smooth="yes"/>
+      <point x="688" y="144"/>
+      <point x="669" y="126"/>
+      <point x="640" y="126" type="curve" smooth="yes"/>
+      <point x="449" y="126" 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/oslash.glif b/src/Cantarell-Bold.ufo/glyphs/oslash.glif
index 2f094df7..39c88080 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="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="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="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>
     <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="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>
   </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/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/sha-cy.glif b/src/Cantarell-Bold.ufo/glyphs/sha-cy.glif
index 2833d76e..8b681572 100644
--- a/src/Cantarell-Bold.ufo/glyphs/sha-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/sha-cy.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sha-cy" format="2">
-  <advance width="854"/>
+  <advance width="870"/>
   <unicode hex="0448"/>
   <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 +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/shcha-cy.glif b/src/Cantarell-Bold.ufo/glyphs/shcha-cy.glif
index 79fa8176..424658fc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/shcha-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/shcha-cy.glif
@@ -1,29 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="shcha-cy" format="2">
-  <advance width="898"/>
+  <advance width="914"/>
   <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"/>
+      <point x="748" y="-135" type="line"/>
+      <point x="904" y="-135" type="line"/>
+      <point x="904" 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="748" 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"/>
+      <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="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"/>
+      <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>
@@ -37,6 +37,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>tse-cy</string>
     </dict>
   </lib>
 </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/te-cy.glif b/src/Cantarell-Bold.ufo/glyphs/te-cy.glif
index 98a03c81..db3c8bc5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/te-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/te-cy.glif
@@ -1,20 +1,20 @@
 <?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"/>
+  <anchor x="487" 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"/>
+      <point x="176" y="0" type="line"/>
+      <point x="336" y="0" type="line"/>
+      <point x="336" y="460" type="line"/>
+      <point x="176" 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="10" 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"/>
     </contour>
   </outline>
   <lib>
@@ -28,6 +28,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/tse-cy.glif b/src/Cantarell-Bold.ufo/glyphs/tse-cy.glif
index 193f8939..1f2fe6fa 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="657"/>
   <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="491" y="-136" type="line"/>
+      <point x="647" y="-136" type="line"/>
+      <point x="647" 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="491" 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,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/ve-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ve-cy.glif
index 9ba57ce8..760bf970 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="378" type="line"/>
+      <point x="283" y="378" type="line" smooth="yes"/>
+      <point x="311" y="378"/>
+      <point x="330" y="367"/>
+      <point x="330" y="337" type="curve" smooth="yes"/>
+      <point x="330" y="311"/>
+      <point x="314" y="295"/>
+      <point x="279" y="286" type="curve"/>
+      <point x="412" y="265" type="line"/>
+      <point x="465" y="281"/>
+      <point x="493" y="319"/>
+      <point x="493" y="373" type="curve" smooth="yes"/>
+      <point x="493" y="451"/>
+      <point x="433" y="490"/>
+      <point x="314" y="490" type="curve" smooth="yes"/>
+      <point x="62" y="490" 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/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/yeru-cy.glif b/src/Cantarell-Bold.ufo/glyphs/yeru-cy.glif
index 658dc1b4..bfe17ba1 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="783"/>
   <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="555" y="-3" type="line"/>
+      <point x="721" y="-3" type="line"/>
+      <point x="721" y="490" type="line"/>
+      <point x="555" 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="62" y="0" type="line"/>
+      <point x="263" y="0" type="line" smooth="yes"/>
+      <point x="413" y="0"/>
+      <point x="502" y="70"/>
+      <point x="502" y="187" type="curve" smooth="yes"/>
+      <point x="502" y="281"/>
+      <point x="423" y="344"/>
+      <point x="307" y="344" type="curve" smooth="yes"/>
+      <point x="169" y="344" type="line"/>
+      <point x="169" y="220" type="line"/>
+      <point x="271" y="220" type="line" smooth="yes"/>
+      <point x="306" y="220"/>
+      <point x="333" y="202"/>
+      <point x="333" y="173" type="curve" smooth="yes"/>
+      <point x="333" y="144"/>
+      <point x="314" y="126"/>
+      <point x="283" 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>
@@ -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..b0ef3421 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="783"/>
   <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/yusbig-cy.glif b/src/Cantarell-Bold.ufo/glyphs/yusbig-cy.glif
index d0ce569c..bcc10c9d 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="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>
     <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="396" y="192" type="line"/>
+      <point x="256" y="192" type="line"/>
+      <point x="256" y="0" type="line"/>
+      <point x="396" y="0" 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="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"/>
+      <point x="16" y="0" type="curve"/>
     </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/ze-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ze-cy.glif
index de65131b..b85d0022 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="486"/>
   <unicode hex="0437"/>
-  <anchor x="235" y="0" name="bottom"/>
-  <anchor x="235" y="490" name="top"/>
+  <anchor x="243" y="0" name="bottom"/>
+  <anchor x="243" 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="196" y="-7" type="curve" smooth="yes"/>
+      <point x="353" y="-7"/>
+      <point x="457" y="57"/>
+      <point x="457" y="154" type="curve" smooth="yes"/>
+      <point x="457" y="221"/>
+      <point x="405" y="264"/>
+      <point x="316" y="267" type="curve"/>
+      <point x="314" y="260" type="line"/>
+      <point x="390" y="260"/>
+      <point x="441" y="302"/>
+      <point x="441" y="366" type="curve" smooth="yes"/>
+      <point x="441" y="448"/>
+      <point x="356" y="500"/>
+      <point x="224" y="500" type="curve" smooth="yes"/>
+      <point x="158" y="500"/>
+      <point x="87" y="484"/>
+      <point x="25" y="456" type="curve"/>
+      <point x="60" y="343" type="line"/>
+      <point x="109" y="361"/>
+      <point x="155" y="370"/>
+      <point x="201" y="370" type="curve" smooth="yes"/>
+      <point x="251" y="370"/>
+      <point x="276" y="359"/>
+      <point x="276" y="338" type="curve" smooth="yes"/>
+      <point x="276" y="314"/>
+      <point x="244" y="300"/>
+      <point x="187" y="300" type="curve" smooth="yes"/>
+      <point x="117" y="300" type="line"/>
+      <point x="117" y="191" type="line"/>
+      <point x="189" y="191" type="line" smooth="yes"/>
+      <point x="253" y="191"/>
+      <point x="291" y="178"/>
+      <point x="291" y="156" type="curve" smooth="yes"/>
+      <point x="291" y="134"/>
+      <point x="262" y="123"/>
+      <point x="206" y="123" type="curve" smooth="yes"/>
+      <point x="157" y="123"/>
+      <point x="101" y="132"/>
+      <point x="58" y="146" type="curve"/>
+      <point x="22" y="27" type="line"/>
+      <point x="74" y="5"/>
+      <point x="129" 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..a2851bda 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="486"/>
   <unicode hex="0499"/>
   <outline>
     <component base="ze-cy"/>
-    <component base="cedillacomb" xOffset="77"/>
+    <component base="cedillacomb" xOffset="85"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zedieresis-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/zedieresis-cy.glif
index d6d74e7c..7acf0db2 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="486"/>
   <unicode hex="04DF"/>
   <outline>
     <component base="ze-cy"/>
-    <component base="dieresiscomb" xOffset="-34"/>
+    <component base="dieresiscomb" xOffset="-26"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zhe-cy.glif b/src/Cantarell-Bold.ufo/glyphs/zhe-cy.glif
index 287205a7..d6622dea 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="704" 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="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>
     <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="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="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="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>
   </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..3e821a41 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zhedescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zhedescender-cy.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zhedescender-cy" format="2">
-  <advance width="855"/>
+  <advance width="871"/>
   <unicode hex="0497"/>
   <outline>
     <component base="zhe-cy"/>
-    <component base="descender-cy" xOffset="597"/>
+    <component base="descender-cy" xOffset="608"/>
   </outline>
   <lib>
     <dict>
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-Light.ufo/glyphs/B_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/B_e-cy.glif
index d9a72447..d094d16e 100644
--- a/src/Cantarell-Light.ufo/glyphs/B_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/B_e-cy.glif
@@ -1,31 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Be-cy" format="2">
-  <advance width="605"/>
+  <advance width="599"/>
   <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="104" y="0" type="line"/>
+      <point x="312" y="0" type="line" smooth="yes"/>
+      <point x="457" y="0"/>
+      <point x="540" y="71"/>
+      <point x="540" y="195" type="curve" smooth="yes"/>
+      <point x="540" y="317"/>
+      <point x="465" y="393"/>
+      <point x="346" y="393" type="curve" smooth="yes"/>
+      <point x="118" y="393" type="line"/>
+      <point x="118" y="376" type="line"/>
+      <point x="336" y="376" type="line" smooth="yes"/>
+      <point x="448" y="376"/>
+      <point x="518" y="305"/>
+      <point x="518" y="191" type="curve" smooth="yes"/>
+      <point x="518" y="78"/>
+      <point x="450" y="18"/>
+      <point x="323" y="18" type="curve" smooth="yes"/>
+      <point x="126" y="18" type="line"/>
+      <point x="126" y="676" type="line"/>
+      <point x="470" y="676" type="line"/>
+      <point x="470" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </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/C_he-cy.glif b/src/Cantarell-Light.ufo/glyphs/C_he-cy.glif
index 46e52ac4..45a2ae9a 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_he-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_he-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Che-cy" format="2">
-  <advance width="616"/>
+  <advance width="610"/>
   <unicode hex="0427"/>
   <anchor x="532" y="0" name="bottomright"/>
   <anchor x="309" y="694" name="top"/>
@@ -30,4 +30,10 @@
       <point x="485" 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..7d2bf832 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_hedescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_hedescender-cy.glif
@@ -8,6 +8,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Che-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_hedieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/C_hedieresis-cy.glif
index 101258ef..54727dac 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_hedieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_hedieresis-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chedieresis-cy" format="2">
-  <advance width="616"/>
+  <advance width="610"/>
   <unicode hex="04F4"/>
   <outline>
     <component base="Che-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_hekhakassian-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/C_hekhakassian-cy.glif
index fddb81a2..b464715f 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_hekhakassian-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_hekhakassian-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chekhakassian-cy" format="2">
-  <advance width="616"/>
+  <advance width="610"/>
   <unicode hex="04CB"/>
   <outline>
     <component base="Che-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_heverticalstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/C_heverticalstroke-cy.glif
index 8ebc2c27..80ac6262 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_heverticalstroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_heverticalstroke-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cheverticalstroke-cy" format="2">
-  <advance width="636"/>
+  <advance width="630"/>
   <unicode hex="04B8"/>
   <outline>
     <contour>
@@ -34,4 +34,12 @@
       <point x="505" 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_je-cy.glif b/src/Cantarell-Light.ufo/glyphs/D_je-cy.glif
index 8854419f..f6e1fa03 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="749"/>
   <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="444" y="0" type="line"/>
+      <point x="597" y="7"/>
+      <point x="689" y="91"/>
+      <point x="689" y="223" type="curve" smooth="yes"/>
+      <point x="689" y="349"/>
+      <point x="606" y="431"/>
+      <point x="478" y="431" type="curve" smooth="yes"/>
+      <point x="392" y="431"/>
+      <point x="298" y="395"/>
+      <point x="255" y="345" type="curve"/>
+      <point x="265" y="334" type="line"/>
+      <point x="305" y="379"/>
+      <point x="396" y="413"/>
+      <point x="475" y="413" type="curve" smooth="yes"/>
+      <point x="592" y="413"/>
+      <point x="668" y="338"/>
+      <point x="668" y="223" type="curve" smooth="yes"/>
+      <point x="668" y="102"/>
+      <point x="583" y="25"/>
+      <point x="442" 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="253" y="0" type="line"/>
+      <point x="274" y="0" type="line"/>
+      <point x="274" y="694" type="line"/>
+      <point x="253" 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="22" y="676" type="line"/>
+      <point x="526" y="676" type="line"/>
+      <point x="526" y="694" type="line"/>
+      <point x="22" 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_zhe-cy.glif b/src/Cantarell-Light.ufo/glyphs/D_zhe-cy.glif
index 06ad4841..1939ef88 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="688"/>
   <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="339" y="-175" type="line"/>
+      <point x="360" y="-175" type="line"/>
+      <point x="360" y="0" type="line"/>
+      <point x="584" y="0" type="line"/>
+      <point x="584" y="694" type="line"/>
+      <point x="563" y="694" type="line"/>
+      <point x="563" y="19" type="line"/>
+      <point x="126" y="19" type="line"/>
+      <point x="126" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
+      <point x="104" y="0" type="line"/>
+      <point x="339" y="0" type="line"/>
     </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..c8d4ec2c 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="661"/>
   <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="69" y="349" type="line"/>
+      <point x="540" y="349" type="line"/>
+      <point x="540" y="367" type="line"/>
+      <point x="69" y="367" type="line"/>
     </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="400" y="-10" type="curve" smooth="yes"/>
+      <point x="468" y="-10"/>
+      <point x="545" y="6"/>
+      <point x="608" y="33" type="curve"/>
+      <point x="603" y="49" type="line"/>
+      <point x="541" y="24"/>
+      <point x="466" y="9"/>
+      <point x="404" y="9" type="curve" smooth="yes"/>
+      <point x="215" y="9"/>
+      <point x="86" y="146"/>
+      <point x="86" y="348" type="curve" smooth="yes"/>
+      <point x="86" y="549"/>
+      <point x="219" y="683"/>
+      <point x="414" y="683" type="curve" smooth="yes"/>
+      <point x="477" y="683"/>
+      <point x="542" y="670"/>
+      <point x="602" y="645" type="curve"/>
+      <point x="609" y="662" type="line"/>
+      <point x="549" y="689"/>
+      <point x="483" y="702"/>
+      <point x="417" y="702" type="curve" smooth="yes"/>
+      <point x="207" y="702"/>
+      <point x="64" y="556"/>
+      <point x="64" y="338" type="curve" smooth="yes"/>
+      <point x="64" y="129"/>
+      <point x="200" y="-10"/>
     </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_l-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_l-cy.glif
index 4d437337..056c11b6 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_l-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_l-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="El-cy" format="2">
-  <advance width="685"/>
+  <advance width="679"/>
   <unicode hex="041B"/>
   <outline>
     <contour>
@@ -26,4 +26,10 @@
       <point x="85" 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_ndescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/E_ndescender-cy.glif
index 47107132..ab29e090 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_ndescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_ndescender-cy.glif
@@ -8,6 +8,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_nghe-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_nghe-cy.glif
index d89c7929..00bd4fb7 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_nghe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_nghe-cy.glif
@@ -1,31 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Enghe-cy" format="2">
-  <advance width="885"/>
+  <advance width="870"/>
   <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="564" y="0" type="line"/>
+      <point x="586" y="0" type="line"/>
+      <point x="586" y="694" type="line"/>
+      <point x="564" y="694" type="line"/>
     </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="104" y="0" type="line"/>
+      <point x="126" y="0" type="line"/>
+      <point x="126" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </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="119" y="352" type="line"/>
+      <point x="570" y="352" type="line"/>
+      <point x="570" y="371" type="line"/>
+      <point x="119" y="371" type="line"/>
     </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="564" y="676" type="line"/>
+      <point x="848" y="676" type="line"/>
+      <point x="848" y="694" type="line"/>
+      <point x="564" y="694" type="line"/>
     </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_reversed-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/E_reversed-cy.glif
index 70cec149..8efad513 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="658"/>
   <unicode hex="042D"/>
-  <anchor x="332" y="694" name="top"/>
+  <anchor x="333" 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="249" y="-10" type="curve" smooth="yes"/>
+      <point x="460" y="-10"/>
+      <point x="594" y="133"/>
+      <point x="594" y="352" type="curve" smooth="yes"/>
+      <point x="594" y="566"/>
+      <point x="467" y="702"/>
+      <point x="270" y="702" type="curve" smooth="yes"/>
+      <point x="200" y="702"/>
+      <point x="114" y="685"/>
+      <point x="53" y="659" type="curve"/>
+      <point x="58" y="643" type="line"/>
+      <point x="117" y="667"/>
+      <point x="200" y="683"/>
+      <point x="266" y="683" type="curve" smooth="yes"/>
+      <point x="456" y="683"/>
+      <point x="572" y="545"/>
+      <point x="572" y="346" type="curve" smooth="yes"/>
+      <point x="572" y="140"/>
+      <point x="448" y="9"/>
+      <point x="255" y="9" type="curve" smooth="yes"/>
+      <point x="188" y="9"/>
+      <point x="115" y="23"/>
+      <point x="59" y="47" type="curve"/>
+      <point x="52" y="30" type="line"/>
+      <point x="108" y="5"/>
+      <point x="181" y="-10"/>
     </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="103" y="352" type="line"/>
+      <point x="578" y="352" type="line"/>
+      <point x="578" y="370" type="line"/>
+      <point x="103" y="370" type="line"/>
     </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/G_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/G_e-cy.glif
index 46e4f514..6efd743a 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="503"/>
   <unicode hex="0413"/>
-  <anchor x="169" y="0" name="bottomright"/>
-  <anchor x="265" y="694" name="top"/>
+  <anchor x="163" y="0" name="bottomright"/>
+  <anchor x="259" 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="104" y="0" type="line"/>
+      <point x="126" y="0" type="line"/>
+      <point x="126" y="676" type="line"/>
+      <point x="481" y="676" type="line"/>
+      <point x="481" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </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..7a2557fe 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="503"/>
   <unicode hex="04F6"/>
   <outline>
     <component base="Ge-cy"/>
-    <component base="descender-cy.case" xOffset="73"/>
+    <component base="descender-cy.case" xOffset="67"/>
   </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..89086da7 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="627"/>
   <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="247" y="-231" type="line"/>
+      <point x="438" y="-214"/>
+      <point x="565" y="-77"/>
+      <point x="565" y="111" type="curve" smooth="yes"/>
+      <point x="565" y="286"/>
+      <point x="475" y="391"/>
+      <point x="326" y="391" type="curve" smooth="yes"/>
+      <point x="243" y="391"/>
+      <point x="157" y="357"/>
+      <point x="111" y="305" type="curve"/>
+      <point x="121" y="294" type="line"/>
+      <point x="164" y="341"/>
+      <point x="245" y="373"/>
+      <point x="322" y="373" type="curve" smooth="yes"/>
+      <point x="461" y="373"/>
+      <point x="544" y="274"/>
+      <point x="544" y="110" type="curve" smooth="yes"/>
+      <point x="544" y="-68"/>
+      <point x="425" y="-200"/>
+      <point x="246" y="-219" type="curve"/>
     </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="104" y="0" type="line"/>
+      <point x="125" y="0" type="line"/>
+      <point x="125" y="676" type="line"/>
+      <point x="470" y="676" type="line"/>
+      <point x="470" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </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..4dd4dbdc 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_hestroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_hestroke-cy.glif
@@ -18,4 +18,10 @@
       <point x="40" y="335" 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/G_heupturn-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/G_heupturn-cy.glif
index c8422e92..9fb40a67 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="498"/>
   <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="104" y="0" type="line"/>
+      <point x="126" y="0" type="line"/>
+      <point x="126" y="676" type="line"/>
+      <point x="476" y="676" type="line"/>
+      <point x="476" y="850" type="line"/>
+      <point x="457" y="850" type="line"/>
+      <point x="457" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </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..fbb3552b 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="503"/>
   <unicode hex="0403"/>
   <outline>
     <component base="Ge-cy"/>
-    <component base="acutecomb.case" xOffset="207"/>
+    <component base="acutecomb.case" xOffset="201"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_adescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/H_adescender-cy.glif
index 6ab06bd4..e48c59f9 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_adescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_adescender-cy.glif
@@ -1,13 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hadescender-cy" format="2">
-  <advance width="662"/>
+  <advance width="655"/>
   <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="464"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Ha-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_ardsign-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/H_ardsign-cy.glif
index a6a52cf5..3303d08f 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="692"/>
   <unicode hex="042A"/>
-  <anchor x="355" y="694" name="top"/>
+  <anchor x="338" 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="214" y="0" type="line"/>
+      <point x="411" y="0" type="line" smooth="yes"/>
+      <point x="550" y="0"/>
+      <point x="632" y="74"/>
+      <point x="632" y="200" type="curve" smooth="yes"/>
+      <point x="632" y="322"/>
+      <point x="557" y="403"/>
+      <point x="444" y="403" type="curve" smooth="yes"/>
+      <point x="228" y="403" type="line"/>
+      <point x="228" y="386" type="line"/>
+      <point x="434" y="386" type="line" smooth="yes"/>
+      <point x="540" y="386"/>
+      <point x="610" y="310"/>
+      <point x="610" y="195" type="curve" smooth="yes"/>
+      <point x="610" y="84"/>
+      <point x="540" y="18"/>
+      <point x="422" y="18" type="curve" smooth="yes"/>
+      <point x="236" y="18" type="line"/>
+      <point x="236" y="694" type="line"/>
+      <point x="22" y="694" type="line"/>
+      <point x="22" y="676" type="line"/>
+      <point x="214" 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/I_a-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_a-cy.glif
index 5bc5c90c..4aa103d5 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_a-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ia-cy" format="2">
-  <advance width="605"/>
+  <advance width="599"/>
   <unicode hex="042F"/>
   <anchor x="300" y="694" name="top"/>
   <outline>
@@ -37,4 +37,10 @@
       <point x="474" 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/I_dieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/I_dieresis-cy.glif
index c2ed84e7..fc1b5dbd 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="710"/>
   <unicode hex="04E4"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="dieresiscomb.case" xOffset="141"/>
+    <component base="dieresiscomb.case" xOffset="135"/>
   </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..4df68d3b 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="710"/>
   <unicode hex="0418"/>
-  <anchor x="702" y="0" name="bottomright"/>
-  <anchor x="361" y="694" name="top"/>
+  <anchor x="696" y="0" name="bottomright"/>
+  <anchor x="355" 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="104" y="0" type="line"/>
+      <point x="131" y="0" type="line"/>
+      <point x="587" y="674" type="line"/>
+      <point x="586" y="674" type="line"/>
+      <point x="586" y="0" type="line"/>
+      <point x="606" y="0" type="line"/>
+      <point x="606" y="694" type="line"/>
+      <point x="579" y="694" type="line"/>
+      <point x="122" y="20" type="line"/>
+      <point x="124" y="20" type="line"/>
+      <point x="124" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </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..bcb36dbf 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="710"/>
   <unicode hex="040D"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="gravecomb.case" xOffset="164"/>
+    <component base="gravecomb.case" xOffset="158"/>
   </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..1464b75c 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="710"/>
   <unicode hex="0419"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="brevecomb-cy.case" xOffset="168"/>
+    <component base="brevecomb-cy.case" xOffset="162"/>
   </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..dcc9547b 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="710"/>
   <unicode hex="04E2"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="macroncomb.case" xOffset="123"/>
+    <component base="macroncomb.case" xOffset="117"/>
   </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..4ad86ba2 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="945"/>
   <unicode hex="042E"/>
-  <anchor x="480" y="694" name="top"/>
+  <anchor x="474" 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="575" y="-10" type="curve" smooth="yes"/>
+      <point x="757" y="-10"/>
+      <point x="881" y="134"/>
+      <point x="881" y="347" type="curve" smooth="yes"/>
+      <point x="881" y="558"/>
+      <point x="760" y="699"/>
+      <point x="579" y="699" type="curve" smooth="yes"/>
+      <point x="401" y="699"/>
+      <point x="290" y="562"/>
+      <point x="290" y="343" type="curve" smooth="yes"/>
+      <point x="290" y="125"/>
+      <point x="399" y="-10"/>
     </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="104" y="0" type="line"/>
+      <point x="126" y="0" type="line"/>
+      <point x="126" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </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="119" y="352" type="line"/>
+      <point x="303" y="352" type="line"/>
+      <point x="303" y="371" type="line"/>
+      <point x="119" y="371" type="line"/>
     </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="578" y="9" type="curve" smooth="yes"/>
+      <point x="413" y="9"/>
+      <point x="311" y="137"/>
+      <point x="311" y="346" type="curve" smooth="yes"/>
+      <point x="311" y="556"/>
+      <point x="409" y="680"/>
+      <point x="575" y="680" type="curve" smooth="yes"/>
+      <point x="744" y="680"/>
+      <point x="859" y="543"/>
+      <point x="859" y="342" type="curve" smooth="yes"/>
+      <point x="859" y="142"/>
+      <point x="746" y="9"/>
     </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..d244bd6c 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="664"/>
   <unicode hex="0474"/>
   <outline>
     <contour>
-      <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="277" y="0" type="line"/>
+      <point x="288" y="0" type="line"/>
+      <point x="475" y="532" type="line" smooth="yes"/>
+      <point x="512" y="638"/>
+      <point x="560" y="687"/>
+      <point x="626" y="687" type="curve"/>
+      <point x="625" y="707" type="line"/>
+      <point x="552" y="707"/>
+      <point x="494" y="648"/>
+      <point x="454" y="533" type="curve" smooth="yes"/>
+      <point x="279" y="30" type="line"/>
+      <point x="288" y="30" type="line"/>
+      <point x="41" y="694" type="line"/>
+      <point x="18" y="694" type="line"/>
     </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/K_a-cy.glif b/src/Cantarell-Light.ufo/glyphs/K_a-cy.glif
index 961add26..0f7b3fe5 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="602"/>
   <unicode hex="041A"/>
-  <anchor x="589" y="0" name="bottomright"/>
-  <anchor x="309" y="694" name="top"/>
+  <anchor x="583" y="0" name="bottomright"/>
+  <anchor x="303" 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="549" y="0" type="line"/>
+      <point x="574" y="0" type="line"/>
+      <point x="279" y="364" type="line"/>
+      <point x="279" y="353" type="line"/>
+      <point x="559" y="694" type="line"/>
+      <point x="535" y="694" type="line"/>
+      <point x="260" y="357" type="line"/>
     </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="104" y="0" type="line"/>
+      <point x="124" y="0" type="line"/>
+      <point x="124" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </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="113" y="348" type="line"/>
+      <point x="274" y="348" type="line"/>
+      <point x="274" y="366" type="line"/>
+      <point x="113" y="366" type="line"/>
     </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..0e307e91 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif
@@ -1,38 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kabashkir-cy" format="2">
-  <advance width="714"/>
+  <advance width="796"/>
   <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="104" y="676" type="line"/>
+      <point x="318" y="676" type="line"/>
+      <point x="318" y="694" type="line"/>
+      <point x="104" y="694" 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="743" y="0" type="line"/>
+      <point x="768" y="0" type="line"/>
+      <point x="473" y="364" type="line"/>
+      <point x="473" y="353" type="line"/>
+      <point x="753" y="694" type="line"/>
+      <point x="729" y="694" type="line"/>
+      <point x="454" y="357" 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"/>
+      <point x="298" y="0" type="line"/>
+      <point x="318" y="0" type="line"/>
+      <point x="318" y="694" type="line"/>
+      <point x="298" 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="307" y="348" type="line"/>
+      <point x="468" y="348" type="line"/>
+      <point x="468" y="366" type="line"/>
+      <point x="307" 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_adescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/K_adescender-cy.glif
index 3f90c9f3..e51f54eb 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_adescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_adescender-cy.glif
@@ -1,13 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kadescender-cy" format="2">
-  <advance width="684"/>
+  <advance width="678"/>
   <unicode hex="049A"/>
   <outline>
-    <component base="Ka-cy"/>
-    <component base="descender-cy.case" xOffset="493"/>
+    <component base="Ka-cy" xOffset="-6"/>
+    <component base="descender-cy.case" xOffset="481"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_averticalstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/K_averticalstroke-cy.glif
index 7b190300..0012a8b3 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_averticalstroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_averticalstroke-cy.glif
@@ -1,34 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kaverticalstroke-cy" format="2">
-  <advance width="605"/>
+  <advance width="599"/>
   <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="545" y="0" type="line"/>
+      <point x="570" y="0" type="line"/>
+      <point x="295" y="364" type="line"/>
+      <point x="295" y="353" type="line"/>
+      <point x="555" y="694" type="line"/>
+      <point x="531" y="694" type="line"/>
+      <point x="276" y="357" type="line"/>
     </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="104" y="0" type="line"/>
+      <point x="124" y="0" type="line"/>
+      <point x="124" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </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="113" y="348" type="line"/>
+      <point x="290" y="348" type="line"/>
+      <point x="290" y="366" type="line"/>
+      <point x="113" y="366" type="line"/>
     </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="217" y="178" type="line"/>
+      <point x="237" y="178" type="line"/>
+      <point x="237" y="538" type="line"/>
+      <point x="217" y="538" type="line"/>
     </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_je-cy.glif b/src/Cantarell-Light.ufo/glyphs/K_je-cy.glif
index 3b3fe377..8d0cb31f 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="602"/>
   <unicode hex="040C"/>
   <outline>
     <component base="Ka-cy"/>
-    <component base="acutecomb.case" xOffset="251"/>
+    <component base="acutecomb.case" xOffset="245"/>
   </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..55de6f84 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_je-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_je-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lje-cy" format="2">
-  <advance width="1049"/>
+  <advance width="1050"/>
   <unicode hex="0409"/>
   <outline>
     <contour>
@@ -50,6 +50,8 @@
     <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/N_je-cy.glif b/src/Cantarell-Light.ufo/glyphs/N_je-cy.glif
index be52699c..0db93736 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="1059"/>
   <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="576" y="0" type="line"/>
+      <point x="771" y="0" type="line" smooth="yes"/>
+      <point x="914" y="0"/>
+      <point x="999" y="73"/>
+      <point x="999" y="200" type="curve" smooth="yes"/>
+      <point x="999" y="322"/>
+      <point x="921" y="403"/>
+      <point x="805" y="403" type="curve" smooth="yes"/>
+      <point x="581" y="403" type="line"/>
+      <point x="581" y="386" type="line"/>
+      <point x="795" y="386" type="line" smooth="yes"/>
+      <point x="902" y="386"/>
+      <point x="977" y="312"/>
+      <point x="977" y="195" type="curve" smooth="yes"/>
+      <point x="977" y="82"/>
+      <point x="907" y="18"/>
+      <point x="782" y="18" type="curve" smooth="yes"/>
+      <point x="576" y="18" type="line"/>
     </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="104" y="0" type="line"/>
+      <point x="126" y="0" type="line"/>
+      <point x="126" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </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="119" y="352" type="line"/>
+      <point x="570" y="352" type="line"/>
+      <point x="570" y="371" type="line"/>
+      <point x="119" y="371" type="line"/>
     </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="564" y="0" type="line"/>
+      <point x="586" y="0" type="line"/>
+      <point x="586" y="694" type="line"/>
+      <point x="564" y="694" type="line"/>
     </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/P_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/P_e-cy.glif
index 7c985862..023bbf6f 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="659"/>
   <unicode hex="041F"/>
-  <anchor x="651" y="0" name="bottomright"/>
+  <anchor x="645" 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="104" y="0" type="line"/>
+      <point x="125" y="0" type="line"/>
+      <point x="125" y="676" type="line"/>
+      <point x="534" y="676" type="line"/>
+      <point x="534" y="0" type="line"/>
+      <point x="555" y="0" type="line"/>
+      <point x="555" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </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_chwa-cy.glif b/src/Cantarell-Light.ufo/glyphs/S_chwa-cy.glif
index ad748805..2ee0a66c 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="729"/>
   <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..de947854 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_chwa.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_chwa.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Schwa" format="2">
-  <advance width="755"/>
+  <advance width="729"/>
   <unicode hex="018F"/>
   <anchor x="369" y="0" name="bottom"/>
   <anchor x="369" y="694" name="top"/>
@@ -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_ha-cy.glif b/src/Cantarell-Light.ufo/glyphs/S_ha-cy.glif
index 57bd335c..37aa836d 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_ha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_ha-cy.glif
@@ -1,23 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sha-cy" format="2">
-  <advance width="954"/>
+  <advance width="942"/>
   <unicode hex="0428"/>
   <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="104" y="0" type="line"/>
+      <point x="838" y="0" type="line"/>
+      <point x="838" y="694" type="line"/>
+      <point x="816" y="694" type="line"/>
+      <point x="816" y="19" type="line"/>
+      <point x="126" y="19" type="line"/>
+      <point x="126" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </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="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>
   </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..436d1745 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif
@@ -1,29 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Shcha-cy" format="2">
-  <advance width="976"/>
+  <advance width="965"/>
   <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"/>
+      <point x="905" y="-175" type="line"/>
+      <point x="926" y="-175" type="line"/>
+      <point x="926" 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="905" 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"/>
+      <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="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"/>
+      <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/S_hha-cy.glif b/src/Cantarell-Light.ufo/glyphs/S_hha-cy.glif
index fcecdf1b..fbb07b8f 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="612"/>
   <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="520" y="0" type="line"/>
+      <point x="541" y="0" type="line"/>
+      <point x="541" y="239" type="line" smooth="yes"/>
+      <point x="541" y="346"/>
+      <point x="468" y="411"/>
+      <point x="334" y="411" type="curve" smooth="yes"/>
+      <point x="247" y="411"/>
+      <point x="158" y="384"/>
+      <point x="104" y="345" type="curve"/>
+      <point x="114" y="334" type="line"/>
+      <point x="162" y="367"/>
+      <point x="250" y="393"/>
+      <point x="331" y="393" type="curve" smooth="yes"/>
+      <point x="452" y="393"/>
+      <point x="520" y="336"/>
+      <point x="520" y="239" type="curve" smooth="yes"/>
     </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="105" y="0" type="line"/>
+      <point x="126" y="0" type="line"/>
+      <point x="126" y="694" type="line"/>
+      <point x="105" y="694" type="line"/>
     </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..d31cef79 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="591"/>
   <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="104" y="0" type="line"/>
+      <point x="306" y="0" type="line" smooth="yes"/>
+      <point x="447" y="0"/>
+      <point x="531" y="74"/>
+      <point x="531" y="200" type="curve" smooth="yes"/>
+      <point x="531" y="322"/>
+      <point x="454" y="403"/>
+      <point x="339" y="403" type="curve" smooth="yes"/>
+      <point x="118" y="403" type="line"/>
+      <point x="118" y="386" type="line"/>
+      <point x="329" y="386" type="line" smooth="yes"/>
+      <point x="437" y="386"/>
+      <point x="509" y="310"/>
+      <point x="509" y="195" type="curve" smooth="yes"/>
+      <point x="509" y="84"/>
+      <point x="438" y="18"/>
+      <point x="317" y="18" type="curve" smooth="yes"/>
+      <point x="126" y="18" type="line"/>
+      <point x="126" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </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_se-cy.glif b/src/Cantarell-Light.ufo/glyphs/T_se-cy.glif
index 16e4c1f6..878967e6 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_se-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_se-cy.glif
@@ -1,23 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tse-cy" format="2">
-  <advance width="687"/>
+  <advance width="681"/>
   <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="621" y="-175" type="line"/>
+      <point x="642" y="-175" type="line"/>
+      <point x="642" 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="621" 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="533" y="10" type="line"/>
+      <point x="554" y="10" type="line"/>
+      <point x="554" y="694" type="line"/>
+      <point x="533" y="694" type="line"/>
     </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_she-cy.glif b/src/Cantarell-Light.ufo/glyphs/T_she-cy.glif
index b0e171a9..780661c9 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="762"/>
   <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="670" y="0" type="line"/>
+      <point x="691" y="0" type="line"/>
+      <point x="691" y="239" type="line" smooth="yes"/>
+      <point x="691" y="346"/>
+      <point x="618" y="411"/>
+      <point x="484" y="411" type="curve" smooth="yes"/>
+      <point x="397" y="411"/>
+      <point x="308" y="384"/>
+      <point x="254" y="345" type="curve"/>
+      <point x="264" y="334" type="line"/>
+      <point x="312" y="367"/>
+      <point x="400" y="393"/>
+      <point x="481" y="393" type="curve" smooth="yes"/>
+      <point x="602" y="393"/>
+      <point x="670" y="336"/>
+      <point x="670" y="239" type="curve" smooth="yes"/>
     </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"/>
+      <point x="255" y="0" type="line"/>
+      <point x="276" y="0" type="line"/>
+      <point x="276" y="694" type="line"/>
+      <point x="255" 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="22" y="676" type="line"/>
+      <point x="529" y="676" type="line"/>
+      <point x="529" y="694" type="line"/>
+      <point x="22" 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/Y_at-cy.glif b/src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif
index 127f08b2..af5cea33 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yat-cy" format="2">
-  <advance width="688"/>
+  <advance width="689"/>
   <unicode hex="0462"/>
   <outline>
     <contour>
@@ -32,4 +32,10 @@
       <point x="43" y="564" 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/Y_eru-cy.glif b/src/Cantarell-Light.ufo/glyphs/Y_eru-cy.glif
index 234199c3..07db8cf2 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="775"/>
   <unicode hex="042B"/>
-  <anchor x="399" y="694" name="top"/>
+  <anchor x="393" 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="104" y="0" type="line"/>
+      <point x="288" y="0" type="line" smooth="yes"/>
+      <point x="431" y="0"/>
+      <point x="516" y="74"/>
+      <point x="516" y="200" type="curve" smooth="yes"/>
+      <point x="516" y="322"/>
+      <point x="438" y="403"/>
+      <point x="322" y="403" type="curve" smooth="yes"/>
+      <point x="118" y="403" type="line"/>
+      <point x="118" y="386" type="line"/>
+      <point x="312" y="386" type="line" smooth="yes"/>
+      <point x="421" y="386"/>
+      <point x="494" y="310"/>
+      <point x="494" y="195" type="curve" smooth="yes"/>
+      <point x="494" y="84"/>
+      <point x="422" y="18"/>
+      <point x="299" y="18" type="curve" smooth="yes"/>
+      <point x="126" y="18" type="line"/>
+      <point x="126" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </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="650" y="0" type="line"/>
+      <point x="671" y="0" type="line"/>
+      <point x="671" y="694" type="line"/>
+      <point x="650" y="694" type="line"/>
     </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..680396cc 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="775"/>
   <unicode hex="04F8"/>
   <outline>
     <component base="Yeru-cy"/>
-    <component base="dieresiscomb.case" xOffset="179"/>
+    <component base="dieresiscomb.case" xOffset="173"/>
   </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..e837ba77 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif
@@ -40,4 +40,10 @@
       <point x="58" y="0" type="curve"/>
     </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_hedescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/Z_hedescender-cy.glif
index 3c5f1696..5dd2a783 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_hedescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_hedescender-cy.glif
@@ -1,13 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhedescender-cy" format="2">
-  <advance width="954"/>
+  <advance width="947"/>
   <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="756"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Zhe-cy</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..dc46db8b 100644
--- a/src/Cantarell-Light.ufo/glyphs/che-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/che-cy.glif
@@ -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/cheverticalstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/cheverticalstroke-cy.glif
index 7b57fbef..661815b7 100644
--- a/src/Cantarell-Light.ufo/glyphs/cheverticalstroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/cheverticalstroke-cy.glif
@@ -34,4 +34,10 @@
       <point x="218" y="351" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>en-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dzhe-cy.glif b/src/Cantarell-Light.ufo/glyphs/dzhe-cy.glif
index d3b01e6a..e407a007 100644
--- a/src/Cantarell-Light.ufo/glyphs/dzhe-cy.glif
+++ b/src/Cantarell-Light.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-Light.ufo/glyphs/e-cy.glif b/src/Cantarell-Light.ufo/glyphs/e-cy.glif
index b39d00b8..7d37a27a 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="466"/>
   <unicode hex="0454"/>
-  <anchor x="227" y="0" name="bottom"/>
-  <anchor x="242" y="480" name="top"/>
+  <anchor x="228" y="0" name="bottom"/>
+  <anchor x="243" 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="273" y="-10" type="curve" smooth="yes"/>
+      <point x="325" y="-10"/>
+      <point x="376" y="4"/>
+      <point x="420" y="28" type="curve"/>
+      <point x="415" y="42" type="line"/>
+      <point x="370" y="19"/>
+      <point x="322" y="6"/>
+      <point x="277" y="6" type="curve" smooth="yes"/>
+      <point x="158" y="6"/>
+      <point x="78" y="98"/>
+      <point x="78" y="241" type="curve" smooth="yes"/>
+      <point x="78" y="384"/>
+      <point x="157" y="468"/>
+      <point x="285" y="468" type="curve" smooth="yes"/>
+      <point x="328" y="468"/>
+      <point x="373" y="458"/>
+      <point x="415" y="436" type="curve"/>
+      <point x="422" y="452" type="line"/>
+      <point x="379" y="475"/>
+      <point x="333" y="486"/>
+      <point x="288" y="486" type="curve" smooth="yes"/>
+      <point x="146" y="486"/>
+      <point x="57" y="391"/>
+      <point x="57" y="236" type="curve" smooth="yes"/>
+      <point x="57" y="85"/>
+      <point x="142" 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="72" y="247" type="line"/>
+      <point x="384" y="247" type="line"/>
+      <point x="384" y="264" type="line"/>
+      <point x="72" 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/ef-cy.glif b/src/Cantarell-Light.ufo/glyphs/ef-cy.glif
index 92977ece..6c57b219 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="759"/>
   <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="370" y="-217" type="line"/>
+      <point x="389" y="-217" type="line"/>
+      <point x="389" y="739" type="line"/>
+      <point x="370" y="739" type="line"/>
     </contour>
     <contour>
-      <point x="237" y="-5" type="curve" smooth="yes"/>
+      <point x="236" 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="346" y="29"/>
+      <point x="376" y="90" type="curve"/>
+      <point x="372" y="111" type="line"/>
+      <point x="345" y="49"/>
+      <point x="296" y="13"/>
+      <point x="239" y="13" type="curve" smooth="yes"/>
+      <point x="143" y="13"/>
+      <point x="78" y="106"/>
+      <point x="78" y="241" type="curve" smooth="yes"/>
+      <point x="78" y="374"/>
+      <point x="142" y="464"/>
+      <point x="235" y="464" type="curve" smooth="yes"/>
+      <point x="294" y="464"/>
+      <point x="345" y="427"/>
+      <point x="372" y="363" type="curve"/>
+      <point x="377" y="392" type="line"/>
+      <point x="347" y="451"/>
+      <point x="298" y="482"/>
+      <point x="238" y="482" type="curve" smooth="yes"/>
+      <point x="131" y="482"/>
+      <point x="57" y="382"/>
+      <point x="57" y="239" type="curve" smooth="yes"/>
+      <point x="57" y="95"/>
       <point x="131" 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="523" y="-5" type="curve" smooth="yes"/>
+      <point x="629" y="-5"/>
+      <point x="702" y="96"/>
+      <point x="702" y="242" type="curve" smooth="yes"/>
+      <point x="702" y="384"/>
+      <point x="630" y="482"/>
+      <point x="525" y="482" type="curve" smooth="yes"/>
+      <point x="458" y="482"/>
+      <point x="404" y="442"/>
+      <point x="376" y="371" type="curve"/>
+      <point x="380" y="351" type="line"/>
+      <point x="405" y="422"/>
+      <point x="457" y="464"/>
+      <point x="520" y="464" type="curve" smooth="yes"/>
+      <point x="616" y="464"/>
+      <point x="681" y="374"/>
+      <point x="681" y="239" type="curve" smooth="yes"/>
+      <point x="681" y="104"/>
+      <point x="618" y="13"/>
+      <point x="524" 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="406" y="57"/>
+      <point x="381" y="131" type="curve"/>
+      <point x="377" y="101" type="line"/>
+      <point x="406" y="32"/>
+      <point x="458" y="-5"/>
     </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/el-cy.glif b/src/Cantarell-Light.ufo/glyphs/el-cy.glif
index 94cc15a3..81f2c832 100644
--- a/src/Cantarell-Light.ufo/glyphs/el-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/el-cy.glif
@@ -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/em-cy.glif b/src/Cantarell-Light.ufo/glyphs/em-cy.glif
index 0df3e5ff..de79099f 100644
--- a/src/Cantarell-Light.ufo/glyphs/em-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/em-cy.glif
@@ -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/en-cy.glif b/src/Cantarell-Light.ufo/glyphs/en-cy.glif
index b4893ea3..6c089386 100644
--- a/src/Cantarell-Light.ufo/glyphs/en-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/en-cy.glif
@@ -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/enghe-cy.glif b/src/Cantarell-Light.ufo/glyphs/enghe-cy.glif
index 6674f55f..9ec55d94 100644
--- a/src/Cantarell-Light.ufo/glyphs/enghe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/enghe-cy.glif
@@ -28,4 +28,12 @@
       <point x="428" 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/ereversed-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/ereversed-cy.glif
index 84c01e8d..96aa6272 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="464"/>
   <unicode hex="044D"/>
-  <anchor x="228" y="480" name="top"/>
+  <anchor x="235" 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="186" y="-7" type="curve" smooth="yes"/>
+      <point x="323" y="-7"/>
+      <point x="407" y="89"/>
+      <point x="407" y="247" type="curve" smooth="yes"/>
+      <point x="407" y="398"/>
+      <point x="328" y="490"/>
+      <point x="200" y="490" type="curve" smooth="yes"/>
+      <point x="154" y="490"/>
+      <point x="88" y="478"/>
+      <point x="45" y="459" type="curve"/>
+      <point x="50" y="444" type="line"/>
+      <point x="90" y="461"/>
+      <point x="159" y="471"/>
+      <point x="198" y="471" type="curve" smooth="yes"/>
+      <point x="314" y="471"/>
+      <point x="385" y="383"/>
+      <point x="385" y="240" type="curve" smooth="yes"/>
+      <point x="385" y="96"/>
+      <point x="313" y="12"/>
+      <point x="190" y="12" type="curve" smooth="yes"/>
+      <point x="149" y="12"/>
+      <point x="90" y="21"/>
+      <point x="51" y="38" type="curve"/>
+      <point x="44" y="21" type="line"/>
+      <point x="83" y="3"/>
+      <point x="142" 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="79" y="243" type="line"/>
+      <point x="393" y="243" type="line"/>
+      <point x="393" y="260" type="line"/>
+      <point x="79" 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/ge-cy.glif b/src/Cantarell-Light.ufo/glyphs/ge-cy.glif
index c5936cb9..6f853a7a 100644
--- a/src/Cantarell-Light.ufo/glyphs/ge-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ge-cy.glif
@@ -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/germandbls.glif b/src/Cantarell-Light.ufo/glyphs/germandbls.glif
index bdfef279..be2039b2 100644
--- a/src/Cantarell-Light.ufo/glyphs/germandbls.glif
+++ b/src/Cantarell-Light.ufo/glyphs/germandbls.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="germandbls" format="2">
-  <advance width="556"/>
+  <advance width="538"/>
   <unicode hex="00DF"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/ghemiddlehook-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/ghemiddlehook-cy.glif
index 00872a64..f68c5f9c 100644
--- a/src/Cantarell-Light.ufo/glyphs/ghemiddlehook-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ghemiddlehook-cy.glif
@@ -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..14dd3843 100644
--- a/src/Cantarell-Light.ufo/glyphs/ghestroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ghestroke-cy.glif
@@ -18,4 +18,10 @@
       <point x="19" 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..3590798e 100644
--- a/src/Cantarell-Light.ufo/glyphs/gheupturn-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gheupturn-cy.glif
@@ -14,4 +14,12 @@
       <point x="88" 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/hardsign-cy.glif b/src/Cantarell-Light.ufo/glyphs/hardsign-cy.glif
index 7b78389d..7d8df7c7 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="534"/>
   <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="161" y="0" type="line"/>
+      <point x="318" y="0" type="line" smooth="yes"/>
+      <point x="426" y="0"/>
+      <point x="491" y="56"/>
+      <point x="491" y="150" type="curve" smooth="yes"/>
+      <point x="491" y="241"/>
+      <point x="432" y="301"/>
+      <point x="343" y="301" type="curve" smooth="yes"/>
+      <point x="175" y="301" type="line"/>
+      <point x="175" y="284" type="line"/>
+      <point x="335" y="284" type="line" smooth="yes"/>
+      <point x="416" y="284"/>
+      <point x="470" y="228"/>
+      <point x="470" y="145" type="curve" smooth="yes"/>
+      <point x="470" y="65"/>
+      <point x="416" y="17"/>
+      <point x="326" y="17" type="curve" smooth="yes"/>
+      <point x="182" y="17" type="line"/>
+      <point x="182" y="480" type="line"/>
+      <point x="161" 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="12" y="463" type="line"/>
+      <point x="171" y="463" type="line"/>
+      <point x="171" y="480" type="line"/>
+      <point x="12" 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/ia-cy.glif b/src/Cantarell-Light.ufo/glyphs/ia-cy.glif
index 924f8363..53cafc9b 100644
--- a/src/Cantarell-Light.ufo/glyphs/ia-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ia-cy.glif
@@ -46,6 +46,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/ii-cy.glif b/src/Cantarell-Light.ufo/glyphs/ii-cy.glif
index 1d07fda4..ac670f7b 100644
--- a/src/Cantarell-Light.ufo/glyphs/ii-cy.glif
+++ b/src/Cantarell-Light.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-Light.ufo/glyphs/iu-cy.glif b/src/Cantarell-Light.ufo/glyphs/iu-cy.glif
index e3dd7cc9..70284cf3 100644
--- a/src/Cantarell-Light.ufo/glyphs/iu-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iu-cy.glif
@@ -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/ka-cy.glif b/src/Cantarell-Light.ufo/glyphs/ka-cy.glif
index 2cdddeed..26a600e8 100644
--- a/src/Cantarell-Light.ufo/glyphs/ka-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ka-cy.glif
@@ -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..87b3325b 100644
--- a/src/Cantarell-Light.ufo/glyphs/kabashkir-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kabashkir-cy.glif
@@ -1,38 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kabashkir-cy" format="2">
-  <advance width="547"/>
+  <advance width="554"/>
   <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="12" y="463" type="line"/>
+      <point x="220" y="463" type="line"/>
+      <point x="220" y="480" type="line"/>
+      <point x="12" y="480" 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="514" y="0" type="line"/>
+      <point x="538" y="0" type="line"/>
+      <point x="358" y="260" type="line"/>
+      <point x="358" y="251" type="line"/>
+      <point x="526" y="480" type="line"/>
+      <point x="503" y="480" type="line"/>
+      <point x="339" 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"/>
+      <point x="201" y="0" type="line"/>
+      <point x="220" y="0" type="line"/>
+      <point x="220" y="480" type="line"/>
+      <point x="201" 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="209" y="245" type="line"/>
+      <point x="352" y="245" type="line"/>
+      <point x="352" y="262" type="line"/>
+      <point x="209" 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/lje-cy.glif b/src/Cantarell-Light.ufo/glyphs/lje-cy.glif
index 482ac05e..bc07cfd0 100644
--- a/src/Cantarell-Light.ufo/glyphs/lje-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lje-cy.glif
@@ -50,6 +50,8 @@
     <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/nje-cy.glif b/src/Cantarell-Light.ufo/glyphs/nje-cy.glif
index 94732871..3affec07 100644
--- a/src/Cantarell-Light.ufo/glyphs/nje-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nje-cy.glif
@@ -42,4 +42,12 @@
       <point x="432" y="17" 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/oslash.glif b/src/Cantarell-Light.ufo/glyphs/oslash.glif
index fb656b69..b4670491 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="535"/>
   <unicode hex="00F8"/>
-  <anchor x="274" y="480" name="top"/>
+  <anchor x="268" 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="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"/>
     </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="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"/>
     </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="89" y="-42" type="line"/>
+      <point x="456" y="505" type="line"/>
+      <point x="445" y="513" type="line"/>
+      <point x="78" y="-34" type="line"/>
     </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..3f07b1c8 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="535"/>
   <unicode hex="01FF"/>
   <outline>
     <component base="oslash"/>
-    <component base="acutecomb" xOffset="207"/>
+    <component base="acutecomb" xOffset="201"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/pe-cy.glif b/src/Cantarell-Light.ufo/glyphs/pe-cy.glif
index aade4904..e097ce45 100644
--- a/src/Cantarell-Light.ufo/glyphs/pe-cy.glif
+++ b/src/Cantarell-Light.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-Light.ufo/glyphs/sha-cy.glif b/src/Cantarell-Light.ufo/glyphs/sha-cy.glif
index a95fd7f4..cd74ba83 100644
--- a/src/Cantarell-Light.ufo/glyphs/sha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sha-cy.glif
@@ -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>=|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..4c0da7b9 100644
--- a/src/Cantarell-Light.ufo/glyphs/shcha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/shcha-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="shcha-cy" format="2">
-  <advance width="746"/>
+  <advance width="761"/>
   <unicode hex="0449"/>
   <outline>
     <contour>
@@ -35,6 +35,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>tse-cy</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/softsign-cy.glif b/src/Cantarell-Light.ufo/glyphs/softsign-cy.glif
index 4d98b4e1..f73e9b40 100644
--- a/src/Cantarell-Light.ufo/glyphs/softsign-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/softsign-cy.glif
@@ -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/te-cy.glif b/src/Cantarell-Light.ufo/glyphs/te-cy.glif
index d38ad9dc..86532460 100644
--- a/src/Cantarell-Light.ufo/glyphs/te-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/te-cy.glif
@@ -26,6 +26,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/tse-cy.glif b/src/Cantarell-Light.ufo/glyphs/tse-cy.glif
index e73e10a0..14903e15 100644
--- a/src/Cantarell-Light.ufo/glyphs/tse-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tse-cy.glif
@@ -29,6 +29,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/ve-cy.glif b/src/Cantarell-Light.ufo/glyphs/ve-cy.glif
index 3e7bca42..46502896 100644
--- a/src/Cantarell-Light.ufo/glyphs/ve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ve-cy.glif
@@ -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/yat-cy.glif b/src/Cantarell-Light.ufo/glyphs/yat-cy.glif
index c776f369..657f33ca 100644
--- a/src/Cantarell-Light.ufo/glyphs/yat-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yat-cy.glif
@@ -32,4 +32,10 @@
       <point x="23" 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/yeru-cy.glif b/src/Cantarell-Light.ufo/glyphs/yeru-cy.glif
index ed2436bd..7898d812 100644
--- a/src/Cantarell-Light.ufo/glyphs/yeru-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yeru-cy.glif
@@ -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/yusbig-cy.glif b/src/Cantarell-Light.ufo/glyphs/yusbig-cy.glif
index a0a9dc13..20150a86 100644
--- a/src/Cantarell-Light.ufo/glyphs/yusbig-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yusbig-cy.glif
@@ -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/zhe-cy.glif b/src/Cantarell-Light.ufo/glyphs/zhe-cy.glif
index d7cd4de1..832aeb1f 100644
--- a/src/Cantarell-Light.ufo/glyphs/zhe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zhe-cy.glif
@@ -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-Regular.ufo/glyphs/B_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/B_e-cy.glif
index 142ae766..a7bacd4e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/B_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/B_e-cy.glif
@@ -1,31 +1,37 @@
 <?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>
+    </dict>
+  </lib>
 </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..4910e55e 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="569" 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..ebd39ac1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_hedescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_hedescender-cy.glif
@@ -1,13 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chedescender-cy" format="2">
-  <advance width="694"/>
+  <advance width="665"/>
   <unicode hex="04B6"/>
   <outline>
     <component base="Che-cy"/>
-    <component base="descender-cy.case" xOffset="472"/>
+    <component base="descender-cy.case" xOffset="462"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Che-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..e2208334 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="390"/>
   </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_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/D_e-cy.glif
index ac2cd601..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="734"/>
+  <advance width="728"/>
   <unicode hex="0414"/>
   <outline>
     <contour>
-      <point x="80" y="17" type="line"/>
-      <point x="209" y="17"/>
-      <point x="272" y="129"/>
-      <point x="272" y="342" type="curve" smooth="yes"/>
-      <point x="272" y="624" type="line"/>
-      <point x="535" y="624" type="line"/>
-      <point x="535" y="40" type="line"/>
-      <point x="616" y="40" type="line"/>
-      <point x="616" y="694" type="line"/>
-      <point x="191" y="694" type="line"/>
-      <point x="191" y="342" type="line" smooth="yes"/>
-      <point x="191" y="161"/>
-      <point x="153" y="67"/>
-      <point x="70" 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="31" y="-178" type="line"/>
-      <point x="106" y="-178" type="line"/>
-      <point x="106" y="0" type="line"/>
-      <point x="628" y="0" type="line"/>
-      <point x="628" y="-178" type="line"/>
-      <point x="703" y="-178" type="line"/>
-      <point x="703" y="71" type="line"/>
-      <point x="31" 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_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..f01fb0d4 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="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>
     <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="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>
   </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_f-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_f-cy.glif
index 9795fcc8..d28fae12 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_f-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_f-cy.glif
@@ -1,41 +1,41 @@
 <?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="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="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="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>
     <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="357" y="-20" type="line"/>
+      <point x="440" y="-20" type="line"/>
+      <point x="440" y="714" type="line"/>
+      <point x="357" y="714" type="line"/>
     </contour>
   </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..54357941 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="721"/>
   <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="125" y="-10" type="curve" smooth="yes"/>
+      <point x="227" y="-10"/>
+      <point x="276" y="75"/>
+      <point x="276" y="252" type="curve" smooth="yes"/>
+      <point x="276" y="624" type="line"/>
+      <point x="548" y="624" type="line"/>
+      <point x="548" y="0" type="line"/>
+      <point x="629" y="0" type="line"/>
+      <point x="629" y="694" type="line"/>
+      <point x="197" y="694" type="line"/>
+      <point x="197" y="252" type="line" smooth="yes"/>
+      <point x="197" y="120"/>
+      <point x="171" y="62"/>
+      <point x="112" y="62" type="curve" smooth="yes"/>
+      <point x="91" y="62"/>
+      <point x="64" y="69"/>
+      <point x="41" y="83" type="curve"/>
+      <point x="19" y="19" type="line"/>
+      <point x="48" y="1"/>
+      <point x="88" 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_ndescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_ndescender-cy.glif
index 76c9ea34..8de2b456 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_ndescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_ndescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Endescender-cy" format="2">
-  <advance width="787"/>
+  <advance width="768"/>
   <unicode hex="04A2"/>
   <outline>
     <component base="En-cy"/>
@@ -8,6 +8,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_nghe-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_nghe-cy.glif
index e64de6b9..598fc8e2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_nghe-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_nghe-cy.glif
@@ -1,31 +1,39 @@
 <?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="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"/>
+      <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="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="546" 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>
   </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_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/G_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/G_e-cy.glif
index 117a468f..fe722edb 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="184" 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..951d6173 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="77"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_ermandbls.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_ermandbls.glif
index 71ced801..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="699"/>
+  <advance width="692"/>
   <unicode hex="1E9E"/>
   <outline>
     <contour>
-      <point x="439" y="-10" type="curve" smooth="yes"/>
-      <point x="568" y="-10"/>
-      <point x="654" y="66"/>
-      <point x="654" y="181" type="curve" smooth="yes"/>
-      <point x="654" y="283"/>
-      <point x="586" y="364"/>
-      <point x="458" y="388" type="curve"/>
-      <point x="468" y="352" type="line"/>
-      <point x="604" y="583" type="line"/>
-      <point x="571" y="657"/>
-      <point x="475" y="704"/>
-      <point x="358" y="704" type="curve" smooth="yes"/>
-      <point x="193" y="704"/>
-      <point x="85" y="610"/>
-      <point x="85" y="468" type="curve" smooth="yes"/>
-      <point x="85" y="0" type="line"/>
-      <point x="168" y="0" type="line"/>
-      <point x="168" y="468" type="line" smooth="yes"/>
-      <point x="168" y="566"/>
-      <point x="238" y="631"/>
-      <point x="353" y="631" type="curve" smooth="yes"/>
-      <point x="426" y="631"/>
-      <point x="487" y="605"/>
-      <point x="510" y="565" type="curve"/>
-      <point x="375" y="332" type="line"/>
-      <point x="500" y="312"/>
-      <point x="569" y="255"/>
-      <point x="569" y="171" type="curve" smooth="yes"/>
-      <point x="569" y="102"/>
-      <point x="523" y="63"/>
-      <point x="444" y="63" type="curve" smooth="yes"/>
-      <point x="402" y="63"/>
-      <point x="349" y="74"/>
-      <point x="309" y="91" type="curve"/>
-      <point x="284" y="26" type="line"/>
-      <point x="328" y="3"/>
-      <point x="384" y="-10"/>
+      <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..4d28e33d 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="660"/>
   <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..0e7a6ad3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_hestroke-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_hestroke-cy.glif
@@ -1,21 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ghestroke-cy" format="2">
-  <advance width="560"/>
+  <advance width="562"/>
   <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="122" y="0" type="line"/>
+      <point x="205" y="0" type="line"/>
+      <point x="205" y="622" type="line"/>
+      <point x="533" y="622" type="line"/>
+      <point x="533" y="694" type="line"/>
+      <point x="122" 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="32" y="295" type="line"/>
+      <point x="372" y="295" type="line"/>
+      <point x="372" y="360" type="line"/>
+      <point x="32" y="360" 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/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/H_adescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/H_adescender-cy.glif
index 57060bdc..12bb6f33 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_adescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_adescender-cy.glif
@@ -1,13 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hadescender-cy" format="2">
-  <advance width="712"/>
+  <advance width="680"/>
   <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="477"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Ha-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/I_a-cy.glif b/src/Cantarell-Regular.ufo/glyphs/I_a-cy.glif
index b810945a..d1cf90fe 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_a-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_a-cy.glif
@@ -1,40 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ia-cy" format="2">
-  <advance width="652"/>
+  <advance width="629"/>
   <unicode hex="042F"/>
-  <anchor x="326" y="694" name="top"/>
+  <anchor x="315" 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="282" y="260" type="curve" smooth="yes"/>
+      <point x="484" y="260" type="line"/>
+      <point x="484" y="330" type="line"/>
+      <point x="292" y="330" type="line" smooth="yes"/>
+      <point x="202" y="330"/>
+      <point x="140" y="390"/>
+      <point x="140" y="480" type="curve" smooth="yes"/>
+      <point x="140" y="569"/>
+      <point x="195" y="622"/>
+      <point x="282" y="622" type="curve" smooth="yes"/>
+      <point x="484" y="622" type="line"/>
+      <point x="484" y="694" type="line"/>
+      <point x="292" y="694" type="line" smooth="yes"/>
+      <point x="155" y="694"/>
+      <point x="55" y="597"/>
+      <point x="55" y="465" type="curve" smooth="yes"/>
+      <point x="55" y="341"/>
+      <point x="146" y="260"/>
     </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"/>
+      <point x="45" y="0" type="line"/>
+      <point x="144" y="0" type="line"/>
+      <point x="327" y="306" type="line"/>
+      <point x="233" 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="454" y="0" type="line"/>
+      <point x="537" y="0" type="line"/>
+      <point x="537" y="694" type="line"/>
+      <point x="454" 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/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_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_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_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..99590399 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="663"/>
   <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/K_a-cy.glif b/src/Cantarell-Regular.ufo/glyphs/K_a-cy.glif
index 6061a8f1..714c6203 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="642"/>
   <unicode hex="041A"/>
-  <anchor x="609" y="0" name="bottomright"/>
-  <anchor x="325" y="694" name="top"/>
+  <anchor x="598" 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..727efbce 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_abashkir-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_abashkir-cy.glif
@@ -1,38 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kabashkir-cy" format="2">
-  <advance width="752"/>
+  <advance width="818"/>
   <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="92" y="622" type="line"/>
+      <point x="350" y="622" type="line"/>
+      <point x="350" y="694" type="line"/>
+      <point x="92" y="694" 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="703" y="0" type="line"/>
+      <point x="798" y="0" type="line"/>
+      <point x="540" y="380" type="line"/>
+      <point x="545" y="358" type="line"/>
+      <point x="785" y="694" type="line"/>
+      <point x="697" y="694" type="line"/>
+      <point x="456" y="361" 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"/>
+      <point x="268" y="0" type="line"/>
+      <point x="350" y="0" type="line"/>
+      <point x="350" y="694" type="line"/>
+      <point x="268" 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="301" y="323" type="line"/>
+      <point x="506" y="323" type="line"/>
+      <point x="506" y="395" type="line"/>
+      <point x="301" 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_adescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/K_adescender-cy.glif
index 83c9a1ba..74b09232 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_adescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_adescender-cy.glif
@@ -1,13 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kadescender-cy" format="2">
-  <advance width="725"/>
+  <advance width="695"/>
   <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="491"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</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..b807bb4b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_averticalstroke-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_averticalstroke-cy.glif
@@ -1,34 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kaverticalstroke-cy" format="2">
-  <advance width="675"/>
+  <advance width="652"/>
   <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>
+    </dict>
+  </lib>
 </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..528cec8d 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="642"/>
   <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_je-cy.glif b/src/Cantarell-Regular.ufo/glyphs/L_je-cy.glif
index e92ac0c9..032a7ade 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="1077"/>
   <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="595" y="0" type="line"/>
+      <point x="780" y="0" type="line" smooth="yes"/>
+      <point x="934" y="0"/>
+      <point x="1034" y="85"/>
+      <point x="1034" y="217" type="curve" smooth="yes"/>
+      <point x="1034" y="339"/>
+      <point x="941" y="427"/>
+      <point x="813" y="427" type="curve" smooth="yes"/>
+      <point x="597" y="427" type="line"/>
+      <point x="597" y="355" type="line"/>
+      <point x="804" y="355" type="line" smooth="yes"/>
+      <point x="888" y="355"/>
+      <point x="949" y="290"/>
+      <point x="949" y="200" type="curve" smooth="yes"/>
+      <point x="949" y="115"/>
+      <point x="895" y="72"/>
+      <point x="790" y="72" type="curve" smooth="yes"/>
+      <point x="595" y="72" type="line"/>
     </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="125" y="-10" type="curve" smooth="yes"/>
+      <point x="227" y="-10"/>
+      <point x="276" y="75"/>
+      <point x="276" y="252" type="curve" smooth="yes"/>
+      <point x="276" y="624" type="line"/>
+      <point x="548" y="624" type="line"/>
+      <point x="548" y="0" type="line"/>
+      <point x="629" y="0" type="line"/>
+      <point x="629" y="694" type="line"/>
+      <point x="197" y="694" type="line"/>
+      <point x="197" y="252" type="line" smooth="yes"/>
+      <point x="197" y="120"/>
+      <point x="171" y="62"/>
+      <point x="112" y="62" type="curve" smooth="yes"/>
+      <point x="91" y="62"/>
+      <point x="64" y="69"/>
+      <point x="41" y="83" type="curve"/>
+      <point x="19" y="19" type="line"/>
+      <point x="48" y="1"/>
+      <point x="88" y="-10"/>
     </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/N_je-cy.glif b/src/Cantarell-Regular.ufo/glyphs/N_je-cy.glif
index 5f343882..bbcc06af 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="928" y="0"/>
+      <point x="1028" y="85"/>
+      <point x="1028" y="217" type="curve" smooth="yes"/>
+      <point x="1028" y="339"/>
+      <point x="935" y="427"/>
+      <point x="807" y="427" type="curve" smooth="yes"/>
+      <point x="581" y="427" type="line"/>
+      <point x="581" y="355" type="line"/>
+      <point x="798" y="355" type="line" smooth="yes"/>
+      <point x="882" y="355"/>
+      <point x="943" y="290"/>
+      <point x="943" y="200" type="curve" smooth="yes"/>
+      <point x="943" y="115"/>
+      <point x="889" 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/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/S_chwa-cy.glif b/src/Cantarell-Regular.ufo/glyphs/S_chwa-cy.glif
index f2b525c5..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="726"/>
+  <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 d7b074ba..2617aefa 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="726"/>
+  <advance width="723"/>
   <unicode hex="018F"/>
-  <anchor x="360" y="0" name="bottom"/>
-  <anchor x="360" y="694" name="top"/>
+  <anchor x="359" y="0" name="bottom"/>
+  <anchor x="359" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="313" y="700" type="curve" smooth="yes"/>
-      <point x="226" y="700"/>
-      <point x="148" y="680"/>
-      <point x="78" y="640" type="curve"/>
-      <point x="97" y="579" type="line"/>
-      <point x="161" y="610"/>
-      <point x="231" y="627"/>
-      <point x="299" y="627" type="curve" smooth="yes"/>
-      <point x="477" y="627"/>
-      <point x="585" y="521"/>
-      <point x="585" y="329" type="curve" smooth="yes"/>
-      <point x="585" y="158"/>
-      <point x="500" y="63"/>
-      <point x="353" y="63" type="curve" smooth="yes"/>
-      <point x="213" y="63"/>
-      <point x="131" y="148"/>
-      <point x="131" y="300" type="curve"/>
-      <point x="606" y="300" type="line"/>
-      <point x="606" y="368" type="line"/>
-      <point x="58" y="368" type="line"/>
-      <point x="56" y="345"/>
-      <point x="54" y="312"/>
-      <point x="54" y="291" type="curve" smooth="yes"/>
-      <point x="54" y="111"/>
-      <point x="170" y="-10"/>
-      <point x="346" y="-10" type="curve" smooth="yes"/>
-      <point x="537" y="-10"/>
-      <point x="670" y="132"/>
-      <point x="670" y="347" type="curve" smooth="yes"/>
-      <point x="670" y="566"/>
-      <point x="532" y="700"/>
+      <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"/>
+      <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"/>
     </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_ha-cy.glif b/src/Cantarell-Regular.ufo/glyphs/S_ha-cy.glif
index 7d0e4a11..4ed0307e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_ha-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_ha-cy.glif
@@ -1,23 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sha-cy" format="2">
-  <advance width="1022"/>
+  <advance width="998"/>
   <unicode hex="0428"/>
   <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..63485e15 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_hcha-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_hcha-cy.glif
@@ -1,29 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Shcha-cy" format="2">
-  <advance width="1068"/>
+  <advance width="1045"/>
   <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"/>
+      <point x="941" y="-178" type="line"/>
+      <point x="1017" y="-178" type="line"/>
+      <point x="1017" 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="941" 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"/>
+      <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="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"/>
+      <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/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_se-cy.glif b/src/Cantarell-Regular.ufo/glyphs/T_se-cy.glif
index 98b14701..46be3c6b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_se-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_se-cy.glif
@@ -1,23 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tse-cy" format="2">
-  <advance width="764"/>
+  <advance width="741"/>
   <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="638" y="-178" type="line"/>
+      <point x="713" y="-178" type="line"/>
+      <point x="713" 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="638" 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>
+    </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..35a0c74f 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="785"/>
   <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="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>
     <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/U_-cy.glif b/src/Cantarell-Regular.ufo/glyphs/U_-cy.glif
index 95f6cf76..46a15d36 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="620"/>
   <unicode hex="0423"/>
-  <anchor x="314" y="694" name="top"/>
+  <anchor x="310" 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="155" y="0" type="line"/>
+      <point x="243" y="0" type="line"/>
+      <point x="602" y="694" type="line"/>
+      <point x="518" y="694" type="line"/>
+      <point x="322" y="301" type="line"/>
+      <point x="293" 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="312" y="199" type="line"/>
+      <point x="350" y="279" type="line"/>
+      <point x="116" y="694" type="line"/>
+      <point x="16" y="694" type="line"/>
     </contour>
   </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..d93e9316 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="620"/>
   <unicode hex="04F0"/>
   <outline>
     <component base="U-cy"/>
-    <component base="dieresiscomb.case" xOffset="78"/>
+    <component base="dieresiscomb.case" xOffset="74"/>
   </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..aba923f1 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="620"/>
   <unicode hex="04F2"/>
   <outline>
     <component base="U-cy"/>
-    <component base="hungarumlautcomb.case" xOffset="104"/>
+    <component base="hungarumlautcomb.case" xOffset="100"/>
   </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..671544fa 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="620"/>
   <unicode hex="04EE"/>
   <outline>
     <component base="U-cy"/>
-    <component base="macroncomb.case" xOffset="72"/>
+    <component base="macroncomb.case" xOffset="68"/>
   </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..2382c3c5 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="620"/>
   <unicode hex="040E"/>
   <outline>
     <component base="U-cy"/>
-    <component base="brevecomb-cy.case" xOffset="99"/>
+    <component base="brevecomb-cy.case" xOffset="95"/>
   </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..3550d5b6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_at-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_at-cy.glif
@@ -1,35 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yat-cy" format="2">
-  <advance width="717"/>
+  <advance width="689"/>
   <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="150" y="0" type="line"/>
+      <point x="392" y="0" type="line" smooth="yes"/>
+      <point x="546" y="0"/>
+      <point x="646" y="85"/>
+      <point x="646" y="217" type="curve" smooth="yes"/>
+      <point x="646" y="339"/>
+      <point x="553" y="427"/>
+      <point x="425" y="427" type="curve" smooth="yes"/>
+      <point x="199" y="427" type="line"/>
+      <point x="199" y="355" type="line"/>
+      <point x="416" y="355" type="line" smooth="yes"/>
+      <point x="500" y="355"/>
+      <point x="561" y="290"/>
+      <point x="561" y="200" type="curve" smooth="yes"/>
+      <point x="561" y="115"/>
+      <point x="507" y="72"/>
+      <point x="402" y="72" type="curve" smooth="yes"/>
+      <point x="233" y="72" type="line"/>
+      <point x="233" y="694" type="line"/>
+      <point x="150" 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="25" y="523" type="line"/>
+      <point x="405" y="523" type="line"/>
+      <point x="405" y="588" type="line"/>
+      <point x="25" y="588" 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/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_usbig-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_usbig-cy.glif
index 19cb3ec2..e130534b 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="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>
     <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="430" y="346" type="line"/>
+      <point x="347" y="346" type="line"/>
+      <point x="347" y="0" type="line"/>
+      <point x="430" y="0" 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="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"/>
+      <point x="43" y="0" type="curve"/>
     </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_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..af1454ad 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="954"/>
   <unicode hex="0416"/>
-  <anchor x="911" y="0" name="bottomright"/>
-  <anchor x="483" y="694" name="top"/>
+  <anchor x="906" y="0" name="bottomright"/>
+  <anchor x="478" 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="834" y="0" type="line"/>
+      <point x="933" y="0" type="line"/>
+      <point x="697" y="376" type="line"/>
+      <point x="698" y="356" type="line"/>
+      <point x="920" y="694" type="line"/>
+      <point x="825" y="694" type="line"/>
+      <point x="607" 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="21" y="0" type="line"/>
+      <point x="116" y="0" type="line"/>
+      <point x="347" y="363" type="line"/>
+      <point x="133" y="694" type="line"/>
+      <point x="34" y="694" type="line"/>
+      <point x="259" y="349" type="line"/>
+      <point x="257" 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="279" y="323" type="line"/>
+      <point x="659" y="323" type="line"/>
+      <point x="659" y="395" type="line"/>
+      <point x="279" y="395" 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="436" y="0" type="line"/>
+      <point x="519" y="0" type="line"/>
+      <point x="519" y="694" type="line"/>
+      <point x="436" y="694" 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..6f882d3e 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="954"/>
   <unicode hex="04C1"/>
   <outline>
     <component base="Zhe-cy"/>
-    <component base="brevecomb-cy.case" xOffset="268"/>
+    <component base="brevecomb-cy.case" xOffset="263"/>
   </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..35fc4897 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_hedescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_hedescender-cy.glif
@@ -1,13 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhedescender-cy" format="2">
-  <advance width="1039"/>
+  <advance width="1003"/>
   <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="799"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</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..426e8e8e 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="954"/>
   <unicode hex="04DC"/>
   <outline>
     <component base="Zhe-cy"/>
-    <component base="dieresiscomb.case" xOffset="247"/>
+    <component base="dieresiscomb.case" xOffset="242"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/be-cy.glif b/src/Cantarell-Regular.ufo/glyphs/be-cy.glif
index 607e52bc..5914782e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/be-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/be-cy.glif
@@ -1,43 +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="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="544"/>
-      <point x="183" y="608"/>
-      <point x="319" y="634" type="curve" smooth="yes"/>
-      <point x="444" y="658" type="line"/>
-      <point x="431" y="729" type="line"/>
-      <point x="303" y="704" type="line" smooth="yes"/>
-      <point x="131" y="670"/>
-      <point x="61" y="567"/>
-      <point x="61" y="346" type="curve" smooth="yes"/>
-      <point x="61" y="103"/>
-      <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/che-cy.glif b/src/Cantarell-Regular.ufo/glyphs/che-cy.glif
index b4e74070..2ca661f5 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="445" 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..ff0f92e3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/chedescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/chedescender-cy.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="chedescender-cy" format="2">
-  <advance width="549"/>
+  <advance width="545"/>
   <unicode hex="04B7"/>
   <outline>
     <component base="che-cy"/>
-    <component base="descender-cy" xOffset="339"/>
+    <component base="descender-cy" xOffset="338"/>
   </outline>
   <lib>
     <dict>
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..6ddc2b8c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/chekhakassian-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/chekhakassian-cy.glif
@@ -1,9 +1,9 @@
 <?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"/>
-    <component base="_descenderreversed-cy" xOffset="254"/>
+    <component base="_descenderreversed-cy" xOffset="253"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/cheverticalstroke-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/cheverticalstroke-cy.glif
index a9b78454..98cf3270 100644
--- a/src/Cantarell-Regular.ufo/glyphs/cheverticalstroke-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/cheverticalstroke-cy.glif
@@ -34,4 +34,10 @@
       <point x="223" y="378" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>en-cy</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/de-cy.glif b/src/Cantarell-Regular.ufo/glyphs/de-cy.glif
index a96652ed..21fe8089 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="564"/>
+  <advance width="561"/>
   <unicode hex="0434"/>
   <outline>
     <contour>
-      <point x="63" y="20" type="line"/>
-      <point x="161" y="20"/>
-      <point x="213" y="96"/>
-      <point x="213" y="243" type="curve" smooth="yes"/>
-      <point x="213" y="415" type="line"/>
-      <point x="390" y="415" type="line"/>
-      <point x="390" y="23" type="line"/>
-      <point x="467" y="23" type="line"/>
-      <point x="467" y="482" type="line"/>
-      <point x="139" y="482" type="line"/>
-      <point x="139" y="242" type="line" smooth="yes"/>
-      <point x="139" y="126"/>
-      <point x="109" y="65"/>
-      <point x="51" 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="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="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="459" y="0" type="line"/>
+      <point x="459" y="-126" type="line"/>
+      <point x="531" y="-126" type="line"/>
+      <point x="531" y="67" type="line"/>
+      <point x="21" y="67" type="line"/>
     </contour>
   </outline>
   <lib>
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/ef-cy.glif b/src/Cantarell-Regular.ufo/glyphs/ef-cy.glif
index 9c4d0f30..2bea86a4 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="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>
     <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="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="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="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>
   </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/el-cy.glif b/src/Cantarell-Regular.ufo/glyphs/el-cy.glif
index db49830d..0820480a 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="580"/>
   <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="96" y="-11" type="curve" smooth="yes"/>
+      <point x="181" y="-11"/>
+      <point x="225" y="68"/>
+      <point x="225" y="218" type="curve" smooth="yes"/>
+      <point x="225" y="415" type="line"/>
+      <point x="417" y="415" type="line"/>
+      <point x="417" y="0" type="line"/>
+      <point x="497" y="0" type="line"/>
+      <point x="497" y="482" type="line"/>
+      <point x="150" y="482" type="line"/>
+      <point x="150" y="211" type="line" smooth="yes"/>
+      <point x="150" y="111"/>
+      <point x="128" y="60"/>
+      <point x="84" y="60" type="curve" smooth="yes"/>
+      <point x="72" y="60"/>
+      <point x="55" y="64"/>
+      <point x="35" y="73" type="curve"/>
+      <point x="18" y="13" type="line"/>
+      <point x="42" y="-3"/>
+      <point x="69" 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/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/en-cy.glif b/src/Cantarell-Regular.ufo/glyphs/en-cy.glif
index 15ec96a6..5463b74a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/en-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/en-cy.glif
@@ -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/endescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/endescender-cy.glif
index 0ee10d92..2aeacbce 100644
--- a/src/Cantarell-Regular.ufo/glyphs/endescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/endescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="endescender-cy" format="2">
-  <advance width="591"/>
+  <advance width="589"/>
   <unicode hex="04A3"/>
   <outline>
     <component base="en-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/enghe-cy.glif b/src/Cantarell-Regular.ufo/glyphs/enghe-cy.glif
index 44e54096..96fc4d60 100644
--- a/src/Cantarell-Regular.ufo/glyphs/enghe-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/enghe-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="enghe-cy" format="2">
-  <advance width="688"/>
+  <advance width="699"/>
   <unicode hex="04A5"/>
   <outline>
     <contour>
@@ -28,4 +28,12 @@
       <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/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/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/ghemiddlehook-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/ghemiddlehook-cy.glif
index 7ac32887..cff512ff 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ghemiddlehook-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ghemiddlehook-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ghemiddlehook-cy" format="2">
-  <advance width="549"/>
+  <advance width="547"/>
   <unicode hex="0495"/>
   <outline>
     <contour>
@@ -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/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/ia-cy.glif b/src/Cantarell-Regular.ufo/glyphs/ia-cy.glif
index 4d21d9e4..182e4797 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ia-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ia-cy.glif
@@ -1,40 +1,40 @@
 <?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="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="383" y="412" type="line"/>
+      <point x="383" 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"/>
     </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"/>
+      <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>
     <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="356" y="0" type="line"/>
+      <point x="436" y="0" type="line"/>
+      <point x="436" y="482" type="line"/>
+      <point x="356" y="482" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -48,6 +48,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/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/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 68cec0e8..2b8e525f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/izhitsa-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/izhitsa-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="izhitsa-cy" format="2">
-  <advance width="501"/>
+  <advance width="499"/>
   <unicode hex="0475"/>
   <outline>
     <contour>
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..0e4ee344 100644
--- a/src/Cantarell-Regular.ufo/glyphs/kabashkir-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/kabashkir-cy.glif
@@ -1,38 +1,40 @@
 <?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="21" y="415" type="line"/>
+      <point x="275" y="415" type="line"/>
+      <point x="275" y="482" type="line"/>
+      <point x="21" y="482" 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"/>
+      <point x="194" y="0" type="line"/>
+      <point x="275" y="0" type="line"/>
+      <point x="275" y="482" type="line"/>
+      <point x="194" 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..fbaa15fc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/kadescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/kadescender-cy.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kadescender-cy" format="2">
-  <advance width="544"/>
+  <advance width="538"/>
   <unicode hex="049B"/>
   <outline>
     <component base="ka-cy"/>
-    <component base="descender-cy" xOffset="338"/>
+    <component base="descender-cy" xOffset="337"/>
   </outline>
   <lib>
     <dict>
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/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/lje-cy.glif b/src/Cantarell-Regular.ufo/glyphs/lje-cy.glif
index caca6746..8a84b4b3 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="849"/>
   <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="465" y="0" type="line"/>
+      <point x="610" y="0" type="line" smooth="yes"/>
+      <point x="736" y="0"/>
+      <point x="813" y="62"/>
+      <point x="813" y="164" type="curve" smooth="yes"/>
+      <point x="813" y="259"/>
+      <point x="743" y="320"/>
+      <point x="640" y="320" type="curve" smooth="yes"/>
+      <point x="465" y="320" type="line"/>
+      <point x="465" y="255" type="line"/>
+      <point x="627" y="255" type="line" smooth="yes"/>
+      <point x="689" y="255"/>
+      <point x="733" y="214"/>
+      <point x="733" y="156" type="curve" smooth="yes"/>
+      <point x="733" y="100"/>
+      <point x="691" y="67"/>
+      <point x="621" y="67" type="curve" smooth="yes"/>
+      <point x="465" y="67" type="line"/>
     </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="96" y="-11" type="curve" smooth="yes"/>
+      <point x="181" y="-11"/>
+      <point x="225" y="68"/>
+      <point x="225" y="218" type="curve" smooth="yes"/>
+      <point x="225" y="415" type="line"/>
+      <point x="417" y="415" type="line"/>
+      <point x="417" y="0" type="line"/>
+      <point x="497" y="0" type="line"/>
+      <point x="497" y="482" type="line"/>
+      <point x="150" y="482" type="line"/>
+      <point x="150" y="211" type="line" smooth="yes"/>
+      <point x="150" y="111"/>
+      <point x="128" y="60"/>
+      <point x="84" y="60" type="curve" smooth="yes"/>
+      <point x="72" y="60"/>
+      <point x="55" y="64"/>
+      <point x="35" y="73" type="curve"/>
+      <point x="18" y="13" type="line"/>
+      <point x="42" y="-3"/>
+      <point x="69" y="-11"/>
     </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/nje-cy.glif b/src/Cantarell-Regular.ufo/glyphs/nje-cy.glif
index bf2245d2..8563ba20 100644
--- a/src/Cantarell-Regular.ufo/glyphs/nje-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/nje-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nje-cy" format="2">
-  <advance width="837"/>
+  <advance width="835"/>
   <unicode hex="045A"/>
   <outline>
     <contour>
@@ -42,4 +42,12 @@
       <point x="451" y="67" 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/oslash.glif b/src/Cantarell-Regular.ufo/glyphs/oslash.glif
index 18fcec56..176215e8 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="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="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="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="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="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>
   </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/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/sha-cy.glif b/src/Cantarell-Regular.ufo/glyphs/sha-cy.glif
index 0d77b535..7db02f53 100644
--- a/src/Cantarell-Regular.ufo/glyphs/sha-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/sha-cy.glif
@@ -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>=|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..8993d1ba 100644
--- a/src/Cantarell-Regular.ufo/glyphs/shcha-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/shcha-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="shcha-cy" format="2">
-  <advance width="822"/>
+  <advance width="826"/>
   <unicode hex="0449"/>
   <outline>
     <contour>
@@ -35,6 +35,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>tse-cy</string>
     </dict>
   </lib>
 </glyph>
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/te-cy.glif b/src/Cantarell-Regular.ufo/glyphs/te-cy.glif
index 019f095e..404bf974 100644
--- a/src/Cantarell-Regular.ufo/glyphs/te-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/te-cy.glif
@@ -1,20 +1,20 @@
 <?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"/>
+  <anchor x="474" 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"/>
+      <point x="203" y="0" type="line"/>
+      <point x="282" y="0" type="line"/>
+      <point x="282" y="460" type="line"/>
+      <point x="203" 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="21" 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"/>
     </contour>
   </outline>
   <lib>
@@ -28,6 +28,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/tse-cy.glif b/src/Cantarell-Regular.ufo/glyphs/tse-cy.glif
index 1a35861c..3c48812a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tse-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tse-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tse-cy" format="2">
-  <advance width="582"/>
+  <advance width="572"/>
   <unicode hex="0446"/>
   <outline>
     <contour>
@@ -31,6 +31,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/ve-cy.glif b/src/Cantarell-Regular.ufo/glyphs/ve-cy.glif
index b978a260..852a7008 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,20 +15,20 @@
       <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="332" y="415"/>
+      <point x="370" y="391"/>
+      <point x="370" y="348" type="curve" smooth="yes"/>
+      <point x="370" y="311"/>
+      <point x="343" y="286"/>
       <point x="282" y="267" type="curve"/>
       <point x="379" y="260" type="line"/>
       <point x="423" y="276"/>
@@ -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/yat-cy.glif b/src/Cantarell-Regular.ufo/glyphs/yat-cy.glif
index 460828c7..2591c8d3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/yat-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/yat-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yat-cy" format="2">
-  <advance width="514"/>
+  <advance width="512"/>
   <unicode hex="0463"/>
   <outline>
     <contour>
@@ -32,4 +32,10 @@
       <point x="23" y="524" 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/yeru-cy.glif b/src/Cantarell-Regular.ufo/glyphs/yeru-cy.glif
index ee38d157..c912742a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/yeru-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/yeru-cy.glif
@@ -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/yusbig-cy.glif b/src/Cantarell-Regular.ufo/glyphs/yusbig-cy.glif
index aa48da63..9e4d2bc2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/yusbig-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/yusbig-cy.glif
@@ -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/ze-cy.glif b/src/Cantarell-Regular.ufo/glyphs/ze-cy.glif
index 837fad9d..e3db23cd 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="420"/>
+      <point x="206" y="420" type="curve" smooth="yes"/>
+      <point x="279" y="420"/>
+      <point x="327" y="392"/>
+      <point x="327" y="351" type="curve" smooth="yes"/>
+      <point x="327" y="309"/>
+      <point x="276" 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/zhe-cy.glif b/src/Cantarell-Regular.ufo/glyphs/zhe-cy.glif
index 9e025372..35084f14 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="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>
     <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="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="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="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>
   </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..e82d4976 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zhedescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zhedescender-cy.glif
@@ -4,7 +4,7 @@
   <unicode hex="0497"/>
   <outline>
     <component base="zhe-cy"/>
-    <component base="descender-cy" xOffset="577"/>
+    <component base="descender-cy" xOffset="585"/>
   </outline>
   <lib>
     <dict>
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>


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