From bf27f7475bedab45873c67f1c1cb67e17d2682bd Mon Sep 17 00:00:00 2001
From: Rasmus Andersson <rasmus@notion.se>
Date: Tue, 9 Oct 2018 07:20:44 -0700
Subject: cyrillic

---
 src/Inter-UI-Black.ufo/glyphs/A_dieresis.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/B_dotaccent.glif     |   2 +-
 src/Inter-UI-Black.ufo/glyphs/C_dotaccent.glif     |   2 +-
 .../glyphs/C_hedieresiscyrillic.glif               |   2 +-
 .../glyphs/C_heverticalstrokecyrillic.glif         |  45 +++-----
 src/Inter-UI-Black.ufo/glyphs/D_dotaccent.glif     |   2 +-
 src/Inter-UI-Black.ufo/glyphs/E_dieresis.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/E_dotaccent.glif     |   2 +-
 src/Inter-UI-Black.ufo/glyphs/F_dotaccent.glif     |   2 +-
 src/Inter-UI-Black.ufo/glyphs/G_dotaccent.glif     |   2 +-
 src/Inter-UI-Black.ufo/glyphs/H_dieresis.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/H_dotaccent.glif     |   2 +-
 src/Inter-UI-Black.ufo/glyphs/I_dieresis.glif      |   2 +-
 .../glyphs/I_dieresiscyrillic.glif                 |   2 +-
 src/Inter-UI-Black.ufo/glyphs/I_dotaccent.glif     |   2 +-
 src/Inter-UI-Black.ufo/glyphs/K_acyr.glif          |   6 +-
 .../glyphs/K_averticalstrokecyrillic.glif          |  57 +++++-----
 src/Inter-UI-Black.ufo/glyphs/M_dotaccent.glif     |   2 +-
 src/Inter-UI-Black.ufo/glyphs/N_dotaccent.glif     |   2 +-
 .../glyphs/O_barreddieresiscyrillic.glif           |   2 +-
 src/Inter-UI-Black.ufo/glyphs/O_dieresis.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/P_dotaccent.glif     |   2 +-
 src/Inter-UI-Black.ufo/glyphs/R_dotaccent.glif     |   2 +-
 .../glyphs/S_chwadieresiscyrillic.glif             |   2 +-
 src/Inter-UI-Black.ufo/glyphs/S_dotaccent.glif     |   2 +-
 .../glyphs/S_dotbelowdotaccent.glif                |   2 +-
 src/Inter-UI-Black.ufo/glyphs/S_hhacyrillic.glif   |  37 ++----
 src/Inter-UI-Black.ufo/glyphs/T_dotaccent.glif     |   2 +-
 src/Inter-UI-Black.ufo/glyphs/T_etsecyrillic.glif  |  43 +++----
 src/Inter-UI-Black.ufo/glyphs/U_dieresis.glif      |   2 +-
 .../glyphs/U_dieresiscyrillic.glif                 |   4 +-
 .../glyphs/U_hungarumlautcyrillic.glif             |   4 +-
 .../glyphs/U_macroncyrillic.glif                   |   4 +-
 .../glyphs/U_psilondieresishooksymbolgreek.glif    |   2 +-
 src/Inter-UI-Black.ufo/glyphs/W_dieresis.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/W_dotaccent.glif     |   2 +-
 src/Inter-UI-Black.ufo/glyphs/X_dieresis.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/X_dotaccent.glif     |   2 +-
 src/Inter-UI-Black.ufo/glyphs/Y_dieresis.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/Y_dotaccent.glif     |   2 +-
 src/Inter-UI-Black.ufo/glyphs/Z_dotaccent.glif     |   2 +-
 .../glyphs/Z_edieresiscyrillic.glif                |   2 +-
 .../glyphs/Z_hebrevecyrillic.glif                  |   4 +-
 .../glyphs/Z_hedescendercyrillic.glif              |   4 +-
 .../glyphs/Z_hedieresiscyrillic.glif               |   4 +-
 src/Inter-UI-Black.ufo/glyphs/adieresis.glif       |   2 +-
 src/Inter-UI-Black.ufo/glyphs/afii10023.glif       |   2 +-
 src/Inter-UI-Black.ufo/glyphs/afii10024.glif       |  58 ++++------
 src/Inter-UI-Black.ufo/glyphs/afii10037.glif       |  63 +++++------
 src/Inter-UI-Black.ufo/glyphs/afii10040.glif       |  34 +++---
 src/Inter-UI-Black.ufo/glyphs/afii10041.glif       |  12 +-
 src/Inter-UI-Black.ufo/glyphs/afii10042.glif       |  16 ++-
 src/Inter-UI-Black.ufo/glyphs/afii10043.glif       |  39 +++----
 src/Inter-UI-Black.ufo/glyphs/afii10044.glif       |  47 +++-----
 src/Inter-UI-Black.ufo/glyphs/afii10046.glif       |   4 +
 src/Inter-UI-Black.ufo/glyphs/afii10047.glif       |  70 ++++++------
 src/Inter-UI-Black.ufo/glyphs/afii10049.glif       |  44 ++-----
 src/Inter-UI-Black.ufo/glyphs/afii10056.glif       |   2 +-
 src/Inter-UI-Black.ufo/glyphs/afii10058.glif       |  57 +++-------
 src/Inter-UI-Black.ufo/glyphs/afii10059.glif       |  59 ++++------
 src/Inter-UI-Black.ufo/glyphs/afii10060.glif       |  48 +++-----
 src/Inter-UI-Black.ufo/glyphs/afii10062.glif       |   4 +-
 src/Inter-UI-Black.ufo/glyphs/afii10145.glif       |  30 ++---
 src/Inter-UI-Black.ufo/glyphs/bar.glif             |  37 +++---
 src/Inter-UI-Black.ufo/glyphs/bdotaccent.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/cdotaccent.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/checyrillic.glif     |  46 ++++----
 .../glyphs/chedescendercyrillic.glif               |   4 +-
 .../glyphs/chedieresiscyrillic.glif                |   4 +-
 .../glyphs/cheverticalstrokecyrillic.glif          |  49 +++-----
 src/Inter-UI-Black.ufo/glyphs/ddotaccent.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/dieresis.glif        |  49 ++++----
 src/Inter-UI-Black.ufo/glyphs/dotaccent.glif       |  24 ++--
 src/Inter-UI-Black.ufo/glyphs/dzhecyrillic.glif    |  30 ++---
 src/Inter-UI-Black.ufo/glyphs/eacute.glif          |   2 +-
 src/Inter-UI-Black.ufo/glyphs/ebreve.glif          |   2 +-
 src/Inter-UI-Black.ufo/glyphs/ecaron.glif          |   2 +-
 src/Inter-UI-Black.ufo/glyphs/ecedillabreve.glif   |   2 +-
 src/Inter-UI-Black.ufo/glyphs/ecircumflex.glif     |   2 +-
 .../glyphs/ecircumflexacute.glif                   |   2 +-
 .../glyphs/ecircumflexdotbelow.glif                |   2 +-
 .../glyphs/ecircumflexgrave.glif                   |   2 +-
 .../glyphs/ecircumflexhookabove.glif               |   2 +-
 .../glyphs/ecircumflextilde.glif                   |   2 +-
 src/Inter-UI-Black.ufo/glyphs/edblgrave.glif       |   2 +-
 src/Inter-UI-Black.ufo/glyphs/edieresis.glif       |   2 +-
 src/Inter-UI-Black.ufo/glyphs/edotaccent.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/efcyrillic.glif      | 126 +++++++++++----------
 src/Inter-UI-Black.ufo/glyphs/egrave.glif          |   2 +-
 src/Inter-UI-Black.ufo/glyphs/ehookabove.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/einvertedbreve.glif  |   2 +-
 src/Inter-UI-Black.ufo/glyphs/emacron.glif         |   2 +-
 src/Inter-UI-Black.ufo/glyphs/emacronacute.glif    |   2 +-
 src/Inter-UI-Black.ufo/glyphs/emacrongrave.glif    |   2 +-
 src/Inter-UI-Black.ufo/glyphs/emcyrillic.glif      |  36 +++---
 src/Inter-UI-Black.ufo/glyphs/encyrillic.glif      |  28 +++--
 .../glyphs/endescendercyrillic.glif                |  17 ++-
 src/Inter-UI-Black.ufo/glyphs/enghecyrillic.glif   |  41 +++----
 src/Inter-UI-Black.ufo/glyphs/enhookcyrillic.glif  |  53 ++++-----
 .../glyphs/ereversedcyrillic.glif                  |  70 ++++++------
 src/Inter-UI-Black.ufo/glyphs/etilde.glif          |   2 +-
 src/Inter-UI-Black.ufo/glyphs/fdotaccent.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/gamma.glif           |  51 ++++-----
 src/Inter-UI-Black.ufo/glyphs/gdotaccent.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/gecyrillic.glif      |   8 +-
 .../glyphs/ghemiddlehookcyrillic.glif              |  48 ++++----
 src/Inter-UI-Black.ufo/glyphs/hdieresis.glif       |   2 +-
 src/Inter-UI-Black.ufo/glyphs/hdotaccent.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/i.glif               |   2 +-
 src/Inter-UI-Black.ufo/glyphs/iacyrillic.glif      |  54 +++++----
 src/Inter-UI-Black.ufo/glyphs/idieresis.glif       |   2 +-
 .../glyphs/idieresiscyrillic.glif                  |   4 +-
 src/Inter-UI-Black.ufo/glyphs/iebrevecyrillic.glif |   2 +-
 src/Inter-UI-Black.ufo/glyphs/iicyrillic.glif      |  28 +++--
 src/Inter-UI-Black.ufo/glyphs/iishortcyrillic.glif |   4 +-
 src/Inter-UI-Black.ufo/glyphs/ij.glif              |   2 +-
 src/Inter-UI-Black.ufo/glyphs/imacroncyrillic.glif |   4 +-
 src/Inter-UI-Black.ufo/glyphs/iogonek.glif         |   2 +-
 src/Inter-UI-Black.ufo/glyphs/iota.glif            |   6 +-
 src/Inter-UI-Black.ufo/glyphs/iotadieresis.glif    |   4 +-
 .../glyphs/iotadieresistonos.glif                  |   4 +-
 src/Inter-UI-Black.ufo/glyphs/iotatonos.glif       |   4 +-
 src/Inter-UI-Black.ufo/glyphs/j.glif               |   4 +-
 src/Inter-UI-Black.ufo/glyphs/jcaron.glif          |   4 +-
 src/Inter-UI-Black.ufo/glyphs/jcircumflex.glif     |   4 +-
 src/Inter-UI-Black.ufo/glyphs/jcrosstail.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/jdotless.glif        |  28 ++---
 src/Inter-UI-Black.ufo/glyphs/jdotlessbar.glif     |   4 +-
 src/Inter-UI-Black.ufo/glyphs/jecyrillic.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/kacyrillic.glif      |  45 ++++----
 .../glyphs/kadescendercyrillic.glif                |   4 +-
 src/Inter-UI-Black.ufo/glyphs/kjecyrillic.glif     |   4 +-
 src/Inter-UI-Black.ufo/glyphs/ljecyrillic.glif     |  20 ++--
 src/Inter-UI-Black.ufo/glyphs/mdotaccent.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/ndotaccent.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/nj.glif              |   2 +-
 src/Inter-UI-Black.ufo/glyphs/njecyrillic.glif     |   8 +-
 src/Inter-UI-Black.ufo/glyphs/oacute.glif          |   2 +-
 .../glyphs/obarreddieresiscyrillic.glif            |   2 +-
 src/Inter-UI-Black.ufo/glyphs/obreve.glif          |   2 +-
 src/Inter-UI-Black.ufo/glyphs/ocaron.glif          |   2 +-
 src/Inter-UI-Black.ufo/glyphs/ocircumflex.glif     |   2 +-
 .../glyphs/ocircumflexacute.glif                   |   2 +-
 .../glyphs/ocircumflexdotbelow.glif                |   2 +-
 .../glyphs/ocircumflexgrave.glif                   |   2 +-
 .../glyphs/ocircumflexhookabove.glif               |   2 +-
 .../glyphs/ocircumflextilde.glif                   |   2 +-
 src/Inter-UI-Black.ufo/glyphs/odblgrave.glif       |   2 +-
 src/Inter-UI-Black.ufo/glyphs/odieresis.glif       |   2 +-
 src/Inter-UI-Black.ufo/glyphs/ograve.glif          |   2 +-
 src/Inter-UI-Black.ufo/glyphs/ohookabove.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/ohornacute.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/ohorngrave.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/ohornhookabove.glif  |   2 +-
 src/Inter-UI-Black.ufo/glyphs/ohorntilde.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/ohungarumlaut.glif   |   2 +-
 src/Inter-UI-Black.ufo/glyphs/oinvertedbreve.glif  |   2 +-
 src/Inter-UI-Black.ufo/glyphs/omacron.glif         |   2 +-
 src/Inter-UI-Black.ufo/glyphs/omacronacute.glif    |   2 +-
 src/Inter-UI-Black.ufo/glyphs/omacrongrave.glif    |   2 +-
 src/Inter-UI-Black.ufo/glyphs/omegacyrillic.glif   |  78 +++++++------
 src/Inter-UI-Black.ufo/glyphs/omicrontonos.glif    |   2 +-
 src/Inter-UI-Black.ufo/glyphs/oogonekmacron.glif   |   2 +-
 src/Inter-UI-Black.ufo/glyphs/oslashacute.glif     |   2 +-
 src/Inter-UI-Black.ufo/glyphs/otildeacute.glif     |   2 +-
 src/Inter-UI-Black.ufo/glyphs/otildedieresis.glif  |   2 +-
 src/Inter-UI-Black.ufo/glyphs/pdotaccent.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/pecyrillic.glif      |  46 ++++----
 .../glyphs/pemiddlehookcyrillic.glif               |  68 ++++++-----
 src/Inter-UI-Black.ufo/glyphs/rdotaccent.1.glif    |   2 +-
 src/Inter-UI-Black.ufo/glyphs/rdotaccent.glif      |   2 +-
 .../glyphs/schwadieresiscyrillic.glif              |   2 +-
 src/Inter-UI-Black.ufo/glyphs/sdotaccent.glif      |   2 +-
 .../glyphs/sdotbelowdotaccent.glif                 |   2 +-
 src/Inter-UI-Black.ufo/glyphs/shacyrillic.glif     |  30 ++---
 src/Inter-UI-Black.ufo/glyphs/shchacyrillic.glif   |  39 +++----
 src/Inter-UI-Black.ufo/glyphs/slash.glif           |  33 +++---
 .../glyphs/softsigncyrillic.glif                   |  46 ++++----
 src/Inter-UI-Black.ufo/glyphs/tdieresis.glif       |   2 +-
 src/Inter-UI-Black.ufo/glyphs/tdotaccent.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/tecyrillic.glif      |  32 +++---
 .../glyphs/tedescendercyrillic.glif                |   4 +-
 src/Inter-UI-Black.ufo/glyphs/tsecyrillic.glif     |   8 +-
 src/Inter-UI-Black.ufo/glyphs/udieresis.glif       |   2 +-
 src/Inter-UI-Black.ufo/glyphs/uni0226.glif         |   2 +-
 src/Inter-UI-Black.ufo/glyphs/uni0227.glif         |   2 +-
 src/Inter-UI-Black.ufo/glyphs/uni022B_.glif        |   2 +-
 src/Inter-UI-Black.ufo/glyphs/uni022D_.glif        |   2 +-
 src/Inter-UI-Black.ufo/glyphs/uni022E_.glif        |   2 +-
 src/Inter-UI-Black.ufo/glyphs/uni022F_.glif        |   2 +-
 src/Inter-UI-Black.ufo/glyphs/uni0231.glif         |   2 +-
 src/Inter-UI-Black.ufo/glyphs/uni0249.ccmp.glif    |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni0249.glif         |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni0299.glif         |   2 +-
 src/Inter-UI-Black.ufo/glyphs/uni0450.glif         |   2 +-
 src/Inter-UI-Black.ufo/glyphs/uni045D_.glif        |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni048B_.glif        |   6 +-
 src/Inter-UI-Black.ufo/glyphs/uni04C_A_.glif       |  17 ++-
 src/Inter-UI-Black.ufo/glyphs/uni04C_E_.glif       |  17 ++-
 src/Inter-UI-Black.ufo/glyphs/uni04E_C_.glif       |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni04E_D_.glif       |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_30.glif        |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_31.glif        |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_32.glif        |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_33.glif        |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_34.glif        |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_35.glif        |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_36.glif        |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_37.glif        |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_40.glif        |   2 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_41.glif        |   2 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_42.glif        |   2 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_43.glif        |   2 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_44.glif        |   2 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_45.glif        |   2 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_50.glif        |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_51.glif        |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_52.glif        |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_53.glif        |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_54.glif        |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_55.glif        |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_56.glif        |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_57.glif        |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_76.glif        |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_77.glif        |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_78.glif        |   2 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_79.glif        |   2 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_7A_.glif       |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_7B_.glif       |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_D_0.glif       |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_D_1.glif       |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_D_2.glif       |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_D_3.glif       |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_D_6.glif       |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_D_7.glif       |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_E_0.glif       |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_E_1.glif       |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_E_2.glif       |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_E_3.glif       |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_E_6.glif       |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni1F_E_7.glif       |   4 +-
 src/Inter-UI-Black.ufo/glyphs/upsilon.glif         |  50 ++++----
 src/Inter-UI-Black.ufo/glyphs/upsilondieresis.glif |   4 +-
 .../glyphs/upsilondieresistonos.glif               |   4 +-
 src/Inter-UI-Black.ufo/glyphs/upsilontonos.glif    |   4 +-
 .../glyphs/ustraightcyrillic.glif                  |   2 +-
 .../glyphs/ustraightstrokecyrillic.glif            |   4 +-
 src/Inter-UI-Black.ufo/glyphs/vecyrillic.glif      | 107 +++++++++--------
 src/Inter-UI-Black.ufo/glyphs/wacute.glif          |   2 +-
 src/Inter-UI-Black.ufo/glyphs/wcircumflex.glif     |   2 +-
 src/Inter-UI-Black.ufo/glyphs/wdieresis.glif       |   2 +-
 src/Inter-UI-Black.ufo/glyphs/wdotaccent.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/wgrave.glif          |   2 +-
 src/Inter-UI-Black.ufo/glyphs/wring.glif           |   2 +-
 src/Inter-UI-Black.ufo/glyphs/xdieresis.glif       |   2 +-
 src/Inter-UI-Black.ufo/glyphs/xdotaccent.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/ydieresis.glif       |   2 +-
 src/Inter-UI-Black.ufo/glyphs/ydotaccent.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/yericyrillic.glif    |  16 +--
 .../glyphs/yerudieresiscyrillic.glif               |  15 +--
 src/Inter-UI-Black.ufo/glyphs/yotgreek.glif        |   2 +-
 src/Inter-UI-Black.ufo/glyphs/zdotaccent.glif      |   2 +-
 .../glyphs/zedieresiscyrillic.glif                 |   2 +-
 .../glyphs/zhebrevecyrillic.glif                   |   4 +-
 src/Inter-UI-Black.ufo/glyphs/zhecyrillic.glif     |  70 ++++++------
 .../glyphs/zhedescendercyrillic.glif               |   4 +-
 .../glyphs/zhedieresiscyrillic.glif                |   4 +-
 267 files changed, 1368 insertions(+), 1529 deletions(-)

(limited to 'src/Inter-UI-Black.ufo/glyphs')

diff --git a/src/Inter-UI-Black.ufo/glyphs/A_dieresis.glif b/src/Inter-UI-Black.ufo/glyphs/A_dieresis.glif
index aa12e150a..da0faa0d4 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_dieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_dieresis.glif
@@ -5,6 +5,6 @@
   <guideline x="1084.0" y="1232.0" angle="90.0"/>
   <outline>
     <component base="A"/>
-    <component base="casedieresis.cn" xOffset="460.0" yOffset="68.0"/>
+    <component base="casedieresis.cn" xOffset="460.0" yOffset="24.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/B_dotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/B_dotaccent.glif
index 0399b1258..bc7fe530c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/B_dotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/B_dotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E02"/>
   <outline>
     <component base="B"/>
-    <component base="dotaccent" xOffset="456.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="456.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/C_dotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/C_dotaccent.glif
index bfd59f4d3..a0150ca59 100644
--- a/src/Inter-UI-Black.ufo/glyphs/C_dotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/C_dotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="010A"/>
   <outline>
     <component base="C"/>
-    <component base="dotaccent" xOffset="652.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="652.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/C_hedieresiscyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/C_hedieresiscyrillic.glif
index 7a2a1706d..4aa8dae0d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/C_hedieresiscyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/C_hedieresiscyrillic.glif
@@ -4,6 +4,6 @@
   <unicode hex="04F4"/>
   <outline>
     <component base="afii10041"/>
-    <component base="dieresis" xOffset="576.0" yOffset="468.0"/>
+    <component base="dieresis" xOffset="476.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/C_heverticalstrokecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/C_heverticalstrokecyrillic.glif
index e869ca342..51e8cbf84 100644
--- a/src/Inter-UI-Black.ufo/glyphs/C_heverticalstrokecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/C_heverticalstrokecyrillic.glif
@@ -1,41 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Cheverticalstrokecyrillic" format="2">
-  <advance width="1856.0"/>
+  <advance width="2248.0"/>
   <unicode hex="04B8"/>
   <outline>
     <contour>
-      <point x="1020.0" y="1516.0" type="line"/>
-      <point x="772.0" y="1516.0" type="line"/>
-      <point x="772.0" y="388.0" type="line"/>
-      <point x="1020.0" y="388.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="60.0" y="2004.0" type="line"/>
-      <point x="60.0" y="1404.0" type="line"/>
-      <point x="62.0" y="928.0"/>
-      <point x="422.0" y="700.0"/>
-      <point x="960.0" y="700.0" type="curve" smooth="yes"/>
-      <point x="998.0" y="700.0"/>
-      <point x="1298.0" y="712.0"/>
-      <point x="1364.0" y="736.0" type="curve"/>
-      <point x="1364.0" y="1156.0" type="line"/>
-      <point x="1306.0" y="1136.0"/>
-      <point x="1030.0" y="1128.0"/>
-      <point x="960.0" y="1128.0" type="curve" smooth="yes"/>
-      <point x="686.0" y="1128.0"/>
-      <point x="598.0" y="1212.0"/>
-      <point x="596.0" y="1404.0" type="curve" smooth="yes"/>
-      <point x="596.0" y="2004.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1260.0" y="2004.0" type="line"/>
-      <point x="1260.0" y="0.0" type="line"/>
-      <point x="1800.0" y="0.0" type="line"/>
-      <point x="1800.0" y="2004.0" type="line"/>
+      <point x="1216.0" y="1516.0" type="line"/>
+      <point x="968.0" y="1516.0" type="line"/>
+      <point x="968.0" y="388.0" type="line"/>
+      <point x="1216.0" y="388.0" type="line"/>
     </contour>
+    <component base="afii10041"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>afii10041</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>afii10041</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -43,10 +24,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
             <real>0.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -85,8 +66,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
             <real>0.0</real>
+            <real>2.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/D_dotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/D_dotaccent.glif
index aa7e8925f..66167b3e3 100644
--- a/src/Inter-UI-Black.ufo/glyphs/D_dotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/D_dotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E0A"/>
   <outline>
     <component base="D"/>
-    <component base="dotaccent" xOffset="356.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="356.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/E_dieresis.glif b/src/Inter-UI-Black.ufo/glyphs/E_dieresis.glif
index 476a909d3..bd6490cb6 100644
--- a/src/Inter-UI-Black.ufo/glyphs/E_dieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/E_dieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="00CB"/>
   <outline>
     <component base="E"/>
-    <component base="casedieresis.cn" xOffset="216.0" yOffset="68.0"/>
+    <component base="casedieresis.cn" xOffset="216.0" yOffset="24.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/E_dotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/E_dotaccent.glif
index 89b71f235..55f1a7d53 100644
--- a/src/Inter-UI-Black.ufo/glyphs/E_dotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/E_dotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="0116"/>
   <outline>
     <component base="E"/>
-    <component base="dotaccent" xOffset="416.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="416.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/F_dotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/F_dotaccent.glif
index 43e750f40..f54a37dad 100644
--- a/src/Inter-UI-Black.ufo/glyphs/F_dotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/F_dotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E1E"/>
   <outline>
     <component base="F"/>
-    <component base="dotaccent" xOffset="396.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="396.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/G_dotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/G_dotaccent.glif
index f68570058..0f8d12b11 100644
--- a/src/Inter-UI-Black.ufo/glyphs/G_dotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/G_dotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="0120"/>
   <outline>
     <component base="G"/>
-    <component base="dotaccent" xOffset="648.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="648.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/H_dieresis.glif b/src/Inter-UI-Black.ufo/glyphs/H_dieresis.glif
index 8101a0eb5..847502616 100644
--- a/src/Inter-UI-Black.ufo/glyphs/H_dieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/H_dieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E26"/>
   <outline>
     <component base="H"/>
-    <component base="casedieresis.cn" xOffset="396.0" yOffset="68.0"/>
+    <component base="casedieresis.cn" xOffset="396.0" yOffset="24.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/H_dotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/H_dotaccent.glif
index c814b3fae..8696f6034 100644
--- a/src/Inter-UI-Black.ufo/glyphs/H_dotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/H_dotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E22"/>
   <outline>
     <component base="H"/>
-    <component base="dotaccent" xOffset="596.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="596.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/I_dieresis.glif b/src/Inter-UI-Black.ufo/glyphs/I_dieresis.glif
index d400a7cca..9fc50d3e3 100644
--- a/src/Inter-UI-Black.ufo/glyphs/I_dieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/I_dieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="00CF"/>
   <outline>
     <component base="I"/>
-    <component base="casedieresis.cn" xOffset="-248.0" yOffset="68.0"/>
+    <component base="casedieresis.cn" xOffset="-248.0" yOffset="24.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/I_dieresiscyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/I_dieresiscyrillic.glif
index 015b71b9f..591bc2dfa 100644
--- a/src/Inter-UI-Black.ufo/glyphs/I_dieresiscyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/I_dieresiscyrillic.glif
@@ -4,6 +4,6 @@
   <unicode hex="04E4"/>
   <outline>
     <component base="afii10026"/>
-    <component base="casedieresis.cn" xOffset="356.0" yOffset="68.0"/>
+    <component base="casedieresis.cn" xOffset="356.0" yOffset="24.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/I_dotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/I_dotaccent.glif
index 8152168b6..4d56c324c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/I_dotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/I_dotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="0130"/>
   <outline>
     <component base="I"/>
-    <component base="dotaccent" xOffset="-48.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="-48.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/K_acyr.glif b/src/Inter-UI-Black.ufo/glyphs/K_acyr.glif
index bdef78828..29bd515e8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/K_acyr.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/K_acyr.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Kacyr" format="2">
-  <advance width="2232.0"/>
+  <advance width="2236.0"/>
   <unicode hex="041A"/>
   <outline>
     <contour>
@@ -21,6 +21,10 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>K</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>K</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/K_averticalstrokecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/K_averticalstrokecyrillic.glif
index 0aefe7f06..4a4273578 100644
--- a/src/Inter-UI-Black.ufo/glyphs/K_averticalstrokecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/K_averticalstrokecyrillic.glif
@@ -1,37 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Kaverticalstrokecyrillic" format="2">
-  <advance width="2312.0"/>
+  <advance width="2104.0"/>
   <unicode hex="049C"/>
   <outline>
     <contour>
-      <point x="184.0" y="2004.0" type="line"/>
-      <point x="184.0" y="0.0" type="line"/>
-      <point x="732.0" y="0.0" type="line"/>
-      <point x="732.0" y="2004.0" type="line"/>
+      <point x="772.0" y="1616.0" type="line"/>
+      <point x="772.0" y="440.0" type="line"/>
+      <point x="1024.0" y="440.0" type="line"/>
+      <point x="1024.0" y="1616.0" type="line"/>
     </contour>
     <contour>
-      <point x="824.0" y="1616.0" type="line"/>
-      <point x="824.0" y="440.0" type="line"/>
-      <point x="1076.0" y="440.0" type="line"/>
-      <point x="1076.0" y="1616.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1380.0" y="2004.0" type="line"/>
-      <point x="1088.0" y="1256.0" type="line"/>
-      <point x="576.0" y="1256.0" type="line"/>
-      <point x="636.0" y="740.0" type="line"/>
-      <point x="1324.0" y="740.0" type="line"/>
-      <point x="2076.0" y="2004.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1084.0" y="844.0" type="line"/>
-      <point x="1420.0" y="0.0" type="line"/>
-      <point x="2140.0" y="0.0" type="line"/>
-      <point x="1564.0" y="1088.0" type="line"/>
+      <point x="132.0" y="0.0" type="line"/>
+      <point x="680.0" y="0.0" type="line"/>
+      <point x="680.0" y="740.0" type="line"/>
+      <point x="1080.0" y="740.0" type="line"/>
+      <point x="1408.0" y="0.0" type="line"/>
+      <point x="2088.0" y="0.0" type="line"/>
+      <point x="1492.0" y="1120.0" type="line"/>
+      <point x="2024.0" y="2048.0" type="line"/>
+      <point x="1368.0" y="2048.0" type="line"/>
+      <point x="1036.0" y="1256.0" type="line"/>
+      <point x="680.0" y="1256.0" type="line"/>
+      <point x="680.0" y="2048.0" type="line"/>
+      <point x="132.0" y="2048.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>K</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>K</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -41,8 +40,8 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>0.0</real>
-            <real>0.0</real>
+            <real>1.0</real>
+            <real>12.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -61,14 +60,14 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
+            <real>0.0</real>
             <real>0.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
+            <real>0.0</real>
             <real>1.0</real>
           </array>
           <key>type</key>
@@ -81,8 +80,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>0.0</real>
-            <real>0.0</real>
+            <real>1.0</real>
+            <real>12.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/M_dotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/M_dotaccent.glif
index bd9074f0f..df42c7ebb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/M_dotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/M_dotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E40"/>
   <outline>
     <component base="M"/>
-    <component base="dotaccent" xOffset="852.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="852.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/N_dotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/N_dotaccent.glif
index 357161e95..7aa2a39cf 100644
--- a/src/Inter-UI-Black.ufo/glyphs/N_dotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/N_dotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E44"/>
   <outline>
     <component base="N"/>
-    <component base="dotaccent" xOffset="560.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="560.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/O_barreddieresiscyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/O_barreddieresiscyrillic.glif
index 42f3382cd..47f7e2942 100644
--- a/src/Inter-UI-Black.ufo/glyphs/O_barreddieresiscyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/O_barreddieresiscyrillic.glif
@@ -4,6 +4,6 @@
   <unicode hex="04EA"/>
   <outline>
     <component base="afii10147"/>
-    <component base="casedieresis.cn" xOffset="460.0" yOffset="68.0"/>
+    <component base="casedieresis.cn" xOffset="460.0" yOffset="24.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/O_dieresis.glif b/src/Inter-UI-Black.ufo/glyphs/O_dieresis.glif
index 70bd6e079..17c133cd0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/O_dieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/O_dieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="00D6"/>
   <outline>
     <component base="O"/>
-    <component base="casedieresis.cn" xOffset="460.0" yOffset="68.0"/>
+    <component base="casedieresis.cn" xOffset="460.0" yOffset="24.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/P_dotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/P_dotaccent.glif
index d0b420ea4..919c3763e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/P_dotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/P_dotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E56"/>
   <outline>
     <component base="P"/>
-    <component base="dotaccent" xOffset="444.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="444.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/R_dotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/R_dotaccent.glif
index 2f2778064..0bcb4bffa 100644
--- a/src/Inter-UI-Black.ufo/glyphs/R_dotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/R_dotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E58"/>
   <outline>
     <component base="R"/>
-    <component base="dotaccent" xOffset="452.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="452.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/S_chwadieresiscyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/S_chwadieresiscyrillic.glif
index 9def0f321..06bff251d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/S_chwadieresiscyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/S_chwadieresiscyrillic.glif
@@ -4,6 +4,6 @@
   <unicode hex="04DA"/>
   <outline>
     <component base="Schwacyrillic"/>
-    <component base="dieresis" xOffset="424.0" yOffset="404.0"/>
+    <component base="dieresis" xOffset="424.0" yOffset="360.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/S_dotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/S_dotaccent.glif
index fe8f0ce13..9eeee0d7c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/S_dotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/S_dotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E60"/>
   <outline>
     <component base="S"/>
-    <component base="dotaccent" xOffset="480.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="480.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/S_dotbelowdotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/S_dotbelowdotaccent.glif
index 3981d5d85..7502cc794 100644
--- a/src/Inter-UI-Black.ufo/glyphs/S_dotbelowdotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/S_dotbelowdotaccent.glif
@@ -5,6 +5,6 @@
   <outline>
     <component base="S"/>
     <component base="dotbelow" xOffset="1900.0" yOffset="-164.0"/>
-    <component base="dotaccent" xOffset="480.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="480.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/S_hhacyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/S_hhacyrillic.glif
index 7cc89a692..56f200ed6 100644
--- a/src/Inter-UI-Black.ufo/glyphs/S_hhacyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/S_hhacyrillic.glif
@@ -3,30 +3,7 @@
   <advance width="2248.0"/>
   <unicode hex="04BA"/>
   <outline>
-    <contour>
-      <point x="1996.0" y="0.0" type="line"/>
-      <point x="1996.0" y="596.0" type="line"/>
-      <point x="1995.0" y="1072.0"/>
-      <point x="1627.0" y="1304.0"/>
-      <point x="1092.0" y="1304.0" type="curve" smooth="yes"/>
-      <point x="1055.0" y="1304.0"/>
-      <point x="751.0" y="1292.0"/>
-      <point x="688.0" y="1272.0" type="curve"/>
-      <point x="688.0" y="840.0" type="line"/>
-      <point x="747.0" y="864.0"/>
-      <point x="1043.0" y="876.0"/>
-      <point x="1092.0" y="876.0" type="curve" smooth="yes"/>
-      <point x="1363.0" y="876.0"/>
-      <point x="1455.0" y="792.0"/>
-      <point x="1456.0" y="596.0" type="curve" smooth="yes"/>
-      <point x="1456.0" y="0.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="792.0" y="0.0" type="line"/>
-      <point x="792.0" y="2004.0" type="line"/>
-      <point x="256.0" y="2004.0" type="line"/>
-      <point x="256.0" y="0.0" type="line"/>
-    </contour>
+    <component base="afii10041" xScale="-1.0" yScale="-1.0" xOffset="2248.0" yOffset="2048.0"/>
   </outline>
   <lib>
     <dict>
@@ -37,10 +14,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>2.0</real>
+            <real>0.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -57,10 +34,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>2.0</real>
+            <real>0.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/T_dotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/T_dotaccent.glif
index 2ec58943a..92b53cb6c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/T_dotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/T_dotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E6A"/>
   <outline>
     <component base="T"/>
-    <component base="dotaccent" xOffset="508.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="508.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/T_etsecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/T_etsecyrillic.glif
index 344f480d7..a262f7944 100644
--- a/src/Inter-UI-Black.ufo/glyphs/T_etsecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/T_etsecyrillic.glif
@@ -1,35 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Tetsecyrillic" format="2">
-  <advance width="2756.0"/>
+  <advance width="2760.0"/>
   <unicode hex="04B4"/>
   <outline>
     <contour>
-      <point x="1472.0" y="2004.0" type="line"/>
-      <point x="80.0" y="2004.0" type="line"/>
-      <point x="80.0" y="1588.0" type="line"/>
-      <point x="1472.0" y="1588.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="2688.0" y="420.0" type="line"/>
-      <point x="2004.0" y="420.0" type="line"/>
-      <point x="2004.0" y="0.0" type="line"/>
-      <point x="2148.0" y="0.0" type="line"/>
-      <point x="2148.0" y="-484.0" type="line"/>
-      <point x="2664.0" y="-484.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="560.0" y="0.0" type="line"/>
-      <point x="2356.0" y="0.0" type="line"/>
-      <point x="2356.0" y="2004.0" type="line"/>
-      <point x="1812.0" y="2004.0" type="line"/>
-      <point x="1812.0" y="428.0" type="line"/>
-      <point x="1096.0" y="428.0" type="line"/>
-      <point x="1096.0" y="2004.0" type="line"/>
-      <point x="560.0" y="2004.0" type="line"/>
+      <point x="1468.0" y="2048.0" type="line"/>
+      <point x="76.0" y="2048.0" type="line"/>
+      <point x="76.0" y="1632.0" type="line"/>
+      <point x="1468.0" y="1632.0" type="line"/>
     </contour>
+    <component base="afii10040" xOffset="368.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>T</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>H</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -37,10 +24,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>7.0</real>
+            <real>0.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -59,8 +46,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
-            <real>7.0</real>
+            <real>0.0</real>
+            <real>1.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/U_dieresis.glif b/src/Inter-UI-Black.ufo/glyphs/U_dieresis.glif
index 8093f89d5..c5c65f052 100644
--- a/src/Inter-UI-Black.ufo/glyphs/U_dieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/U_dieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="00DC"/>
   <outline>
     <component base="U"/>
-    <component base="casedieresis.cn" xOffset="356.0" yOffset="68.0"/>
+    <component base="casedieresis.cn" xOffset="356.0" yOffset="24.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/U_dieresiscyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/U_dieresiscyrillic.glif
index 397acc8d4..8633ed3f1 100644
--- a/src/Inter-UI-Black.ufo/glyphs/U_dieresiscyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/U_dieresiscyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Udieresiscyrillic" format="2">
-  <advance width="1940.0"/>
+  <advance width="1980.0"/>
   <unicode hex="04F0"/>
   <outline>
     <component base="afii10037"/>
-    <component base="dieresis" xOffset="384.0" yOffset="468.0"/>
+    <component base="dieresis" xOffset="344.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/U_hungarumlautcyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/U_hungarumlautcyrillic.glif
index c660f23ee..4bb799d92 100644
--- a/src/Inter-UI-Black.ufo/glyphs/U_hungarumlautcyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/U_hungarumlautcyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Uhungarumlautcyrillic" format="2">
-  <advance width="1940.0"/>
+  <advance width="1980.0"/>
   <unicode hex="04F2"/>
   <outline>
     <component base="afii10037"/>
-    <component base="hungarumlaut" xOffset="496.0" yOffset="416.0"/>
+    <component base="hungarumlaut" xOffset="456.0" yOffset="404.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/U_macroncyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/U_macroncyrillic.glif
index df1f71492..ed1f449bf 100644
--- a/src/Inter-UI-Black.ufo/glyphs/U_macroncyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/U_macroncyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Umacroncyrillic" format="2">
-  <advance width="1940.0"/>
+  <advance width="1980.0"/>
   <unicode hex="04EE"/>
   <outline>
     <component base="afii10037"/>
-    <component base="macron" xOffset="124.0" yOffset="400.0"/>
+    <component base="macron" xOffset="84.0" yOffset="388.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/U_psilondieresishooksymbolgreek.glif b/src/Inter-UI-Black.ufo/glyphs/U_psilondieresishooksymbolgreek.glif
index 13f135b4a..58e77ce5f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/U_psilondieresishooksymbolgreek.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/U_psilondieresishooksymbolgreek.glif
@@ -4,6 +4,6 @@
   <unicode hex="03D4"/>
   <outline>
     <component base="Upsilonhooksymbol"/>
-    <component base="dieresis" xOffset="380.0" yOffset="444.0"/>
+    <component base="dieresis" xOffset="380.0" yOffset="400.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/W_dieresis.glif b/src/Inter-UI-Black.ufo/glyphs/W_dieresis.glif
index c81cbd3e3..e46f53abc 100644
--- a/src/Inter-UI-Black.ufo/glyphs/W_dieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/W_dieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E84"/>
   <outline>
     <component base="W"/>
-    <component base="casedieresis.cn" xOffset="880.0" yOffset="68.0"/>
+    <component base="casedieresis.cn" xOffset="880.0" yOffset="24.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/W_dotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/W_dotaccent.glif
index ff1ef5e0a..143bca6a9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/W_dotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/W_dotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E86"/>
   <outline>
     <component base="W"/>
-    <component base="dotaccent" xOffset="1080.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="1080.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/X_dieresis.glif b/src/Inter-UI-Black.ufo/glyphs/X_dieresis.glif
index e4ea5bb1c..4bdfe1b50 100644
--- a/src/Inter-UI-Black.ufo/glyphs/X_dieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/X_dieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E8C"/>
   <outline>
     <component base="X"/>
-    <component base="casedieresis.cn" xOffset="412.0" yOffset="68.0"/>
+    <component base="casedieresis.cn" xOffset="412.0" yOffset="24.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/X_dotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/X_dotaccent.glif
index de958bf08..92d522c0d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/X_dotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/X_dotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E8A"/>
   <outline>
     <component base="X"/>
-    <component base="dotaccent" xOffset="612.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="612.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Y_dieresis.glif b/src/Inter-UI-Black.ufo/glyphs/Y_dieresis.glif
index 9b5d75b5a..a7ae7d5e6 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Y_dieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Y_dieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="0178"/>
   <outline>
     <component base="Y"/>
-    <component base="casedieresis.cn" xOffset="416.0" yOffset="68.0"/>
+    <component base="casedieresis.cn" xOffset="416.0" yOffset="24.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Y_dotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/Y_dotaccent.glif
index 6d81dbace..dec0c520a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Y_dotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Y_dotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E8E"/>
   <outline>
     <component base="Y"/>
-    <component base="dotaccent" xOffset="616.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="616.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Z_dotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/Z_dotaccent.glif
index 5a851024b..e28d2f275 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Z_dotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Z_dotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="017B"/>
   <outline>
     <component base="Z"/>
-    <component base="dotaccent" xOffset="524.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="524.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Z_edieresiscyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/Z_edieresiscyrillic.glif
index 65c865ca1..c68586e0c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Z_edieresiscyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Z_edieresiscyrillic.glif
@@ -4,6 +4,6 @@
   <unicode hex="04DE"/>
   <outline>
     <component base="afii10025"/>
-    <component base="dieresis" xOffset="332.0" yOffset="536.0"/>
+    <component base="dieresis" xOffset="332.0" yOffset="492.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Z_hebrevecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/Z_hebrevecyrillic.glif
index e39d043af..8d16f9d4e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Z_hebrevecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Z_hebrevecyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Zhebrevecyrillic" format="2">
-  <advance width="3376.0"/>
+  <advance width="3312.0"/>
   <unicode hex="04C1"/>
   <outline>
     <component base="afii10024"/>
-    <component base="breve" xOffset="968.0" yOffset="416.0"/>
+    <component base="breve" xOffset="944.0" yOffset="404.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Z_hedescendercyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/Z_hedescendercyrillic.glif
index cb4d45338..e2828abe3 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Z_hedescendercyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Z_hedescendercyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Zhedescendercyrillic" format="2">
-  <advance width="3376.0"/>
+  <advance width="3312.0"/>
   <unicode hex="0496"/>
   <outline>
     <component base="afii10024"/>
-    <component base="cyrillictic.cn" xOffset="2768.0"/>
+    <component base="cyrillictic.cn" xOffset="2732.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Z_hedieresiscyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/Z_hedieresiscyrillic.glif
index 8d7171f27..2df6e3e80 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Z_hedieresiscyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Z_hedieresiscyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Zhedieresiscyrillic" format="2">
-  <advance width="3376.0"/>
+  <advance width="3312.0"/>
   <unicode hex="04DC"/>
   <outline>
     <component base="afii10024"/>
-    <component base="dieresis" xOffset="1032.0" yOffset="468.0"/>
+    <component base="dieresis" xOffset="1008.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/adieresis.glif b/src/Inter-UI-Black.ufo/glyphs/adieresis.glif
index c57230ac0..90a8031eb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/adieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/adieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="00E4"/>
   <outline>
     <component base="a"/>
-    <component base="dieresis" xOffset="176.0" yOffset="44.0"/>
+    <component base="dieresis" xOffset="176.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10023.glif b/src/Inter-UI-Black.ufo/glyphs/afii10023.glif
index 1e0c0fa99..14dfb970f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10023.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10023.glif
@@ -4,6 +4,6 @@
   <unicode hex="0401"/>
   <outline>
     <component base="E"/>
-    <component base="dieresis" xOffset="228.0" yOffset="456.0"/>
+    <component base="dieresis" xOffset="228.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10024.glif b/src/Inter-UI-Black.ufo/glyphs/afii10024.glif
index f3f29c311..d87b883fc 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10024.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10024.glif
@@ -1,45 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="afii10024" format="2">
-  <advance width="3376.0"/>
+  <advance width="3312.0"/>
   <unicode hex="0416"/>
   <outline>
     <contour>
-      <point x="972.0" y="736.0" type="line"/>
-      <point x="1508.0" y="736.0" type="line"/>
-      <point x="1572.0" y="1248.0" type="line"/>
-      <point x="1228.0" y="1248.0" type="line"/>
-      <point x="816.0" y="2004.0" type="line"/>
-      <point x="128.0" y="2004.0" type="line"/>
+      <point x="1924.0" y="2048.0" type="line"/>
+      <point x="1388.0" y="2048.0" type="line"/>
+      <point x="1388.0" y="0.0" type="line"/>
+      <point x="1924.0" y="0.0" type="line"/>
     </contour>
     <contour>
-      <point x="1212.0" y="844.0" type="line"/>
-      <point x="748.0" y="1088.0" type="line"/>
-      <point x="120.0" y="0.0" type="line"/>
-      <point x="788.0" y="0.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1968.0" y="2004.0" type="line"/>
-      <point x="1432.0" y="2004.0" type="line"/>
-      <point x="1432.0" y="0.0" type="line"/>
-      <point x="1968.0" y="0.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="3244.0" y="2004.0" type="line"/>
-      <point x="2560.0" y="2004.0" type="line"/>
-      <point x="2168.0" y="1248.0" type="line"/>
-      <point x="1824.0" y="1248.0" type="line"/>
-      <point x="1884.0" y="736.0" type="line"/>
-      <point x="2424.0" y="736.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="2588.0" y="0.0" type="line"/>
-      <point x="3260.0" y="0.0" type="line"/>
-      <point x="2656.0" y="1088.0" type="line"/>
-      <point x="2184.0" y="844.0" type="line"/>
+      <point x="84.0" y="0.0" type="line"/>
+      <point x="752.0" y="0.0" type="line"/>
+      <point x="1120.0" y="736.0" type="line"/>
+      <point x="2204.0" y="736.0" type="line"/>
+      <point x="2556.0" y="0.0" type="line"/>
+      <point x="3228.0" y="0.0" type="line"/>
+      <point x="2620.0" y="1096.0" type="line"/>
+      <point x="3212.0" y="2048.0" type="line"/>
+      <point x="2528.0" y="2048.0" type="line"/>
+      <point x="2136.0" y="1248.0" type="line"/>
+      <point x="1192.0" y="1248.0" type="line"/>
+      <point x="780.0" y="2048.0" type="line"/>
+      <point x="92.0" y="2048.0" type="line"/>
+      <point x="712.0" y="1088.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>X</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>X</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -50,7 +42,7 @@
           <key>origin</key>
           <array>
             <real>1.0</real>
-            <real>1.0</real>
+            <real>13.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -70,7 +62,7 @@
           <key>origin</key>
           <array>
             <real>1.0</real>
-            <real>1.0</real>
+            <real>13.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10037.glif b/src/Inter-UI-Black.ufo/glyphs/afii10037.glif
index 710465c72..dabeccd9f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10037.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10037.glif
@@ -1,44 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="afii10037" format="2">
-  <advance width="1940.0"/>
+  <advance width="1980.0"/>
   <unicode hex="0423"/>
-  <guideline x="4.0" y="1240.0" angle="0.0"/>
-  <guideline x="4.0" y="764.0" angle="0.0"/>
+  <guideline x="24.0" y="1240.0" angle="0.0"/>
+  <guideline x="24.0" y="764.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="856.0" y="792.0" type="line"/>
-      <point x="776.0" y="576.0" type="line"/>
-      <point x="734.0" y="440.0"/>
-      <point x="682.0" y="400.0"/>
-      <point x="508.0" y="400.0" type="curve" smooth="yes"/>
-      <point x="490.0" y="400.0"/>
-      <point x="434.0" y="400.0"/>
-      <point x="408.0" y="404.0" type="curve"/>
-      <point x="424.0" y="-32.0" type="line"/>
-      <point x="470.0" y="-28.0"/>
-      <point x="534.0" y="-28.0"/>
-      <point x="576.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="926.0" y="-28.0"/>
-      <point x="1090.0" y="196.0"/>
-      <point x="1208.0" y="448.0" type="curve"/>
-      <point x="1912.0" y="2004.0" type="line"/>
-      <point x="1352.0" y="2004.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="596.0" y="2004.0" type="line"/>
-      <point x="28.0" y="2004.0" type="line"/>
-      <point x="808.0" y="616.0" type="line"/>
-      <point x="1188.0" y="612.0" type="line"/>
-      <point x="1008.0" y="1276.0" type="line"/>
+      <point x="428.0" y="-28.0" type="line"/>
+      <point x="596.0" y="-28.0" type="line" smooth="yes"/>
+      <point x="948.0" y="-28.0"/>
+      <point x="1112.0" y="196.0"/>
+      <point x="1228.0" y="448.0" type="curve" smooth="yes"/>
+      <point x="1932.0" y="2048.0" type="line"/>
+      <point x="1372.0" y="2048.0" type="line"/>
+      <point x="1044.0" y="1216.0" type="line"/>
+      <point x="616.0" y="2048.0" type="line"/>
+      <point x="48.0" y="2048.0" type="line"/>
+      <point x="816.0" y="636.0" type="line"/>
+      <point x="796.0" y="576.0" type="line" smooth="yes"/>
+      <point x="756.0" y="440.0"/>
+      <point x="704.0" y="404.0"/>
+      <point x="528.0" y="404.0" type="curve" smooth="yes"/>
+      <point x="428.0" y="404.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.nodeUserData.0.16</key>
-      <dict>
-        <key>name</key>
-        <string>hr00</string>
-      </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>Y</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Y</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -49,7 +40,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>10.0</real>
+            <real>0.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -69,7 +60,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>7.0</real>
+            <real>15.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -89,7 +80,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>10.0</real>
+            <real>0.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -104,7 +95,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>7.0</real>
+            <real>15.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10040.glif b/src/Inter-UI-Black.ufo/glyphs/afii10040.glif
index 88b44f8f0..515874b1e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10040.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10040.glif
@@ -1,29 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="afii10040" format="2">
-  <advance width="2504.0"/>
+  <advance width="2392.0"/>
   <unicode hex="0426"/>
   <outline>
     <contour>
-      <point x="2316.0" y="420.0" type="line"/>
-      <point x="1632.0" y="420.0" type="line"/>
-      <point x="1632.0" y="0.0" type="line"/>
-      <point x="1776.0" y="0.0" type="line"/>
-      <point x="1776.0" y="-484.0" type="line"/>
-      <point x="2292.0" y="-484.0" type="line"/>
+      <point x="2260.0" y="420.0" type="line"/>
+      <point x="1576.0" y="420.0" type="line"/>
+      <point x="1576.0" y="0.0" type="line"/>
+      <point x="1720.0" y="0.0" type="line"/>
+      <point x="1720.0" y="-484.0" type="line"/>
+      <point x="2236.0" y="-484.0" type="line"/>
     </contour>
     <contour>
-      <point x="188.0" y="0.0" type="line"/>
-      <point x="1984.0" y="0.0" type="line"/>
-      <point x="1984.0" y="2004.0" type="line"/>
-      <point x="1440.0" y="2004.0" type="line"/>
-      <point x="1440.0" y="428.0" type="line"/>
-      <point x="724.0" y="428.0" type="line"/>
-      <point x="724.0" y="2004.0" type="line"/>
-      <point x="188.0" y="2004.0" type="line"/>
+      <point x="132.0" y="0.0" type="line"/>
+      <point x="1928.0" y="0.0" type="line"/>
+      <point x="1928.0" y="2048.0" type="line"/>
+      <point x="1384.0" y="2048.0" type="line"/>
+      <point x="1384.0" y="428.0" type="line"/>
+      <point x="668.0" y="428.0" type="line"/>
+      <point x="668.0" y="2048.0" type="line"/>
+      <point x="132.0" y="2048.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>H</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>H</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10041.glif b/src/Inter-UI-Black.ufo/glyphs/afii10041.glif
index f800964fe..a71ef4de6 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10041.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10041.glif
@@ -4,7 +4,7 @@
   <unicode hex="0427"/>
   <outline>
     <contour>
-      <point x="256.0" y="2004.0" type="line"/>
+      <point x="256.0" y="2048.0" type="line"/>
       <point x="256.0" y="1404.0" type="line"/>
       <point x="255.0" y="928.0"/>
       <point x="615.0" y="700.0"/>
@@ -17,19 +17,21 @@
       <point x="1223.0" y="1128.0"/>
       <point x="1156.0" y="1128.0" type="curve" smooth="yes"/>
       <point x="879.0" y="1128.0"/>
-      <point x="791.0" y="1212.0"/>
+      <point x="792.0" y="1212.0"/>
       <point x="792.0" y="1404.0" type="curve" smooth="yes"/>
-      <point x="792.0" y="2004.0" type="line"/>
+      <point x="792.0" y="2048.0" type="line"/>
     </contour>
     <contour>
-      <point x="1456.0" y="2004.0" type="line"/>
+      <point x="1456.0" y="2048.0" type="line"/>
       <point x="1456.0" y="0.0" type="line"/>
       <point x="1996.0" y="0.0" type="line"/>
-      <point x="1996.0" y="2004.0" type="line"/>
+      <point x="1996.0" y="2048.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>H</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10042.glif b/src/Inter-UI-Black.ufo/glyphs/afii10042.glif
index fc0d90a98..bae735e2f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10042.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10042.glif
@@ -4,22 +4,26 @@
   <unicode hex="0428"/>
   <outline>
     <contour>
-      <point x="268.0" y="2004.0" type="line"/>
+      <point x="268.0" y="2048.0" type="line"/>
       <point x="268.0" y="0.0" type="line"/>
       <point x="2868.0" y="0.0" type="line"/>
-      <point x="2868.0" y="2004.0" type="line"/>
-      <point x="2332.0" y="2004.0" type="line"/>
+      <point x="2868.0" y="2048.0" type="line"/>
+      <point x="2332.0" y="2048.0" type="line"/>
       <point x="2332.0" y="428.0" type="line"/>
       <point x="1844.0" y="428.0" type="line"/>
-      <point x="1844.0" y="2004.0" type="line"/>
-      <point x="1308.0" y="2004.0" type="line"/>
+      <point x="1844.0" y="2048.0" type="line"/>
+      <point x="1308.0" y="2048.0" type="line"/>
       <point x="1308.0" y="428.0" type="line"/>
       <point x="808.0" y="428.0" type="line"/>
-      <point x="808.0" y="2004.0" type="line"/>
+      <point x="808.0" y="2048.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>H</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>H</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10043.glif b/src/Inter-UI-Black.ufo/glyphs/afii10043.glif
index bf34a0f12..b3caad28f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10043.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10043.glif
@@ -1,33 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="afii10043" format="2">
-  <advance width="3404.0"/>
+  <advance width="3372.0"/>
   <unicode hex="0429"/>
   <outline>
     <contour>
-      <point x="3172.0" y="412.0" type="line"/>
-      <point x="2504.0" y="412.0" type="line"/>
-      <point x="2504.0" y="0.0" type="line"/>
-      <point x="2652.0" y="0.0" type="line"/>
-      <point x="2652.0" y="-480.0" type="line"/>
-      <point x="3144.0" y="-480.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="336.0" y="2004.0" type="line"/>
-      <point x="336.0" y="0.0" type="line"/>
-      <point x="2936.0" y="0.0" type="line"/>
-      <point x="2936.0" y="2004.0" type="line"/>
-      <point x="2400.0" y="2004.0" type="line"/>
-      <point x="2400.0" y="428.0" type="line"/>
-      <point x="1912.0" y="428.0" type="line"/>
-      <point x="1912.0" y="2004.0" type="line"/>
-      <point x="1376.0" y="2004.0" type="line"/>
-      <point x="1376.0" y="428.0" type="line"/>
-      <point x="876.0" y="428.0" type="line"/>
-      <point x="876.0" y="2004.0" type="line"/>
+      <point x="3104.0" y="412.0" type="line"/>
+      <point x="2436.0" y="412.0" type="line"/>
+      <point x="2436.0" y="0.0" type="line"/>
+      <point x="2584.0" y="0.0" type="line"/>
+      <point x="2584.0" y="-480.0" type="line"/>
+      <point x="3076.0" y="-480.0" type="line"/>
     </contour>
+    <component base="afii10042"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>afii10042</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>afii10042</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -35,10 +26,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
             <real>0.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -57,8 +48,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
             <real>0.0</real>
+            <real>1.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10044.glif b/src/Inter-UI-Black.ufo/glyphs/afii10044.glif
index 9951bae05..88f59c000 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10044.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10044.glif
@@ -1,39 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="afii10044" format="2">
-  <advance width="2560.0"/>
+  <advance width="2332.0"/>
   <unicode hex="042A"/>
   <outline>
     <contour>
-      <point x="212.0" y="1632.0" type="line"/>
-      <point x="1036.0" y="1632.0" type="line"/>
-      <point x="1036.0" y="2048.0" type="line"/>
-      <point x="212.0" y="2048.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1096.0" y="1360.0" type="line"/>
-      <point x="1096.0" y="936.0" type="line"/>
-      <point x="1516.0" y="936.0" type="line"/>
-      <point x="1719.0" y="936.0"/>
-      <point x="1827.0" y="832.0"/>
-      <point x="1828.0" y="692.0" type="curve"/>
-      <point x="1827.0" y="544.0"/>
-      <point x="1719.0" y="436.0"/>
-      <point x="1516.0" y="436.0" type="curve"/>
-      <point x="1308.0" y="436.0" type="line"/>
-      <point x="1308.0" y="2048.0" type="line"/>
-      <point x="756.0" y="2048.0" type="line"/>
-      <point x="756.0" y="0.0" type="line"/>
-      <point x="1516.0" y="0.0" type="line"/>
-      <point x="2035.0" y="0.0"/>
-      <point x="2379.0" y="280.0"/>
-      <point x="2380.0" y="688.0" type="curve"/>
-      <point x="2379.0" y="1096.0"/>
-      <point x="2035.0" y="1360.0"/>
-      <point x="1516.0" y="1360.0" type="curve"/>
+      <point x="76.0" y="1632.0" type="line"/>
+      <point x="900.0" y="1632.0" type="line"/>
+      <point x="900.0" y="2048.0" type="line"/>
+      <point x="76.0" y="2048.0" type="line"/>
     </contour>
+    <component base="afii10046" xOffset="472.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>T</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>b</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -41,10 +24,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>11.0</real>
+            <real>0.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -85,8 +68,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>11.0</real>
+            <real>0.0</real>
+            <real>0.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10046.glif b/src/Inter-UI-Black.ufo/glyphs/afii10046.glif
index c3e111b68..c28979833 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10046.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10046.glif
@@ -28,6 +28,10 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>B</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>b</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10047.glif b/src/Inter-UI-Black.ufo/glyphs/afii10047.glif
index d14d6050c..b52709961 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10047.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10047.glif
@@ -1,47 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="afii10047" format="2">
-  <advance width="2284.0"/>
+  <advance width="2028.0"/>
   <unicode hex="042D"/>
   <outline>
     <contour>
-      <point x="1860.0" y="1220.0" type="line"/>
-      <point x="952.0" y="1220.0" type="line"/>
-      <point x="952.0" y="788.0" type="line"/>
-      <point x="1860.0" y="788.0" type="line"/>
+      <point x="1728.0" y="1220.0" type="line"/>
+      <point x="820.0" y="1220.0" type="line"/>
+      <point x="820.0" y="788.0" type="line"/>
+      <point x="1728.0" y="788.0" type="line"/>
     </contour>
     <contour>
-      <point x="260.0" y="692.0" type="line"/>
-      <point x="279.0" y="252.0"/>
-      <point x="623.0" y="-28.0"/>
-      <point x="1140.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="1707.0" y="-28.0"/>
-      <point x="2035.0" y="344.0"/>
-      <point x="2036.0" y="960.0" type="curve" smooth="yes"/>
-      <point x="2036.0" y="1036.0" type="line" smooth="yes"/>
-      <point x="2035.0" y="1652.0"/>
-      <point x="1687.0" y="2032.0"/>
-      <point x="1152.0" y="2032.0" type="curve" smooth="yes"/>
-      <point x="579.0" y="2032.0"/>
-      <point x="295.0" y="1700.0"/>
-      <point x="256.0" y="1288.0" type="curve"/>
-      <point x="804.0" y="1288.0" type="line"/>
-      <point x="807.0" y="1480.0"/>
-      <point x="871.0" y="1596.0"/>
-      <point x="1152.0" y="1596.0" type="curve" smooth="yes"/>
-      <point x="1407.0" y="1596.0"/>
-      <point x="1495.0" y="1428.0"/>
-      <point x="1496.0" y="1040.0" type="curve" smooth="yes"/>
-      <point x="1496.0" y="960.0" type="line" smooth="yes"/>
-      <point x="1495.0" y="564.0"/>
-      <point x="1431.0" y="400.0"/>
-      <point x="1140.0" y="400.0" type="curve" smooth="yes"/>
-      <point x="931.0" y="400.0"/>
-      <point x="803.0" y="492.0"/>
-      <point x="808.0" y="692.0" type="curve"/>
+      <point x="128.0" y="692.0" type="line"/>
+      <point x="147.0" y="252.0"/>
+      <point x="491.0" y="-28.0"/>
+      <point x="1008.0" y="-28.0" type="curve" smooth="yes"/>
+      <point x="1575.0" y="-28.0"/>
+      <point x="1904.0" y="344.0"/>
+      <point x="1904.0" y="960.0" type="curve" smooth="yes"/>
+      <point x="1904.0" y="1080.0" type="line" smooth="yes"/>
+      <point x="1904.0" y="1696.0"/>
+      <point x="1555.0" y="2076.0"/>
+      <point x="1020.0" y="2076.0" type="curve" smooth="yes"/>
+      <point x="447.0" y="2076.0"/>
+      <point x="163.0" y="1744.0"/>
+      <point x="124.0" y="1332.0" type="curve"/>
+      <point x="672.0" y="1332.0" type="line"/>
+      <point x="675.0" y="1524.0"/>
+      <point x="739.0" y="1640.0"/>
+      <point x="1020.0" y="1640.0" type="curve" smooth="yes"/>
+      <point x="1275.0" y="1640.0"/>
+      <point x="1364.0" y="1472.0"/>
+      <point x="1364.0" y="1084.0" type="curve" smooth="yes"/>
+      <point x="1364.0" y="960.0" type="line" smooth="yes"/>
+      <point x="1364.0" y="564.0"/>
+      <point x="1299.0" y="400.0"/>
+      <point x="1008.0" y="400.0" type="curve" smooth="yes"/>
+      <point x="799.0" y="400.0"/>
+      <point x="671.0" y="492.0"/>
+      <point x="676.0" y="692.0" type="curve"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>O</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10049.glif b/src/Inter-UI-Black.ufo/glyphs/afii10049.glif
index bb914e71c..6c8e74ace 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10049.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10049.glif
@@ -1,37 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="afii10049" format="2">
-  <advance width="1568.0"/>
+  <advance width="1908.0"/>
   <unicode hex="042F"/>
   <outline>
-    <contour>
-      <point x="1320.0" y="676.0" type="line"/>
-      <point x="1320.0" y="1064.0" type="line"/>
-      <point x="876.0" y="1064.0" type="line"/>
-      <point x="704.0" y="1064.0"/>
-      <point x="612.0" y="1092.0"/>
-      <point x="612.0" y="1312.0" type="curve"/>
-      <point x="612.0" y="1488.0"/>
-      <point x="688.0" y="1572.0"/>
-      <point x="876.0" y="1572.0" type="curve"/>
-      <point x="1112.0" y="1572.0" type="line"/>
-      <point x="1112.0" y="0.0" type="line"/>
-      <point x="1648.0" y="0.0" type="line"/>
-      <point x="1648.0" y="2004.0" type="line"/>
-      <point x="876.0" y="2004.0" type="line"/>
-      <point x="388.0" y="2004.0"/>
-      <point x="80.0" y="1792.0"/>
-      <point x="80.0" y="1372.0" type="curve"/>
-      <point x="80.0" y="1048.0"/>
-      <point x="260.0" y="840.0"/>
-      <point x="608.0" y="740.0" type="curve"/>
-      <point x="756.0" y="676.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="940.0" y="872.0" type="line"/>
-      <point x="344.0" y="872.0" type="line"/>
-      <point x="-88.0" y="0.0" type="line"/>
-      <point x="504.0" y="0.0" type="line"/>
-    </contour>
+    <component base="R" xScale="-1.0" xOffset="1908.0"/>
   </outline>
   <lib>
     <dict>
@@ -42,10 +14,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -62,10 +34,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10056.glif b/src/Inter-UI-Black.ufo/glyphs/afii10056.glif
index df21d5f88..2fade02a4 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10056.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10056.glif
@@ -4,6 +4,6 @@
   <unicode hex="0407"/>
   <outline>
     <component base="I"/>
-    <component base="dieresis" xOffset="-236.0" yOffset="456.0"/>
+    <component base="dieresis" xOffset="-236.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10058.glif b/src/Inter-UI-Black.ufo/glyphs/afii10058.glif
index 02050fa03..c97fd2ccd 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10058.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10058.glif
@@ -1,53 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="afii10058" format="2">
-  <advance width="3308.0"/>
+  <advance width="3252.0"/>
   <unicode hex="0409"/>
   <outline>
     <contour>
-      <point x="588.0" y="1988.0" type="line"/>
-      <point x="556.0" y="1188.0" type="line" smooth="yes"/>
-      <point x="533.0" y="564.0"/>
-      <point x="413.0" y="464.0"/>
-      <point x="236.0" y="436.0" type="curve" smooth="yes"/>
-      <point x="184.0" y="428.0" type="line"/>
       <point x="184.0" y="0.0" type="line"/>
       <point x="312.0" y="0.0" type="line" smooth="yes"/>
-      <point x="773.0" y="0.0"/>
-      <point x="1025.0" y="176.0"/>
+      <point x="772.0" y="0.0"/>
+      <point x="1028.0" y="176.0"/>
       <point x="1068.0" y="972.0" type="curve" smooth="yes"/>
-      <point x="1124.0" y="1988.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1720.0" y="1988.0" type="line"/>
-      <point x="612.0" y="1988.0" type="line"/>
-      <point x="612.0" y="1552.0" type="line"/>
-      <point x="1720.0" y="1552.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1868.0" y="1404.0" type="line"/>
-      <point x="1868.0" y="976.0" type="line"/>
-      <point x="2296.0" y="976.0" type="line" smooth="yes"/>
-      <point x="2505.0" y="976.0"/>
-      <point x="2621.0" y="848.0"/>
-      <point x="2620.0" y="704.0" type="curve" smooth="yes"/>
-      <point x="2621.0" y="556.0"/>
-      <point x="2505.0" y="428.0"/>
-      <point x="2296.0" y="428.0" type="curve" smooth="yes"/>
-      <point x="2072.0" y="428.0" type="line"/>
-      <point x="2072.0" y="1988.0" type="line"/>
-      <point x="1536.0" y="1988.0" type="line"/>
-      <point x="1536.0" y="0.0" type="line"/>
-      <point x="2296.0" y="0.0" type="line" smooth="yes"/>
-      <point x="2813.0" y="0.0"/>
-      <point x="3161.0" y="292.0"/>
-      <point x="3160.0" y="704.0" type="curve" smooth="yes"/>
-      <point x="3161.0" y="1104.0"/>
-      <point x="2813.0" y="1404.0"/>
-      <point x="2296.0" y="1404.0" type="curve" smooth="yes"/>
+      <point x="1100.0" y="1612.0" type="line"/>
+      <point x="1720.0" y="1612.0" type="line"/>
+      <point x="1720.0" y="2048.0" type="line"/>
+      <point x="588.0" y="2048.0" type="line"/>
+      <point x="556.0" y="1188.0" type="line" smooth="yes"/>
+      <point x="532.0" y="564.0"/>
+      <point x="414.0" y="450.0"/>
+      <point x="236.0" y="436.0" type="curve" smooth="yes"/>
+      <point x="184.0" y="432.0" type="line"/>
     </contour>
+    <component base="afii10046" xOffset="1392.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>b</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -58,7 +35,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>5.0</real>
+            <real>13.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -78,7 +55,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>5.0</real>
+            <real>13.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10059.glif b/src/Inter-UI-Black.ufo/glyphs/afii10059.glif
index 21ba6fdf3..384d2ec3a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10059.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10059.glif
@@ -1,45 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="afii10059" format="2">
-  <advance width="3324.0"/>
+  <advance width="3140.0"/>
   <unicode hex="040A"/>
   <outline>
     <contour>
-      <point x="1656.0" y="1172.0" type="line"/>
-      <point x="568.0" y="1172.0" type="line"/>
-      <point x="568.0" y="744.0" type="line"/>
-      <point x="1656.0" y="744.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="756.0" y="1988.0" type="line"/>
-      <point x="220.0" y="1988.0" type="line"/>
-      <point x="220.0" y="0.0" type="line"/>
-      <point x="756.0" y="0.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1800.0" y="1436.0" type="line"/>
-      <point x="1800.0" y="1012.0" type="line"/>
-      <point x="2232.0" y="1012.0" type="line"/>
-      <point x="2436.0" y="1012.0"/>
-      <point x="2552.0" y="868.0"/>
-      <point x="2552.0" y="720.0" type="curve"/>
-      <point x="2552.0" y="560.0"/>
-      <point x="2436.0" y="416.0"/>
-      <point x="2232.0" y="416.0" type="curve"/>
-      <point x="2004.0" y="416.0" type="line"/>
-      <point x="2004.0" y="1988.0" type="line"/>
-      <point x="1472.0" y="1988.0" type="line"/>
-      <point x="1472.0" y="0.0" type="line"/>
-      <point x="2232.0" y="0.0" type="line"/>
-      <point x="2752.0" y="0.0"/>
-      <point x="3092.0" y="304.0"/>
-      <point x="3092.0" y="716.0" type="curve"/>
-      <point x="3092.0" y="1128.0"/>
-      <point x="2752.0" y="1436.0"/>
-      <point x="2232.0" y="1436.0" type="curve"/>
+      <point x="132.0" y="0.0" type="line"/>
+      <point x="688.0" y="0.0" type="line"/>
+      <point x="688.0" y="936.0" type="line"/>
+      <point x="1624.0" y="936.0" type="line"/>
+      <point x="1624.0" y="1360.0" type="line"/>
+      <point x="688.0" y="1360.0" type="line"/>
+      <point x="688.0" y="2048.0" type="line"/>
+      <point x="132.0" y="2048.0" type="line"/>
     </contour>
+    <component base="afii10046" xOffset="1280.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>H</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>b</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -47,10 +28,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -67,10 +48,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10060.glif b/src/Inter-UI-Black.ufo/glyphs/afii10060.glif
index 875eb9e54..eb708cda3 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10060.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10060.glif
@@ -1,41 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="afii10060" format="2">
-  <advance width="2128.0"/>
+  <advance width="2592.0"/>
   <unicode hex="040B"/>
+  <guideline x="868.0" y="2096.0" angle="90.0"/>
   <outline>
     <contour>
-      <point x="2096.0" y="0.0" type="line"/>
-      <point x="2096.0" y="604.0" type="line" smooth="yes"/>
-      <point x="2095.0" y="1068.0"/>
-      <point x="1735.0" y="1308.0"/>
-      <point x="1200.0" y="1308.0" type="curve" smooth="yes"/>
-      <point x="1167.0" y="1308.0"/>
-      <point x="855.0" y="1292.0"/>
-      <point x="792.0" y="1272.0" type="curve"/>
-      <point x="792.0" y="844.0" type="line"/>
-      <point x="847.0" y="864.0"/>
-      <point x="1127.0" y="876.0"/>
-      <point x="1200.0" y="876.0" type="curve" smooth="yes"/>
-      <point x="1471.0" y="876.0"/>
-      <point x="1559.0" y="792.0"/>
-      <point x="1560.0" y="604.0" type="curve" smooth="yes"/>
-      <point x="1560.0" y="0.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1008.0" y="2004.0" type="line"/>
-      <point x="468.0" y="2004.0" type="line"/>
-      <point x="468.0" y="0.0" type="line"/>
-      <point x="1008.0" y="0.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1620.0" y="2004.0" type="line"/>
-      <point x="36.0" y="2004.0" type="line"/>
-      <point x="36.0" y="1572.0" type="line"/>
-      <point x="1620.0" y="1572.0" type="line"/>
+      <point x="1660.0" y="2048.0" type="line"/>
+      <point x="76.0" y="2048.0" type="line"/>
+      <point x="76.0" y="1616.0" type="line"/>
+      <point x="1660.0" y="1616.0" type="line"/>
     </contour>
+    <component base="Shhacyrillic" xOffset="344.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>T</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Shhacyrillic</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -43,10 +25,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -65,7 +47,7 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
+            <real>0.0</real>
             <real>1.0</real>
           </array>
           <key>stem</key>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10062.glif b/src/Inter-UI-Black.ufo/glyphs/afii10062.glif
index 86f9b95be..b44b56d65 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10062.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10062.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="afii10062" format="2">
-  <advance width="1940.0"/>
+  <advance width="1980.0"/>
   <unicode hex="040E"/>
   <outline>
     <component base="afii10037"/>
-    <component base="breve" xOffset="320.0" yOffset="416.0"/>
+    <component base="breve" xOffset="280.0" yOffset="404.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10145.glif b/src/Inter-UI-Black.ufo/glyphs/afii10145.glif
index 5c44fc8c5..e9e155b16 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10145.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10145.glif
@@ -1,27 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="afii10145" format="2">
-  <advance width="2240.0"/>
+  <advance width="2060.0"/>
   <unicode hex="040F"/>
   <outline>
     <contour>
-      <point x="224.0" y="0.0" type="line"/>
-      <point x="2020.0" y="0.0" type="line"/>
-      <point x="2020.0" y="2004.0" type="line"/>
-      <point x="1476.0" y="2004.0" type="line"/>
-      <point x="1476.0" y="428.0" type="line"/>
-      <point x="760.0" y="428.0" type="line"/>
-      <point x="760.0" y="2004.0" type="line"/>
-      <point x="224.0" y="2004.0" type="line"/>
+      <point x="132.0" y="0.0" type="line"/>
+      <point x="1928.0" y="0.0" type="line"/>
+      <point x="1928.0" y="2048.0" type="line"/>
+      <point x="1384.0" y="2048.0" type="line"/>
+      <point x="1384.0" y="428.0" type="line"/>
+      <point x="668.0" y="428.0" type="line"/>
+      <point x="668.0" y="2048.0" type="line"/>
+      <point x="132.0" y="2048.0" type="line"/>
     </contour>
     <contour>
-      <point x="1416.0" y="440.0" type="line"/>
-      <point x="876.0" y="440.0" type="line"/>
-      <point x="876.0" y="-496.0" type="line"/>
-      <point x="1416.0" y="-496.0" type="line"/>
+      <point x="1300.0" y="320.0" type="line"/>
+      <point x="760.0" y="320.0" type="line"/>
+      <point x="760.0" y="-496.0" type="line"/>
+      <point x="1300.0" y="-496.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>H</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>H</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/bar.glif b/src/Inter-UI-Black.ufo/glyphs/bar.glif
index 6eded7b76..fb49950c0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/bar.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/bar.glif
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="bar" format="2">
-  <advance width="1120.0"/>
+  <advance width="1140.0"/>
   <unicode hex="007C"/>
-  <guideline x="28.0" y="1240.0" angle="0.0"/>
-  <guideline x="28.0" y="764.0" angle="0.0"/>
+  <guideline x="-32.0" y="1240.0" angle="0.0"/>
+  <guideline x="-32.0" y="764.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="804.0" y="2048.0" type="line"/>
-      <point x="316.0" y="2048.0" type="line"/>
-      <point x="316.0" y="-384.0" type="line"/>
-      <point x="804.0" y="-384.0" type="line"/>
+      <point x="840.0" y="2708.0" type="line"/>
+      <point x="300.0" y="2708.0" type="line"/>
+      <point x="300.0" y="-660.0" type="line"/>
+      <point x="840.0" y="-660.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -21,10 +21,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>0.0</real>
+            <real>2048.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -43,18 +43,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>1.0</real>
+            <real>316.0</real>
+            <real>488.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>2.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -63,10 +58,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>0.0</real>
+            <real>2048.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/bdotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/bdotaccent.glif
index e5c9f8116..dce11787e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/bdotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/bdotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E03"/>
   <outline>
     <component base="b"/>
-    <component base="dotaccent" xOffset="692.0" yOffset="84.0"/>
+    <component base="dotaccent" xOffset="692.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/cdotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/cdotaccent.glif
index 61738cff3..06ee35c75 100644
--- a/src/Inter-UI-Black.ufo/glyphs/cdotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/cdotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="010B"/>
   <outline>
     <component base="c"/>
-    <component base="dotaccent" xOffset="432.0" yOffset="80.0"/>
+    <component base="dotaccent" xOffset="432.0" yOffset="-4.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/checyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/checyrillic.glif
index c20f9a4b0..1847c8581 100644
--- a/src/Inter-UI-Black.ufo/glyphs/checyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/checyrillic.glif
@@ -1,35 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="checyrillic" format="2">
-  <advance width="1684.0"/>
+  <advance width="1712.0"/>
   <unicode hex="0447"/>
   <outline>
     <contour>
-      <point x="1560.0" y="1488.0" type="line"/>
-      <point x="1044.0" y="1488.0" type="line"/>
-      <point x="1044.0" y="0.0" type="line"/>
-      <point x="1560.0" y="0.0" type="line"/>
+      <point x="1572.0" y="1536.0" type="line"/>
+      <point x="1056.0" y="1536.0" type="line"/>
+      <point x="1056.0" y="0.0" type="line"/>
+      <point x="1572.0" y="0.0" type="line"/>
     </contour>
     <contour>
-      <point x="1292.0" y="900.0" type="line"/>
-      <point x="1140.0" y="848.0"/>
-      <point x="1028.0" y="824.0"/>
-      <point x="928.0" y="824.0" type="curve" smooth="yes"/>
-      <point x="680.0" y="824.0"/>
-      <point x="640.0" y="852.0"/>
-      <point x="640.0" y="992.0" type="curve" smooth="yes"/>
-      <point x="640.0" y="1488.0" type="line"/>
-      <point x="128.0" y="1488.0" type="line"/>
-      <point x="128.0" y="992.0" type="line" smooth="yes"/>
-      <point x="128.0" y="576.0"/>
-      <point x="424.0" y="412.0"/>
-      <point x="928.0" y="412.0" type="curve" smooth="yes"/>
-      <point x="1024.0" y="412.0"/>
-      <point x="1236.0" y="452.0"/>
-      <point x="1292.0" y="488.0" type="curve"/>
+      <point x="1304.0" y="900.0" type="line"/>
+      <point x="1152.0" y="848.0"/>
+      <point x="1040.0" y="824.0"/>
+      <point x="940.0" y="824.0" type="curve" smooth="yes"/>
+      <point x="692.0" y="824.0"/>
+      <point x="652.0" y="852.0"/>
+      <point x="652.0" y="992.0" type="curve" smooth="yes"/>
+      <point x="652.0" y="1536.0" type="line"/>
+      <point x="140.0" y="1536.0" type="line"/>
+      <point x="140.0" y="992.0" type="line" smooth="yes"/>
+      <point x="140.0" y="576.0"/>
+      <point x="436.0" y="412.0"/>
+      <point x="940.0" y="412.0" type="curve" smooth="yes"/>
+      <point x="1036.0" y="412.0"/>
+      <point x="1248.0" y="452.0"/>
+      <point x="1304.0" y="488.0" type="curve"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>u</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>g</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/chedescendercyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/chedescendercyrillic.glif
index 796f86219..9969534d7 100644
--- a/src/Inter-UI-Black.ufo/glyphs/chedescendercyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/chedescendercyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="chedescendercyrillic" format="2">
-  <advance width="1684.0"/>
+  <advance width="1712.0"/>
   <unicode hex="04B7"/>
   <outline>
     <component base="checyrillic"/>
-    <component base="cyrillictic.cn" xOffset="1324.0"/>
+    <component base="cyrillictic.cn" xOffset="1336.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/chedieresiscyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/chedieresiscyrillic.glif
index 97c1d6587..813501c34 100644
--- a/src/Inter-UI-Black.ufo/glyphs/chedieresiscyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/chedieresiscyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="chedieresiscyrillic" format="2">
-  <advance width="1684.0"/>
+  <advance width="1712.0"/>
   <unicode hex="04F5"/>
   <outline>
     <component base="checyrillic"/>
-    <component base="dieresis" xOffset="252.0" yOffset="64.0"/>
+    <component base="dieresis" xOffset="208.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/cheverticalstrokecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/cheverticalstrokecyrillic.glif
index be0199061..30172b0c9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/cheverticalstrokecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/cheverticalstrokecyrillic.glif
@@ -1,41 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="cheverticalstrokecyrillic" format="2">
-  <advance width="1684.0"/>
+  <advance width="1712.0"/>
   <unicode hex="04B9"/>
   <outline>
     <contour>
-      <point x="968.0" y="1180.0" type="line"/>
-      <point x="716.0" y="1180.0" type="line"/>
-      <point x="716.0" y="180.0" type="line"/>
-      <point x="968.0" y="180.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1544.0" y="1488.0" type="line"/>
-      <point x="1028.0" y="1488.0" type="line"/>
-      <point x="1028.0" y="0.0" type="line"/>
-      <point x="1544.0" y="0.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1276.0" y="900.0" type="line"/>
-      <point x="1122.0" y="848.0"/>
-      <point x="1010.0" y="824.0"/>
-      <point x="912.0" y="824.0" type="curve" smooth="yes"/>
-      <point x="662.0" y="824.0"/>
-      <point x="622.0" y="852.0"/>
-      <point x="624.0" y="992.0" type="curve" smooth="yes"/>
-      <point x="624.0" y="1488.0" type="line"/>
-      <point x="112.0" y="1488.0" type="line"/>
-      <point x="112.0" y="992.0" type="line" smooth="yes"/>
-      <point x="110.0" y="576.0"/>
-      <point x="406.0" y="412.0"/>
-      <point x="912.0" y="412.0" type="curve" smooth="yes"/>
-      <point x="1002.0" y="412.0"/>
-      <point x="1218.0" y="452.0"/>
-      <point x="1276.0" y="488.0" type="curve"/>
+      <point x="980.0" y="1180.0" type="line"/>
+      <point x="728.0" y="1180.0" type="line"/>
+      <point x="728.0" y="180.0" type="line"/>
+      <point x="980.0" y="180.0" type="line"/>
     </contour>
+    <component base="checyrillic"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>checyrillic</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>checyrillic</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -43,10 +24,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -85,8 +66,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>2.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ddotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/ddotaccent.glif
index 3335f367b..0aa409c7f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ddotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ddotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E0B"/>
   <outline>
     <component base="d"/>
-    <component base="dotaccent" xOffset="212.0" yOffset="84.0"/>
+    <component base="dotaccent" xOffset="212.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dieresis.glif b/src/Inter-UI-Black.ufo/glyphs/dieresis.glif
index de98ee80e..8805fc527 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dieresis.glif
@@ -3,34 +3,35 @@
   <advance width="1296.0"/>
   <unicode hex="00A8"/>
   <guideline x="684.0" y="1892.0" angle="90.0"/>
+  <guideline x="656.0" y="1924.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="344.0" y="1688.0" type="curve" smooth="yes"/>
-      <point x="464.0" y="1688.0"/>
-      <point x="560.0" y="1779.0"/>
-      <point x="560.0" y="1892.0" type="curve" smooth="yes"/>
-      <point x="560.0" y="2005.0"/>
-      <point x="464.0" y="2096.0"/>
-      <point x="344.0" y="2096.0" type="curve" smooth="yes"/>
-      <point x="228.0" y="2096.0"/>
-      <point x="132.0" y="2005.0"/>
-      <point x="132.0" y="1892.0" type="curve" smooth="yes"/>
-      <point x="132.0" y="1779.0"/>
-      <point x="228.0" y="1688.0"/>
+      <point x="332.0" y="1692.0" type="curve" smooth="yes"/>
+      <point x="464.0" y="1692.0"/>
+      <point x="572.0" y="1796.0"/>
+      <point x="572.0" y="1924.0" type="curve" smooth="yes"/>
+      <point x="572.0" y="2052.0"/>
+      <point x="464.0" y="2156.0"/>
+      <point x="332.0" y="2156.0" type="curve" smooth="yes"/>
+      <point x="196.0" y="2156.0"/>
+      <point x="88.0" y="2052.0"/>
+      <point x="88.0" y="1924.0" type="curve" smooth="yes"/>
+      <point x="88.0" y="1796.0"/>
+      <point x="196.0" y="1692.0"/>
     </contour>
     <contour>
-      <point x="948.0" y="1688.0" type="curve" smooth="yes"/>
-      <point x="1068.0" y="1688.0"/>
-      <point x="1164.0" y="1779.0"/>
-      <point x="1164.0" y="1892.0" type="curve" smooth="yes"/>
-      <point x="1164.0" y="2005.0"/>
-      <point x="1068.0" y="2096.0"/>
-      <point x="948.0" y="2096.0" type="curve" smooth="yes"/>
-      <point x="832.0" y="2096.0"/>
-      <point x="736.0" y="2005.0"/>
-      <point x="736.0" y="1892.0" type="curve" smooth="yes"/>
-      <point x="736.0" y="1779.0"/>
-      <point x="832.0" y="1688.0"/>
+      <point x="968.0" y="1692.0" type="curve" smooth="yes"/>
+      <point x="1100.0" y="1692.0"/>
+      <point x="1208.0" y="1796.0"/>
+      <point x="1208.0" y="1924.0" type="curve" smooth="yes"/>
+      <point x="1208.0" y="2052.0"/>
+      <point x="1100.0" y="2156.0"/>
+      <point x="968.0" y="2156.0" type="curve" smooth="yes"/>
+      <point x="832.0" y="2156.0"/>
+      <point x="724.0" y="2052.0"/>
+      <point x="724.0" y="1924.0" type="curve" smooth="yes"/>
+      <point x="724.0" y="1796.0"/>
+      <point x="832.0" y="1692.0"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/dotaccent.glif
index fd188a8e3..c653515ae 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dotaccent.glif
@@ -5,18 +5,18 @@
   <guideline x="544.0" y="1500.0" angle="90.0"/>
   <outline>
     <contour>
-      <point x="460.0" y="1640.0" type="curve" smooth="yes"/>
-      <point x="604.0" y="1640.0"/>
-      <point x="732.0" y="1748.0"/>
-      <point x="732.0" y="1892.0" type="curve" smooth="yes"/>
-      <point x="732.0" y="2036.0"/>
-      <point x="604.0" y="2144.0"/>
-      <point x="460.0" y="2144.0" type="curve" smooth="yes"/>
-      <point x="316.0" y="2144.0"/>
-      <point x="188.0" y="2036.0"/>
-      <point x="188.0" y="1892.0" type="curve" smooth="yes"/>
-      <point x="188.0" y="1748.0"/>
-      <point x="316.0" y="1640.0"/>
+      <point x="460.0" y="1672.0" type="curve" smooth="yes"/>
+      <point x="604.0" y="1672.0"/>
+      <point x="732.0" y="1780.0"/>
+      <point x="732.0" y="1924.0" type="curve" smooth="yes"/>
+      <point x="732.0" y="2068.0"/>
+      <point x="604.0" y="2176.0"/>
+      <point x="460.0" y="2176.0" type="curve" smooth="yes"/>
+      <point x="316.0" y="2176.0"/>
+      <point x="188.0" y="2068.0"/>
+      <point x="188.0" y="1924.0" type="curve" smooth="yes"/>
+      <point x="188.0" y="1780.0"/>
+      <point x="316.0" y="1672.0"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dzhecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/dzhecyrillic.glif
index c3d463633..4934e6c07 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dzhecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dzhecyrillic.glif
@@ -1,27 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="dzhecyrillic" format="2">
-  <advance width="1688.0"/>
+  <advance width="1692.0"/>
   <unicode hex="045F"/>
   <outline>
     <contour>
-      <point x="584.0" y="416.0" type="line"/>
-      <point x="584.0" y="-496.0" type="line"/>
-      <point x="1100.0" y="-496.0" type="line"/>
-      <point x="1100.0" y="416.0" type="line"/>
+      <point x="592.0" y="416.0" type="line"/>
+      <point x="592.0" y="-496.0" type="line"/>
+      <point x="1108.0" y="-496.0" type="line"/>
+      <point x="1108.0" y="416.0" type="line"/>
     </contour>
     <contour>
-      <point x="132.0" y="1488.0" type="line"/>
-      <point x="132.0" y="0.0" type="line"/>
-      <point x="1560.0" y="0.0" type="line"/>
-      <point x="1560.0" y="1488.0" type="line"/>
-      <point x="1040.0" y="1488.0" type="line"/>
-      <point x="1040.0" y="416.0" type="line"/>
-      <point x="644.0" y="416.0" type="line"/>
-      <point x="644.0" y="1488.0" type="line"/>
+      <point x="140.0" y="1536.0" type="line"/>
+      <point x="140.0" y="0.0" type="line"/>
+      <point x="1568.0" y="0.0" type="line"/>
+      <point x="1568.0" y="1536.0" type="line"/>
+      <point x="1048.0" y="1536.0" type="line"/>
+      <point x="1048.0" y="416.0" type="line"/>
+      <point x="652.0" y="416.0" type="line"/>
+      <point x="652.0" y="1536.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>m</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>a</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/eacute.glif b/src/Inter-UI-Black.ufo/glyphs/eacute.glif
index ac2cd8980..67524671b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/eacute.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/eacute.glif
@@ -4,6 +4,6 @@
   <unicode hex="00E9"/>
   <outline>
     <component base="e"/>
-    <component base="acute" xOffset="416.0" yOffset="24.0"/>
+    <component base="acute" xOffset="416.0" yOffset="28.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ebreve.glif b/src/Inter-UI-Black.ufo/glyphs/ebreve.glif
index 1c4a5c79f..8840ecddf 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ebreve.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ebreve.glif
@@ -4,6 +4,6 @@
   <unicode hex="0115"/>
   <outline>
     <component base="e"/>
-    <component base="breve" xOffset="152.0" yOffset="-12.0"/>
+    <component base="breve" xOffset="152.0" yOffset="-8.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ecaron.glif b/src/Inter-UI-Black.ufo/glyphs/ecaron.glif
index 270ccda5e..1fe45ed8d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ecaron.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ecaron.glif
@@ -4,6 +4,6 @@
   <unicode hex="011B"/>
   <outline>
     <component base="e"/>
-    <component base="caron" xOffset="-28.0" yOffset="56.0"/>
+    <component base="caron" xOffset="-28.0" yOffset="60.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ecedillabreve.glif b/src/Inter-UI-Black.ufo/glyphs/ecedillabreve.glif
index 1fa52ba62..7e2ebdd87 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ecedillabreve.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ecedillabreve.glif
@@ -5,6 +5,6 @@
   <outline>
     <component base="e"/>
     <component base="cedilla" xOffset="244.0"/>
-    <component base="breve" xOffset="152.0" yOffset="-12.0"/>
+    <component base="breve" xOffset="152.0" yOffset="-8.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ecircumflex.glif b/src/Inter-UI-Black.ufo/glyphs/ecircumflex.glif
index c5616709e..c27152c74 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ecircumflex.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ecircumflex.glif
@@ -4,6 +4,6 @@
   <unicode hex="00EA"/>
   <outline>
     <component base="e"/>
-    <component base="circumflex" xOffset="-20.0" yOffset="-96.0"/>
+    <component base="circumflex" xOffset="-20.0" yOffset="-92.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ecircumflexacute.glif b/src/Inter-UI-Black.ufo/glyphs/ecircumflexacute.glif
index 12b016e6d..a6daf0023 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ecircumflexacute.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ecircumflexacute.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EBF"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexacutecomb.cn" xOffset="280.0" yOffset="-80.0"/>
+    <component base="circumflexacutecomb.cn" xOffset="280.0" yOffset="-76.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ecircumflexdotbelow.glif b/src/Inter-UI-Black.ufo/glyphs/ecircumflexdotbelow.glif
index 7c4a0bade..c6b211bf1 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ecircumflexdotbelow.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ecircumflexdotbelow.glif
@@ -4,7 +4,7 @@
   <unicode hex="1EC7"/>
   <outline>
     <component base="e"/>
-    <component base="circumflex" xOffset="-20.0" yOffset="-96.0"/>
+    <component base="circumflex" xOffset="-20.0" yOffset="-92.0"/>
     <component base="dotbelow" xOffset="1816.0" yOffset="-164.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ecircumflexgrave.glif b/src/Inter-UI-Black.ufo/glyphs/ecircumflexgrave.glif
index bbf784564..519bc537a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ecircumflexgrave.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ecircumflexgrave.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EC1"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexgravecomb.cn" xOffset="-232.0" yOffset="-100.0"/>
+    <component base="circumflexgravecomb.cn" xOffset="-232.0" yOffset="-96.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ecircumflexhookabove.glif b/src/Inter-UI-Black.ufo/glyphs/ecircumflexhookabove.glif
index e83580710..e6e751467 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ecircumflexhookabove.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ecircumflexhookabove.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EC3"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexhookcomb.cn" xOffset="164.0" yOffset="-80.0"/>
+    <component base="circumflexhookcomb.cn" xOffset="164.0" yOffset="-76.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ecircumflextilde.glif b/src/Inter-UI-Black.ufo/glyphs/ecircumflextilde.glif
index dd6270635..39ca185a8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ecircumflextilde.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ecircumflextilde.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EC5"/>
   <outline>
     <component base="e"/>
-    <component base="circumflextildecomb.cn" yOffset="-68.0"/>
+    <component base="circumflextildecomb.cn" yOffset="-64.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/edblgrave.glif b/src/Inter-UI-Black.ufo/glyphs/edblgrave.glif
index d60f75837..43b43f608 100644
--- a/src/Inter-UI-Black.ufo/glyphs/edblgrave.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/edblgrave.glif
@@ -4,6 +4,6 @@
   <unicode hex="0205"/>
   <outline>
     <component base="e"/>
-    <component base="dblgravecmb" xOffset="1712.0" yOffset="-8.0"/>
+    <component base="dblgravecmb" xOffset="1712.0" yOffset="-4.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/edieresis.glif b/src/Inter-UI-Black.ufo/glyphs/edieresis.glif
index c0dab1454..501e48960 100644
--- a/src/Inter-UI-Black.ufo/glyphs/edieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/edieresis.glif
@@ -4,7 +4,7 @@
   <unicode hex="00EB"/>
   <outline>
     <component base="e"/>
-    <component base="dieresis" xOffset="216.0" yOffset="40.0"/>
+    <component base="dieresis" xOffset="216.0"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/edotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/edotaccent.glif
index 1232758cf..20174d2de 100644
--- a/src/Inter-UI-Black.ufo/glyphs/edotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/edotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="0117"/>
   <outline>
     <component base="e"/>
-    <component base="dotaccent" xOffset="404.0" yOffset="80.0"/>
+    <component base="dotaccent" xOffset="404.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/efcyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/efcyrillic.glif
index dcf0ef3e9..eb06a0ca3 100644
--- a/src/Inter-UI-Black.ufo/glyphs/efcyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/efcyrillic.glif
@@ -1,81 +1,85 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="efcyrillic" format="2">
-  <advance width="2600.0"/>
+  <advance width="2224.0"/>
   <unicode hex="0444"/>
   <outline>
     <contour>
-      <point x="2320.0" y="748.0" type="line"/>
-      <point x="2322.0" y="1196.0"/>
-      <point x="2118.0" y="1516.0"/>
-      <point x="1736.0" y="1516.0" type="curve" smooth="yes"/>
-      <point x="1358.0" y="1516.0"/>
-      <point x="1222.0" y="1088.0"/>
-      <point x="1156.0" y="616.0" type="curve"/>
-      <point x="1156.0" y="812.0" type="line"/>
-      <point x="1226.0" y="340.0"/>
-      <point x="1370.0" y="-28.0"/>
-      <point x="1736.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="2118.0" y="-28.0"/>
-      <point x="2322.0" y="284.0"/>
-      <point x="2320.0" y="720.0" type="curve" smooth="yes"/>
+      <point x="2132.0" y="768.0" type="line"/>
+      <point x="2134.0" y="1228.0"/>
+      <point x="1930.0" y="1556.0"/>
+      <point x="1548.0" y="1556.0" type="curve" smooth="yes"/>
+      <point x="1170.0" y="1556.0"/>
+      <point x="1034.0" y="1117.0"/>
+      <point x="968.0" y="632.0" type="curve"/>
+      <point x="968.0" y="832.0" type="line"/>
+      <point x="1038.0" y="350.0"/>
+      <point x="1182.0" y="-28.0"/>
+      <point x="1548.0" y="-28.0" type="curve" smooth="yes"/>
+      <point x="1930.0" y="-28.0"/>
+      <point x="2134.0" y="292.0"/>
+      <point x="2132.0" y="740.0" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="1800.0" y="720.0" type="line"/>
-      <point x="1802.0" y="524.0"/>
-      <point x="1762.0" y="388.0"/>
-      <point x="1608.0" y="388.0" type="curve" smooth="yes"/>
-      <point x="1374.0" y="388.0"/>
-      <point x="1298.0" y="544.0"/>
-      <point x="1292.0" y="800.0" type="curve" smooth="yes"/>
-      <point x="1292.0" y="620.0" type="line" smooth="yes"/>
-      <point x="1294.0" y="900.0"/>
-      <point x="1366.0" y="1104.0"/>
-      <point x="1612.0" y="1104.0" type="curve" smooth="yes"/>
-      <point x="1750.0" y="1104.0"/>
-      <point x="1802.0" y="948.0"/>
-      <point x="1800.0" y="748.0" type="curve" smooth="yes"/>
+      <point x="1612.0" y="740.0" type="line"/>
+      <point x="1614.0" y="538.0"/>
+      <point x="1574.0" y="399.0"/>
+      <point x="1420.0" y="400.0" type="curve" smooth="yes"/>
+      <point x="1186.0" y="399.0"/>
+      <point x="1110.0" y="559.0"/>
+      <point x="1104.0" y="820.0" type="curve" smooth="yes"/>
+      <point x="1104.0" y="636.0" type="line" smooth="yes"/>
+      <point x="1106.0" y="924.0"/>
+      <point x="1178.0" y="1133.0"/>
+      <point x="1424.0" y="1132.0" type="curve" smooth="yes"/>
+      <point x="1562.0" y="1133.0"/>
+      <point x="1614.0" y="973.0"/>
+      <point x="1612.0" y="768.0" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="280.0" y="720.0" type="line"/>
-      <point x="282.0" y="284.0"/>
-      <point x="490.0" y="-28.0"/>
-      <point x="864.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="1242.0" y="-28.0"/>
-      <point x="1382.0" y="360.0"/>
-      <point x="1448.0" y="796.0" type="curve"/>
-      <point x="1448.0" y="616.0" type="line"/>
-      <point x="1382.0" y="1100.0"/>
-      <point x="1246.0" y="1516.0"/>
-      <point x="864.0" y="1516.0" type="curve" smooth="yes"/>
-      <point x="490.0" y="1516.0"/>
-      <point x="282.0" y="1196.0"/>
-      <point x="280.0" y="748.0" type="curve" smooth="yes"/>
+      <point x="92.0" y="740.0" type="line"/>
+      <point x="94.0" y="292.0"/>
+      <point x="302.0" y="-28.0"/>
+      <point x="676.0" y="-28.0" type="curve" smooth="yes"/>
+      <point x="1054.0" y="-28.0"/>
+      <point x="1194.0" y="370.0"/>
+      <point x="1260.0" y="816.0" type="curve"/>
+      <point x="1260.0" y="632.0" type="line"/>
+      <point x="1194.0" y="1129.0"/>
+      <point x="1058.0" y="1556.0"/>
+      <point x="676.0" y="1556.0" type="curve" smooth="yes"/>
+      <point x="302.0" y="1556.0"/>
+      <point x="94.0" y="1228.0"/>
+      <point x="92.0" y="768.0" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="800.0" y="748.0" type="line"/>
-      <point x="802.0" y="944.0"/>
-      <point x="854.0" y="1104.0"/>
-      <point x="992.0" y="1104.0" type="curve" smooth="yes"/>
-      <point x="1250.0" y="1104.0"/>
-      <point x="1310.0" y="892.0"/>
-      <point x="1312.0" y="620.0" type="curve" smooth="yes"/>
-      <point x="1312.0" y="792.0" type="line" smooth="yes"/>
-      <point x="1314.0" y="572.0"/>
-      <point x="1250.0" y="388.0"/>
-      <point x="992.0" y="388.0" type="curve" smooth="yes"/>
-      <point x="826.0" y="388.0"/>
-      <point x="802.0" y="564.0"/>
-      <point x="800.0" y="720.0" type="curve" smooth="yes"/>
+      <point x="612.0" y="768.0" type="line"/>
+      <point x="614.0" y="969.0"/>
+      <point x="666.0" y="1133.0"/>
+      <point x="804.0" y="1132.0" type="curve" smooth="yes"/>
+      <point x="1062.0" y="1133.0"/>
+      <point x="1122.0" y="916.0"/>
+      <point x="1124.0" y="636.0" type="curve" smooth="yes"/>
+      <point x="1124.0" y="812.0" type="line" smooth="yes"/>
+      <point x="1126.0" y="588.0"/>
+      <point x="1062.0" y="399.0"/>
+      <point x="804.0" y="400.0" type="curve" smooth="yes"/>
+      <point x="638.0" y="399.0"/>
+      <point x="614.0" y="579.0"/>
+      <point x="612.0" y="740.0" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="1048.0" y="-572.0" type="line"/>
-      <point x="1560.0" y="-572.0" type="line"/>
-      <point x="1560.0" y="2112.0" type="line"/>
-      <point x="1048.0" y="2112.0" type="line"/>
+      <point x="860.0" y="-572.0" type="line"/>
+      <point x="1372.0" y="-572.0" type="line"/>
+      <point x="1372.0" y="2112.0" type="line"/>
+      <point x="860.0" y="2112.0" 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>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/egrave.glif b/src/Inter-UI-Black.ufo/glyphs/egrave.glif
index 29ee28183..646950226 100644
--- a/src/Inter-UI-Black.ufo/glyphs/egrave.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/egrave.glif
@@ -4,6 +4,6 @@
   <unicode hex="00E8"/>
   <outline>
     <component base="e"/>
-    <component base="grave" xOffset="64.0" yOffset="24.0"/>
+    <component base="grave" xOffset="64.0" yOffset="28.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ehookabove.glif b/src/Inter-UI-Black.ufo/glyphs/ehookabove.glif
index c22e989d9..ba97e6956 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ehookabove.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ehookabove.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EBB"/>
   <outline>
     <component base="e"/>
-    <component base="hook" xOffset="1880.0" yOffset="-36.0"/>
+    <component base="hook" xOffset="1880.0" yOffset="-32.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/einvertedbreve.glif b/src/Inter-UI-Black.ufo/glyphs/einvertedbreve.glif
index 67d1d2313..1dcbfbcf4 100644
--- a/src/Inter-UI-Black.ufo/glyphs/einvertedbreve.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/einvertedbreve.glif
@@ -4,6 +4,6 @@
   <unicode hex="0207"/>
   <outline>
     <component base="e"/>
-    <component base="breveinvnosp" xOffset="1824.0" yOffset="188.0"/>
+    <component base="breveinvnosp" xOffset="1824.0" yOffset="192.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/emacron.glif b/src/Inter-UI-Black.ufo/glyphs/emacron.glif
index 837c2b036..d8238f07b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/emacron.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/emacron.glif
@@ -4,6 +4,6 @@
   <unicode hex="0113"/>
   <outline>
     <component base="e"/>
-    <component base="macron" xOffset="-44.0" yOffset="-28.0"/>
+    <component base="macron" xOffset="-44.0" yOffset="-24.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/emacronacute.glif b/src/Inter-UI-Black.ufo/glyphs/emacronacute.glif
index c3b3b2ade..fc06a9865 100644
--- a/src/Inter-UI-Black.ufo/glyphs/emacronacute.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/emacronacute.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E17"/>
   <outline>
     <component base="e"/>
-    <component base="macronacutecomb.lc" xOffset="1824.0" yOffset="-24.0"/>
+    <component base="macronacutecomb.lc" xOffset="1824.0" yOffset="-20.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/emacrongrave.glif b/src/Inter-UI-Black.ufo/glyphs/emacrongrave.glif
index d4f32f5f0..0ce4db122 100644
--- a/src/Inter-UI-Black.ufo/glyphs/emacrongrave.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/emacrongrave.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E15"/>
   <outline>
     <component base="e"/>
-    <component base="macrongravecomb.lc" xOffset="1832.0" yOffset="-24.0"/>
+    <component base="macrongravecomb.lc" xOffset="1832.0" yOffset="-20.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/emcyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/emcyrillic.glif
index c87fe352f..d2a2a3658 100644
--- a/src/Inter-UI-Black.ufo/glyphs/emcyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/emcyrillic.glif
@@ -1,32 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="emcyrillic" format="2">
-  <advance width="2224.0"/>
+  <advance width="2196.0"/>
   <unicode hex="043C"/>
   <outline>
     <contour>
-      <point x="1096.0" y="572.0" type="line"/>
-      <point x="776.0" y="1488.0" type="line"/>
-      <point x="384.0" y="1488.0" type="line"/>
-      <point x="924.0" y="0.0" type="line"/>
-      <point x="1268.0" y="0.0" type="line"/>
-      <point x="1824.0" y="1488.0" type="line"/>
-      <point x="1432.0" y="1488.0" type="line"/>
+      <point x="1092.0" y="572.0" type="line"/>
+      <point x="772.0" y="1536.0" type="line"/>
+      <point x="380.0" y="1536.0" type="line"/>
+      <point x="920.0" y="0.0" type="line"/>
+      <point x="1264.0" y="0.0" type="line"/>
+      <point x="1820.0" y="1536.0" type="line"/>
+      <point x="1428.0" y="1536.0" type="line"/>
     </contour>
     <contour>
-      <point x="664.0" y="1488.0" type="line"/>
-      <point x="144.0" y="1488.0" type="line"/>
-      <point x="144.0" y="0.0" type="line"/>
-      <point x="664.0" y="0.0" type="line"/>
+      <point x="660.0" y="1536.0" type="line"/>
+      <point x="140.0" y="1536.0" type="line"/>
+      <point x="140.0" y="0.0" type="line"/>
+      <point x="660.0" y="0.0" type="line"/>
     </contour>
     <contour>
-      <point x="1564.0" y="0.0" type="line"/>
-      <point x="2076.0" y="0.0" type="line"/>
-      <point x="2076.0" y="1488.0" type="line"/>
-      <point x="1564.0" y="1488.0" type="line"/>
+      <point x="1560.0" y="0.0" type="line"/>
+      <point x="2072.0" y="0.0" type="line"/>
+      <point x="2072.0" y="1536.0" type="line"/>
+      <point x="1560.0" y="1536.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>m</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>a</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/encyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/encyrillic.glif
index dda22a5b8..d5cf5b0da 100644
--- a/src/Inter-UI-Black.ufo/glyphs/encyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/encyrillic.glif
@@ -4,26 +4,30 @@
   <unicode hex="043D"/>
   <outline>
     <contour>
-      <point x="1228.0" y="932.0" type="line"/>
-      <point x="456.0" y="932.0" type="line"/>
-      <point x="456.0" y="520.0" type="line"/>
-      <point x="1228.0" y="520.0" type="line"/>
+      <point x="1236.0" y="980.0" type="line"/>
+      <point x="464.0" y="980.0" type="line"/>
+      <point x="464.0" y="568.0" type="line"/>
+      <point x="1236.0" y="568.0" type="line"/>
     </contour>
     <contour>
-      <point x="652.0" y="1488.0" type="line"/>
-      <point x="132.0" y="1488.0" type="line"/>
-      <point x="132.0" y="0.0" type="line"/>
-      <point x="652.0" y="0.0" type="line"/>
+      <point x="660.0" y="1536.0" type="line"/>
+      <point x="140.0" y="1536.0" type="line"/>
+      <point x="140.0" y="0.0" type="line"/>
+      <point x="660.0" y="0.0" type="line"/>
     </contour>
     <contour>
-      <point x="1552.0" y="1488.0" type="line"/>
-      <point x="1036.0" y="1488.0" type="line"/>
-      <point x="1036.0" y="0.0" type="line"/>
-      <point x="1552.0" y="0.0" type="line"/>
+      <point x="1560.0" y="1536.0" type="line"/>
+      <point x="1044.0" y="1536.0" type="line"/>
+      <point x="1044.0" y="0.0" type="line"/>
+      <point x="1560.0" y="0.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>m</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>a</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/endescendercyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/endescendercyrillic.glif
index e6e421649..51428e5d1 100644
--- a/src/Inter-UI-Black.ufo/glyphs/endescendercyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/endescendercyrillic.glif
@@ -1,9 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="endescendercyrillic" format="2">
-  <advance width="1684.0"/>
+  <advance width="2144.0"/>
   <unicode hex="04A3"/>
   <outline>
     <component base="encyrillic"/>
-    <component base="cyrillictic.cn" xOffset="1324.0"/>
+    <component base="cyrillictic.cn" xOffset="1332.0"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>m</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>t</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>-1</integer>
+        <integer>0</integer>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/enghecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/enghecyrillic.glif
index 9d63b0df1..d387a28e7 100644
--- a/src/Inter-UI-Black.ufo/glyphs/enghecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/enghecyrillic.glif
@@ -1,35 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="enghecyrillic" format="2">
-  <advance width="2232.0"/>
+  <advance width="2040.0"/>
   <unicode hex="04A5"/>
   <outline>
     <contour>
-      <point x="2068.0" y="1488.0" type="line"/>
-      <point x="1496.0" y="1488.0" type="line"/>
-      <point x="1492.0" y="1076.0" type="line"/>
-      <point x="2068.0" y="1076.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1264.0" y="932.0" type="line"/>
-      <point x="492.0" y="932.0" type="line"/>
-      <point x="492.0" y="520.0" type="line"/>
-      <point x="1264.0" y="520.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="688.0" y="1488.0" type="line"/>
-      <point x="168.0" y="1488.0" type="line"/>
-      <point x="168.0" y="0.0" type="line"/>
-      <point x="688.0" y="0.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1588.0" y="1488.0" type="line"/>
-      <point x="1072.0" y="1488.0" type="line"/>
-      <point x="1072.0" y="0.0" type="line"/>
-      <point x="1588.0" y="0.0" type="line"/>
+      <point x="2040.0" y="1536.0" type="line"/>
+      <point x="1468.0" y="1536.0" type="line"/>
+      <point x="1464.0" y="1124.0" type="line"/>
+      <point x="2040.0" y="1124.0" type="line"/>
     </contour>
+    <component base="encyrillic"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>m</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>f</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -37,10 +24,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -59,7 +46,7 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
+            <real>0.0</real>
             <real>1.0</real>
           </array>
           <key>stem</key>
diff --git a/src/Inter-UI-Black.ufo/glyphs/enhookcyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/enhookcyrillic.glif
index c45990a71..551d78c32 100644
--- a/src/Inter-UI-Black.ufo/glyphs/enhookcyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/enhookcyrillic.glif
@@ -4,34 +4,31 @@
   <unicode hex="04C8"/>
   <outline>
     <contour>
-      <point x="132.0" y="1488.0" type="line"/>
-      <point x="132.0" y="0.0" type="line"/>
-      <point x="652.0" y="0.0" type="line"/>
-      <point x="652.0" y="520.0" type="line"/>
-      <point x="1036.0" y="520.0" type="line"/>
-      <point x="1036.0" y="20.0" type="line" smooth="yes"/>
-      <point x="1036.0" y="-116.0"/>
-      <point x="980.0" y="-188.0"/>
-      <point x="872.0" y="-188.0" type="curve" smooth="yes"/>
-      <point x="808.0" y="-188.0"/>
-      <point x="788.0" y="-188.0"/>
-      <point x="720.0" y="-172.0" type="curve"/>
-      <point x="700.0" y="-580.0" type="line"/>
-      <point x="788.0" y="-596.0"/>
-      <point x="860.0" y="-600.0"/>
-      <point x="948.0" y="-600.0" type="curve" smooth="yes"/>
-      <point x="1320.0" y="-600.0"/>
-      <point x="1552.0" y="-380.0"/>
-      <point x="1552.0" y="20.0" type="curve" smooth="yes"/>
-      <point x="1552.0" y="1488.0" type="line"/>
-      <point x="1036.0" y="1488.0" type="line"/>
-      <point x="1036.0" y="932.0" type="line"/>
-      <point x="652.0" y="932.0" type="line"/>
-      <point x="652.0" y="1488.0" type="line"/>
+      <point x="1560.0" y="0.0" type="line"/>
+      <point x="1044.0" y="0.0" type="line"/>
+      <point x="1044.0" y="-20.0" type="line" smooth="yes"/>
+      <point x="1044.0" y="-146.0"/>
+      <point x="988.0" y="-188.0"/>
+      <point x="880.0" y="-188.0" type="curve" smooth="yes"/>
+      <point x="816.0" y="-188.0"/>
+      <point x="796.0" y="-188.0"/>
+      <point x="728.0" y="-172.0" type="curve"/>
+      <point x="708.0" y="-580.0" type="line"/>
+      <point x="796.0" y="-596.0"/>
+      <point x="868.0" y="-600.0"/>
+      <point x="956.0" y="-600.0" type="curve" smooth="yes"/>
+      <point x="1328.0" y="-600.0"/>
+      <point x="1560.0" y="-410.0"/>
+      <point x="1560.0" y="-20.0" type="curve" smooth="yes"/>
     </contour>
+    <component base="encyrillic"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>encyrillic</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>encyrillic</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -39,10 +36,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
             <real>0.0</real>
-            <real>0.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -62,14 +59,14 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>0.0</real>
+            <real>8.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
             <real>0.0</real>
-            <real>17.0</real>
+            <real>14.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ereversedcyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/ereversedcyrillic.glif
index ab1973e22..47013d95b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ereversedcyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ereversedcyrillic.glif
@@ -1,47 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="ereversedcyrillic" format="2">
-  <advance width="1684.0"/>
+  <advance width="1596.0"/>
   <unicode hex="044D"/>
   <outline>
     <contour>
-      <point x="800.0" y="1104.0" type="curve" smooth="yes"/>
-      <point x="1008.0" y="1104.0"/>
-      <point x="1028.0" y="940.0"/>
-      <point x="1028.0" y="756.0" type="curve" smooth="yes"/>
-      <point x="1028.0" y="732.0" type="line" smooth="yes"/>
-      <point x="1028.0" y="576.0"/>
-      <point x="1016.0" y="388.0"/>
-      <point x="800.0" y="388.0" type="curve"/>
-      <point x="664.0" y="388.0"/>
-      <point x="620.0" y="476.0"/>
-      <point x="620.0" y="592.0" type="curve"/>
-      <point x="136.0" y="592.0" type="line"/>
-      <point x="136.0" y="184.0"/>
-      <point x="404.0" y="-28.0"/>
-      <point x="800.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="1296.0" y="-28.0"/>
-      <point x="1548.0" y="288.0"/>
-      <point x="1548.0" y="732.0" type="curve" smooth="yes"/>
-      <point x="1548.0" y="756.0" type="line" smooth="yes"/>
-      <point x="1548.0" y="1196.0"/>
-      <point x="1292.0" y="1516.0"/>
-      <point x="800.0" y="1516.0" type="curve"/>
-      <point x="408.0" y="1516.0"/>
-      <point x="136.0" y="1300.0"/>
-      <point x="136.0" y="936.0" type="curve"/>
-      <point x="620.0" y="936.0" type="line"/>
-      <point x="620.0" y="1048.0"/>
-      <point x="664.0" y="1104.0"/>
+      <point x="756.0" y="1140.0" type="curve" smooth="yes"/>
+      <point x="964.0" y="1139.0"/>
+      <point x="984.0" y="970.0"/>
+      <point x="984.0" y="780.0" type="curve" smooth="yes"/>
+      <point x="984.0" y="756.0" type="line" smooth="yes"/>
+      <point x="984.0" y="595.0"/>
+      <point x="972.0" y="401.0"/>
+      <point x="756.0" y="400.0" type="curve"/>
+      <point x="620.0" y="401.0"/>
+      <point x="576.0" y="492.0"/>
+      <point x="576.0" y="612.0" type="curve"/>
+      <point x="92.0" y="612.0" type="line"/>
+      <point x="92.0" y="191.0"/>
+      <point x="360.0" y="-28.0"/>
+      <point x="756.0" y="-28.0" type="curve" smooth="yes"/>
+      <point x="1252.0" y="-28.0"/>
+      <point x="1504.0" y="298.0"/>
+      <point x="1504.0" y="756.0" type="curve" smooth="yes"/>
+      <point x="1504.0" y="780.0" type="line" smooth="yes"/>
+      <point x="1504.0" y="1234.0"/>
+      <point x="1248.0" y="1564.0"/>
+      <point x="756.0" y="1564.0" type="curve"/>
+      <point x="364.0" y="1564.0"/>
+      <point x="92.0" y="1341.0"/>
+      <point x="92.0" y="964.0" type="curve"/>
+      <point x="576.0" y="964.0" type="line"/>
+      <point x="576.0" y="1081.0"/>
+      <point x="620.0" y="1139.0"/>
     </contour>
     <contour>
-      <point x="1168.0" y="872.0" type="line"/>
-      <point x="712.0" y="872.0" type="line"/>
-      <point x="712.0" y="608.0" type="line"/>
-      <point x="1168.0" y="608.0" type="line"/>
+      <point x="1124.0" y="900.0" type="line"/>
+      <point x="668.0" y="900.0" type="line"/>
+      <point x="668.0" y="628.0" type="line"/>
+      <point x="1124.0" y="628.0" 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>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/etilde.glif b/src/Inter-UI-Black.ufo/glyphs/etilde.glif
index 917df89fd..9209a6ab7 100644
--- a/src/Inter-UI-Black.ufo/glyphs/etilde.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/etilde.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EBD"/>
   <outline>
     <component base="e"/>
-    <component base="tilde" xOffset="156.0" yOffset="-12.0"/>
+    <component base="tilde" xOffset="156.0" yOffset="-8.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/fdotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/fdotaccent.glif
index 454930ac6..82964ac1e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/fdotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/fdotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E1F"/>
   <outline>
     <component base="f"/>
-    <component base="dotaccent" xOffset="240.0" yOffset="616.0"/>
+    <component base="dotaccent" xOffset="240.0" yOffset="532.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/gamma.glif b/src/Inter-UI-Black.ufo/glyphs/gamma.glif
index 3cc87f2aa..1bd1b7544 100644
--- a/src/Inter-UI-Black.ufo/glyphs/gamma.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/gamma.glif
@@ -1,31 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="gamma" format="2">
-  <advance width="1676.0"/>
+  <advance width="1564.0"/>
   <unicode hex="03B3"/>
   <outline>
     <contour>
-      <point x="1096.0" y="56.0" type="line"/>
-      <point x="580.0" y="56.0" type="line"/>
-      <point x="580.0" y="-572.0" type="line"/>
-      <point x="1096.0" y="-572.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="812.0" y="380.0" type="line"/>
-      <point x="756.0" y="0.0" type="line"/>
-      <point x="1108.0" y="0.0" type="line"/>
-      <point x="1604.0" y="1556.0" type="line"/>
-      <point x="1060.0" y="1556.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="620.0" y="1556.0" type="line"/>
-      <point x="72.0" y="1556.0" type="line"/>
-      <point x="572.0" y="0.0" type="line"/>
-      <point x="924.0" y="0.0" type="line"/>
-      <point x="888.0" y="364.0" type="line"/>
+      <point x="16.0" y="1536.0" type="line"/>
+      <point x="524.0" y="0.0" type="line"/>
+      <point x="524.0" y="-572.0" type="line"/>
+      <point x="1040.0" y="-572.0" type="line"/>
+      <point x="1040.0" y="0.0" type="line"/>
+      <point x="1548.0" y="1536.0" type="line"/>
+      <point x="1004.0" y="1536.0" type="line"/>
+      <point x="792.0" y="544.0" type="line"/>
+      <point x="564.0" y="1536.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>y</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>y</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -55,8 +50,8 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>0.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -75,8 +70,8 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
             <real>0.0</real>
+            <real>8.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -97,15 +92,15 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
             <real>0.0</real>
+            <real>8.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
-            <real>2.0</real>
+            <real>0.0</real>
+            <real>4.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -132,8 +127,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>0.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -147,8 +142,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
             <real>0.0</real>
+            <real>8.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/gdotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/gdotaccent.glif
index 6a8e6ee63..2b08640ad 100644
--- a/src/Inter-UI-Black.ufo/glyphs/gdotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/gdotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="0121"/>
   <outline>
     <component base="g"/>
-    <component base="dotaccent" xOffset="420.0" yOffset="84.0"/>
+    <component base="dotaccent" xOffset="420.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/gecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/gecyrillic.glif
index 8e00d3e99..54dfe61c5 100644
--- a/src/Inter-UI-Black.ufo/glyphs/gecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/gecyrillic.glif
@@ -4,12 +4,12 @@
   <unicode hex="0433"/>
   <outline>
     <contour>
-      <point x="1252.0" y="1488.0" type="line"/>
-      <point x="132.0" y="1488.0" type="line"/>
+      <point x="1252.0" y="1536.0" type="line"/>
+      <point x="132.0" y="1536.0" type="line"/>
       <point x="132.0" y="0.0" type="line"/>
       <point x="664.0" y="0.0" type="line"/>
-      <point x="664.0" y="1076.0" type="line"/>
-      <point x="1252.0" y="1076.0" type="line"/>
+      <point x="664.0" y="1124.0" type="line"/>
+      <point x="1252.0" y="1124.0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ghemiddlehookcyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/ghemiddlehookcyrillic.glif
index ef24b097e..bae169207 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ghemiddlehookcyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ghemiddlehookcyrillic.glif
@@ -1,37 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="ghemiddlehookcyrillic" format="2">
-  <advance width="1688.0"/>
+  <advance width="1704.0"/>
   <unicode hex="0495"/>
   <outline>
     <contour>
-      <point x="388.0" y="532.0" type="line"/>
-      <point x="672.0" y="532.0" type="line" smooth="yes"/>
-      <point x="879.0" y="532.0"/>
-      <point x="1031.0" y="464.0"/>
-      <point x="1028.0" y="252.0" type="curve" smooth="yes"/>
-      <point x="1023.0" y="84.0"/>
-      <point x="899.0" y="8.0"/>
-      <point x="772.0" y="-80.0" type="curve"/>
-      <point x="1028.0" y="-392.0" type="line"/>
-      <point x="1379.0" y="-224.0"/>
-      <point x="1551.0" y="24.0"/>
-      <point x="1544.0" y="252.0" type="curve"/>
-      <point x="1543.0" y="744.0"/>
-      <point x="1183.0" y="936.0"/>
-      <point x="672.0" y="936.0" type="curve" smooth="yes"/>
-      <point x="388.0" y="936.0" type="line"/>
+      <point x="404.0" y="532.0" type="line"/>
+      <point x="688.0" y="532.0" type="line" smooth="yes"/>
+      <point x="895.0" y="532.0"/>
+      <point x="1047.0" y="464.0"/>
+      <point x="1044.0" y="252.0" type="curve" smooth="yes"/>
+      <point x="1039.0" y="84.0"/>
+      <point x="915.0" y="8.0"/>
+      <point x="788.0" y="-80.0" type="curve"/>
+      <point x="1044.0" y="-392.0" type="line"/>
+      <point x="1395.0" y="-224.0"/>
+      <point x="1567.0" y="24.0"/>
+      <point x="1560.0" y="252.0" type="curve"/>
+      <point x="1559.0" y="744.0"/>
+      <point x="1199.0" y="936.0"/>
+      <point x="688.0" y="936.0" type="curve" smooth="yes"/>
+      <point x="404.0" y="936.0" type="line"/>
     </contour>
     <contour>
-      <point x="1244.0" y="1488.0" type="line"/>
-      <point x="124.0" y="1488.0" type="line"/>
-      <point x="124.0" y="0.0" type="line"/>
-      <point x="656.0" y="0.0" type="line"/>
-      <point x="656.0" y="1076.0" type="line"/>
-      <point x="1244.0" y="1076.0" type="line"/>
+      <point x="1260.0" y="1536.0" type="line"/>
+      <point x="140.0" y="1536.0" type="line"/>
+      <point x="140.0" y="0.0" type="line"/>
+      <point x="672.0" y="0.0" type="line"/>
+      <point x="672.0" y="1124.0" type="line"/>
+      <point x="1260.0" y="1124.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>m</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/hdieresis.glif b/src/Inter-UI-Black.ufo/glyphs/hdieresis.glif
index 9d222bead..38c70e5f6 100644
--- a/src/Inter-UI-Black.ufo/glyphs/hdieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/hdieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E27"/>
   <outline>
     <component base="h"/>
-    <component base="dieresis" xOffset="-240.0" yOffset="456.0"/>
+    <component base="dieresis" xOffset="-240.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/hdotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/hdotaccent.glif
index b59330146..354597412 100644
--- a/src/Inter-UI-Black.ufo/glyphs/hdotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/hdotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E23"/>
   <outline>
     <component base="h"/>
-    <component base="dotaccent" xOffset="-52.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="-52.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/i.glif b/src/Inter-UI-Black.ufo/glyphs/i.glif
index 6d04faa81..9b47dde28 100644
--- a/src/Inter-UI-Black.ufo/glyphs/i.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/i.glif
@@ -6,7 +6,7 @@
   <guideline y="763.125"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccent" xOffset="-44.0" yOffset="84.0"/>
+    <component base="dotaccent" xOffset="-44.0"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/iacyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/iacyrillic.glif
index 7725bfa73..ca1e7410b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/iacyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/iacyrillic.glif
@@ -1,39 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="iacyrillic" format="2">
-  <advance width="1684.0"/>
+  <advance width="1708.0"/>
   <unicode hex="044F"/>
   <outline>
     <contour>
-      <point x="544.0" y="776.0" type="line"/>
-      <point x="124.0" y="0.0" type="line"/>
-      <point x="632.0" y="0.0" type="line"/>
-      <point x="1052.0" y="776.0" type="line"/>
+      <point x="560.0" y="824.0" type="line"/>
+      <point x="140.0" y="0.0" type="line"/>
+      <point x="648.0" y="0.0" type="line"/>
+      <point x="1068.0" y="824.0" type="line"/>
     </contour>
     <contour>
-      <point x="860.0" y="1488.0" type="line"/>
-      <point x="419.0" y="1488.0"/>
-      <point x="139.0" y="1264.0"/>
-      <point x="140.0" y="952.0" type="curve"/>
-      <point x="139.0" y="664.0"/>
-      <point x="423.0" y="460.0"/>
-      <point x="872.0" y="460.0" type="curve"/>
-      <point x="1264.0" y="460.0" type="line"/>
-      <point x="1264.0" y="792.0" type="line"/>
-      <point x="872.0" y="792.0" type="line"/>
-      <point x="727.0" y="792.0"/>
-      <point x="659.0" y="864.0"/>
-      <point x="660.0" y="932.0" type="curve"/>
-      <point x="659.0" y="996.0"/>
-      <point x="723.0" y="1076.0"/>
-      <point x="860.0" y="1076.0" type="curve"/>
-      <point x="1052.0" y="1076.0" type="line"/>
-      <point x="1052.0" y="0.0" type="line"/>
-      <point x="1568.0" y="0.0" type="line"/>
-      <point x="1568.0" y="1488.0" type="line"/>
+      <point x="876.0" y="1536.0" type="line"/>
+      <point x="435.0" y="1536.0"/>
+      <point x="155.0" y="1312.0"/>
+      <point x="156.0" y="1000.0" type="curve"/>
+      <point x="155.0" y="712.0"/>
+      <point x="439.0" y="508.0"/>
+      <point x="888.0" y="508.0" type="curve"/>
+      <point x="1280.0" y="508.0" type="line"/>
+      <point x="1280.0" y="840.0" type="line"/>
+      <point x="888.0" y="840.0" type="line"/>
+      <point x="743.0" y="840.0"/>
+      <point x="675.0" y="912.0"/>
+      <point x="676.0" y="980.0" type="curve"/>
+      <point x="675.0" y="1044.0"/>
+      <point x="739.0" y="1124.0"/>
+      <point x="876.0" y="1124.0" type="curve"/>
+      <point x="1068.0" y="1124.0" type="line"/>
+      <point x="1068.0" y="0.0" type="line"/>
+      <point x="1584.0" y="0.0" type="line"/>
+      <point x="1584.0" y="1536.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>m</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>a</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/idieresis.glif b/src/Inter-UI-Black.ufo/glyphs/idieresis.glif
index 878dbdf1e..20c63af7a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/idieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/idieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="00EF"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresis" xOffset="-232.0" yOffset="44.0"/>
+    <component base="dieresis" xOffset="-232.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/idieresiscyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/idieresiscyrillic.glif
index 2c2291e1f..34915342f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/idieresiscyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/idieresiscyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="idieresiscyrillic" format="2">
-  <advance width="1688.0"/>
+  <advance width="1748.0"/>
   <unicode hex="04E5"/>
   <outline>
     <component base="iicyrillic"/>
-    <component base="dieresis" xOffset="196.0" yOffset="64.0"/>
+    <component base="dieresis" xOffset="204.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/iebrevecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/iebrevecyrillic.glif
index 1d88a3748..ca3a5c1cb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/iebrevecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/iebrevecyrillic.glif
@@ -4,6 +4,6 @@
   <unicode hex="04D7"/>
   <outline>
     <component base="e"/>
-    <component base="breve" xOffset="152.0" yOffset="-12.0"/>
+    <component base="breve" xOffset="152.0" yOffset="-8.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/iicyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/iicyrillic.glif
index b1f588992..ff71b605b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/iicyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/iicyrillic.glif
@@ -1,24 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="iicyrillic" format="2">
-  <advance width="1688.0"/>
+  <advance width="1748.0"/>
   <unicode hex="0438"/>
-  <guideline x="1088.0" y="1812.0" angle="90.0"/>
+  <guideline x="1096.0" y="1812.0" angle="90.0"/>
   <outline>
     <contour>
-      <point x="652.0" y="704.0" type="line"/>
-      <point x="652.0" y="1488.0" type="line"/>
-      <point x="132.0" y="1488.0" type="line"/>
-      <point x="132.0" y="0.0" type="line"/>
-      <point x="652.0" y="0.0" type="line"/>
-      <point x="1040.0" y="788.0" type="line"/>
-      <point x="1040.0" y="0.0" type="line"/>
-      <point x="1560.0" y="0.0" type="line"/>
-      <point x="1560.0" y="1488.0" type="line"/>
-      <point x="1040.0" y="1488.0" type="line"/>
+      <point x="660.0" y="704.0" type="line"/>
+      <point x="660.0" y="1536.0" type="line"/>
+      <point x="140.0" y="1536.0" type="line"/>
+      <point x="140.0" y="0.0" type="line"/>
+      <point x="660.0" y="0.0" type="line"/>
+      <point x="1088.0" y="836.0" type="line"/>
+      <point x="1088.0" y="0.0" type="line"/>
+      <point x="1608.0" y="0.0" type="line"/>
+      <point x="1608.0" y="1536.0" type="line"/>
+      <point x="1088.0" y="1536.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>u</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/iishortcyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/iishortcyrillic.glif
index ab1d715e4..3ddc1cd3b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/iishortcyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/iishortcyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="iishortcyrillic" format="2">
-  <advance width="1688.0"/>
+  <advance width="1748.0"/>
   <unicode hex="0439"/>
   <outline>
     <component base="iicyrillic"/>
-    <component base="breve" xOffset="132.0" yOffset="12.0"/>
+    <component base="breve" xOffset="140.0" yOffset="-8.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ij.glif b/src/Inter-UI-Black.ufo/glyphs/ij.glif
index 256e7398b..acc40a18a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ij.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ij.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="ij" format="2">
-  <advance width="1700.0"/>
+  <advance width="1664.0"/>
   <unicode hex="0133"/>
   <outline>
     <component base="i"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/imacroncyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/imacroncyrillic.glif
index f53b16252..b66255786 100644
--- a/src/Inter-UI-Black.ufo/glyphs/imacroncyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/imacroncyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="imacroncyrillic" format="2">
-  <advance width="1688.0"/>
+  <advance width="1748.0"/>
   <unicode hex="04E3"/>
   <outline>
     <component base="iicyrillic"/>
-    <component base="macron" xOffset="-64.0" yOffset="-4.0"/>
+    <component base="macron" xOffset="-56.0" yOffset="-24.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/iogonek.glif b/src/Inter-UI-Black.ufo/glyphs/iogonek.glif
index 205a213cb..5d21406d3 100644
--- a/src/Inter-UI-Black.ufo/glyphs/iogonek.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/iogonek.glif
@@ -4,7 +4,7 @@
   <unicode hex="012F"/>
   <outline>
     <component base="uni012F.ccmp" xOffset="-32.0"/>
-    <component base="dotaccent" xOffset="-40.0" yOffset="84.0"/>
+    <component base="dotaccent" xOffset="-40.0"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/iota.glif b/src/Inter-UI-Black.ufo/glyphs/iota.glif
index 08d9529a1..4cf1ea6bc 100644
--- a/src/Inter-UI-Black.ufo/glyphs/iota.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/iota.glif
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="iota" format="2">
-  <advance width="1248.0"/>
+  <advance width="1008.0"/>
   <unicode hex="03B9"/>
   <guideline x="16.0" y="908.0" angle="0.0"/>
   <guideline x="460.0" y="1380.0" angle="90.0"/>
   <outline>
     <contour>
-      <point x="192.0" y="1488.0" type="line"/>
+      <point x="192.0" y="1536.0" type="line"/>
       <point x="192.0" y="464.0" type="line"/>
       <point x="194.0" y="128.0"/>
       <point x="382.0" y="-16.0"/>
@@ -21,7 +21,7 @@
       <point x="750.0" y="404.0"/>
       <point x="718.0" y="440.0"/>
       <point x="716.0" y="548.0" type="curve"/>
-      <point x="724.0" y="1488.0" type="line"/>
+      <point x="724.0" y="1536.0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/iotadieresis.glif b/src/Inter-UI-Black.ufo/glyphs/iotadieresis.glif
index 361492db1..14e879e7a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/iotadieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/iotadieresis.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="iotadieresis" format="2">
-  <advance width="1248.0"/>
+  <advance width="1008.0"/>
   <unicode hex="03CA"/>
   <outline>
     <component base="iota"/>
-    <component base="dieresis" xOffset="-188.0" yOffset="40.0"/>
+    <component base="dieresis" xOffset="-188.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/iotadieresistonos.glif b/src/Inter-UI-Black.ufo/glyphs/iotadieresistonos.glif
index 33d1f12a8..411b6a83f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/iotadieresistonos.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/iotadieresistonos.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="iotadieresistonos" format="2">
-  <advance width="1248.0"/>
+  <advance width="1008.0"/>
   <unicode hex="0390"/>
   <outline>
     <component base="iota"/>
-    <component base="dieresistonos" xOffset="-388.0" yOffset="-12.0"/>
+    <component base="dieresistonos" xOffset="-388.0" yOffset="-8.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/iotatonos.glif b/src/Inter-UI-Black.ufo/glyphs/iotatonos.glif
index 41725ac7f..095aa8252 100644
--- a/src/Inter-UI-Black.ufo/glyphs/iotatonos.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/iotatonos.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="iotatonos" format="2">
-  <advance width="1248.0"/>
+  <advance width="1008.0"/>
   <unicode hex="03AF"/>
   <outline>
     <component base="iota"/>
-    <component base="tonostop" xOffset="-52.0"/>
+    <component base="tonostop" xOffset="-52.0" yOffset="4.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/j.glif b/src/Inter-UI-Black.ufo/glyphs/j.glif
index 89f313d7f..d49b1605a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/j.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/j.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="j" format="2">
-  <advance width="868.0"/>
+  <advance width="832.0"/>
   <unicode hex="006A"/>
   <guideline y="906.125"/>
   <guideline y="1381.875"/>
   <guideline x="548.0" y="1564.0" angle="90.0"/>
   <outline>
     <component base="jdotless"/>
-    <component base="dotaccent" xOffset="-8.0" yOffset="84.0"/>
+    <component base="dotaccent" xOffset="-44.0"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/jcaron.glif b/src/Inter-UI-Black.ufo/glyphs/jcaron.glif
index aaa7e5f13..06c4975ff 100644
--- a/src/Inter-UI-Black.ufo/glyphs/jcaron.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/jcaron.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="jcaron" format="2">
-  <advance width="868.0"/>
+  <advance width="832.0"/>
   <unicode hex="01F0"/>
   <outline>
     <component base="jdotless"/>
-    <component base="caron" xOffset="-440.0" yOffset="60.0"/>
+    <component base="caron" xOffset="-476.0" yOffset="60.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/jcircumflex.glif b/src/Inter-UI-Black.ufo/glyphs/jcircumflex.glif
index 398ec721d..80c7ce230 100644
--- a/src/Inter-UI-Black.ufo/glyphs/jcircumflex.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/jcircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="jcircumflex" format="2">
-  <advance width="868.0"/>
+  <advance width="832.0"/>
   <unicode hex="0135"/>
   <outline>
     <component base="jdotless"/>
-    <component base="circumflex" xOffset="-432.0" yOffset="-92.0"/>
+    <component base="circumflex" xOffset="-468.0" yOffset="-92.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/jcrosstail.glif b/src/Inter-UI-Black.ufo/glyphs/jcrosstail.glif
index cafb6ece6..7df7ddf89 100644
--- a/src/Inter-UI-Black.ufo/glyphs/jcrosstail.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/jcrosstail.glif
@@ -4,6 +4,6 @@
   <unicode hex="029D"/>
   <outline>
     <component base="jcrosstail.ccmp"/>
-    <component base="dotaccent" xOffset="576.0" yOffset="84.0"/>
+    <component base="dotaccent" xOffset="576.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/jdotless.glif b/src/Inter-UI-Black.ufo/glyphs/jdotless.glif
index 42684abb9..2d81b950b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/jdotless.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/jdotless.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="jdotless" format="2">
-  <advance width="868.0"/>
+  <advance width="832.0"/>
   <unicode hex="0237"/>
-  <guideline x="452.0" y="1416.0" angle="90.0"/>
+  <guideline x="416.0" y="1416.0" angle="90.0"/>
   <outline>
     <contour>
-      <point x="176.0" y="1536.0" type="line"/>
-      <point x="176.0" y="-12.0" type="line"/>
-      <point x="177.0" y="-88.0"/>
-      <point x="145.0" y="-160.0"/>
-      <point x="-56.0" y="-160.0" type="curve"/>
-      <point x="-172.0" y="-160.0" type="line"/>
-      <point x="-172.0" y="-576.0" type="line"/>
-      <point x="40.0" y="-576.0" type="line"/>
-      <point x="417.0" y="-576.0"/>
-      <point x="729.0" y="-428.0"/>
-      <point x="728.0" y="-24.0" type="curve"/>
-      <point x="728.0" y="1536.0" type="line"/>
+      <point x="140.0" y="1536.0" type="line"/>
+      <point x="140.0" y="-12.0" type="line"/>
+      <point x="141.0" y="-88.0"/>
+      <point x="109.0" y="-160.0"/>
+      <point x="-92.0" y="-160.0" type="curve"/>
+      <point x="-208.0" y="-160.0" type="line"/>
+      <point x="-208.0" y="-576.0" type="line"/>
+      <point x="4.0" y="-576.0" type="line"/>
+      <point x="381.0" y="-576.0"/>
+      <point x="693.0" y="-428.0"/>
+      <point x="692.0" y="-24.0" type="curve"/>
+      <point x="692.0" y="1536.0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/jdotlessbar.glif b/src/Inter-UI-Black.ufo/glyphs/jdotlessbar.glif
index c8bc66a79..b24c8eac4 100644
--- a/src/Inter-UI-Black.ufo/glyphs/jdotlessbar.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/jdotlessbar.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="jdotlessbar" format="2">
-  <advance width="868.0"/>
+  <advance width="832.0"/>
   <unicode hex="025F"/>
   <outline>
     <component base="jdotless"/>
-    <component base="crossbar" xOffset="-264.0" yOffset="-164.0"/>
+    <component base="crossbar" xOffset="-300.0" yOffset="-164.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/jecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/jecyrillic.glif
index f5ef00e50..1c249e4f7 100644
--- a/src/Inter-UI-Black.ufo/glyphs/jecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/jecyrillic.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="jecyrillic" format="2">
-  <advance width="868.0"/>
+  <advance width="832.0"/>
   <unicode hex="0458"/>
   <outline>
     <component base="j"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/kacyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/kacyrillic.glif
index 387d131e4..28dcec1bf 100644
--- a/src/Inter-UI-Black.ufo/glyphs/kacyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/kacyrillic.glif
@@ -1,31 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="kacyrillic" format="2">
-  <advance width="2052.0"/>
+  <advance width="1740.0"/>
   <unicode hex="043A"/>
   <outline>
     <contour>
-      <point x="724.0" y="1488.0" type="line"/>
-      <point x="212.0" y="1488.0" type="line"/>
-      <point x="212.0" y="0.0" type="line"/>
-      <point x="724.0" y="0.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1740.0" y="1488.0" type="line"/>
-      <point x="1068.0" y="1488.0" type="line"/>
-      <point x="860.0" y="988.0" type="line"/>
-      <point x="608.0" y="988.0" type="line"/>
-      <point x="668.0" y="476.0" type="line"/>
-      <point x="1108.0" y="476.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1076.0" y="0.0" type="line"/>
-      <point x="1784.0" y="0.0" type="line"/>
-      <point x="1316.0" y="776.0" type="line"/>
-      <point x="820.0" y="584.0" type="line"/>
+      <point x="140.0" y="0.0" type="line"/>
+      <point x="692.0" y="0.0" type="line"/>
+      <point x="692.0" y="476.0" type="line"/>
+      <point x="816.0" y="476.0" type="line"/>
+      <point x="1112.0" y="0.0" type="line"/>
+      <point x="1752.0" y="0.0" type="line"/>
+      <point x="1256.0" y="760.0" type="line"/>
+      <point x="1748.0" y="1536.0" type="line"/>
+      <point x="1116.0" y="1536.0" type="line"/>
+      <point x="788.0" y="988.0" type="line"/>
+      <point x="692.0" y="988.0" type="line"/>
+      <point x="692.0" y="1536.0" type="line"/>
+      <point x="140.0" y="1536.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>m</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>k</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -36,7 +35,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>1.0</real>
+            <real>12.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -56,14 +55,14 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>1.0</real>
+            <real>12.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>2.0</real>
             <real>0.0</real>
+            <real>4.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -76,7 +75,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>1.0</real>
+            <real>12.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/kadescendercyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/kadescendercyrillic.glif
index cb1523070..18f585d57 100644
--- a/src/Inter-UI-Black.ufo/glyphs/kadescendercyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/kadescendercyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="kadescendercyrillic" format="2">
-  <advance width="2052.0"/>
+  <advance width="1740.0"/>
   <unicode hex="049B"/>
   <outline>
     <component base="kacyrillic"/>
-    <component base="cyrillictic.cn" xOffset="1304.0"/>
+    <component base="cyrillictic.cn" xOffset="1272.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/kjecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/kjecyrillic.glif
index ac35a448d..f543f8d25 100644
--- a/src/Inter-UI-Black.ufo/glyphs/kjecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/kjecyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="kjecyrillic" format="2">
-  <advance width="2052.0"/>
+  <advance width="1740.0"/>
   <unicode hex="045C"/>
   <outline>
     <component base="kacyrillic"/>
-    <component base="acute" xOffset="480.0" yOffset="48.0"/>
+    <component base="acute" xOffset="412.0" yOffset="28.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ljecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/ljecyrillic.glif
index bb784c5ef..a35c93931 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ljecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ljecyrillic.glif
@@ -4,24 +4,24 @@
   <unicode hex="0459"/>
   <outline>
     <contour>
-      <point x="400.0" y="1488.0" type="line"/>
+      <point x="400.0" y="1536.0" type="line"/>
       <point x="368.0" y="856.0" type="line" smooth="yes"/>
-      <point x="351.0" y="552.0"/>
+      <point x="354.0" y="552.0"/>
       <point x="291.0" y="416.0"/>
       <point x="176.0" y="416.0" type="curve" smooth="yes"/>
       <point x="124.0" y="416.0" type="line"/>
       <point x="136.0" y="0.0" type="line"/>
       <point x="288.0" y="0.0" type="line" smooth="yes"/>
       <point x="615.0" y="0.0"/>
-      <point x="831.0" y="184.0"/>
+      <point x="835.0" y="184.0"/>
       <point x="860.0" y="708.0" type="curve" smooth="yes"/>
-      <point x="900.0" y="1488.0" type="line"/>
+      <point x="900.0" y="1536.0" type="line"/>
     </contour>
     <contour>
-      <point x="1320.0" y="1488.0" type="line"/>
-      <point x="532.0" y="1488.0" type="line"/>
-      <point x="532.0" y="1076.0" type="line"/>
-      <point x="1320.0" y="1076.0" type="line"/>
+      <point x="1320.0" y="1536.0" type="line"/>
+      <point x="532.0" y="1536.0" type="line"/>
+      <point x="532.0" y="1124.0" type="line"/>
+      <point x="1320.0" y="1124.0" type="line"/>
     </contour>
     <contour>
       <point x="1456.0" y="1100.0" type="line"/>
@@ -34,8 +34,8 @@
       <point x="2055.0" y="412.0"/>
       <point x="1896.0" y="412.0" type="curve" smooth="yes"/>
       <point x="1676.0" y="412.0" type="line"/>
-      <point x="1676.0" y="1488.0" type="line"/>
-      <point x="1156.0" y="1488.0" type="line"/>
+      <point x="1676.0" y="1536.0" type="line"/>
+      <point x="1156.0" y="1536.0" type="line"/>
       <point x="1156.0" y="0.0" type="line"/>
       <point x="1896.0" y="0.0" type="line" smooth="yes"/>
       <point x="2363.0" y="0.0"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/mdotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/mdotaccent.glif
index 47e96cfa8..fad9a947b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/mdotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/mdotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E41"/>
   <outline>
     <component base="m"/>
-    <component base="dotaccent" xOffset="868.0" yOffset="84.0"/>
+    <component base="dotaccent" xOffset="868.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ndotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/ndotaccent.glif
index f5ff57a64..c51290057 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ndotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ndotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E45"/>
   <outline>
     <component base="n"/>
-    <component base="dotaccent" xOffset="452.0" yOffset="84.0"/>
+    <component base="dotaccent" xOffset="452.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/nj.glif b/src/Inter-UI-Black.ufo/glyphs/nj.glif
index 9e5e6be0b..89c3e4041 100644
--- a/src/Inter-UI-Black.ufo/glyphs/nj.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/nj.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="nj" format="2">
-  <advance width="2688.0"/>
+  <advance width="2652.0"/>
   <unicode hex="01CC"/>
   <outline>
     <component base="n"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/njecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/njecyrillic.glif
index fac35e7bf..385a83957 100644
--- a/src/Inter-UI-Black.ufo/glyphs/njecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/njecyrillic.glif
@@ -10,8 +10,8 @@
       <point x="1292.0" y="488.0" type="line"/>
     </contour>
     <contour>
-      <point x="712.0" y="1488.0" type="line"/>
-      <point x="192.0" y="1488.0" type="line"/>
+      <point x="712.0" y="1536.0" type="line"/>
+      <point x="192.0" y="1536.0" type="line"/>
       <point x="192.0" y="0.0" type="line"/>
       <point x="712.0" y="0.0" type="line"/>
     </contour>
@@ -26,8 +26,8 @@
       <point x="1998.0" y="412.0"/>
       <point x="1836.0" y="412.0" type="curve"/>
       <point x="1612.0" y="412.0" type="line"/>
-      <point x="1612.0" y="1488.0" type="line"/>
-      <point x="1096.0" y="1488.0" type="line"/>
+      <point x="1612.0" y="1536.0" type="line"/>
+      <point x="1096.0" y="1536.0" type="line"/>
       <point x="1096.0" y="0.0" type="line"/>
       <point x="1836.0" y="0.0" type="line"/>
       <point x="2302.0" y="0.0"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/oacute.glif b/src/Inter-UI-Black.ufo/glyphs/oacute.glif
index 3d51e0137..3a75006dc 100644
--- a/src/Inter-UI-Black.ufo/glyphs/oacute.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/oacute.glif
@@ -4,6 +4,6 @@
   <unicode hex="00F3"/>
   <outline>
     <component base="o"/>
-    <component base="acute" xOffset="440.0" yOffset="24.0"/>
+    <component base="acute" xOffset="440.0" yOffset="28.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/obarreddieresiscyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/obarreddieresiscyrillic.glif
index 9f83f493e..c6ac55f2e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/obarreddieresiscyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/obarreddieresiscyrillic.glif
@@ -4,6 +4,6 @@
   <unicode hex="04EB"/>
   <outline>
     <component base="fitacyrillic"/>
-    <component base="dieresis" xOffset="240.0" yOffset="40.0"/>
+    <component base="dieresis" xOffset="240.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/obreve.glif b/src/Inter-UI-Black.ufo/glyphs/obreve.glif
index 6df20d9ff..2e35823ad 100644
--- a/src/Inter-UI-Black.ufo/glyphs/obreve.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/obreve.glif
@@ -4,6 +4,6 @@
   <unicode hex="014F"/>
   <outline>
     <component base="o"/>
-    <component base="breve" xOffset="176.0" yOffset="-12.0"/>
+    <component base="breve" xOffset="176.0" yOffset="-8.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ocaron.glif b/src/Inter-UI-Black.ufo/glyphs/ocaron.glif
index ac9bcba18..f0b98d30b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ocaron.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ocaron.glif
@@ -4,6 +4,6 @@
   <unicode hex="01D2"/>
   <outline>
     <component base="o"/>
-    <component base="caron" xOffset="-4.0" yOffset="56.0"/>
+    <component base="caron" xOffset="-4.0" yOffset="60.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ocircumflex.glif b/src/Inter-UI-Black.ufo/glyphs/ocircumflex.glif
index 4f2e3f3df..888c48a36 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ocircumflex.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ocircumflex.glif
@@ -4,6 +4,6 @@
   <unicode hex="00F4"/>
   <outline>
     <component base="o"/>
-    <component base="circumflex" xOffset="4.0" yOffset="-96.0"/>
+    <component base="circumflex" xOffset="4.0" yOffset="-92.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ocircumflexacute.glif b/src/Inter-UI-Black.ufo/glyphs/ocircumflexacute.glif
index 10b81690e..ec759321e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ocircumflexacute.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ocircumflexacute.glif
@@ -4,6 +4,6 @@
   <unicode hex="1ED1"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexacutecomb.cn" xOffset="304.0" yOffset="-80.0"/>
+    <component base="circumflexacutecomb.cn" xOffset="304.0" yOffset="-76.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ocircumflexdotbelow.glif b/src/Inter-UI-Black.ufo/glyphs/ocircumflexdotbelow.glif
index f811775c0..43e01bc21 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ocircumflexdotbelow.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ocircumflexdotbelow.glif
@@ -4,7 +4,7 @@
   <unicode hex="1ED9"/>
   <outline>
     <component base="o"/>
-    <component base="circumflex" xOffset="4.0" yOffset="-96.0"/>
+    <component base="circumflex" xOffset="4.0" yOffset="-92.0"/>
     <component base="dotbelow" xOffset="1840.0" yOffset="-164.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ocircumflexgrave.glif b/src/Inter-UI-Black.ufo/glyphs/ocircumflexgrave.glif
index 36f5c1eba..3544c7611 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ocircumflexgrave.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ocircumflexgrave.glif
@@ -4,6 +4,6 @@
   <unicode hex="1ED3"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexgravecomb.cn" xOffset="-208.0" yOffset="-100.0"/>
+    <component base="circumflexgravecomb.cn" xOffset="-208.0" yOffset="-96.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ocircumflexhookabove.glif b/src/Inter-UI-Black.ufo/glyphs/ocircumflexhookabove.glif
index 328716afe..a07a90801 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ocircumflexhookabove.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ocircumflexhookabove.glif
@@ -4,6 +4,6 @@
   <unicode hex="1ED5"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexhookcomb.cn" xOffset="188.0" yOffset="-80.0"/>
+    <component base="circumflexhookcomb.cn" xOffset="188.0" yOffset="-76.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ocircumflextilde.glif b/src/Inter-UI-Black.ufo/glyphs/ocircumflextilde.glif
index 22bc9c861..0cba0ff5b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ocircumflextilde.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ocircumflextilde.glif
@@ -4,6 +4,6 @@
   <unicode hex="1ED7"/>
   <outline>
     <component base="o"/>
-    <component base="circumflextildecomb.cn" xOffset="24.0" yOffset="-68.0"/>
+    <component base="circumflextildecomb.cn" xOffset="24.0" yOffset="-64.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/odblgrave.glif b/src/Inter-UI-Black.ufo/glyphs/odblgrave.glif
index f429d2f8f..053f3e624 100644
--- a/src/Inter-UI-Black.ufo/glyphs/odblgrave.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/odblgrave.glif
@@ -4,6 +4,6 @@
   <unicode hex="020D"/>
   <outline>
     <component base="o"/>
-    <component base="dblgravecmb" xOffset="1736.0" yOffset="-8.0"/>
+    <component base="dblgravecmb" xOffset="1736.0" yOffset="-4.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/odieresis.glif b/src/Inter-UI-Black.ufo/glyphs/odieresis.glif
index 01b24bac8..9a8b13987 100644
--- a/src/Inter-UI-Black.ufo/glyphs/odieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/odieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="00F6"/>
   <outline>
     <component base="o"/>
-    <component base="dieresis" xOffset="240.0" yOffset="40.0"/>
+    <component base="dieresis" xOffset="240.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ograve.glif b/src/Inter-UI-Black.ufo/glyphs/ograve.glif
index 49f6cdd3b..1b88ee8f4 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ograve.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ograve.glif
@@ -4,6 +4,6 @@
   <unicode hex="00F2"/>
   <outline>
     <component base="o"/>
-    <component base="grave" xOffset="88.0" yOffset="24.0"/>
+    <component base="grave" xOffset="88.0" yOffset="28.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ohookabove.glif b/src/Inter-UI-Black.ufo/glyphs/ohookabove.glif
index 3e87e3b58..fb7373ea2 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ohookabove.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ohookabove.glif
@@ -4,6 +4,6 @@
   <unicode hex="1ECF"/>
   <outline>
     <component base="o"/>
-    <component base="hook" xOffset="1904.0" yOffset="-36.0"/>
+    <component base="hook" xOffset="1904.0" yOffset="-32.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ohornacute.glif b/src/Inter-UI-Black.ufo/glyphs/ohornacute.glif
index f1ec7d480..307e14d17 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ohornacute.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ohornacute.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EDB"/>
   <outline>
     <component base="ohorn"/>
-    <component base="acute" xOffset="440.0" yOffset="24.0"/>
+    <component base="acute" xOffset="440.0" yOffset="28.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ohorngrave.glif b/src/Inter-UI-Black.ufo/glyphs/ohorngrave.glif
index 06a455aaf..5cfd7146e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ohorngrave.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ohorngrave.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EDD"/>
   <outline>
     <component base="ohorn"/>
-    <component base="grave" xOffset="88.0" yOffset="24.0"/>
+    <component base="grave" xOffset="88.0" yOffset="28.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ohornhookabove.glif b/src/Inter-UI-Black.ufo/glyphs/ohornhookabove.glif
index ba70ec9b2..2c7ec5d35 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ohornhookabove.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ohornhookabove.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EDF"/>
   <outline>
     <component base="ohorn"/>
-    <component base="hook" xOffset="1904.0" yOffset="-36.0"/>
+    <component base="hook" xOffset="1904.0" yOffset="-32.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ohorntilde.glif b/src/Inter-UI-Black.ufo/glyphs/ohorntilde.glif
index 74d24b9f1..ceeccf698 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ohorntilde.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ohorntilde.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EE1"/>
   <outline>
     <component base="ohorn"/>
-    <component base="tilde" xOffset="180.0" yOffset="-12.0"/>
+    <component base="tilde" xOffset="180.0" yOffset="-8.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ohungarumlaut.glif b/src/Inter-UI-Black.ufo/glyphs/ohungarumlaut.glif
index d838c2e21..fa8e44a95 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ohungarumlaut.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ohungarumlaut.glif
@@ -4,6 +4,6 @@
   <unicode hex="0151"/>
   <outline>
     <component base="o"/>
-    <component base="hungarumlaut" xOffset="352.0" yOffset="-12.0"/>
+    <component base="hungarumlaut" xOffset="352.0" yOffset="-8.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/oinvertedbreve.glif b/src/Inter-UI-Black.ufo/glyphs/oinvertedbreve.glif
index 0913841ee..25a3f8897 100644
--- a/src/Inter-UI-Black.ufo/glyphs/oinvertedbreve.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/oinvertedbreve.glif
@@ -4,6 +4,6 @@
   <unicode hex="020F"/>
   <outline>
     <component base="o"/>
-    <component base="breveinvnosp" xOffset="1848.0" yOffset="188.0"/>
+    <component base="breveinvnosp" xOffset="1848.0" yOffset="192.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/omacron.glif b/src/Inter-UI-Black.ufo/glyphs/omacron.glif
index 91da8f256..f3e1600d5 100644
--- a/src/Inter-UI-Black.ufo/glyphs/omacron.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/omacron.glif
@@ -4,6 +4,6 @@
   <unicode hex="014D"/>
   <outline>
     <component base="o"/>
-    <component base="macron" xOffset="-20.0" yOffset="-28.0"/>
+    <component base="macron" xOffset="-20.0" yOffset="-24.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/omacronacute.glif b/src/Inter-UI-Black.ufo/glyphs/omacronacute.glif
index e00ec53a6..27d0b43be 100644
--- a/src/Inter-UI-Black.ufo/glyphs/omacronacute.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/omacronacute.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E53"/>
   <outline>
     <component base="o"/>
-    <component base="macronacutecomb.lc" xOffset="1848.0" yOffset="-24.0"/>
+    <component base="macronacutecomb.lc" xOffset="1848.0" yOffset="-20.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/omacrongrave.glif b/src/Inter-UI-Black.ufo/glyphs/omacrongrave.glif
index f6784165c..c15a7f9c9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/omacrongrave.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/omacrongrave.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E51"/>
   <outline>
     <component base="o"/>
-    <component base="macrongravecomb.lc" xOffset="1856.0" yOffset="-24.0"/>
+    <component base="macrongravecomb.lc" xOffset="1856.0" yOffset="-20.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/omegacyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/omegacyrillic.glif
index 309a17c1a..dc0e6afca 100644
--- a/src/Inter-UI-Black.ufo/glyphs/omegacyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/omegacyrillic.glif
@@ -1,51 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="omegacyrillic" format="2">
-  <advance width="2948.0"/>
+  <advance width="2628.0"/>
   <unicode hex="0461"/>
   <outline>
     <contour>
-      <point x="1224.0" y="1488.0" type="line"/>
-      <point x="1224.0" y="736.0" type="line" smooth="yes"/>
-      <point x="1222.0" y="512.0"/>
-      <point x="1174.0" y="384.0"/>
-      <point x="1008.0" y="384.0" type="curve" smooth="yes"/>
-      <point x="854.0" y="384.0"/>
-      <point x="810.0" y="524.0"/>
-      <point x="812.0" y="736.0" type="curve" smooth="yes"/>
-      <point x="812.0" y="1488.0" type="line"/>
-      <point x="292.0" y="1488.0" type="line"/>
-      <point x="292.0" y="736.0" type="line" smooth="yes"/>
-      <point x="290.0" y="240.0"/>
-      <point x="586.0" y="-28.0"/>
-      <point x="1008.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="1386.0" y="-28.0"/>
-      <point x="1646.0" y="244.0"/>
-      <point x="1648.0" y="736.0" type="curve" smooth="yes"/>
-      <point x="1648.0" y="1488.0" type="line"/>
+      <point x="1072.0" y="1536.0" type="line"/>
+      <point x="1072.0" y="736.0" type="line" smooth="yes"/>
+      <point x="1072.0" y="512.0"/>
+      <point x="1022.0" y="384.0"/>
+      <point x="856.0" y="384.0" type="curve" smooth="yes"/>
+      <point x="702.0" y="384.0"/>
+      <point x="660.0" y="524.0"/>
+      <point x="660.0" y="736.0" type="curve" smooth="yes"/>
+      <point x="660.0" y="1536.0" type="line"/>
+      <point x="140.0" y="1536.0" type="line"/>
+      <point x="140.0" y="736.0" type="line" smooth="yes"/>
+      <point x="140.0" y="240.0"/>
+      <point x="434.0" y="-28.0"/>
+      <point x="856.0" y="-28.0" type="curve" smooth="yes"/>
+      <point x="1234.0" y="-28.0"/>
+      <point x="1496.0" y="244.0"/>
+      <point x="1496.0" y="736.0" type="curve" smooth="yes"/>
+      <point x="1496.0" y="1536.0" type="line"/>
     </contour>
     <contour>
-      <point x="2136.0" y="1488.0" type="line"/>
-      <point x="2136.0" y="736.0" type="line" smooth="yes"/>
-      <point x="2134.0" y="512.0"/>
-      <point x="2098.0" y="384.0"/>
-      <point x="1952.0" y="384.0" type="curve" smooth="yes"/>
-      <point x="1786.0" y="384.0"/>
-      <point x="1738.0" y="512.0"/>
-      <point x="1740.0" y="736.0" type="curve" smooth="yes"/>
-      <point x="1740.0" y="1488.0" type="line"/>
-      <point x="1320.0" y="1488.0" type="line"/>
-      <point x="1320.0" y="736.0" type="line" smooth="yes"/>
-      <point x="1318.0" y="244.0"/>
-      <point x="1566.0" y="-28.0"/>
-      <point x="1952.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="2370.0" y="-28.0"/>
-      <point x="2654.0" y="244.0"/>
-      <point x="2656.0" y="736.0" type="curve" smooth="yes"/>
-      <point x="2656.0" y="1488.0" type="line"/>
+      <point x="1984.0" y="1536.0" type="line"/>
+      <point x="1984.0" y="736.0" type="line" smooth="yes"/>
+      <point x="1984.0" y="512.0"/>
+      <point x="1946.0" y="384.0"/>
+      <point x="1800.0" y="384.0" type="curve" smooth="yes"/>
+      <point x="1634.0" y="384.0"/>
+      <point x="1588.0" y="512.0"/>
+      <point x="1588.0" y="736.0" type="curve" smooth="yes"/>
+      <point x="1588.0" y="1536.0" type="line"/>
+      <point x="1168.0" y="1536.0" type="line"/>
+      <point x="1168.0" y="736.0" type="line" smooth="yes"/>
+      <point x="1168.0" y="244.0"/>
+      <point x="1414.0" y="-28.0"/>
+      <point x="1800.0" y="-28.0" type="curve" smooth="yes"/>
+      <point x="2218.0" y="-28.0"/>
+      <point x="2504.0" y="244.0"/>
+      <point x="2504.0" y="736.0" type="curve" smooth="yes"/>
+      <point x="2504.0" y="1536.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>m</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>a</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/omicrontonos.glif b/src/Inter-UI-Black.ufo/glyphs/omicrontonos.glif
index 291bb22a1..d50dc728a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/omicrontonos.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/omicrontonos.glif
@@ -4,6 +4,6 @@
   <unicode hex="03CC"/>
   <outline>
     <component base="o"/>
-    <component base="tonostop" xOffset="376.0"/>
+    <component base="tonostop" xOffset="376.0" yOffset="4.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/oogonekmacron.glif b/src/Inter-UI-Black.ufo/glyphs/oogonekmacron.glif
index 5c1cbe464..f548b4688 100644
--- a/src/Inter-UI-Black.ufo/glyphs/oogonekmacron.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/oogonekmacron.glif
@@ -5,6 +5,6 @@
   <outline>
     <component base="o"/>
     <component base="ogonek" xOffset="428.0"/>
-    <component base="macron" xOffset="-20.0" yOffset="-28.0"/>
+    <component base="macron" xOffset="-20.0" yOffset="-24.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/oslashacute.glif b/src/Inter-UI-Black.ufo/glyphs/oslashacute.glif
index f9e80ec6b..5fd1e87f8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/oslashacute.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/oslashacute.glif
@@ -4,6 +4,6 @@
   <unicode hex="01FF"/>
   <outline>
     <component base="oslash"/>
-    <component base="acute" xOffset="440.0" yOffset="20.0"/>
+    <component base="acute" xOffset="440.0" yOffset="24.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/otildeacute.glif b/src/Inter-UI-Black.ufo/glyphs/otildeacute.glif
index a05924dcf..039ba7198 100644
--- a/src/Inter-UI-Black.ufo/glyphs/otildeacute.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/otildeacute.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E4D"/>
   <outline>
     <component base="o"/>
-    <component base="tildeacutecomb.lc" xOffset="1820.0" yOffset="-20.0"/>
+    <component base="tildeacutecomb.lc" xOffset="1820.0" yOffset="-16.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/otildedieresis.glif b/src/Inter-UI-Black.ufo/glyphs/otildedieresis.glif
index 3cb94c4c2..f55613d2f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/otildedieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/otildedieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E4F"/>
   <outline>
     <component base="o"/>
-    <component base="tildedieresiscomb.lc" xOffset="1856.0" yOffset="-20.0"/>
+    <component base="tildedieresiscomb.lc" xOffset="1856.0" yOffset="-16.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/pdotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/pdotaccent.glif
index ee4e1783f..e82cc3f42 100644
--- a/src/Inter-UI-Black.ufo/glyphs/pdotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/pdotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E57"/>
   <outline>
     <component base="p"/>
-    <component base="dotaccent" xOffset="740.0" yOffset="64.0"/>
+    <component base="dotaccent" xOffset="740.0" yOffset="-20.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/pecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/pecyrillic.glif
index b54008c85..2b4e26972 100644
--- a/src/Inter-UI-Black.ufo/glyphs/pecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/pecyrillic.glif
@@ -1,29 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="pecyrillic" format="2">
-  <advance width="1688.0"/>
+  <advance width="1696.0"/>
   <unicode hex="043F"/>
   <outline>
     <contour>
-      <point x="1208.0" y="1488.0" type="line"/>
-      <point x="472.0" y="1488.0" type="line"/>
-      <point x="472.0" y="1076.0" type="line"/>
-      <point x="1208.0" y="1076.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="644.0" y="1488.0" type="line"/>
-      <point x="132.0" y="1488.0" type="line"/>
-      <point x="132.0" y="0.0" type="line"/>
-      <point x="644.0" y="0.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1560.0" y="1488.0" type="line"/>
-      <point x="1040.0" y="1488.0" type="line"/>
-      <point x="1040.0" y="0.0" type="line"/>
-      <point x="1560.0" y="0.0" type="line"/>
+      <point x="140.0" y="0.0" type="line"/>
+      <point x="652.0" y="0.0" type="line"/>
+      <point x="652.0" y="1124.0" type="line"/>
+      <point x="1052.0" y="1124.0" type="line"/>
+      <point x="1052.0" y="0.0" type="line"/>
+      <point x="1572.0" y="0.0" type="line"/>
+      <point x="1572.0" y="1536.0" type="line"/>
+      <point x="140.0" y="1536.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>m</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>a</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -33,8 +29,8 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>7.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -53,15 +49,15 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>7.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>2.0</real>
-            <real>2.0</real>
+            <real>0.0</real>
+            <real>4.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -73,8 +69,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>7.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/pemiddlehookcyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/pemiddlehookcyrillic.glif
index 4df590975..c57806a4a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/pemiddlehookcyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/pemiddlehookcyrillic.glif
@@ -1,48 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="pemiddlehookcyrillic" format="2">
-  <advance width="2764.0"/>
+  <advance width="2616.0"/>
   <unicode hex="04A7"/>
-  <guideline x="16.0" y="4788.0" angle="0.0"/>
+  <guideline x="-36.0" y="4788.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="1216.0" y="548.0" type="line"/>
-      <point x="1680.0" y="548.0" type="line" smooth="yes"/>
-      <point x="1914.0" y="548.0"/>
-      <point x="2070.0" y="476.0"/>
-      <point x="2064.0" y="276.0" type="curve" smooth="yes"/>
-      <point x="2062.0" y="108.0"/>
-      <point x="1950.0" y="40.0"/>
-      <point x="1808.0" y="-64.0" type="curve"/>
-      <point x="2056.0" y="-376.0" type="line"/>
-      <point x="2418.0" y="-208.0"/>
-      <point x="2590.0" y="44.0"/>
-      <point x="2576.0" y="276.0" type="curve"/>
-      <point x="2578.0" y="760.0"/>
-      <point x="2214.0" y="960.0"/>
-      <point x="1680.0" y="960.0" type="curve" smooth="yes"/>
-      <point x="1216.0" y="960.0" type="line"/>
+      <point x="1164.0" y="548.0" type="line"/>
+      <point x="1628.0" y="548.0" type="line" smooth="yes"/>
+      <point x="1862.0" y="548.0"/>
+      <point x="2018.0" y="476.0"/>
+      <point x="2012.0" y="276.0" type="curve" smooth="yes"/>
+      <point x="2010.0" y="108.0"/>
+      <point x="1898.0" y="40.0"/>
+      <point x="1756.0" y="-64.0" type="curve"/>
+      <point x="2004.0" y="-376.0" type="line"/>
+      <point x="2366.0" y="-208.0"/>
+      <point x="2538.0" y="44.0"/>
+      <point x="2524.0" y="276.0" type="curve"/>
+      <point x="2526.0" y="760.0"/>
+      <point x="2162.0" y="960.0"/>
+      <point x="1628.0" y="960.0" type="curve" smooth="yes"/>
+      <point x="1164.0" y="960.0" type="line"/>
     </contour>
     <contour>
-      <point x="1268.0" y="1488.0" type="line"/>
-      <point x="532.0" y="1488.0" type="line"/>
-      <point x="532.0" y="1076.0" type="line"/>
-      <point x="1268.0" y="1076.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="704.0" y="1488.0" type="line"/>
-      <point x="192.0" y="1488.0" type="line"/>
-      <point x="192.0" y="0.0" type="line"/>
-      <point x="704.0" y="0.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1620.0" y="1488.0" type="line"/>
-      <point x="1100.0" y="1488.0" type="line"/>
-      <point x="1100.0" y="0.0" type="line"/>
-      <point x="1620.0" y="0.0" type="line"/>
+      <point x="140.0" y="0.0" type="line"/>
+      <point x="652.0" y="0.0" type="line"/>
+      <point x="652.0" y="1124.0" type="line"/>
+      <point x="1048.0" y="1124.0" type="line"/>
+      <point x="1048.0" y="0.0" type="line"/>
+      <point x="1568.0" y="0.0" type="line"/>
+      <point x="1568.0" y="1536.0" type="line"/>
+      <point x="140.0" y="1536.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>m</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>b</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -52,8 +48,8 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
             <real>1.0</real>
+            <real>7.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -72,8 +68,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
             <real>1.0</real>
+            <real>7.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/rdotaccent.1.glif b/src/Inter-UI-Black.ufo/glyphs/rdotaccent.1.glif
index e23b6f01d..bf102d60d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/rdotaccent.1.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/rdotaccent.1.glif
@@ -3,7 +3,7 @@
   <advance width="1220.0"/>
   <outline>
     <component base="r.1"/>
-    <component base="dotaccent" xOffset="208.0" yOffset="84.0"/>
+    <component base="dotaccent" xOffset="208.0"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/rdotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/rdotaccent.glif
index bf9af85e5..64adda783 100644
--- a/src/Inter-UI-Black.ufo/glyphs/rdotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/rdotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E59"/>
   <outline>
     <component base="r"/>
-    <component base="dotaccent" xOffset="208.0" yOffset="84.0"/>
+    <component base="dotaccent" xOffset="208.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/schwadieresiscyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/schwadieresiscyrillic.glif
index d1ddfa18a..37d4ce9e8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/schwadieresiscyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/schwadieresiscyrillic.glif
@@ -4,6 +4,6 @@
   <unicode hex="04DB"/>
   <outline>
     <component base="schwa"/>
-    <component base="dieresis" xOffset="216.0" yOffset="40.0"/>
+    <component base="dieresis" xOffset="216.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/sdotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/sdotaccent.glif
index 3016aead9..b64bdcbd9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/sdotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/sdotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E61"/>
   <outline>
     <component base="s"/>
-    <component base="dotaccent" xOffset="376.0" yOffset="80.0"/>
+    <component base="dotaccent" xOffset="376.0" yOffset="-4.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/sdotbelowdotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/sdotbelowdotaccent.glif
index 323d0e791..5821b578f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/sdotbelowdotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/sdotbelowdotaccent.glif
@@ -5,6 +5,6 @@
   <outline>
     <component base="s"/>
     <component base="dotbelow" xOffset="1784.0" yOffset="-164.0"/>
-    <component base="dotaccent" xOffset="376.0" yOffset="80.0"/>
+    <component base="dotaccent" xOffset="376.0" yOffset="-4.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/shacyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/shacyrillic.glif
index 62c266495..929cb7df1 100644
--- a/src/Inter-UI-Black.ufo/glyphs/shacyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/shacyrillic.glif
@@ -1,25 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="shacyrillic" format="2">
-  <advance width="2492.0"/>
+  <advance width="2496.0"/>
   <unicode hex="0448"/>
   <outline>
     <contour>
-      <point x="132.0" y="1488.0" type="line"/>
-      <point x="132.0" y="0.0" type="line"/>
-      <point x="2360.0" y="0.0" type="line"/>
-      <point x="2360.0" y="1488.0" type="line"/>
-      <point x="1844.0" y="1488.0" type="line"/>
-      <point x="1844.0" y="416.0" type="line"/>
-      <point x="1508.0" y="416.0" type="line"/>
-      <point x="1508.0" y="1488.0" type="line"/>
-      <point x="988.0" y="1488.0" type="line"/>
-      <point x="988.0" y="416.0" type="line"/>
-      <point x="652.0" y="416.0" type="line"/>
-      <point x="652.0" y="1488.0" type="line"/>
+      <point x="140.0" y="1536.0" type="line"/>
+      <point x="140.0" y="0.0" type="line"/>
+      <point x="2372.0" y="0.0" type="line"/>
+      <point x="2372.0" y="1536.0" type="line"/>
+      <point x="1852.0" y="1536.0" type="line"/>
+      <point x="1852.0" y="416.0" type="line"/>
+      <point x="1516.0" y="416.0" type="line"/>
+      <point x="1516.0" y="1536.0" type="line"/>
+      <point x="996.0" y="1536.0" type="line"/>
+      <point x="996.0" y="416.0" type="line"/>
+      <point x="660.0" y="416.0" type="line"/>
+      <point x="660.0" y="1536.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>m</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>a</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/shchacyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/shchacyrillic.glif
index 5d8e556fc..3d2060f71 100644
--- a/src/Inter-UI-Black.ufo/glyphs/shchacyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/shchacyrillic.glif
@@ -1,33 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="shchacyrillic" format="2">
-  <advance width="3136.0"/>
+  <advance width="2888.0"/>
   <unicode hex="0449"/>
   <outline>
     <contour>
-      <point x="2872.0" y="412.0" type="line"/>
-      <point x="2200.0" y="412.0" type="line"/>
-      <point x="2200.0" y="0.0" type="line"/>
-      <point x="2352.0" y="0.0" type="line"/>
-      <point x="2352.0" y="-440.0" type="line"/>
-      <point x="2840.0" y="-440.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="248.0" y="1488.0" type="line"/>
-      <point x="248.0" y="0.0" type="line"/>
-      <point x="2476.0" y="0.0" type="line"/>
-      <point x="2476.0" y="1488.0" type="line"/>
-      <point x="1960.0" y="1488.0" type="line"/>
-      <point x="1960.0" y="416.0" type="line"/>
-      <point x="1624.0" y="416.0" type="line"/>
-      <point x="1624.0" y="1488.0" type="line"/>
-      <point x="1104.0" y="1488.0" type="line"/>
-      <point x="1104.0" y="416.0" type="line"/>
-      <point x="768.0" y="416.0" type="line"/>
-      <point x="768.0" y="1488.0" type="line"/>
+      <point x="2764.0" y="412.0" type="line"/>
+      <point x="2092.0" y="412.0" type="line"/>
+      <point x="2092.0" y="0.0" type="line"/>
+      <point x="2244.0" y="0.0" type="line"/>
+      <point x="2244.0" y="-440.0" type="line"/>
+      <point x="2732.0" y="-440.0" type="line"/>
     </contour>
+    <component base="shacyrillic"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>shacyrillic</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>shacyrillic</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -35,10 +26,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
             <real>0.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -57,8 +48,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
             <real>0.0</real>
+            <real>1.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/slash.glif b/src/Inter-UI-Black.ufo/glyphs/slash.glif
index 0704700d2..0b8647a18 100644
--- a/src/Inter-UI-Black.ufo/glyphs/slash.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/slash.glif
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="slash" format="2">
-  <advance width="1308.0"/>
+  <advance width="1160.0"/>
   <unicode hex="002F"/>
   <guideline x="12.0" y="1240.0" angle="0.0"/>
   <guideline x="12.0" y="764.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="1204.0" y="2048.0" type="line"/>
-      <point x="736.0" y="2048.0" type="line"/>
-      <point x="112.0" y="-308.0" type="line"/>
-      <point x="580.0" y="-308.0" type="line"/>
+      <point x="1144.0" y="2144.0" type="line"/>
+      <point x="676.0" y="2144.0" type="line"/>
+      <point x="16.0" y="-308.0" type="line"/>
+      <point x="484.0" y="-308.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -21,10 +21,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>0.0</real>
+            <real>2048.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -43,18 +43,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>1.0</real>
+            <real>112.0</real>
+            <real>1092.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>3.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -63,10 +58,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>0.0</real>
+            <real>2048.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/softsigncyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/softsigncyrillic.glif
index f76edd646..c367d04ee 100644
--- a/src/Inter-UI-Black.ufo/glyphs/softsigncyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/softsigncyrillic.glif
@@ -1,33 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="softsigncyrillic" format="2">
-  <advance width="2064.0"/>
+  <advance width="1720.0"/>
   <unicode hex="044C"/>
   <outline>
     <contour>
-      <point x="596.0" y="1120.0" type="line"/>
-      <point x="596.0" y="708.0" type="line"/>
-      <point x="1036.0" y="708.0" type="line"/>
-      <point x="1190.0" y="708.0"/>
-      <point x="1262.0" y="664.0"/>
-      <point x="1264.0" y="556.0" type="curve"/>
-      <point x="1262.0" y="468.0"/>
-      <point x="1190.0" y="412.0"/>
-      <point x="1036.0" y="412.0" type="curve"/>
-      <point x="808.0" y="412.0" type="line"/>
-      <point x="808.0" y="1488.0" type="line"/>
-      <point x="288.0" y="1488.0" type="line"/>
-      <point x="288.0" y="0.0" type="line"/>
-      <point x="1036.0" y="0.0" type="line"/>
-      <point x="1494.0" y="0.0"/>
-      <point x="1774.0" y="220.0"/>
-      <point x="1776.0" y="552.0" type="curve"/>
-      <point x="1774.0" y="892.0"/>
-      <point x="1494.0" y="1120.0"/>
-      <point x="1036.0" y="1120.0" type="curve"/>
+      <point x="448.0" y="1120.0" type="line"/>
+      <point x="448.0" y="708.0" type="line"/>
+      <point x="920.0" y="708.0" type="line"/>
+      <point x="1033.0" y="708.0"/>
+      <point x="1114.0" y="645.0"/>
+      <point x="1116.0" y="556.0" type="curve"/>
+      <point x="1114.0" y="472.0"/>
+      <point x="1033.0" y="412.0"/>
+      <point x="920.0" y="412.0" type="curve"/>
+      <point x="660.0" y="412.0" type="line"/>
+      <point x="660.0" y="1536.0" type="line"/>
+      <point x="140.0" y="1536.0" type="line"/>
+      <point x="140.0" y="0.0" type="line"/>
+      <point x="920.0" y="0.0" type="line"/>
+      <point x="1358.0" y="0.0"/>
+      <point x="1626.0" y="209.0"/>
+      <point x="1628.0" y="552.0" type="curve"/>
+      <point x="1626.0" y="905.0"/>
+      <point x="1358.0" y="1120.0"/>
+      <point x="920.0" y="1120.0" type="curve"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>m</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>b</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tdieresis.glif b/src/Inter-UI-Black.ufo/glyphs/tdieresis.glif
index b14e8194a..0174cd504 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tdieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tdieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E97"/>
   <outline>
     <component base="t"/>
-    <component base="dieresis" xOffset="-132.0" yOffset="456.0"/>
+    <component base="dieresis" xOffset="-132.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tdotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/tdotaccent.glif
index 822374092..1c945e6ff 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tdotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tdotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E6B"/>
   <outline>
     <component base="t"/>
-    <component base="dotaccent" xOffset="56.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="56.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/tecyrillic.glif
index b5196ea51..0372dba22 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tecyrillic.glif
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="tecyrillic" format="2">
-  <advance width="1676.0"/>
+  <advance width="1752.0"/>
   <unicode hex="0442"/>
   <outline>
     <contour>
-      <point x="1096.0" y="1488.0" type="line"/>
-      <point x="576.0" y="1488.0" type="line"/>
-      <point x="576.0" y="0.0" type="line"/>
-      <point x="1096.0" y="0.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1584.0" y="1488.0" type="line"/>
-      <point x="96.0" y="1488.0" type="line"/>
-      <point x="96.0" y="1076.0" type="line"/>
-      <point x="1584.0" y="1076.0" type="line"/>
+      <point x="140.0" y="1124.0" type="line"/>
+      <point x="620.0" y="1124.0" type="line"/>
+      <point x="620.0" y="0.0" type="line"/>
+      <point x="1140.0" y="0.0" type="line"/>
+      <point x="1140.0" y="1124.0" type="line"/>
+      <point x="1628.0" y="1124.0" type="line"/>
+      <point x="1628.0" y="1536.0" type="line"/>
+      <point x="140.0" y="1536.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>m</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>a</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -47,15 +49,15 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>7.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
-            <real>2.0</real>
+            <real>0.0</real>
+            <real>4.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tedescendercyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/tedescendercyrillic.glif
index cefe90b2b..4e45df413 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tedescendercyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tedescendercyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="tedescendercyrillic" format="2">
-  <advance width="1676.0"/>
+  <advance width="1752.0"/>
   <unicode hex="04AD"/>
   <outline>
     <component base="tecyrillic"/>
-    <component base="cyrillictic.cn" xOffset="856.0"/>
+    <component base="cyrillictic.cn" xOffset="900.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tsecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/tsecyrillic.glif
index 7dfcd22ab..0a7934431 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tsecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tsecyrillic.glif
@@ -6,12 +6,12 @@
     <contour>
       <point x="132.0" y="0.0" type="line"/>
       <point x="1560.0" y="0.0" type="line"/>
-      <point x="1560.0" y="1488.0" type="line"/>
-      <point x="1040.0" y="1488.0" type="line"/>
+      <point x="1560.0" y="1536.0" type="line"/>
+      <point x="1040.0" y="1536.0" type="line"/>
       <point x="1040.0" y="416.0" type="line"/>
       <point x="652.0" y="416.0" type="line"/>
-      <point x="652.0" y="1488.0" type="line"/>
-      <point x="132.0" y="1488.0" type="line"/>
+      <point x="652.0" y="1536.0" type="line"/>
+      <point x="132.0" y="1536.0" type="line"/>
     </contour>
     <contour>
       <point x="1824.0" y="412.0" type="line"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/udieresis.glif b/src/Inter-UI-Black.ufo/glyphs/udieresis.glif
index db5ab33e5..15aa88877 100644
--- a/src/Inter-UI-Black.ufo/glyphs/udieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/udieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="00FC"/>
   <outline>
     <component base="u"/>
-    <component base="dieresis" xOffset="268.0" yOffset="44.0"/>
+    <component base="dieresis" xOffset="268.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0226.glif b/src/Inter-UI-Black.ufo/glyphs/uni0226.glif
index fd0a4f118..77e3b3097 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0226.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0226.glif
@@ -4,6 +4,6 @@
   <unicode hex="0226"/>
   <outline>
     <component base="A"/>
-    <component base="dotaccent" xOffset="660.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="660.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0227.glif b/src/Inter-UI-Black.ufo/glyphs/uni0227.glif
index dd4cfef91..6536e860d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0227.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0227.glif
@@ -4,6 +4,6 @@
   <unicode hex="0227"/>
   <outline>
     <component base="a"/>
-    <component base="dotaccent" xOffset="364.0" yOffset="84.0"/>
+    <component base="dotaccent" xOffset="364.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni022B_.glif b/src/Inter-UI-Black.ufo/glyphs/uni022B_.glif
index d5f12c06c..94276bb4b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni022B_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni022B_.glif
@@ -4,6 +4,6 @@
   <unicode hex="022B"/>
   <outline>
     <component base="o"/>
-    <component base="dieresismacroncomb.lc" xOffset="1856.0" yOffset="-12.0"/>
+    <component base="dieresismacroncomb.lc" xOffset="1856.0" yOffset="-8.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni022D_.glif b/src/Inter-UI-Black.ufo/glyphs/uni022D_.glif
index 1826e113b..211d445b5 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni022D_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni022D_.glif
@@ -4,6 +4,6 @@
   <unicode hex="022D"/>
   <outline>
     <component base="o"/>
-    <component base="tildemacroncomb.lc" xOffset="1852.0" yOffset="-20.0"/>
+    <component base="tildemacroncomb.lc" xOffset="1852.0" yOffset="-16.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni022E_.glif b/src/Inter-UI-Black.ufo/glyphs/uni022E_.glif
index af4918a1c..bfb8fa0a3 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni022E_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni022E_.glif
@@ -4,6 +4,6 @@
   <unicode hex="022E"/>
   <outline>
     <component base="O"/>
-    <component base="dotaccent" xOffset="660.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="660.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni022F_.glif b/src/Inter-UI-Black.ufo/glyphs/uni022F_.glif
index bf1caccf4..b90e3f1d8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni022F_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni022F_.glif
@@ -4,6 +4,6 @@
   <unicode hex="022F"/>
   <outline>
     <component base="o"/>
-    <component base="dotaccent" xOffset="428.0" yOffset="80.0"/>
+    <component base="dotaccent" xOffset="428.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0231.glif b/src/Inter-UI-Black.ufo/glyphs/uni0231.glif
index 14ec4a0c7..9994ff8c6 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0231.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0231.glif
@@ -4,6 +4,6 @@
   <unicode hex="0231"/>
   <outline>
     <component base="o"/>
-    <component base="dotmacroncomb.lc" xOffset="1848.0" yOffset="36.0"/>
+    <component base="dotmacroncomb.lc" xOffset="1848.0" yOffset="40.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0249.ccmp.glif b/src/Inter-UI-Black.ufo/glyphs/uni0249.ccmp.glif
index a45db0c2d..7874880fd 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0249.ccmp.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0249.ccmp.glif
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni0249.ccmp" format="2">
-  <advance width="868.0"/>
+  <advance width="832.0"/>
   <outline>
     <component base="jdotless"/>
-    <component base="crossbar" xOffset="-264.0" yOffset="-164.0"/>
+    <component base="crossbar" xOffset="-300.0" yOffset="-164.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0249.glif b/src/Inter-UI-Black.ufo/glyphs/uni0249.glif
index ea68edf49..e05104efd 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0249.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0249.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni0249" format="2">
-  <advance width="868.0"/>
+  <advance width="832.0"/>
   <unicode hex="0249"/>
   <outline>
     <component base="uni0249.ccmp"/>
-    <component base="dotaccent" xOffset="-8.0" yOffset="84.0"/>
+    <component base="dotaccent" xOffset="-44.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0299.glif b/src/Inter-UI-Black.ufo/glyphs/uni0299.glif
index b6c666f3e..549ae183c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0299.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0299.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni0299" format="2">
-  <advance width="2064.0"/>
+  <advance width="1684.0"/>
   <unicode hex="0299"/>
   <outline>
     <component base="vecyrillic"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0450.glif b/src/Inter-UI-Black.ufo/glyphs/uni0450.glif
index 0a3c6176e..2bdb1c683 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0450.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0450.glif
@@ -4,6 +4,6 @@
   <unicode hex="0450"/>
   <outline>
     <component base="e"/>
-    <component base="grave" xOffset="64.0" yOffset="24.0"/>
+    <component base="grave" xOffset="64.0" yOffset="28.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni045D_.glif b/src/Inter-UI-Black.ufo/glyphs/uni045D_.glif
index cb98d4e1c..2cb7e065d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni045D_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni045D_.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni045D" format="2">
-  <advance width="1688.0"/>
+  <advance width="1748.0"/>
   <unicode hex="045D"/>
   <outline>
     <component base="iicyrillic"/>
-    <component base="grave" xOffset="44.0" yOffset="48.0"/>
+    <component base="grave" xOffset="52.0" yOffset="28.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni048B_.glif b/src/Inter-UI-Black.ufo/glyphs/uni048B_.glif
index 57835c1f7..dcf5d9b1c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni048B_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni048B_.glif
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni048B" format="2">
-  <advance width="1688.0"/>
+  <advance width="1748.0"/>
   <unicode hex="048B"/>
   <outline>
     <component base="iicyrillic"/>
-    <component base="breve" xOffset="132.0" yOffset="12.0"/>
-    <component base="cyrillictail.cn" xOffset="1304.0" yOffset="-100.0"/>
+    <component base="breve" xOffset="140.0" yOffset="-8.0"/>
+    <component base="cyrillictail.cn" xOffset="1352.0" yOffset="-100.0"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni04C_A_.glif b/src/Inter-UI-Black.ufo/glyphs/uni04C_A_.glif
index ae81adf3a..a1a9d688f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni04C_A_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni04C_A_.glif
@@ -1,9 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni04CA" format="2">
-  <advance width="1684.0"/>
+  <advance width="2024.0"/>
   <unicode hex="04CA"/>
   <outline>
     <component base="encyrillic"/>
-    <component base="cyrillictail.cn" xOffset="1296.0" yOffset="-100.0"/>
+    <component base="cyrillictail.cn" xOffset="1304.0" yOffset="-100.0"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>encyrillic</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>t</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>-1</integer>
+        <integer>0</integer>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni04C_E_.glif b/src/Inter-UI-Black.ufo/glyphs/uni04C_E_.glif
index 022383fb6..1ed61fde6 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni04C_E_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni04C_E_.glif
@@ -1,9 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni04CE" format="2">
-  <advance width="2224.0"/>
+  <advance width="2536.0"/>
   <unicode hex="04CE"/>
   <outline>
     <component base="emcyrillic"/>
-    <component base="cyrillictail.cn" xOffset="1820.0" yOffset="-100.0"/>
+    <component base="cyrillictail.cn" xOffset="1816.0" yOffset="-100.0"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>emcyrillic</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>t</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>-1</integer>
+        <integer>0</integer>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni04E_C_.glif b/src/Inter-UI-Black.ufo/glyphs/uni04E_C_.glif
index 8df517e47..46d933e2a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni04E_C_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni04E_C_.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni04EC" format="2">
-  <advance width="2284.0"/>
+  <advance width="2028.0"/>
   <unicode hex="04EC"/>
   <outline>
     <component base="afii10047"/>
-    <component base="dieresis" xOffset="524.0" yOffset="456.0"/>
+    <component base="dieresis" xOffset="372.0" yOffset="412.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni04E_D_.glif b/src/Inter-UI-Black.ufo/glyphs/uni04E_D_.glif
index dc78d150c..d977d37e8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni04E_D_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni04E_D_.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni04ED" format="2">
-  <advance width="1684.0"/>
+  <advance width="1596.0"/>
   <unicode hex="04ED"/>
   <outline>
     <component base="ereversedcyrillic"/>
-    <component base="dieresis" xOffset="168.0" yOffset="52.0"/>
+    <component base="dieresis" xOffset="124.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_30.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_30.glif
index 313b59bd9..eec506e31 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_30.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_30.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F30" format="2">
-  <advance width="1248.0"/>
+  <advance width="1008.0"/>
   <unicode hex="1F30"/>
   <outline>
     <component base="iota"/>
-    <component base="uni1FBD" xOffset="228.0" yOffset="140.0"/>
+    <component base="uni1FBD" xOffset="228.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_31.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_31.glif
index 943805765..a1f3ac561 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_31.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_31.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F31" format="2">
-  <advance width="1248.0"/>
+  <advance width="1008.0"/>
   <unicode hex="1F31"/>
   <outline>
     <component base="iota"/>
-    <component base="uni1FFE" xOffset="-64.0" yOffset="148.0"/>
+    <component base="uni1FFE" xOffset="-64.0" yOffset="152.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_32.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_32.glif
index f0ac02102..c0e204553 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_32.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_32.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F32" format="2">
-  <advance width="1248.0"/>
+  <advance width="1008.0"/>
   <unicode hex="1F32"/>
   <outline>
     <component base="iota"/>
-    <component base="uni1FCD" xOffset="-280.0" yOffset="140.0"/>
+    <component base="uni1FCD" xOffset="-280.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_33.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_33.glif
index 89e4cf365..adb437f13 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_33.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_33.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F33" format="2">
-  <advance width="1248.0"/>
+  <advance width="1008.0"/>
   <unicode hex="1F33"/>
   <outline>
     <component base="iota"/>
-    <component base="uni1FDD" xOffset="-144.0" yOffset="144.0"/>
+    <component base="uni1FDD" xOffset="-144.0" yOffset="148.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_34.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_34.glif
index 77d236f20..1cb460cdb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_34.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_34.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F34" format="2">
-  <advance width="1248.0"/>
+  <advance width="1008.0"/>
   <unicode hex="1F34"/>
   <outline>
     <component base="iota"/>
-    <component base="uni1FCE" xOffset="-180.0" yOffset="148.0"/>
+    <component base="uni1FCE" xOffset="-180.0" yOffset="152.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_35.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_35.glif
index 891711a11..236d79ef5 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_35.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_35.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F35" format="2">
-  <advance width="1248.0"/>
+  <advance width="1008.0"/>
   <unicode hex="1F35"/>
   <outline>
     <component base="iota"/>
-    <component base="uni1FDE" xOffset="-172.0" yOffset="144.0"/>
+    <component base="uni1FDE" xOffset="-172.0" yOffset="148.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_36.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_36.glif
index 3d31f3dbd..c1f68ebd8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_36.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_36.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F36" format="2">
-  <advance width="1248.0"/>
+  <advance width="1008.0"/>
   <unicode hex="1F36"/>
   <outline>
     <component base="iota"/>
-    <component base="uni1FCF" xOffset="-40.0" yOffset="140.0"/>
+    <component base="uni1FCF" xOffset="-40.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_37.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_37.glif
index fae1b7b51..39fe90216 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_37.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_37.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F37" format="2">
-  <advance width="1248.0"/>
+  <advance width="1008.0"/>
   <unicode hex="1F37"/>
   <outline>
     <component base="iota"/>
-    <component base="uni1FDF" xOffset="-144.0" yOffset="140.0"/>
+    <component base="uni1FDF" xOffset="-144.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_40.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_40.glif
index e0b9d8beb..2aab5066b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_40.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_40.glif
@@ -4,6 +4,6 @@
   <unicode hex="1F40"/>
   <outline>
     <component base="o"/>
-    <component base="uni1FBD" xOffset="656.0" yOffset="140.0"/>
+    <component base="uni1FBD" xOffset="656.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_41.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_41.glif
index 578f1126e..299b4621c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_41.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_41.glif
@@ -4,6 +4,6 @@
   <unicode hex="1F41"/>
   <outline>
     <component base="o"/>
-    <component base="uni1FFE" xOffset="364.0" yOffset="148.0"/>
+    <component base="uni1FFE" xOffset="364.0" yOffset="152.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_42.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_42.glif
index 14d8a212e..f617c0a00 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_42.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_42.glif
@@ -4,6 +4,6 @@
   <unicode hex="1F42"/>
   <outline>
     <component base="o"/>
-    <component base="uni1FCD" xOffset="148.0" yOffset="140.0"/>
+    <component base="uni1FCD" xOffset="148.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_43.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_43.glif
index 6e183d65f..fae6e0df2 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_43.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_43.glif
@@ -4,6 +4,6 @@
   <unicode hex="1F43"/>
   <outline>
     <component base="o"/>
-    <component base="uni1FDD" xOffset="284.0" yOffset="144.0"/>
+    <component base="uni1FDD" xOffset="284.0" yOffset="148.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_44.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_44.glif
index f91487168..54229c03e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_44.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_44.glif
@@ -4,6 +4,6 @@
   <unicode hex="1F44"/>
   <outline>
     <component base="o"/>
-    <component base="uni1FCE" xOffset="248.0" yOffset="148.0"/>
+    <component base="uni1FCE" xOffset="248.0" yOffset="152.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_45.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_45.glif
index f8e8e8a22..57af17127 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_45.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_45.glif
@@ -4,6 +4,6 @@
   <unicode hex="1F45"/>
   <outline>
     <component base="o"/>
-    <component base="uni1FDE" xOffset="256.0" yOffset="144.0"/>
+    <component base="uni1FDE" xOffset="256.0" yOffset="148.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_50.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_50.glif
index ce54dcb3b..0b37460d7 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_50.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_50.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F50" format="2">
-  <advance width="1668.0"/>
+  <advance width="1664.0"/>
   <unicode hex="1F50"/>
   <outline>
     <component base="upsilon"/>
-    <component base="uni1FBD" xOffset="640.0" yOffset="140.0"/>
+    <component base="uni1FBD" xOffset="604.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_51.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_51.glif
index c64cd8f6b..4b995b055 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_51.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_51.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F51" format="2">
-  <advance width="1668.0"/>
+  <advance width="1664.0"/>
   <unicode hex="1F51"/>
   <outline>
     <component base="upsilon"/>
-    <component base="uni1FFE" xOffset="348.0" yOffset="148.0"/>
+    <component base="uni1FFE" xOffset="312.0" yOffset="152.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_52.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_52.glif
index 8dd176096..0f0d44cbc 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_52.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_52.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F52" format="2">
-  <advance width="1668.0"/>
+  <advance width="1664.0"/>
   <unicode hex="1F52"/>
   <outline>
     <component base="upsilon"/>
-    <component base="uni1FCD" xOffset="132.0" yOffset="140.0"/>
+    <component base="uni1FCD" xOffset="96.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_53.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_53.glif
index c48fab5ba..164fcb233 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_53.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_53.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F53" format="2">
-  <advance width="1668.0"/>
+  <advance width="1664.0"/>
   <unicode hex="1F53"/>
   <outline>
     <component base="upsilon"/>
-    <component base="uni1FDD" xOffset="268.0" yOffset="144.0"/>
+    <component base="uni1FDD" xOffset="232.0" yOffset="148.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_54.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_54.glif
index caea1f431..89ba39cc4 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_54.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_54.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F54" format="2">
-  <advance width="1668.0"/>
+  <advance width="1664.0"/>
   <unicode hex="1F54"/>
   <outline>
     <component base="upsilon"/>
-    <component base="uni1FCE" xOffset="232.0" yOffset="148.0"/>
+    <component base="uni1FCE" xOffset="196.0" yOffset="152.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_55.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_55.glif
index 8879c89a2..5b97ee817 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_55.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_55.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F55" format="2">
-  <advance width="1668.0"/>
+  <advance width="1664.0"/>
   <unicode hex="1F55"/>
   <outline>
     <component base="upsilon"/>
-    <component base="uni1FDE" xOffset="240.0" yOffset="144.0"/>
+    <component base="uni1FDE" xOffset="204.0" yOffset="148.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_56.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_56.glif
index 0b52e6461..22e67bad5 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_56.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_56.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F56" format="2">
-  <advance width="1668.0"/>
+  <advance width="1664.0"/>
   <unicode hex="1F56"/>
   <outline>
     <component base="upsilon"/>
-    <component base="uni1FCF" xOffset="372.0" yOffset="140.0"/>
+    <component base="uni1FCF" xOffset="336.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_57.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_57.glif
index c0f706ed2..6fe8edbf0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_57.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_57.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F57" format="2">
-  <advance width="1668.0"/>
+  <advance width="1664.0"/>
   <unicode hex="1F57"/>
   <outline>
     <component base="upsilon"/>
-    <component base="uni1FDF" xOffset="268.0" yOffset="140.0"/>
+    <component base="uni1FDF" xOffset="232.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_76.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_76.glif
index 3c5cee3d6..eab96acbb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_76.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_76.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F76" format="2">
-  <advance width="1248.0"/>
+  <advance width="1008.0"/>
   <unicode hex="1F76"/>
   <outline>
     <component base="iota"/>
-    <component base="uni1FEF" xOffset="-96.0" yOffset="140.0"/>
+    <component base="uni1FEF" xOffset="-96.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_77.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_77.glif
index 4cf4150fe..d165691bb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_77.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_77.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F77" format="2">
-  <advance width="1248.0"/>
+  <advance width="1008.0"/>
   <unicode hex="1F77"/>
   <outline>
     <component base="iota"/>
-    <component base="uni1FFD" xOffset="192.0" yOffset="140.0"/>
+    <component base="uni1FFD" xOffset="192.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_78.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_78.glif
index 7431ee891..653708387 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_78.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_78.glif
@@ -4,6 +4,6 @@
   <unicode hex="1F78"/>
   <outline>
     <component base="o"/>
-    <component base="uni1FEF" xOffset="332.0" yOffset="140.0"/>
+    <component base="uni1FEF" xOffset="332.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_79.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_79.glif
index dd88ff8d9..b84caef06 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_79.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_79.glif
@@ -4,6 +4,6 @@
   <unicode hex="1F79"/>
   <outline>
     <component base="o"/>
-    <component base="uni1FFD" xOffset="620.0" yOffset="140.0"/>
+    <component base="uni1FFD" xOffset="620.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_7A_.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_7A_.glif
index 1b4d389f4..76b9e6774 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_7A_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_7A_.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F7A" format="2">
-  <advance width="1668.0"/>
+  <advance width="1664.0"/>
   <unicode hex="1F7A"/>
   <outline>
     <component base="upsilon"/>
-    <component base="uni1FEF" xOffset="316.0" yOffset="140.0"/>
+    <component base="uni1FEF" xOffset="280.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_7B_.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_7B_.glif
index de16d1044..046d76ffd 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_7B_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_7B_.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F7B" format="2">
-  <advance width="1668.0"/>
+  <advance width="1664.0"/>
   <unicode hex="1F7B"/>
   <outline>
     <component base="upsilon"/>
-    <component base="uni1FFD" xOffset="604.0" yOffset="140.0"/>
+    <component base="uni1FFD" xOffset="568.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_D_0.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_D_0.glif
index 92b308872..a221726ea 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_D_0.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_D_0.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FD0" format="2">
-  <advance width="1248.0"/>
+  <advance width="1008.0"/>
   <unicode hex="1FD0"/>
   <outline>
     <component base="iota"/>
-    <component base="breve" xOffset="-252.0" yOffset="-12.0"/>
+    <component base="breve" xOffset="-252.0" yOffset="-8.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_D_1.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_D_1.glif
index 751b8f169..8b3caed4d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_D_1.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_D_1.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FD1" format="2">
-  <advance width="1248.0"/>
+  <advance width="1008.0"/>
   <unicode hex="1FD1"/>
   <outline>
     <component base="iota"/>
-    <component base="macron" xOffset="-448.0" yOffset="-28.0"/>
+    <component base="macron" xOffset="-448.0" yOffset="-24.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_D_2.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_D_2.glif
index d6ea7416b..d4fff3fbd 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_D_2.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_D_2.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FD2" format="2">
-  <advance width="1248.0"/>
+  <advance width="1008.0"/>
   <unicode hex="1FD2"/>
   <outline>
     <component base="iota"/>
-    <component base="uni1FED" xOffset="-260.0" yOffset="140.0"/>
+    <component base="uni1FED" xOffset="-260.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_D_3.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_D_3.glif
index a3b41d6ab..af704919d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_D_3.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_D_3.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FD3" format="2">
-  <advance width="1248.0"/>
+  <advance width="1008.0"/>
   <unicode hex="1FD3"/>
   <outline>
     <component base="iota"/>
-    <component base="uni1FEE" xOffset="-268.0" yOffset="140.0"/>
+    <component base="uni1FEE" xOffset="-268.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_D_6.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_D_6.glif
index 95dff3279..160212c00 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_D_6.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_D_6.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FD6" format="2">
-  <advance width="1248.0"/>
+  <advance width="1008.0"/>
   <unicode hex="1FD6"/>
   <outline>
     <component base="iota"/>
-    <component base="uni1FC0" xOffset="-284.0" yOffset="140.0"/>
+    <component base="uni1FC0" xOffset="-284.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_D_7.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_D_7.glif
index d9e4e03f6..246f747d1 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_D_7.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_D_7.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FD7" format="2">
-  <advance width="1248.0"/>
+  <advance width="1008.0"/>
   <unicode hex="1FD7"/>
   <outline>
     <component base="iota"/>
-    <component base="uni1FC1" xOffset="-244.0" yOffset="140.0"/>
+    <component base="uni1FC1" xOffset="-244.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_E_0.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_E_0.glif
index 4278c595b..9b4c43ae2 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_E_0.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_E_0.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FE0" format="2">
-  <advance width="1668.0"/>
+  <advance width="1664.0"/>
   <unicode hex="1FE0"/>
   <outline>
     <component base="upsilon"/>
-    <component base="breve" xOffset="160.0" yOffset="-12.0"/>
+    <component base="breve" xOffset="124.0" yOffset="-8.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_E_1.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_E_1.glif
index eb1a440f4..3cbbbd35f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_E_1.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_E_1.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FE1" format="2">
-  <advance width="1668.0"/>
+  <advance width="1664.0"/>
   <unicode hex="1FE1"/>
   <outline>
     <component base="upsilon"/>
-    <component base="macron" xOffset="-36.0" yOffset="-28.0"/>
+    <component base="macron" xOffset="-72.0" yOffset="-24.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_E_2.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_E_2.glif
index 6ecc70087..3d6482c5c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_E_2.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_E_2.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FE2" format="2">
-  <advance width="1668.0"/>
+  <advance width="1664.0"/>
   <unicode hex="1FE2"/>
   <outline>
     <component base="upsilon"/>
-    <component base="uni1FED" xOffset="152.0" yOffset="140.0"/>
+    <component base="uni1FED" xOffset="116.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_E_3.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_E_3.glif
index 5340ebc33..7e8dd5e5c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_E_3.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_E_3.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FE3" format="2">
-  <advance width="1668.0"/>
+  <advance width="1664.0"/>
   <unicode hex="1FE3"/>
   <outline>
     <component base="upsilon"/>
-    <component base="uni1FEE" xOffset="144.0" yOffset="140.0"/>
+    <component base="uni1FEE" xOffset="108.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_E_6.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_E_6.glif
index f8b6afcbb..af60e14b0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_E_6.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_E_6.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FE6" format="2">
-  <advance width="1668.0"/>
+  <advance width="1664.0"/>
   <unicode hex="1FE6"/>
   <outline>
     <component base="upsilon"/>
-    <component base="uni1FC0" xOffset="128.0" yOffset="140.0"/>
+    <component base="uni1FC0" xOffset="92.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_E_7.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_E_7.glif
index e79eda6fd..0599c9a95 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_E_7.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_E_7.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FE7" format="2">
-  <advance width="1668.0"/>
+  <advance width="1664.0"/>
   <unicode hex="1FE7"/>
   <outline>
     <component base="upsilon"/>
-    <component base="uni1FC1" xOffset="168.0" yOffset="140.0"/>
+    <component base="uni1FC1" xOffset="132.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/upsilon.glif b/src/Inter-UI-Black.ufo/glyphs/upsilon.glif
index 426c8e4a0..bae543d08 100644
--- a/src/Inter-UI-Black.ufo/glyphs/upsilon.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/upsilon.glif
@@ -1,35 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="upsilon" format="2">
-  <advance width="1668.0"/>
+  <advance width="1664.0"/>
   <unicode hex="03C5"/>
   <outline>
     <contour>
-      <point x="168.0" y="1488.0" type="line"/>
-      <point x="168.0" y="556.0" type="line"/>
-      <point x="167.0" y="152.0"/>
-      <point x="419.0" y="-28.0"/>
-      <point x="808.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="1335.0" y="-28.0"/>
-      <point x="1551.0" y="304.0"/>
-      <point x="1552.0" y="780.0" type="curve"/>
-      <point x="1551.0" y="1088.0"/>
-      <point x="1479.0" y="1320.0"/>
-      <point x="1392.0" y="1488.0" type="curve"/>
-      <point x="904.0" y="1488.0" type="line"/>
-      <point x="975.0" y="1260.0"/>
-      <point x="1019.0" y="1036.0"/>
-      <point x="1028.0" y="780.0" type="curve"/>
-      <point x="1027.0" y="604.0"/>
-      <point x="947.0" y="384.0"/>
-      <point x="792.0" y="384.0" type="curve" smooth="yes"/>
-      <point x="739.0" y="384.0"/>
-      <point x="699.0" y="420.0"/>
-      <point x="700.0" y="552.0" type="curve"/>
-      <point x="700.0" y="1488.0" type="line"/>
+      <point x="140.0" y="1536.0" type="line"/>
+      <point x="140.0" y="556.0" type="line"/>
+      <point x="139.0" y="152.0"/>
+      <point x="391.0" y="-28.0"/>
+      <point x="780.0" y="-28.0" type="curve" smooth="yes"/>
+      <point x="1307.0" y="-28.0"/>
+      <point x="1523.0" y="304.0"/>
+      <point x="1524.0" y="780.0" type="curve"/>
+      <point x="1523.0" y="1088.0"/>
+      <point x="1451.0" y="1368.0"/>
+      <point x="1364.0" y="1536.0" type="curve"/>
+      <point x="876.0" y="1536.0" type="line"/>
+      <point x="947.0" y="1308.0"/>
+      <point x="991.0" y="1036.0"/>
+      <point x="1000.0" y="780.0" type="curve"/>
+      <point x="999.0" y="604.0"/>
+      <point x="919.0" y="384.0"/>
+      <point x="764.0" y="384.0" type="curve" smooth="yes"/>
+      <point x="711.0" y="384.0"/>
+      <point x="671.0" y="420.0"/>
+      <point x="672.0" y="552.0" type="curve"/>
+      <point x="672.0" y="1536.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>u</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>u</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/upsilondieresis.glif b/src/Inter-UI-Black.ufo/glyphs/upsilondieresis.glif
index d32587a39..631a3cc3d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/upsilondieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/upsilondieresis.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="upsilondieresis" format="2">
-  <advance width="1668.0"/>
+  <advance width="1664.0"/>
   <unicode hex="03CB"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dieresis" xOffset="224.0" yOffset="40.0"/>
+    <component base="dieresis" xOffset="188.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/upsilondieresistonos.glif b/src/Inter-UI-Black.ufo/glyphs/upsilondieresistonos.glif
index 0f982dc80..a32cb5f49 100644
--- a/src/Inter-UI-Black.ufo/glyphs/upsilondieresistonos.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/upsilondieresistonos.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="upsilondieresistonos" format="2">
-  <advance width="1668.0"/>
+  <advance width="1664.0"/>
   <unicode hex="03B0"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dieresistonos" xOffset="24.0" yOffset="-12.0"/>
+    <component base="dieresistonos" xOffset="-12.0" yOffset="-8.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/upsilontonos.glif b/src/Inter-UI-Black.ufo/glyphs/upsilontonos.glif
index 08324798f..e8f57e2e7 100644
--- a/src/Inter-UI-Black.ufo/glyphs/upsilontonos.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/upsilontonos.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="upsilontonos" format="2">
-  <advance width="1668.0"/>
+  <advance width="1664.0"/>
   <unicode hex="03CD"/>
   <outline>
     <component base="upsilon"/>
-    <component base="tonostop" xOffset="360.0"/>
+    <component base="tonostop" xOffset="324.0" yOffset="4.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ustraightcyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/ustraightcyrillic.glif
index 8873efc67..684e8bc9b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ustraightcyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ustraightcyrillic.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="ustraightcyrillic" format="2">
-  <advance width="1676.0"/>
+  <advance width="1564.0"/>
   <unicode hex="04AF"/>
   <outline>
     <component base="gamma"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ustraightstrokecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/ustraightstrokecyrillic.glif
index c68f3c7d3..947328aff 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ustraightstrokecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ustraightstrokecyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="ustraightstrokecyrillic" format="2">
-  <advance width="1676.0"/>
+  <advance width="1564.0"/>
   <unicode hex="04B1"/>
   <outline>
     <component base="gamma"/>
-    <component base="crossbar" xOffset="128.0" yOffset="-932.0"/>
+    <component base="crossbar" xOffset="72.0" yOffset="-932.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/vecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/vecyrillic.glif
index a7388a464..07fee385e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/vecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/vecyrillic.glif
@@ -1,57 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="vecyrillic" format="2">
-  <advance width="2064.0"/>
+  <advance width="1684.0"/>
   <unicode hex="0432"/>
-  <guideline x="28.0" y="992.0" angle="0.0"/>
-  <guideline x="28.0" y="612.0" angle="0.0"/>
+  <guideline x="-108.0" y="992.0" angle="0.0"/>
+  <guideline x="-108.0" y="612.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="1092.0" y="592.0" type="line"/>
-      <point x="1116.0" y="724.0" type="line"/>
-      <point x="1460.0" y="736.0"/>
-      <point x="1652.0" y="888.0"/>
-      <point x="1652.0" y="1068.0" type="curve"/>
-      <point x="1652.0" y="1348.0"/>
-      <point x="1400.0" y="1488.0"/>
-      <point x="988.0" y="1488.0" type="curve"/>
-      <point x="312.0" y="1488.0" type="line"/>
-      <point x="312.0" y="0.0" type="line"/>
-      <point x="828.0" y="0.0" type="line"/>
-      <point x="828.0" y="1076.0" type="line"/>
-      <point x="988.0" y="1076.0" type="line"/>
-      <point x="1088.0" y="1076.0"/>
-      <point x="1140.0" y="1060.0"/>
-      <point x="1140.0" y="980.0" type="curve"/>
-      <point x="1140.0" y="932.0"/>
-      <point x="1108.0" y="904.0"/>
-      <point x="1004.0" y="904.0" type="curve"/>
-      <point x="608.0" y="904.0" type="line"/>
-      <point x="612.0" y="592.0" type="line"/>
+      <point x="140.0" y="0.0" type="line"/>
+      <point x="956.0" y="0.0" type="line" smooth="yes"/>
+      <point x="1388.0" y="0.0"/>
+      <point x="1620.0" y="144.0"/>
+      <point x="1620.0" y="424.0" type="curve" smooth="yes"/>
+      <point x="1620.0" y="600.0"/>
+      <point x="1476.0" y="780.0"/>
+      <point x="1128.0" y="796.0" type="curve"/>
+      <point x="1380.0" y="836.0"/>
+      <point x="1516.0" y="964.0"/>
+      <point x="1516.0" y="1116.0" type="curve" smooth="yes"/>
+      <point x="1516.0" y="1396.0"/>
+      <point x="1264.0" y="1536.0"/>
+      <point x="852.0" y="1536.0" type="curve" smooth="yes"/>
+      <point x="140.0" y="1536.0" type="line"/>
     </contour>
     <contour>
-      <point x="1092.0" y="0.0" type="line"/>
-      <point x="1524.0" y="0.0"/>
-      <point x="1756.0" y="144.0"/>
-      <point x="1756.0" y="424.0" type="curve" smooth="yes"/>
-      <point x="1756.0" y="608.0"/>
-      <point x="1596.0" y="752.0"/>
-      <point x="1216.0" y="772.0" type="curve"/>
-      <point x="1108.0" y="904.0" type="line"/>
-      <point x="716.0" y="904.0" type="line"/>
-      <point x="708.0" y="592.0" type="line"/>
-      <point x="1092.0" y="592.0" type="line" smooth="yes"/>
-      <point x="1204.0" y="592.0"/>
-      <point x="1236.0" y="552.0"/>
-      <point x="1236.0" y="492.0" type="curve" smooth="yes"/>
-      <point x="1236.0" y="432.0"/>
-      <point x="1188.0" y="412.0"/>
-      <point x="1092.0" y="412.0" type="curve" smooth="yes"/>
-      <point x="656.0" y="412.0" type="line"/>
-      <point x="508.0" y="0.0" type="line"/>
+      <point x="692.0" y="412.0" type="line"/>
+      <point x="692.0" y="592.0" type="line"/>
+      <point x="956.0" y="592.0" type="line" smooth="yes"/>
+      <point x="1068.0" y="592.0"/>
+      <point x="1100.0" y="552.0"/>
+      <point x="1100.0" y="492.0" type="curve" smooth="yes"/>
+      <point x="1100.0" y="432.0"/>
+      <point x="1052.0" y="412.0"/>
+      <point x="956.0" y="412.0" type="curve" smooth="yes"/>
+    </contour>
+    <contour>
+      <point x="692.0" y="952.0" type="line"/>
+      <point x="692.0" y="1124.0" type="line"/>
+      <point x="852.0" y="1124.0" type="line" smooth="yes"/>
+      <point x="952.0" y="1124.0"/>
+      <point x="1004.0" y="1108.0"/>
+      <point x="1004.0" y="1028.0" type="curve" smooth="yes"/>
+      <point x="1004.0" y="980.0"/>
+      <point x="972.0" y="952.0"/>
+      <point x="868.0" y="952.0" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>m</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>B</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -62,7 +61,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>8.0</real>
+            <real>14.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -81,15 +80,15 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
+            <real>1.0</real>
             <real>0.0</real>
-            <real>19.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>0.0</real>
-            <real>18.0</real>
+            <real>2.0</real>
+            <real>8.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -102,14 +101,14 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>8.0</real>
+            <real>14.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
-            <real>2.0</real>
+            <real>0.0</real>
+            <real>3.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -122,7 +121,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>8.0</real>
+            <real>14.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -136,15 +135,15 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
+            <real>1.0</real>
             <real>0.0</real>
-            <real>19.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>0.0</real>
-            <real>18.0</real>
+            <real>2.0</real>
+            <real>8.0</real>
           </array>
           <key>type</key>
           <string>TTStem</string>
diff --git a/src/Inter-UI-Black.ufo/glyphs/wacute.glif b/src/Inter-UI-Black.ufo/glyphs/wacute.glif
index e117e6a15..32dc35703 100644
--- a/src/Inter-UI-Black.ufo/glyphs/wacute.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/wacute.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E83"/>
   <outline>
     <component base="w"/>
-    <component base="acute" xOffset="772.0" yOffset="24.0"/>
+    <component base="acute" xOffset="784.0" yOffset="28.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/wcircumflex.glif b/src/Inter-UI-Black.ufo/glyphs/wcircumflex.glif
index df3b3cfdd..95f36cac2 100644
--- a/src/Inter-UI-Black.ufo/glyphs/wcircumflex.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/wcircumflex.glif
@@ -4,6 +4,6 @@
   <unicode hex="0175"/>
   <outline>
     <component base="w"/>
-    <component base="circumflex" xOffset="336.0" yOffset="-96.0"/>
+    <component base="circumflex" xOffset="348.0" yOffset="-92.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/wdieresis.glif b/src/Inter-UI-Black.ufo/glyphs/wdieresis.glif
index fb7c72efb..6beee0601 100644
--- a/src/Inter-UI-Black.ufo/glyphs/wdieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/wdieresis.glif
@@ -4,7 +4,7 @@
   <unicode hex="1E85"/>
   <outline>
     <component base="w"/>
-    <component base="dieresis" xOffset="572.0" yOffset="40.0"/>
+    <component base="dieresis" xOffset="584.0"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/wdotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/wdotaccent.glif
index 75be9a2f5..5ad157df2 100644
--- a/src/Inter-UI-Black.ufo/glyphs/wdotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/wdotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E87"/>
   <outline>
     <component base="w"/>
-    <component base="dotaccent" xOffset="760.0" yOffset="80.0"/>
+    <component base="dotaccent" xOffset="772.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/wgrave.glif b/src/Inter-UI-Black.ufo/glyphs/wgrave.glif
index f4ff7ff8d..7031631cc 100644
--- a/src/Inter-UI-Black.ufo/glyphs/wgrave.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/wgrave.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E81"/>
   <outline>
     <component base="w"/>
-    <component base="grave" xOffset="420.0" yOffset="24.0"/>
+    <component base="grave" xOffset="432.0" yOffset="28.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/wring.glif b/src/Inter-UI-Black.ufo/glyphs/wring.glif
index 6f189c5b5..00e87ee6a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/wring.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/wring.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E98"/>
   <outline>
     <component base="w"/>
-    <component base="ring" xOffset="616.0" yOffset="240.0"/>
+    <component base="ring" xOffset="628.0" yOffset="244.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/xdieresis.glif b/src/Inter-UI-Black.ufo/glyphs/xdieresis.glif
index 165b65c1d..775f25363 100644
--- a/src/Inter-UI-Black.ufo/glyphs/xdieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/xdieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E8D"/>
   <outline>
     <component base="x"/>
-    <component base="dieresis" xOffset="192.0" yOffset="44.0"/>
+    <component base="dieresis" xOffset="192.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/xdotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/xdotaccent.glif
index e5e476848..2dd968f6b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/xdotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/xdotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E8B"/>
   <outline>
     <component base="x"/>
-    <component base="dotaccent" xOffset="380.0" yOffset="84.0"/>
+    <component base="dotaccent" xOffset="380.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ydieresis.glif b/src/Inter-UI-Black.ufo/glyphs/ydieresis.glif
index 08a4ce212..065e72231 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ydieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ydieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="00FF"/>
   <outline>
     <component base="y"/>
-    <component base="dieresis" xOffset="188.0" yOffset="44.0"/>
+    <component base="dieresis" xOffset="188.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ydotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/ydotaccent.glif
index 903887e3a..7fc3958a9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ydotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ydotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E8F"/>
   <outline>
     <component base="y"/>
-    <component base="dotaccent" xOffset="376.0" yOffset="84.0"/>
+    <component base="dotaccent" xOffset="376.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/yericyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/yericyrillic.glif
index b5e7c09a4..4c9b96480 100644
--- a/src/Inter-UI-Black.ufo/glyphs/yericyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/yericyrillic.glif
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="yericyrillic" format="2">
-  <advance width="2508.0"/>
+  <advance width="2552.0"/>
   <unicode hex="044B"/>
+  <guideline x="1132.0" y="1992.0" angle="90.0"/>
   <outline>
-    <component base="softsigncyrillic" xOffset="-72.0"/>
-    <component base="idotless" xOffset="1556.0"/>
+    <component base="softsigncyrillic"/>
+    <component base="idotless" xOffset="1720.0"/>
   </outline>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>-1</integer>
-      </array>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/yerudieresiscyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/yerudieresiscyrillic.glif
index 3b689213c..40ec0668a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/yerudieresiscyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/yerudieresiscyrillic.glif
@@ -1,18 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="yerudieresiscyrillic" format="2">
-  <advance width="2508.0"/>
+  <advance width="2552.0"/>
   <unicode hex="04F9"/>
   <outline>
-    <component base="yericyrillic" xOffset="20.0"/>
-    <component base="dieresis" xOffset="540.0" yOffset="4.0"/>
+    <component base="yericyrillic"/>
+    <component base="dieresis" xOffset="628.0"/>
   </outline>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>-1</integer>
-      </array>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/yotgreek.glif b/src/Inter-UI-Black.ufo/glyphs/yotgreek.glif
index 0d85958a2..4f9f46cdb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/yotgreek.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/yotgreek.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="yotgreek" format="2">
-  <advance width="868.0"/>
+  <advance width="832.0"/>
   <unicode hex="03F3"/>
   <outline>
     <component base="j"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/zdotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/zdotaccent.glif
index ecfd90e51..acf3fd868 100644
--- a/src/Inter-UI-Black.ufo/glyphs/zdotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/zdotaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="017C"/>
   <outline>
     <component base="z"/>
-    <component base="dotaccent" xOffset="368.0" yOffset="84.0"/>
+    <component base="dotaccent" xOffset="368.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/zedieresiscyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/zedieresiscyrillic.glif
index 238660783..15cc4b750 100644
--- a/src/Inter-UI-Black.ufo/glyphs/zedieresiscyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/zedieresiscyrillic.glif
@@ -4,6 +4,6 @@
   <unicode hex="04DF"/>
   <outline>
     <component base="zecyrillic"/>
-    <component base="dieresis" xOffset="204.0" yOffset="48.0"/>
+    <component base="dieresis" xOffset="204.0" yOffset="4.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/zhebrevecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/zhebrevecyrillic.glif
index 4ef49291d..e537b5cac 100644
--- a/src/Inter-UI-Black.ufo/glyphs/zhebrevecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/zhebrevecyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="zhebrevecyrillic" format="2">
-  <advance width="2832.0"/>
+  <advance width="2808.0"/>
   <unicode hex="04C2"/>
   <outline>
     <component base="zhecyrillic"/>
-    <component base="breve" xOffset="728.0" yOffset="12.0"/>
+    <component base="breve" xOffset="692.0" yOffset="-8.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/zhecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/zhecyrillic.glif
index 00dc45527..12f364403 100644
--- a/src/Inter-UI-Black.ufo/glyphs/zhecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/zhecyrillic.glif
@@ -1,45 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="zhecyrillic" format="2">
-  <advance width="2832.0"/>
+  <advance width="2808.0"/>
   <unicode hex="0436"/>
   <outline>
     <contour>
-      <point x="780.0" y="472.0" type="line"/>
-      <point x="1252.0" y="472.0" type="line"/>
-      <point x="1308.0" y="980.0" type="line"/>
-      <point x="1020.0" y="980.0" type="line"/>
-      <point x="736.0" y="1488.0" type="line"/>
-      <point x="88.0" y="1488.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1024.0" y="584.0" type="line"/>
-      <point x="568.0" y="776.0" type="line"/>
-      <point x="120.0" y="0.0" type="line"/>
-      <point x="732.0" y="0.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1672.0" y="1488.0" type="line"/>
-      <point x="1156.0" y="1488.0" type="line"/>
-      <point x="1156.0" y="0.0" type="line"/>
-      <point x="1672.0" y="0.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="2744.0" y="1488.0" type="line"/>
-      <point x="2096.0" y="1488.0" type="line"/>
-      <point x="1812.0" y="980.0" type="line"/>
-      <point x="1524.0" y="980.0" type="line"/>
-      <point x="1580.0" y="472.0" type="line"/>
-      <point x="2052.0" y="472.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="2104.0" y="0.0" type="line"/>
-      <point x="2732.0" y="0.0" type="line"/>
-      <point x="2284.0" y="776.0" type="line"/>
-      <point x="1808.0" y="584.0" type="line"/>
+      <point x="48.0" y="0.0" type="line"/>
+      <point x="676.0" y="0.0" type="line"/>
+      <point x="916.0" y="472.0" type="line"/>
+      <point x="1128.0" y="472.0" type="line"/>
+      <point x="1128.0" y="0.0" type="line"/>
+      <point x="1680.0" y="0.0" type="line"/>
+      <point x="1680.0" y="472.0" type="line"/>
+      <point x="1892.0" y="472.0" type="line"/>
+      <point x="2132.0" y="0.0" type="line"/>
+      <point x="2760.0" y="0.0" type="line"/>
+      <point x="2292.0" y="800.0" type="line"/>
+      <point x="2772.0" y="1536.0" type="line"/>
+      <point x="2164.0" y="1536.0" type="line"/>
+      <point x="1840.0" y="980.0" type="line"/>
+      <point x="1680.0" y="980.0" type="line"/>
+      <point x="1680.0" y="1536.0" type="line"/>
+      <point x="1128.0" y="1536.0" type="line"/>
+      <point x="1128.0" y="980.0" type="line"/>
+      <point x="968.0" y="980.0" type="line"/>
+      <point x="644.0" y="1536.0" type="line"/>
+      <point x="36.0" y="1536.0" type="line"/>
+      <point x="516.0" y="800.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>x</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>x</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -47,10 +41,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -69,8 +63,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>5.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/zhedescendercyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/zhedescendercyrillic.glif
index e29de8a09..a038d2022 100644
--- a/src/Inter-UI-Black.ufo/glyphs/zhedescendercyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/zhedescendercyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="zhedescendercyrillic" format="2">
-  <advance width="2832.0"/>
+  <advance width="2808.0"/>
   <unicode hex="0497"/>
   <outline>
     <component base="zhecyrillic"/>
-    <component base="cyrillictic.cn" xOffset="2208.0"/>
+    <component base="cyrillictic.cn" xOffset="2196.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/zhedieresiscyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/zhedieresiscyrillic.glif
index 61ee59f07..103ee6d4c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/zhedieresiscyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/zhedieresiscyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="zhedieresiscyrillic" format="2">
-  <advance width="2832.0"/>
+  <advance width="2808.0"/>
   <unicode hex="04DD"/>
   <outline>
     <component base="zhecyrillic"/>
-    <component base="dieresis" xOffset="792.0" yOffset="64.0"/>
+    <component base="dieresis" xOffset="756.0"/>
   </outline>
 </glyph>
-- 
cgit v1.2.3