From 0544b01dcf2ebf2fc8cdd48f1354949513773549 Mon Sep 17 00:00:00 2001
From: Rasmus Andersson <rasmus@notion.se>
Date: Sun, 1 Oct 2017 18:14:07 -0700
Subject: Massive glyph update

Added:
 feng, hturnhook2, hturnlthook, lcurl, ncurl, Q_rthook, qrthook, slongstroke,
 tcurl, zhook

Removed:
  dhook.cn, finalnun, ghook.cn, bhook.cn, chook.cn, Chook.cn, Oopen.cn,
  phook.cn, qhook.cn

Renamed & modified:
  uni023D -> L_bar
  Ibar    -> Istroke
  Lslash  -> L_slash
  uni02A9 -> feng.glif
  uni1E9C -> slongstroke
  uni02AE -> hturnlthook
  uni0234 -> lcurl
  uni0235 -> ncurl
  uni024A -> Q_rthook
  uni024B -> qrthook
  uni0236 -> tcurl
  uni0225 -> zhook

Modified:
  a, A, a_uni02DE, ae, afii10045, alpha, ascript, ascript_uni02DE,
  aturn, austral, b, B, bbar,, becyrillic, beta, bhook, Bhook, btopbar,
  c, caron, ccurl, ccurl,, cedi, cheabkhasiancyrillic, chook, Chook,
  circumflex, circumflexnosp, circumflexnosp,, circumflexsubnosp,
  coloncurrency, crossbar, d, D, Dbar1, dcroat, Delta, dhook, Dhook,
  Dhook,, Digamma, djecyrillic, dollar, dotlessi, dotlessj, drthook,
  dtopbar, Dtopbar, dyogh, dz, dz,, dzcaron, DZcaron, dzcurl, e,
  ecyrillic, eng, Eng, Enghecyrillic,, Enhookcyrillic, eshcurl, Eturn,
  ezhcurl, f, Fhook, Fturn, g, Gamma1, gamma1,, gbar, Gbar, gecyrillic,
  germandbls, ghook, Ghook, glottalstopbarrev,, guarani, h, hcedilla,
  Hcedilla, henghook, hhook, hryvnia, hturn, hturnhook2, hv, i, I, ibar,
  Idieresisacute, idieresisacute,, itildebelow, Itildebelow, j, J,
  jcrosstail, jdotlessbar, jhookdblbar, K, k,, Kabashkircyrillic, khook,
  Khook, kip, koppa, ksicyrillic, kturn, l, L_bar, Lambda, lari, lbar,,
  lbelt, leftloop.cn, lira, lmidtilde, lrthook, lslash, m, manat, mhook,
  mill, mturn, mturndescend, mu, n, naira, Nhook, Nhook,, nlfthook,
  nrthook, o, oe, ohorn, Oopen, oslash, p, peseta, peso, phook, Phook,
  pipe, pipedblbar, q, Q, q,, Q_rthook, qhook, r, rfishhook,
  rfishhookrev, rho, rhotichookmod, rightloop.cn, rrthook, rturn,
  rturnrthook, Rx, sigma1,, slongdotaccent, srthook, T, tccurl, tcurl,
  tenge, Thook, thorn, tpalatalhook, trthook, Trthook, Trthook,,
  tshecyrillic, tturn, tugrik, twodotleader, twostroke, u, ubar, uhorn,,
  uni006A_.ccmp, uni01F6, uni0221, uni0224, uni023A, uni023B, uni023E,,
  uni0240, uni0243, uni0244, uni0246, uni0247, uni0248, uni0249,
  uni0249,, uni0249.ccmp, uni024C, uni024D, uni024E, uni024F, uni0372,
  uni0373, uni0376, uni048F,, uni04C9, uni04FC, uni20AF, uni20B9,
  uni20BA, uni20BD, uni2C7F, upsilon, V, verticalbardbl, vturn, won,
  wturn, y, yen, yhook, Yhook, yturn, z, zbar, Zbar, zcurl, zcurl,,
  zhook, zrthook
---
 src/Inter-UI-Black.ufo/glyphs/A_.glif              |   2 +-
 src/Inter-UI-Black.ufo/glyphs/B_.glif              |  92 +++++-----
 src/Inter-UI-Black.ufo/glyphs/Bhook_.glif          |  32 ++--
 src/Inter-UI-Black.ufo/glyphs/Chook_.cn.glif       |  38 -----
 src/Inter-UI-Black.ufo/glyphs/Chook_.glif          |  34 ++--
 src/Inter-UI-Black.ufo/glyphs/DZcaron_.glif        |  37 +---
 src/Inter-UI-Black.ufo/glyphs/D_.glif              |   2 +-
 src/Inter-UI-Black.ufo/glyphs/Dhook_.glif          |  32 ++--
 src/Inter-UI-Black.ufo/glyphs/Dtopbar_.glif        |   8 +-
 src/Inter-UI-Black.ufo/glyphs/Eng_.glif            |  51 +++---
 src/Inter-UI-Black.ufo/glyphs/Enhookcyrillic_.glif |  43 ++---
 src/Inter-UI-Black.ufo/glyphs/Eturn_.glif          |  27 +--
 src/Inter-UI-Black.ufo/glyphs/Fhook_.glif          |  36 ++--
 src/Inter-UI-Black.ufo/glyphs/Fturn_.glif          |  21 +--
 src/Inter-UI-Black.ufo/glyphs/Gbar_.glif           |  18 +-
 src/Inter-UI-Black.ufo/glyphs/Ghook_.glif          |  36 ++--
 src/Inter-UI-Black.ufo/glyphs/Hcedilla_.glif       |   2 +-
 src/Inter-UI-Black.ufo/glyphs/I_.glif              |  26 +--
 src/Inter-UI-Black.ufo/glyphs/Ibar_.glif           |  24 ---
 src/Inter-UI-Black.ufo/glyphs/Idieresisacute_.glif |   4 +-
 src/Inter-UI-Black.ufo/glyphs/Istroke_.glif        |  24 +++
 src/Inter-UI-Black.ufo/glyphs/Itildebelow_.glif    |  24 +--
 src/Inter-UI-Black.ufo/glyphs/J_.glif              |  32 ++--
 src/Inter-UI-Black.ufo/glyphs/K_.glif              |  52 +++---
 .../glyphs/Kabashkircyrillic_.glif                 |  12 +-
 src/Inter-UI-Black.ufo/glyphs/Khook_.glif          |  53 +++---
 src/Inter-UI-Black.ufo/glyphs/L__bar.glif          |  24 +++
 src/Inter-UI-Black.ufo/glyphs/L__slash.glif        |  29 ++++
 src/Inter-UI-Black.ufo/glyphs/Lambda_.glif         |  11 +-
 src/Inter-UI-Black.ufo/glyphs/Lslash_.glif         |  29 ----
 src/Inter-UI-Black.ufo/glyphs/Nhook_.glif          |  36 ++--
 src/Inter-UI-Black.ufo/glyphs/Oopen_.cn.glif       |  49 ------
 src/Inter-UI-Black.ufo/glyphs/Oopen_.glif          |  33 +---
 src/Inter-UI-Black.ufo/glyphs/Phook_.glif          |  32 ++--
 src/Inter-UI-Black.ufo/glyphs/Q_.glif              |   8 +-
 src/Inter-UI-Black.ufo/glyphs/Q__rthook.glif       |  92 ++++++++++
 src/Inter-UI-Black.ufo/glyphs/Rx_.glif             |  64 +++----
 src/Inter-UI-Black.ufo/glyphs/T_.glif              |  32 ++--
 src/Inter-UI-Black.ufo/glyphs/Thook_.glif          |  48 +++---
 src/Inter-UI-Black.ufo/glyphs/Trthook_.glif        |  37 ++--
 src/Inter-UI-Black.ufo/glyphs/V_.glif              |  20 +--
 src/Inter-UI-Black.ufo/glyphs/Yhook_.glif          |  47 +++--
 src/Inter-UI-Black.ufo/glyphs/Zbar_.glif           |   9 +-
 src/Inter-UI-Black.ufo/glyphs/afii10045.glif       |   4 +-
 src/Inter-UI-Black.ufo/glyphs/ascript.glif         |  54 +-----
 src/Inter-UI-Black.ufo/glyphs/aturn.glif           |  60 +------
 src/Inter-UI-Black.ufo/glyphs/austral.glif         |  20 +--
 src/Inter-UI-Black.ufo/glyphs/b.glif               |   4 +-
 src/Inter-UI-Black.ufo/glyphs/bhook.cn.glif        |  70 --------
 src/Inter-UI-Black.ufo/glyphs/bhook.glif           | 111 ++++++------
 src/Inter-UI-Black.ufo/glyphs/btopbar.glif         |   8 +-
 src/Inter-UI-Black.ufo/glyphs/caron.glif           |  22 +--
 src/Inter-UI-Black.ufo/glyphs/ccurl.glif           | 128 +++++++++-----
 src/Inter-UI-Black.ufo/glyphs/cedi.glif            |  10 +-
 src/Inter-UI-Black.ufo/glyphs/chook.cn.glif        |  38 -----
 src/Inter-UI-Black.ufo/glyphs/circumflex.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/circumflexnosp.glif  |   2 +-
 .../glyphs/circumflexsubnosp.glif                  |   2 +-
 src/Inter-UI-Black.ufo/glyphs/coloncurrency.glif   |  33 +---
 src/Inter-UI-Black.ufo/glyphs/contents.plist       |  68 +++-----
 src/Inter-UI-Black.ufo/glyphs/d.glif               |   4 +-
 src/Inter-UI-Black.ufo/glyphs/dcroat.glif          |   7 +-
 src/Inter-UI-Black.ufo/glyphs/dhook.cn.glif        |  70 --------
 src/Inter-UI-Black.ufo/glyphs/dhook.glif           | 110 ++++++------
 src/Inter-UI-Black.ufo/glyphs/dollar.glif          |   4 +-
 src/Inter-UI-Black.ufo/glyphs/drthook.glif         |  42 ++---
 src/Inter-UI-Black.ufo/glyphs/dtopbar.glif         |   8 +-
 src/Inter-UI-Black.ufo/glyphs/dyogh.glif           | 110 ++++++++----
 src/Inter-UI-Black.ufo/glyphs/dz.glif              |  23 +--
 src/Inter-UI-Black.ufo/glyphs/dzcaron.glif         |  74 +-------
 src/Inter-UI-Black.ufo/glyphs/dzcurl.glif          |  49 +-----
 src/Inter-UI-Black.ufo/glyphs/eng.glif             |  64 +++----
 src/Inter-UI-Black.ufo/glyphs/feng.glif            |  27 +++
 src/Inter-UI-Black.ufo/glyphs/finalnun.glif        |  82 ---------
 src/Inter-UI-Black.ufo/glyphs/gbar.glif            |  61 +------
 src/Inter-UI-Black.ufo/glyphs/ghook.cn.glif        |  81 ---------
 src/Inter-UI-Black.ufo/glyphs/ghook.glif           |  90 +++-------
 src/Inter-UI-Black.ufo/glyphs/guarani.glif         |  12 +-
 src/Inter-UI-Black.ufo/glyphs/hcedilla.glif        |   2 +-
 src/Inter-UI-Black.ufo/glyphs/henghook.glif        | 115 +++++++------
 src/Inter-UI-Black.ufo/glyphs/hhook.glif           |  83 +++++----
 src/Inter-UI-Black.ufo/glyphs/hryvnia.glif         |  90 +++++-----
 src/Inter-UI-Black.ufo/glyphs/hturn.glif           |  33 +---
 src/Inter-UI-Black.ufo/glyphs/hturnhook2.glif      |  81 +++++++++
 src/Inter-UI-Black.ufo/glyphs/hturnlthook.glif     |  63 +++++++
 src/Inter-UI-Black.ufo/glyphs/hv.glif              |  81 +++++----
 src/Inter-UI-Black.ufo/glyphs/jdotlessbar.glif     |  28 +--
 src/Inter-UI-Black.ufo/glyphs/khook.glif           |  65 ++++---
 src/Inter-UI-Black.ufo/glyphs/kip.glif             |  10 +-
 src/Inter-UI-Black.ufo/glyphs/ksicyrillic.glif     |  12 +-
 src/Inter-UI-Black.ufo/glyphs/kturn.glif           |  29 +---
 src/Inter-UI-Black.ufo/glyphs/lari.glif            |  48 +++---
 src/Inter-UI-Black.ufo/glyphs/lbelt.glif           |  48 +++---
 src/Inter-UI-Black.ufo/glyphs/lcurl.glif           |  51 ++++++
 src/Inter-UI-Black.ufo/glyphs/leftloop.cn.glif     |  44 ++---
 src/Inter-UI-Black.ufo/glyphs/lira.glif            |  32 ++--
 src/Inter-UI-Black.ufo/glyphs/lrthook.glif         |  39 ++---
 src/Inter-UI-Black.ufo/glyphs/manat.glif           |   4 +-
 src/Inter-UI-Black.ufo/glyphs/mhook.glif           |  36 ++--
 src/Inter-UI-Black.ufo/glyphs/mturn.glif           |  46 +----
 src/Inter-UI-Black.ufo/glyphs/mturndescend.glif    |  52 +-----
 src/Inter-UI-Black.ufo/glyphs/mu.glif              |  49 +++---
 src/Inter-UI-Black.ufo/glyphs/naira.glif           |  20 +--
 src/Inter-UI-Black.ufo/glyphs/ncurl.glif           |  48 ++++++
 src/Inter-UI-Black.ufo/glyphs/nlfthook.glif        |  42 ++---
 src/Inter-UI-Black.ufo/glyphs/nrthook.glif         |  36 ++--
 src/Inter-UI-Black.ufo/glyphs/p.glif               |   6 +-
 src/Inter-UI-Black.ufo/glyphs/peseta.glif          |  36 ++--
 src/Inter-UI-Black.ufo/glyphs/peso.glif            |  52 +++---
 src/Inter-UI-Black.ufo/glyphs/phook.cn.glif        |  69 --------
 src/Inter-UI-Black.ufo/glyphs/phook.glif           | 106 ++++++------
 src/Inter-UI-Black.ufo/glyphs/pipedblbar.glif      |   2 +-
 src/Inter-UI-Black.ufo/glyphs/q.glif               |  18 +-
 src/Inter-UI-Black.ufo/glyphs/qhook.cn.glif        |  69 --------
 src/Inter-UI-Black.ufo/glyphs/qhook.glif           |  78 +++------
 src/Inter-UI-Black.ufo/glyphs/qrthook.glif         |  72 ++++++++
 src/Inter-UI-Black.ufo/glyphs/rightloop.cn.glif    |  16 +-
 src/Inter-UI-Black.ufo/glyphs/rrthook.glif         |  32 ++--
 src/Inter-UI-Black.ufo/glyphs/rturn.glif           |  32 +---
 src/Inter-UI-Black.ufo/glyphs/slongstroke.glif     |  40 +++++
 src/Inter-UI-Black.ufo/glyphs/srthook.glif         |  32 ++--
 src/Inter-UI-Black.ufo/glyphs/tccurl.glif          | 116 ++++++-------
 src/Inter-UI-Black.ufo/glyphs/tcurl.glif           |  59 +++++++
 src/Inter-UI-Black.ufo/glyphs/tenge.glif           |  20 +--
 src/Inter-UI-Black.ufo/glyphs/tpalatalhook.glif    |  32 ++--
 src/Inter-UI-Black.ufo/glyphs/trthook.glif         |  26 +--
 src/Inter-UI-Black.ufo/glyphs/tturn.glif           |  33 +---
 src/Inter-UI-Black.ufo/glyphs/tugrik.glif          |  20 +--
 src/Inter-UI-Black.ufo/glyphs/twostroke.glif       |   9 +-
 src/Inter-UI-Black.ufo/glyphs/uni01F6_.glif        |  36 ++--
 src/Inter-UI-Black.ufo/glyphs/uni0224.glif         |  52 +++---
 src/Inter-UI-Black.ufo/glyphs/uni0225.glif         |  51 ------
 src/Inter-UI-Black.ufo/glyphs/uni0234.glif         |  51 ------
 src/Inter-UI-Black.ufo/glyphs/uni0235.glif         |  72 --------
 src/Inter-UI-Black.ufo/glyphs/uni0236.glif         |  53 ------
 src/Inter-UI-Black.ufo/glyphs/uni023D_.glif        |  24 ---
 src/Inter-UI-Black.ufo/glyphs/uni0240.glif         |  55 +++---
 src/Inter-UI-Black.ufo/glyphs/uni0247.glif         |  43 +----
 src/Inter-UI-Black.ufo/glyphs/uni0248.glif         |   4 +-
 src/Inter-UI-Black.ufo/glyphs/uni0249.ccmp.glif    |  12 +-
 src/Inter-UI-Black.ufo/glyphs/uni0249.glif         |  12 +-
 src/Inter-UI-Black.ufo/glyphs/uni024A_.glif        |  81 ---------
 src/Inter-UI-Black.ufo/glyphs/uni024B_.glif        |  70 --------
 src/Inter-UI-Black.ufo/glyphs/uni024E_.glif        |  18 +-
 src/Inter-UI-Black.ufo/glyphs/uni02A9_.glif        |  91 ----------
 src/Inter-UI-Black.ufo/glyphs/uni02AE__.glif       |  64 -------
 src/Inter-UI-Black.ufo/glyphs/uni04C9_.glif        |   2 +-
 src/Inter-UI-Black.ufo/glyphs/uni1E9C__.glif       |  40 -----
 src/Inter-UI-Black.ufo/glyphs/uni20AF__.glif       |  40 ++---
 src/Inter-UI-Black.ufo/glyphs/uni20B9_.glif        |  52 +++---
 src/Inter-UI-Black.ufo/glyphs/uni20BA__.glif       |  20 +--
 src/Inter-UI-Black.ufo/glyphs/uni2C7F__.glif       |  28 +--
 src/Inter-UI-Black.ufo/glyphs/verticalbardbl.glif  |   6 +-
 src/Inter-UI-Black.ufo/glyphs/vturn.glif           |  15 +-
 src/Inter-UI-Black.ufo/glyphs/won.glif             |  20 +--
 src/Inter-UI-Black.ufo/glyphs/wturn.glif           |  39 +----
 src/Inter-UI-Black.ufo/glyphs/y.glif               |   4 +-
 src/Inter-UI-Black.ufo/glyphs/yen.glif             |  46 ++---
 src/Inter-UI-Black.ufo/glyphs/yhook.glif           |  68 ++++----
 src/Inter-UI-Black.ufo/glyphs/yturn.glif           |  27 +--
 src/Inter-UI-Black.ufo/glyphs/zbar.glif            |  11 +-
 src/Inter-UI-Black.ufo/glyphs/zcurl.glif           |  74 ++++----
 src/Inter-UI-Black.ufo/glyphs/zhook.glif           |  39 +++++
 src/Inter-UI-Black.ufo/glyphs/zrthook.glif         |  61 +++----
 src/Inter-UI-Black.ufo/groups.plist                |  74 +++++++-
 src/Inter-UI-Black.ufo/kerning.plist               | 190 +++++++++++----------
 src/Inter-UI-Black.ufo/lib.plist                   |  90 +++++-----
 167 files changed, 2798 insertions(+), 4115 deletions(-)
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/Chook_.cn.glif
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/Ibar_.glif
 create mode 100644 src/Inter-UI-Black.ufo/glyphs/Istroke_.glif
 create mode 100644 src/Inter-UI-Black.ufo/glyphs/L__bar.glif
 create mode 100644 src/Inter-UI-Black.ufo/glyphs/L__slash.glif
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/Lslash_.glif
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/Oopen_.cn.glif
 create mode 100644 src/Inter-UI-Black.ufo/glyphs/Q__rthook.glif
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/bhook.cn.glif
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/chook.cn.glif
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/dhook.cn.glif
 create mode 100644 src/Inter-UI-Black.ufo/glyphs/feng.glif
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/finalnun.glif
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/ghook.cn.glif
 create mode 100644 src/Inter-UI-Black.ufo/glyphs/hturnhook2.glif
 create mode 100644 src/Inter-UI-Black.ufo/glyphs/hturnlthook.glif
 create mode 100644 src/Inter-UI-Black.ufo/glyphs/lcurl.glif
 create mode 100644 src/Inter-UI-Black.ufo/glyphs/ncurl.glif
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/phook.cn.glif
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/qhook.cn.glif
 create mode 100644 src/Inter-UI-Black.ufo/glyphs/qrthook.glif
 create mode 100644 src/Inter-UI-Black.ufo/glyphs/slongstroke.glif
 create mode 100644 src/Inter-UI-Black.ufo/glyphs/tcurl.glif
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/uni0225.glif
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/uni0234.glif
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/uni0235.glif
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/uni0236.glif
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/uni023D_.glif
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/uni024A_.glif
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/uni024B_.glif
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/uni02A9_.glif
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/uni02AE__.glif
 delete mode 100644 src/Inter-UI-Black.ufo/glyphs/uni1E9C__.glif
 create mode 100644 src/Inter-UI-Black.ufo/glyphs/zhook.glif

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

diff --git a/src/Inter-UI-Black.ufo/glyphs/A_.glif b/src/Inter-UI-Black.ufo/glyphs/A_.glif
index 211ed3678..3789c1576 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_.glif
@@ -9,7 +9,7 @@
       <point x="504" y="384" type="line"/>
       <point x="1544" y="384" type="line"/>
     </contour>
-    <component base="V" yScale="-1" yOffset="2048"/>
+    <component base="Lambda"/>
     <contour>
       <point x="1024.0" y="2200.0" type="move" name="top"/>
     </contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/B_.glif b/src/Inter-UI-Black.ufo/glyphs/B_.glif
index c333a6570..0f1dad0b1 100644
--- a/src/Inter-UI-Black.ufo/glyphs/B_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/B_.glif
@@ -1,66 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="B" format="1">
-  <advance width="1740"/>
+  <advance width="1736"/>
   <unicode hex="0042"/>
   <outline>
     <contour>
-      <point x="936" y="876" type="line"/>
-      <point x="1068" y="1000" type="line"/>
-      <point x="1472" y="1004"/>
-      <point x="1620" y="1232"/>
-      <point x="1620" y="1480" type="curve"/>
-      <point x="1620" y="1864"/>
-      <point x="1328" y="2048"/>
-      <point x="844" y="2048" type="curve"/>
-      <point x="132" y="2048" type="line"/>
-      <point x="132" y="8" type="line"/>
-      <point x="592" y="8" type="line"/>
-      <point x="592" y="1664" type="line"/>
-      <point x="844" y="1664" type="line"/>
-      <point x="1064" y="1664"/>
-      <point x="1160" y="1596"/>
-      <point x="1160" y="1424" type="curve"/>
-      <point x="1160" y="1272"/>
-      <point x="1068" y="1196"/>
-      <point x="844" y="1196" type="curve"/>
-      <point x="420" y="1196" type="line"/>
-      <point x="424" y="876" type="line"/>
+      <point x="932" y="876" type="line"/>
+      <point x="1064" y="1000" type="line"/>
+      <point x="1468" y="1004"/>
+      <point x="1616" y="1232"/>
+      <point x="1616" y="1480" type="curve"/>
+      <point x="1616" y="1864"/>
+      <point x="1324" y="2048"/>
+      <point x="840" y="2048" type="curve"/>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="8" type="line"/>
+      <point x="588" y="8" type="line"/>
+      <point x="588" y="1664" type="line"/>
+      <point x="840" y="1664" type="line"/>
+      <point x="1060" y="1664"/>
+      <point x="1156" y="1596"/>
+      <point x="1156" y="1424" type="curve"/>
+      <point x="1156" y="1272"/>
+      <point x="1064" y="1196"/>
+      <point x="840" y="1196" type="curve"/>
+      <point x="416" y="1196" type="line"/>
+      <point x="420" y="876" type="line"/>
     </contour>
     <contour>
-      <point x="920" y="8" type="line"/>
-      <point x="1404" y="8"/>
-      <point x="1660" y="212"/>
-      <point x="1660" y="612" type="curve" smooth="yes"/>
-      <point x="1660" y="848"/>
-      <point x="1524" y="1084"/>
-      <point x="1132" y="1068" type="curve"/>
-      <point x="1028" y="1196" type="line"/>
-      <point x="536" y="1196" type="line"/>
-      <point x="536" y="876" type="line"/>
-      <point x="936" y="876" type="line" smooth="yes"/>
-      <point x="1128" y="876"/>
-      <point x="1204" y="776"/>
-      <point x="1204" y="620" type="curve" smooth="yes"/>
-      <point x="1204" y="488"/>
-      <point x="1120" y="388"/>
-      <point x="920" y="388" type="curve" smooth="yes"/>
-      <point x="368" y="388" type="line"/>
-      <point x="368" y="8" type="line"/>
+      <point x="916" y="8" type="line"/>
+      <point x="1400" y="8"/>
+      <point x="1656" y="212"/>
+      <point x="1656" y="612" type="curve" smooth="yes"/>
+      <point x="1656" y="848"/>
+      <point x="1520" y="1084"/>
+      <point x="1128" y="1068" type="curve"/>
+      <point x="1024" y="1196" type="line"/>
+      <point x="532" y="1196" type="line"/>
+      <point x="532" y="876" type="line"/>
+      <point x="932" y="876" type="line" smooth="yes"/>
+      <point x="1124" y="876"/>
+      <point x="1200" y="776"/>
+      <point x="1200" y="620" type="curve" smooth="yes"/>
+      <point x="1200" y="488"/>
+      <point x="1116" y="388"/>
+      <point x="916" y="388" type="curve" smooth="yes"/>
+      <point x="364" y="388" type="line"/>
+      <point x="364" y="8" type="line"/>
     </contour>
     <contour>
-      <point x="860" y="2260" type="move" name="top"/>
+      <point x="856" y="2260" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="916" y="24" type="move" name="bottom"/>
+      <point x="912" y="24" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1908" y="2244" type="move" name="top_dd"/>
+      <point x="1904" y="2244" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1908" y="-560" type="move" name="bottom_dd"/>
+      <point x="1904" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1908" y="2260" type="move" name="top0315"/>
+      <point x="1904" y="2260" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Bhook_.glif b/src/Inter-UI-Black.ufo/glyphs/Bhook_.glif
index b9e9894d2..ea312737f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Bhook_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Bhook_.glif
@@ -1,27 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Bhook" format="1">
-  <advance width="2304"/>
+  <advance width="2268"/>
   <unicode hex="0181"/>
   <outline>
     <contour>
-      <point x="944" y="1628" type="line" name="hr00"/>
-      <point x="944" y="2004" type="line"/>
-      <point x="632" y="2004" type="line" smooth="yes"/>
-      <point x="256" y="2004"/>
-      <point x="52" y="1796"/>
-      <point x="52" y="1452" type="curve" smooth="yes"/>
-      <point x="52" y="1376"/>
-      <point x="60" y="1316"/>
-      <point x="76" y="1240" type="curve"/>
-      <point x="444" y="1240" type="line"/>
-      <point x="440" y="1284"/>
-      <point x="432" y="1324"/>
-      <point x="432" y="1368" type="curve" smooth="yes"/>
-      <point x="432" y="1492"/>
-      <point x="472" y="1628"/>
-      <point x="632" y="1628" type="curve" smooth="yes"/>
+      <point x="924" y="1668" type="line" name="hr00"/>
+      <point x="924" y="2048" type="line"/>
+      <point x="612" y="2048" type="line" smooth="yes"/>
+      <point x="236" y="2048"/>
+      <point x="0" y="1840"/>
+      <point x="0" y="1496" type="curve" smooth="yes"/>
+      <point x="0" y="1284" type="line"/>
+      <point x="412" y="1284" type="line"/>
+      <point x="412" y="1412" type="line" smooth="yes"/>
+      <point x="412" y="1536"/>
+      <point x="452" y="1668"/>
+      <point x="612" y="1668" type="curve" smooth="yes"/>
     </contour>
-    <component base="B" xOffset="464"/>
+    <component base="B" xOffset="528"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Chook_.cn.glif b/src/Inter-UI-Black.ufo/glyphs/Chook_.cn.glif
deleted file mode 100644
index 322b4871b..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/Chook_.cn.glif
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Chook.cn" format="1">
-  <advance width="2048"/>
-  <outline>
-    <contour>
-      <point x="1648" y="1312" type="line"/>
-      <point x="1648" y="1624" type="line" smooth="yes"/>
-      <point x="1648" y="1800"/>
-      <point x="1800" y="1824"/>
-      <point x="1924" y="1824" type="curve" smooth="yes"/>
-      <point x="1968" y="1824"/>
-      <point x="2008" y="1816"/>
-      <point x="2052" y="1812" type="curve"/>
-      <point x="2052" y="2180" type="line"/>
-      <point x="1976" y="2196"/>
-      <point x="1916" y="2204"/>
-      <point x="1840" y="2204" type="curve" smooth="yes"/>
-      <point x="1496" y="2204"/>
-      <point x="1276" y="2000"/>
-      <point x="1276" y="1624" type="curve" smooth="yes"/>
-      <point x="1276" y="1312" type="line"/>
-    </contour>
-    <component base="C.cn" xOffset="-124"/>
-  </outline>
-  <lib>
-    <dict>
-      <key>com.typemytype.robofont.mark</key>
-      <array>
-        <real>0.77</real>
-        <real>0.95</real>
-        <real>0.76</real>
-        <real>1.0</real>
-      </array>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 1994, 'leftMargin': 117, 'rightMargin': -180}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Chook_.glif b/src/Inter-UI-Black.ufo/glyphs/Chook_.glif
index e53c8490f..b13649638 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Chook_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Chook_.glif
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Chook" format="1">
-  <advance width="2048"/>
+  <advance width="2152"/>
   <unicode hex="0187"/>
   <outline>
     <contour>
-      <point x="1660" y="1312" type="line" name="hr00"/>
-      <point x="1660" y="1560" type="line" smooth="yes"/>
-      <point x="1660" y="1760"/>
-      <point x="1816" y="1824"/>
-      <point x="1940" y="1824" type="curve" smooth="yes"/>
-      <point x="2068" y="1824" type="line"/>
-      <point x="2068" y="2192" type="line"/>
-      <point x="1992" y="2204"/>
-      <point x="1928" y="2204"/>
-      <point x="1856" y="2204" type="curve" smooth="yes"/>
-      <point x="1512" y="2204"/>
-      <point x="1288" y="2000"/>
-      <point x="1288" y="1624" type="curve" smooth="yes"/>
-      <point x="1288" y="1312" type="line"/>
+      <point x="1776" y="1404" type="line" name="hr00"/>
+      <point x="1776" y="1496" type="line" smooth="yes"/>
+      <point x="1776" y="1696"/>
+      <point x="1932" y="1760"/>
+      <point x="2056" y="1760" type="curve"/>
+      <point x="2088" y="1760"/>
+      <point x="2152" y="1756"/>
+      <point x="2184" y="1756" type="curve"/>
+      <point x="2184" y="2128" type="line"/>
+      <point x="2108" y="2140"/>
+      <point x="2044" y="2140"/>
+      <point x="1972" y="2140" type="curve" smooth="yes"/>
+      <point x="1628" y="2140"/>
+      <point x="1404" y="1936"/>
+      <point x="1404" y="1560" type="curve" smooth="yes"/>
+      <point x="1404" y="1404" type="line"/>
     </contour>
-    <component base="C" xOffset="-160"/>
+    <component base="C"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/DZcaron_.glif b/src/Inter-UI-Black.ufo/glyphs/DZcaron_.glif
index c90a40429..f1b174556 100644
--- a/src/Inter-UI-Black.ufo/glyphs/DZcaron_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/DZcaron_.glif
@@ -1,40 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Dzcaron_" format="1">
-  <advance width="3220"/>
+  <advance width="3184"/>
   <unicode hex="01C5"/>
   <outline>
-    <contour>
-      <point x="3080" y="360" type="line"/>
-      <point x="1936" y="360" type="line"/>
-      <point x="1936" y="0" type="line"/>
-      <point x="3080" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="3060" y="1240" type="line"/>
-      <point x="3060" y="1488" type="line"/>
-      <point x="2760" y="1488" type="line"/>
-      <point x="1824" y="260" type="line"/>
-      <point x="1824" y="0" type="line"/>
-      <point x="2124" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="2912" y="1488" type="line"/>
-      <point x="1852" y="1488" type="line"/>
-      <point x="1852" y="1132" type="line"/>
-      <point x="2912" y="1132" type="line"/>
-    </contour>
-    <contour>
-      <point x="2288" y="2100" type="line"/>
-      <point x="1908" y="2100" type="line"/>
-      <point x="1908" y="2084" type="line"/>
-      <point x="2308" y="1724" type="line"/>
-      <point x="2620" y="1724" type="line"/>
-      <point x="3016" y="2080" type="line"/>
-      <point x="3016" y="2100" type="line"/>
-      <point x="2640" y="2100" type="line"/>
-      <point x="2464" y="1916" type="line"/>
-    </contour>
-    <component base="D" xOffset="8"/>
+    <component base="D"/>
+    <component base="z" xOffset="1672"/>
+    <component base="caron" xOffset="1672"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/D_.glif b/src/Inter-UI-Black.ufo/glyphs/D_.glif
index 8c864de6f..24393dabb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/D_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/D_.glif
@@ -20,7 +20,7 @@
       <point x="1292" y="548"/>
       <point x="1084" y="400"/>
       <point x="800" y="400" type="curve"/>
-      <point x="332" y="400" type="line"/>
+      <point x="328" y="400" type="line"/>
       <point x="328" y="0" type="line"/>
     </contour>
     <contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Dhook_.glif b/src/Inter-UI-Black.ufo/glyphs/Dhook_.glif
index a9e95a5a0..0658f6867 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Dhook_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Dhook_.glif
@@ -1,27 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Dhook" format="1">
-  <advance width="2304"/>
+  <advance width="2392"/>
   <unicode hex="018A"/>
   <outline>
     <contour>
-      <point x="936" y="1628" type="line" name="hr00"/>
-      <point x="936" y="2004" type="line"/>
-      <point x="624" y="2004" type="line" smooth="yes"/>
-      <point x="248" y="2004"/>
-      <point x="44" y="1796"/>
-      <point x="44" y="1452" type="curve" smooth="yes"/>
-      <point x="44" y="1376"/>
-      <point x="48" y="1316"/>
-      <point x="68" y="1240" type="curve"/>
-      <point x="436" y="1240" type="line"/>
-      <point x="428" y="1284"/>
-      <point x="424" y="1324"/>
-      <point x="424" y="1368" type="curve" smooth="yes"/>
-      <point x="424" y="1492"/>
-      <point x="460" y="1628"/>
-      <point x="624" y="1628" type="curve" smooth="yes"/>
+      <point x="924" y="1648" type="line" name="hr00"/>
+      <point x="924" y="2048" type="line"/>
+      <point x="612" y="2048" type="line" smooth="yes"/>
+      <point x="236" y="2048"/>
+      <point x="0" y="1840"/>
+      <point x="0" y="1496" type="curve" smooth="yes"/>
+      <point x="0" y="1284" type="line"/>
+      <point x="412" y="1284" type="line"/>
+      <point x="412" y="1412" type="line" smooth="yes"/>
+      <point x="412" y="1536"/>
+      <point x="452" y="1648"/>
+      <point x="612" y="1648" type="curve" smooth="yes"/>
     </contour>
-    <component base="D" xOffset="460"/>
+    <component base="D" xOffset="532"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Dtopbar_.glif b/src/Inter-UI-Black.ufo/glyphs/Dtopbar_.glif
index 0670f02c1..f6c4a169a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Dtopbar_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Dtopbar_.glif
@@ -5,10 +5,10 @@
   <outline>
     <contour>
       <point x="1660" y="0" type="line"/>
-      <point x="1660" y="2004" type="line"/>
-      <point x="320" y="2004" type="line"/>
-      <point x="320" y="1628" type="line"/>
-      <point x="1200" y="1628" type="line"/>
+      <point x="1660" y="2048" type="line"/>
+      <point x="320" y="2048" type="line"/>
+      <point x="320" y="1668" type="line"/>
+      <point x="1200" y="1668" type="line"/>
       <point x="1200" y="1312" type="line"/>
       <point x="924" y="1312" type="line" smooth="yes"/>
       <point x="444" y="1312"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Eng_.glif b/src/Inter-UI-Black.ufo/glyphs/Eng_.glif
index 1a5abed72..b9692713d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Eng_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Eng_.glif
@@ -1,8 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Eng" format="1">
-  <advance width="2048"/>
+  <advance width="1920"/>
   <unicode hex="014A"/>
   <outline>
+    <contour>
+      <point x="1336" y="124" type="line" name="hr00"/>
+      <point x="1336" y="-4" type="line" smooth="yes"/>
+      <point x="1336" y="-180"/>
+      <point x="1200" y="-232"/>
+      <point x="1076" y="-232" type="curve"/>
+      <point x="1044" y="-232"/>
+      <point x="980" y="-228"/>
+      <point x="948" y="-228" type="curve"/>
+      <point x="948" y="-600" type="line"/>
+      <point x="1020" y="-612"/>
+      <point x="1096" y="-612"/>
+      <point x="1160" y="-612" type="curve" smooth="yes"/>
+      <point x="1504" y="-612"/>
+      <point x="1792" y="-432"/>
+      <point x="1792" y="-32" type="curve" smooth="yes"/>
+      <point x="1792" y="124" type="line"/>
+    </contour>
+    <component base="N"/>
     <contour>
       <point x="1028" y="2200" type="move" name="top"/>
     </contour>
@@ -12,36 +31,6 @@
     <contour>
       <point x="2020" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="192" y="2004" type="line"/>
-      <point x="192" y="0" type="line"/>
-      <point x="652" y="0" type="line"/>
-      <point x="652" y="2004" type="line"/>
-    </contour>
-    <contour>
-      <point x="328" y="1836" type="line"/>
-      <point x="1396" y="0" type="line"/>
-      <point x="1724" y="168" type="line"/>
-      <point x="652" y="2004" type="line"/>
-    </contour>
-    <contour>
-      <point x="1396" y="2004" type="line"/>
-      <point x="1396" y="-12" type="line" smooth="yes"/>
-      <point x="1396" y="-156"/>
-      <point x="1340" y="-228"/>
-      <point x="1236" y="-228" type="curve" smooth="yes"/>
-      <point x="1172" y="-228"/>
-      <point x="1144" y="-224"/>
-      <point x="1096" y="-212" type="curve"/>
-      <point x="1080" y="-580" type="line"/>
-      <point x="1156" y="-596"/>
-      <point x="1220" y="-600"/>
-      <point x="1296" y="-600" type="curve" smooth="yes"/>
-      <point x="1648" y="-600"/>
-      <point x="1860" y="-392"/>
-      <point x="1860" y="-12" type="curve" smooth="yes"/>
-      <point x="1860" y="2004" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Enhookcyrillic_.glif b/src/Inter-UI-Black.ufo/glyphs/Enhookcyrillic_.glif
index 5e3a3ccfa..706c6049a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Enhookcyrillic_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Enhookcyrillic_.glif
@@ -1,34 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Enhookcyrillic" format="1">
-  <advance width="2048"/>
+  <advance width="1920"/>
   <unicode hex="04C7"/>
   <outline>
     <contour>
-      <point x="192" y="2004" type="line"/>
-      <point x="192" y="0" type="line"/>
-      <point x="652" y="0" type="line"/>
-      <point x="652" y="800" type="line"/>
-      <point x="1396" y="800" type="line"/>
-      <point x="1396" y="-12" type="line" smooth="yes"/>
-      <point x="1396" y="-156"/>
-      <point x="1340" y="-228"/>
-      <point x="1236" y="-228" type="curve" smooth="yes"/>
-      <point x="1172" y="-228"/>
-      <point x="1144" y="-224"/>
-      <point x="1096" y="-212" type="curve"/>
-      <point x="1076" y="-580" type="line"/>
-      <point x="1156" y="-596"/>
-      <point x="1220" y="-600"/>
-      <point x="1296" y="-600" type="curve" smooth="yes"/>
-      <point x="1644" y="-600"/>
-      <point x="1856" y="-392"/>
-      <point x="1856" y="-12" type="curve" smooth="yes"/>
-      <point x="1856" y="2004" type="line"/>
-      <point x="1396" y="2004" type="line"/>
-      <point x="1396" y="1168" type="line"/>
-      <point x="652" y="1168" type="line"/>
-      <point x="652" y="2004" type="line"/>
+      <point x="1328" y="124" type="line" name="hr00"/>
+      <point x="1328" y="-4" type="line" smooth="yes"/>
+      <point x="1328" y="-180"/>
+      <point x="1200" y="-232"/>
+      <point x="1076" y="-232" type="curve"/>
+      <point x="1044" y="-232"/>
+      <point x="980" y="-228"/>
+      <point x="948" y="-228" type="curve"/>
+      <point x="948" y="-600" type="line"/>
+      <point x="1020" y="-612"/>
+      <point x="1096" y="-612"/>
+      <point x="1160" y="-612" type="curve" smooth="yes"/>
+      <point x="1504" y="-612"/>
+      <point x="1792" y="-432"/>
+      <point x="1792" y="-32" type="curve" smooth="yes"/>
+      <point x="1792" y="124" type="line"/>
     </contour>
+    <component base="H"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Eturn_.glif b/src/Inter-UI-Black.ufo/glyphs/Eturn_.glif
index 7e450b073..d293513b3 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Eturn_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Eturn_.glif
@@ -1,32 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Eturn" format="1">
-  <advance width="1536"/>
+  <advance width="1624"/>
   <unicode hex="018E"/>
   <outline>
-    <contour>
-      <point x="84" y="1632" type="line"/>
-      <point x="1148" y="1632" type="line"/>
-      <point x="1148" y="2004" type="line"/>
-      <point x="84" y="2004" type="line"/>
-    </contour>
-    <contour>
-      <point x="992" y="0" type="line"/>
-      <point x="1452" y="0" type="line"/>
-      <point x="1452" y="2004" type="line"/>
-      <point x="992" y="2004" type="line"/>
-    </contour>
-    <contour>
-      <point x="224" y="796" type="line"/>
-      <point x="1148" y="796" type="line"/>
-      <point x="1148" y="1156" type="line"/>
-      <point x="224" y="1156" type="line"/>
-    </contour>
-    <contour>
-      <point x="84" y="0" type="line"/>
-      <point x="1148" y="0" type="line"/>
-      <point x="1148" y="372" type="line"/>
-      <point x="84" y="372" type="line"/>
-    </contour>
+    <component base="E" xScale="-1.0" yScale="-1.0" xOffset="1624" yOffset="2048"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Fhook_.glif b/src/Inter-UI-Black.ufo/glyphs/Fhook_.glif
index 3e0c9e83d..9601aa892 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Fhook_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Fhook_.glif
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Fhook" format="1">
-  <advance width="1792"/>
+  <advance width="1624"/>
   <unicode hex="0191"/>
   <outline>
     <contour>
-      <point x="356" y="1168" type="line" name="hr00"/>
-      <point x="356" y="-20" type="line" smooth="yes"/>
-      <point x="356" y="-168"/>
-      <point x="300" y="-220"/>
-      <point x="184" y="-220" type="curve" smooth="yes"/>
-      <point x="140" y="-220"/>
-      <point x="104" y="-216"/>
-      <point x="60" y="-204" type="curve"/>
-      <point x="40" y="-580" type="line"/>
-      <point x="116" y="-596"/>
-      <point x="180" y="-600"/>
-      <point x="252" y="-600" type="curve" smooth="yes"/>
-      <point x="596" y="-600"/>
-      <point x="816" y="-396"/>
-      <point x="816" y="-20" type="curve" smooth="yes"/>
-      <point x="816" y="1168" type="line"/>
+      <point x="128" y="184" type="line"/>
+      <point x="128" y="-80" type="line" smooth="yes"/>
+      <point x="128" y="-192"/>
+      <point x="28" y="-220"/>
+      <point x="-76" y="-220" type="curve"/>
+      <point x="-96" y="-220"/>
+      <point x="-136" y="-220"/>
+      <point x="-160" y="-216" type="curve"/>
+      <point x="-160" y="-568" type="line"/>
+      <point x="-112" y="-576"/>
+      <point x="-4" y="-576"/>
+      <point x="48" y="-576" type="curve"/>
+      <point x="288" y="-576"/>
+      <point x="592" y="-516"/>
+      <point x="592" y="-80" type="curve" smooth="yes"/>
+      <point x="592" y="184" type="line"/>
     </contour>
-    <component base="F" xOffset="192"/>
+    <component base="F"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Fturn_.glif b/src/Inter-UI-Black.ufo/glyphs/Fturn_.glif
index 0e247d59b..f16ca456f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Fturn_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Fturn_.glif
@@ -1,26 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Fturn" format="1">
-  <advance width="1536"/>
+  <advance width="1624"/>
   <unicode hex="2132"/>
   <outline>
-    <contour>
-      <point x="972" y="0" type="line"/>
-      <point x="1432" y="0" type="line"/>
-      <point x="1432" y="2004" type="line"/>
-      <point x="972" y="2004" type="line"/>
-    </contour>
-    <contour>
-      <point x="188" y="832" type="line"/>
-      <point x="1100" y="832" type="line"/>
-      <point x="1100" y="1204" type="line"/>
-      <point x="188" y="1204" type="line"/>
-    </contour>
-    <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="1100" y="0" type="line"/>
-      <point x="1100" y="372" type="line"/>
-      <point x="104" y="372" type="line"/>
-    </contour>
+    <component base="F" xScale="-1.0" yScale="-1.0" xOffset="1624" yOffset="2048"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Gbar_.glif b/src/Inter-UI-Black.ufo/glyphs/Gbar_.glif
index cde799424..e0b4a3527 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Gbar_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Gbar_.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Gbar" format="1">
-  <advance width="2048"/>
+  <advance width="2000"/>
   <unicode hex="01E4"/>
   <outline>
     <contour>
-      <point x="1976" y="664" type="line"/>
-      <point x="984" y="664" type="line"/>
-      <point x="984" y="452" type="line"/>
-      <point x="1976" y="452" type="line"/>
+      <point x="1968" y="672" type="line"/>
+      <point x="976" y="672" type="line"/>
+      <point x="976" y="460" type="line"/>
+      <point x="1968" y="460" type="line"/>
     </contour>
-    <component base="G" xOffset="-44"/>
+    <component base="G"/>
     <contour>
-      <point x="924" y="2200" type="move" name="top"/>
+      <point x="968" y="2200" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="952" y="0" type="move" name="bottom"/>
+      <point x="996" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1972" y="2200" type="move" name="top0315"/>
+      <point x="2016" y="2200" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Ghook_.glif b/src/Inter-UI-Black.ufo/glyphs/Ghook_.glif
index 28cd19b8d..b43a407cc 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Ghook_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Ghook_.glif
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Ghook" format="1">
-  <advance width="2304"/>
+  <advance width="2224"/>
   <unicode hex="0193"/>
   <outline>
     <contour>
-      <point x="1744" y="1348" type="line"/>
-      <point x="1744" y="1624" type="line" smooth="yes"/>
-      <point x="1744" y="1800"/>
-      <point x="1900" y="1824"/>
-      <point x="2024" y="1824" type="curve" smooth="yes"/>
-      <point x="2068" y="1824"/>
-      <point x="2108" y="1816"/>
-      <point x="2152" y="1812" type="curve"/>
-      <point x="2152" y="2180" type="line"/>
-      <point x="2076" y="2196"/>
-      <point x="2016" y="2204"/>
-      <point x="1940" y="2204" type="curve" smooth="yes"/>
-      <point x="1596" y="2204"/>
-      <point x="1372" y="2000"/>
-      <point x="1372" y="1624" type="curve" smooth="yes"/>
-      <point x="1372" y="1348" type="line"/>
+      <point x="1776" y="1436" type="line"/>
+      <point x="1776" y="1712" type="line" smooth="yes"/>
+      <point x="1776" y="1888"/>
+      <point x="1932" y="1912"/>
+      <point x="2056" y="1912" type="curve" smooth="yes"/>
+      <point x="2100" y="1912"/>
+      <point x="2140" y="1904"/>
+      <point x="2184" y="1900" type="curve"/>
+      <point x="2184" y="2268" type="line"/>
+      <point x="2108" y="2284"/>
+      <point x="2048" y="2292"/>
+      <point x="1972" y="2292" type="curve" smooth="yes"/>
+      <point x="1628" y="2292"/>
+      <point x="1404" y="2088"/>
+      <point x="1404" y="1712" type="curve" smooth="yes"/>
+      <point x="1404" y="1436" type="line"/>
     </contour>
-    <component base="G" xOffset="-40"/>
+    <component base="G"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Hcedilla_.glif b/src/Inter-UI-Black.ufo/glyphs/Hcedilla_.glif
index 6c543b7fb..c35f3b7a1 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Hcedilla_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Hcedilla_.glif
@@ -4,7 +4,7 @@
   <unicode hex="1E28"/>
   <outline>
     <component base="H"/>
-    <component base="cedilla" xOffset="-16" yOffset="-12"/>
+    <component base="cedilla" xOffset="-16" yOffset="-16"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/I_.glif b/src/Inter-UI-Black.ufo/glyphs/I_.glif
index 86939fe04..836c8186e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/I_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/I_.glif
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="I" format="1">
-  <advance width="768"/>
+  <advance width="720"/>
   <unicode hex="0049"/>
   <outline>
     <contour>
-      <point x="384" y="2200" type="move" name="top"/>
+      <point x="592" y="2048" type="line"/>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="592" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="384" y="0" type="move" name="bottom"/>
+      <point x="360" y="2200" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="-176" y="2004" type="move" name="tonos"/>
+      <point x="360" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="604" y="0" type="move" name="right"/>
+      <point x="-200" y="2004" type="move" name="tonos"/>
     </contour>
     <contour>
-      <point x="524" y="0" type="move" name="ogonek"/>
+      <point x="580" y="0" type="move" name="right"/>
     </contour>
     <contour>
-      <point x="808" y="2200" type="move" name="top_dd"/>
+      <point x="500" y="0" type="move" name="ogonek"/>
     </contour>
     <contour>
-      <point x="808" y="-560" type="move" name="bottom_dd"/>
+      <point x="784" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="808" y="2200" type="move" name="top0315"/>
+      <point x="784" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="616" y="2048" type="line"/>
-      <point x="152" y="2048" type="line"/>
-      <point x="152" y="0" type="line"/>
-      <point x="616" y="0" type="line"/>
+      <point x="784" y="2200" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Ibar_.glif b/src/Inter-UI-Black.ufo/glyphs/Ibar_.glif
deleted file mode 100644
index 82914e215..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/Ibar_.glif
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ibar" format="1">
-  <advance width="1280"/>
-  <unicode hex="0197"/>
-  <outline>
-    <contour>
-      <point x="688" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1212" y="2200" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="688" y="0" type="move" name="bottom"/>
-    </contour>
-    <component base="I" xOffset="268"/>
-    <component base="crossbar"/>
-  </outline>
-  <lib>
-    <dict>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 1046, 'leftMargin': -20, 'rightMargin': 74}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Idieresisacute_.glif b/src/Inter-UI-Black.ufo/glyphs/Idieresisacute_.glif
index 87ae839d2..a8c837966 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Idieresisacute_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Idieresisacute_.glif
@@ -3,6 +3,8 @@
   <advance width="1024"/>
   <unicode hex="1E2E"/>
   <outline>
+    <component base="I" xOffset="94"/>
+    <component base="dieresisacutecomb" xOffset="1305" yOffset="463"/>
     <contour>
       <point x="733" y="0" type="move" name="right"/>
     </contour>
@@ -27,7 +29,5 @@
     <contour>
       <point x="935" y="-560" type="move" name="bottom_dd"/>
     </contour>
-    <component base="I" xOffset="94"/>
-    <component base="dieresisacutecomb" xOffset="1305" yOffset="463"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Istroke_.glif b/src/Inter-UI-Black.ufo/glyphs/Istroke_.glif
new file mode 100644
index 000000000..fd5ea2247
--- /dev/null
+++ b/src/Inter-UI-Black.ufo/glyphs/Istroke_.glif
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="Istroke" format="1">
+  <advance width="1280"/>
+  <unicode hex="0197"/>
+  <outline>
+    <component base="I" xOffset="268"/>
+    <component base="crossbar"/>
+    <contour>
+      <point x="688" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1212" y="2200" type="move" name="top0315"/>
+    </contour>
+    <contour>
+      <point x="688" y="0" type="move" name="bottom"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1046, 'leftMargin': -20, 'rightMargin': 74}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Itildebelow_.glif b/src/Inter-UI-Black.ufo/glyphs/Itildebelow_.glif
index bb2f3993b..90446acec 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Itildebelow_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Itildebelow_.glif
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Itildebelow" format="1">
-  <advance width="1280"/>
+  <advance width="1056"/>
   <unicode hex="1E2C"/>
   <outline>
+    <component base="I" xOffset="152"/>
+    <component base="tilde" xOffset="-112" yOffset="-2284"/>
     <contour>
-      <point x="904" y="0" type="move" name="right"/>
+      <point x="792" y="0" type="move" name="right"/>
     </contour>
     <contour>
-      <point x="684" y="0" type="move" name="bottom"/>
+      <point x="572" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="264" y="2004" type="move" name="tonos"/>
+      <point x="152" y="2004" type="move" name="tonos"/>
     </contour>
     <contour>
-      <point x="684" y="-560" type="move" name="mkmkbottom_acc"/>
+      <point x="572" y="-560" type="move" name="mkmkbottom_acc"/>
     </contour>
     <contour>
-      <point x="684" y="2200" type="move" name="top"/>
+      <point x="572" y="2200" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1108" y="2200" type="move" name="top0315"/>
+      <point x="996" y="2200" type="move" name="top0315"/>
     </contour>
     <contour>
-      <point x="1108" y="2200" type="move" name="top_dd"/>
+      <point x="996" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="824" y="0" type="move" name="ogonek"/>
+      <point x="712" y="0" type="move" name="ogonek"/>
     </contour>
     <contour>
-      <point x="1108" y="-560" type="move" name="bottom_dd"/>
+      <point x="996" y="-560" type="move" name="bottom_dd"/>
     </contour>
-    <component base="I" xOffset="264"/>
-    <component base="tilde" yOffset="-2284"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/J_.glif b/src/Inter-UI-Black.ufo/glyphs/J_.glif
index 84ddc72e6..9c3edd2ae 100644
--- a/src/Inter-UI-Black.ufo/glyphs/J_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/J_.glif
@@ -1,23 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="J" format="1">
-  <advance width="1536"/>
+  <advance width="1580"/>
   <unicode hex="004A"/>
   <outline>
-    <contour>
-      <point x="1212" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="736" y="-16" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1612" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1612" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1612" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="992" y="628" type="line"/>
       <point x="992" y="452"/>
@@ -36,6 +21,21 @@
       <point x="1452" y="2048" type="line"/>
       <point x="992" y="2048" type="line"/>
     </contour>
+    <contour>
+      <point x="1212" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="736" y="-16" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1612" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1612" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1612" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/K_.glif b/src/Inter-UI-Black.ufo/glyphs/K_.glif
index 42cee7195..3633ac002 100644
--- a/src/Inter-UI-Black.ufo/glyphs/K_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/K_.glif
@@ -3,6 +3,25 @@
   <advance width="1920"/>
   <unicode hex="004B"/>
   <outline>
+    <contour>
+      <point x="592" y="2048" type="line"/>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="592" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="1808" y="2048" type="line"/>
+      <point x="1240" y="2048" type="line"/>
+      <point x="608" y="1164" type="line"/>
+      <point x="548" y="1164" type="line"/>
+      <point x="548" y="360" type="line"/>
+    </contour>
+    <contour>
+      <point x="1248" y="0" type="line"/>
+      <point x="1792" y="0" type="line"/>
+      <point x="1060" y="1180" type="line"/>
+      <point x="708" y="904" type="line"/>
+    </contour>
     <contour>
       <point x="924.0" y="72.0" type="move" name="bottom"/>
     </contour>
@@ -24,25 +43,6 @@
     <contour>
       <point x="1828.0" y="2200.0" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="592" y="2048" type="line"/>
-      <point x="128" y="2048" type="line"/>
-      <point x="128" y="0" type="line"/>
-      <point x="592" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1808" y="2048" type="line"/>
-      <point x="1240" y="2048" type="line"/>
-      <point x="760" y="1376" type="line"/>
-      <point x="464" y="936" type="line"/>
-      <point x="548" y="360" type="line"/>
-    </contour>
-    <contour>
-      <point x="1248" y="0" type="line"/>
-      <point x="1792" y="0" type="line"/>
-      <point x="1060" y="1180" type="line"/>
-      <point x="708" y="904" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
@@ -60,6 +60,20 @@
           <key>y</key>
           <real>1651.375</real>
         </dict>
+        <dict>
+          <key>angle</key>
+          <real>-125.53767779197437</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>1172</integer>
+          <key>y</key>
+          <integer>1960</integer>
+        </dict>
       </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Kabashkircyrillic_.glif b/src/Inter-UI-Black.ufo/glyphs/Kabashkircyrillic_.glif
index 89846f1fa..579b0830d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Kabashkircyrillic_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Kabashkircyrillic_.glif
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Kabashkircyrillic" format="1">
-  <advance width="2560"/>
+  <advance width="2448"/>
   <unicode hex="04A0"/>
   <outline>
     <contour>
-      <point x="920" y="2004" type="line"/>
-      <point x="108" y="2004" type="line"/>
-      <point x="108" y="1644" type="line"/>
-      <point x="920" y="1644" type="line"/>
+      <point x="844" y="2048" type="line"/>
+      <point x="32" y="2048" type="line"/>
+      <point x="32" y="1688" type="line"/>
+      <point x="844" y="1688" type="line"/>
     </contour>
-    <component base="K" xOffset="604"/>
+    <component base="K" xOffset="528"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Khook_.glif b/src/Inter-UI-Black.ufo/glyphs/Khook_.glif
index 28954b515..2f55b69fa 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Khook_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Khook_.glif
@@ -1,39 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Khook" format="1">
-  <advance width="2048"/>
+  <advance width="1920"/>
   <unicode hex="0198"/>
   <outline>
     <contour>
-      <point x="652" y="2004" type="line"/>
-      <point x="192" y="2004" type="line"/>
-      <point x="192" y="0" type="line"/>
-      <point x="652" y="0" type="line"/>
+      <point x="1248" y="0" type="line"/>
+      <point x="1792" y="0" type="line"/>
+      <point x="1104" y="1108" type="line"/>
+      <point x="1404" y="1508" type="line"/>
+      <point x="1020" y="1740" type="line"/>
+      <point x="608" y="1164" type="line"/>
+      <point x="592" y="1164" type="line"/>
+      <point x="592" y="2048" type="line"/>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="592" y="0" type="line"/>
+      <point x="592" y="420" type="line"/>
+      <point x="816" y="720" type="line"/>
     </contour>
     <contour>
-      <point x="1312" y="0" type="line"/>
-      <point x="1856" y="0" type="line"/>
-      <point x="1124" y="1180" type="line"/>
-      <point x="772" y="904" type="line"/>
-    </contour>
-    <contour>
-      <point x="1000" y="1632" type="curve" smooth="yes"/>
-      <point x="824" y="1376" type="line"/>
-      <point x="528" y="908" type="line"/>
-      <point x="612" y="492" type="line"/>
-      <point x="1068" y="988" type="line"/>
-      <point x="1376" y="1452" type="line" smooth="yes"/>
-      <point x="1452" y="1572"/>
-      <point x="1504" y="1644"/>
-      <point x="1584" y="1644" type="curve" smooth="yes"/>
-      <point x="1628" y="1644"/>
-      <point x="1640" y="1636"/>
-      <point x="1684" y="1612" type="curve"/>
-      <point x="1852" y="1952" type="line"/>
-      <point x="1752" y="1996"/>
-      <point x="1660" y="2032"/>
-      <point x="1512" y="2032" type="curve" smooth="yes"/>
-      <point x="1256" y="2032"/>
-      <point x="1152" y="1868"/>
+      <point x="1404" y="1508" type="line"/>
+      <point x="1440" y="1556" type="line" smooth="yes"/>
+      <point x="1524" y="1668"/>
+      <point x="1596" y="1715"/>
+      <point x="1720" y="1648" type="curve"/>
+      <point x="1864" y="1980" type="line"/>
+      <point x="1596" y="2136"/>
+      <point x="1276" y="2104"/>
+      <point x="1096" y="1848" type="curve" smooth="yes"/>
+      <point x="1020" y="1740" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/L__bar.glif b/src/Inter-UI-Black.ufo/glyphs/L__bar.glif
new file mode 100644
index 000000000..eb13b06ff
--- /dev/null
+++ b/src/Inter-UI-Black.ufo/glyphs/L__bar.glif
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="L_bar" format="1">
+  <advance width="1792"/>
+  <unicode hex="023D"/>
+  <outline>
+    <component base="crossbar" xOffset="-60"/>
+    <component base="L" xOffset="232"/>
+    <contour>
+      <point x="608.0" y="2200.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1760.0" y="2200.0" type="move" name="top0315"/>
+    </contour>
+    <contour>
+      <point x="924.0" y="16.0" type="move" name="bottom"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1653, 'leftMargin': -20, 'rightMargin': 53}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/L__slash.glif b/src/Inter-UI-Black.ufo/glyphs/L__slash.glif
new file mode 100644
index 000000000..71382e891
--- /dev/null
+++ b/src/Inter-UI-Black.ufo/glyphs/L__slash.glif
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="L_slash" format="1">
+  <advance width="1792"/>
+  <unicode hex="0141"/>
+  <outline>
+    <contour>
+      <point x="1008" y="1332" type="line"/>
+      <point x="84" y="1072" type="line"/>
+      <point x="84" y="828" type="line"/>
+      <point x="1008" y="1084" type="line"/>
+    </contour>
+    <component base="L" xOffset="172"/>
+    <contour>
+      <point x="556" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="928" y="16" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1700" y="2200" type="move" name="top0315"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1588, 'leftMargin': 37, 'rightMargin': 53}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Lambda_.glif b/src/Inter-UI-Black.ufo/glyphs/Lambda_.glif
index 9b28ae01e..d5646a7c8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Lambda_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Lambda_.glif
@@ -3,7 +3,16 @@
   <advance width="2048"/>
   <unicode hex="039B"/>
   <outline>
-    <component base="V" yScale="-1" yOffset="2048"/>
+    <contour>
+      <point x="600" y="0" type="line"/>
+      <point x="1012" y="1468" type="line"/>
+      <point x="1036" y="1468" type="line"/>
+      <point x="1448" y="0" type="line"/>
+      <point x="1956" y="0" type="line"/>
+      <point x="1272" y="2048" type="line"/>
+      <point x="776" y="2048" type="line"/>
+      <point x="92" y="0" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Lslash_.glif b/src/Inter-UI-Black.ufo/glyphs/Lslash_.glif
deleted file mode 100644
index 75e2a1ae6..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/Lslash_.glif
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Lslash" format="1">
-  <advance width="1792"/>
-  <unicode hex="0141"/>
-  <outline>
-    <contour>
-      <point x="556" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="928" y="16" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1700" y="2200" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="1008" y="1332" type="line"/>
-      <point x="84" y="1072" type="line"/>
-      <point x="84" y="828" type="line"/>
-      <point x="1008" y="1084" type="line"/>
-    </contour>
-    <component base="L" xOffset="172"/>
-  </outline>
-  <lib>
-    <dict>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 1588, 'leftMargin': 37, 'rightMargin': 53}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Nhook_.glif b/src/Inter-UI-Black.ufo/glyphs/Nhook_.glif
index 2b6e9c517..4025d1e4b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Nhook_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Nhook_.glif
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Nhook" format="1">
-  <advance width="2048"/>
+  <advance width="1920"/>
   <unicode hex="019D"/>
   <outline>
     <contour>
-      <point x="352" y="1168" type="line"/>
-      <point x="352" y="-20" type="line" smooth="yes"/>
-      <point x="352" y="-168"/>
-      <point x="300" y="-220"/>
-      <point x="180" y="-220" type="curve" smooth="yes"/>
-      <point x="136" y="-220"/>
-      <point x="104" y="-216"/>
-      <point x="60" y="-204" type="curve"/>
-      <point x="40" y="-580" type="line"/>
-      <point x="116" y="-596"/>
-      <point x="176" y="-600"/>
-      <point x="252" y="-600" type="curve" smooth="yes"/>
-      <point x="596" y="-600"/>
-      <point x="812" y="-396"/>
-      <point x="812" y="-20" type="curve" smooth="yes"/>
-      <point x="812" y="1168" type="line"/>
+      <point x="128" y="184" type="line"/>
+      <point x="128" y="-80" type="line" smooth="yes"/>
+      <point x="128" y="-192"/>
+      <point x="28" y="-220"/>
+      <point x="-76" y="-220" type="curve"/>
+      <point x="-96" y="-220"/>
+      <point x="-136" y="-220"/>
+      <point x="-160" y="-216" type="curve"/>
+      <point x="-160" y="-568" type="line"/>
+      <point x="-112" y="-576"/>
+      <point x="-4" y="-576"/>
+      <point x="48" y="-576" type="curve"/>
+      <point x="288" y="-576"/>
+      <point x="592" y="-516"/>
+      <point x="592" y="-80" type="curve" smooth="yes"/>
+      <point x="592" y="184" type="line"/>
     </contour>
-    <component base="N" xOffset="192"/>
+    <component base="N"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Oopen_.cn.glif b/src/Inter-UI-Black.ufo/glyphs/Oopen_.cn.glif
deleted file mode 100644
index 5a39a6c20..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/Oopen_.cn.glif
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Oopen.cn" format="1">
-  <advance width="2048"/>
-  <outline>
-    <contour>
-      <point x="200" y="680" type="line"/>
-      <point x="228" y="208"/>
-      <point x="528" y="-28"/>
-      <point x="1024" y="-28" type="curve" smooth="yes"/>
-      <point x="1552" y="-28"/>
-      <point x="1852" y="260"/>
-      <point x="1852" y="832" type="curve" smooth="yes"/>
-      <point x="1852" y="1168" type="line" smooth="yes"/>
-      <point x="1852" y="1740"/>
-      <point x="1532" y="2032"/>
-      <point x="1024" y="2032" type="curve" smooth="yes"/>
-      <point x="508" y="2032"/>
-      <point x="240" y="1776"/>
-      <point x="200" y="1312" type="curve"/>
-      <point x="660" y="1312" type="line"/>
-      <point x="672" y="1592"/>
-      <point x="764" y="1660"/>
-      <point x="1024" y="1660" type="curve" smooth="yes"/>
-      <point x="1276" y="1660"/>
-      <point x="1388" y="1560"/>
-      <point x="1388" y="1172" type="curve" smooth="yes"/>
-      <point x="1388" y="832" type="line" smooth="yes"/>
-      <point x="1388" y="448"/>
-      <point x="1296" y="344"/>
-      <point x="1024" y="344" type="curve" smooth="yes"/>
-      <point x="792" y="344"/>
-      <point x="672" y="396"/>
-      <point x="660" y="680" type="curve"/>
-    </contour>
-  </outline>
-  <lib>
-    <dict>
-      <key>com.typemytype.robofont.mark</key>
-      <array>
-        <real>0.77</real>
-        <real>0.95</real>
-        <real>0.76</real>
-        <real>1.0</real>
-      </array>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 1847, 'leftMargin': 78, 'rightMargin': 117}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Oopen_.glif b/src/Inter-UI-Black.ufo/glyphs/Oopen_.glif
index ff7445cb8..e68990c53 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Oopen_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Oopen_.glif
@@ -1,38 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Oopen" format="1">
-  <advance width="2048"/>
+  <advance width="1876"/>
   <unicode hex="0186"/>
   <outline>
-    <contour>
-      <point x="192" y="692" type="line"/>
-      <point x="228" y="276"/>
-      <point x="504" y="-28"/>
-      <point x="1020" y="-28" type="curve" smooth="yes"/>
-      <point x="1524" y="-28"/>
-      <point x="1856" y="344"/>
-      <point x="1856" y="948" type="curve" smooth="yes"/>
-      <point x="1856" y="1056" type="line" smooth="yes"/>
-      <point x="1856" y="1660"/>
-      <point x="1544" y="2032"/>
-      <point x="1016" y="2032" type="curve" smooth="yes"/>
-      <point x="520" y="2032"/>
-      <point x="216" y="1744"/>
-      <point x="196" y="1324" type="curve"/>
-      <point x="652" y="1324" type="line"/>
-      <point x="664" y="1552"/>
-      <point x="784" y="1652"/>
-      <point x="1016" y="1652" type="curve" smooth="yes"/>
-      <point x="1288" y="1652"/>
-      <point x="1388" y="1480"/>
-      <point x="1388" y="1056" type="curve" smooth="yes"/>
-      <point x="1388" y="944" type="line" smooth="yes"/>
-      <point x="1388" y="520"/>
-      <point x="1268" y="348"/>
-      <point x="1020" y="348" type="curve" smooth="yes"/>
-      <point x="756" y="348"/>
-      <point x="664" y="468"/>
-      <point x="652" y="692" type="curve"/>
-    </contour>
+    <component base="C" xScale="-1" xOffset="1876"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Phook_.glif b/src/Inter-UI-Black.ufo/glyphs/Phook_.glif
index 2ae685c99..db0fc0bdb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Phook_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Phook_.glif
@@ -1,27 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Phook" format="1">
-  <advance width="2304"/>
+  <advance width="2320"/>
   <unicode hex="01A4"/>
   <outline>
     <contour>
-      <point x="936" y="1628" type="line" name="hr00"/>
-      <point x="936" y="2004" type="line"/>
-      <point x="624" y="2004" type="line" smooth="yes"/>
-      <point x="248" y="2004"/>
-      <point x="44" y="1796"/>
-      <point x="44" y="1452" type="curve" smooth="yes"/>
-      <point x="44" y="1376"/>
-      <point x="52" y="1316"/>
-      <point x="68" y="1240" type="curve"/>
-      <point x="436" y="1240" type="line"/>
-      <point x="432" y="1284"/>
-      <point x="424" y="1324"/>
-      <point x="424" y="1368" type="curve" smooth="yes"/>
-      <point x="424" y="1492"/>
-      <point x="464" y="1628"/>
-      <point x="624" y="1628" type="curve" smooth="yes"/>
+      <point x="924" y="1668" type="line" name="hr00"/>
+      <point x="924" y="2048" type="line"/>
+      <point x="612" y="2048" type="line" smooth="yes"/>
+      <point x="236" y="2048"/>
+      <point x="0" y="1840"/>
+      <point x="0" y="1496" type="curve" smooth="yes"/>
+      <point x="0" y="1284" type="line"/>
+      <point x="412" y="1284" type="line"/>
+      <point x="412" y="1412" type="line" smooth="yes"/>
+      <point x="412" y="1536"/>
+      <point x="452" y="1668"/>
+      <point x="612" y="1668" type="curve" smooth="yes"/>
     </contour>
-    <component base="P" xOffset="456"/>
+    <component base="P" xOffset="528"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Q_.glif b/src/Inter-UI-Black.ufo/glyphs/Q_.glif
index 953f9f749..f48997537 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Q_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Q_.glif
@@ -4,10 +4,10 @@
   <unicode hex="0051"/>
   <outline>
     <contour>
-      <point x="1276" y="764" type="line"/>
-      <point x="976" y="524" type="line"/>
-      <point x="1560" y="-340" type="line"/>
-      <point x="1872" y="-112" type="line"/>
+      <point x="1184" y="788" type="line"/>
+      <point x="896" y="536" type="line"/>
+      <point x="1516" y="-300" type="line"/>
+      <point x="1816" y="-60" type="line"/>
     </contour>
     <component base="O"/>
     <contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Q__rthook.glif b/src/Inter-UI-Black.ufo/glyphs/Q__rthook.glif
new file mode 100644
index 000000000..f1c6af0ce
--- /dev/null
+++ b/src/Inter-UI-Black.ufo/glyphs/Q__rthook.glif
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="Q_rthook" format="1">
+  <advance width="2224"/>
+  <unicode hex="024A"/>
+  <outline>
+    <contour>
+      <point x="1976" y="2052" type="line"/>
+      <point x="1516" y="2052" type="line"/>
+      <point x="1504" y="1916" type="line"/>
+      <point x="1488" y="1916" type="line"/>
+      <point x="1376" y="2036"/>
+      <point x="1156" y="2076"/>
+      <point x="972" y="2076" type="curve" smooth="yes"/>
+      <point x="468" y="2076"/>
+      <point x="100" y="1632"/>
+      <point x="100" y="1024" type="curve"/>
+      <point x="100" y="412"/>
+      <point x="468" y="-28"/>
+      <point x="976" y="-28" type="curve"/>
+      <point x="1208" y="-28"/>
+      <point x="1392" y="20"/>
+      <point x="1500" y="128" type="curve"/>
+      <point x="1516" y="128" type="line"/>
+      <point x="1516" y="8" type="line"/>
+      <point x="1976" y="8" type="line"/>
+    </contour>
+    <contour>
+      <point x="548" y="1024" type="curve"/>
+      <point x="548" y="1376"/>
+      <point x="676" y="1668"/>
+      <point x="1024" y="1668" type="curve"/>
+      <point x="1384" y="1668"/>
+      <point x="1456" y="1388"/>
+      <point x="1480" y="1304" type="curve"/>
+      <point x="1504" y="1220"/>
+      <point x="1512" y="1120"/>
+      <point x="1512" y="1032" type="curve"/>
+      <point x="1512" y="936"/>
+      <point x="1488" y="792"/>
+      <point x="1472" y="700" type="curve"/>
+      <point x="1436" y="576"/>
+      <point x="1340" y="388"/>
+      <point x="1040" y="388" type="curve" smooth="yes"/>
+      <point x="676" y="388"/>
+      <point x="548" y="660"/>
+    </contour>
+    <contour>
+      <point x="1976" y="184" type="line"/>
+      <point x="1516" y="184" type="line"/>
+      <point x="1516" y="-80" type="line" smooth="yes"/>
+      <point x="1516" y="-516"/>
+      <point x="1816" y="-576"/>
+      <point x="2056" y="-576" type="curve" smooth="yes"/>
+      <point x="2156" y="-576"/>
+      <point x="2232" y="-568"/>
+      <point x="2288" y="-560" type="curve"/>
+      <point x="2288" y="-212" type="line"/>
+      <point x="2256" y="-216"/>
+      <point x="2220" y="-220"/>
+      <point x="2180" y="-220" type="curve" smooth="yes"/>
+      <point x="2076" y="-220"/>
+      <point x="1976" y="-192"/>
+      <point x="1976" y="-80" type="curve" smooth="yes"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.adobe.type.autohint</key>
+      <data>
+      </data>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <integer>0</integer>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>100</integer>
+          <key>y</key>
+          <integer>1024</integer>
+        </dict>
+      </array>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 2181, 'leftMargin': 103, 'rightMargin': 14}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Rx_.glif b/src/Inter-UI-Black.ufo/glyphs/Rx_.glif
index 5ded03d34..47b0d1db2 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Rx_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Rx_.glif
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Rx" format="1">
-  <advance width="2304"/>
+  <advance width="2088"/>
   <unicode hex="211E"/>
   <outline>
     <contour>
-      <point x="1608" y="0" type="line"/>
-      <point x="2084" y="0" type="line"/>
-      <point x="2084" y="20" type="line"/>
-      <point x="1352" y="892" type="line"/>
-      <point x="884" y="888" type="line"/>
+      <point x="128" y="2004" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="588" y="0" type="line"/>
+      <point x="588" y="1628" type="line"/>
+      <point x="900" y="1628" type="line" smooth="yes"/>
+      <point x="1096" y="1628"/>
+      <point x="1192" y="1524"/>
+      <point x="1192" y="1352" type="curve" smooth="yes"/>
+      <point x="1192" y="1184"/>
+      <point x="1096" y="1080"/>
+      <point x="900" y="1080" type="curve" smooth="yes"/>
+      <point x="416" y="1080" type="line"/>
+      <point x="420" y="708" type="line"/>
+      <point x="1076" y="708" type="line"/>
+      <point x="1224" y="796" type="line"/>
+      <point x="1480" y="892"/>
+      <point x="1652" y="1052"/>
+      <point x="1652" y="1396" type="curve" smooth="yes"/>
+      <point x="1652" y="1792"/>
+      <point x="1364" y="2004"/>
+      <point x="900" y="2004" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="2072" y="888" type="line"/>
-      <point x="1604" y="892" type="line"/>
-      <point x="872" y="20" type="line"/>
-      <point x="872" y="0" type="line"/>
-      <point x="1348" y="0" type="line"/>
+      <point x="1580" y="0" type="line"/>
+      <point x="2056" y="0" type="line"/>
+      <point x="2056" y="20" type="line"/>
+      <point x="1324" y="892" type="line"/>
+      <point x="856" y="892" type="line"/>
     </contour>
     <contour>
-      <point x="220" y="2004" type="line"/>
-      <point x="220" y="0" type="line"/>
-      <point x="680" y="0" type="line"/>
-      <point x="680" y="1628" type="line"/>
-      <point x="992" y="1628" type="line" smooth="yes"/>
-      <point x="1188" y="1628"/>
-      <point x="1284" y="1524"/>
-      <point x="1284" y="1352" type="curve" smooth="yes"/>
-      <point x="1284" y="1184"/>
-      <point x="1188" y="1080"/>
-      <point x="992" y="1080" type="curve" smooth="yes"/>
-      <point x="508" y="1080" type="line"/>
-      <point x="512" y="708" type="line"/>
-      <point x="1168" y="708" type="line"/>
-      <point x="1316" y="796" type="line"/>
-      <point x="1572" y="892"/>
-      <point x="1744" y="1052"/>
-      <point x="1744" y="1396" type="curve" smooth="yes"/>
-      <point x="1744" y="1792"/>
-      <point x="1456" y="2004"/>
-      <point x="992" y="2004" type="curve" smooth="yes"/>
+      <point x="1320" y="0" type="line"/>
+      <point x="2044" y="892" type="line"/>
+      <point x="1576" y="892" type="line"/>
+      <point x="844" y="20" type="line"/>
+      <point x="844" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/T_.glif b/src/Inter-UI-Black.ufo/glyphs/T_.glif
index 7faa1881c..eefbebb56 100644
--- a/src/Inter-UI-Black.ufo/glyphs/T_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/T_.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="T" format="1">
-  <advance width="1792"/>
+  <advance width="1788"/>
   <unicode hex="0054"/>
   <outline>
     <contour>
-      <point x="888.0" y="2200.0" type="move" name="top"/>
+      <point x="1124" y="2048" type="line"/>
+      <point x="664" y="2048" type="line"/>
+      <point x="664" y="0" type="line"/>
+      <point x="1124" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="888.0" y="16.0" type="move" name="bottom"/>
+      <point x="1724" y="2048" type="line"/>
+      <point x="64" y="2048" type="line"/>
+      <point x="64" y="1664" type="line"/>
+      <point x="1724" y="1664" type="line"/>
     </contour>
     <contour>
-      <point x="1064.0" y="0.0" type="move" name="right"/>
+      <point x="884" y="2200" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="848.0" y="1120.0" type="move" name="cross"/>
+      <point x="884" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1780.0" y="2200.0" type="move" name="top_dd"/>
+      <point x="1060" y="0" type="move" name="right"/>
     </contour>
     <contour>
-      <point x="1780.0" y="-560.0" type="move" name="bottom_dd"/>
+      <point x="844" y="1120" type="move" name="cross"/>
     </contour>
     <contour>
-      <point x="1780.0" y="2200.0" type="move" name="top0315"/>
+      <point x="1776" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1128" y="2048" type="line"/>
-      <point x="664" y="2048" type="line"/>
-      <point x="664" y="0" type="line"/>
-      <point x="1128" y="0" type="line"/>
+      <point x="1776" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1728" y="2048" type="line"/>
-      <point x="68" y="2048" type="line"/>
-      <point x="68" y="1664" type="line"/>
-      <point x="1728" y="1664" type="line"/>
+      <point x="1776" y="2200" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Thook_.glif b/src/Inter-UI-Black.ufo/glyphs/Thook_.glif
index c2c723329..17ed82dc0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Thook_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Thook_.glif
@@ -1,37 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Thook" format="1">
-  <advance width="2304"/>
+  <advance width="2136"/>
   <unicode hex="01AC"/>
   <outline>
     <contour>
-      <point x="1528" y="2004" type="line"/>
-      <point x="1064" y="2004" type="line"/>
-      <point x="1064" y="0" type="line"/>
-      <point x="1528" y="0" type="line"/>
+      <point x="1220" y="2048" type="line"/>
+      <point x="588" y="2048" type="line" smooth="yes"/>
+      <point x="212" y="2048"/>
+      <point x="8" y="1840"/>
+      <point x="8" y="1496" type="curve" smooth="yes"/>
+      <point x="8" y="1284" type="line"/>
+      <point x="388" y="1284" type="line"/>
+      <point x="388" y="1412" type="line" smooth="yes"/>
+      <point x="388" y="1536"/>
+      <point x="424" y="1664"/>
+      <point x="588" y="1664" type="curve" smooth="yes"/>
+      <point x="1220" y="1664" type="line"/>
     </contour>
     <contour>
-      <point x="2132" y="2004" type="line"/>
-      <point x="864" y="2004" type="line"/>
-      <point x="864" y="1628" type="line"/>
-      <point x="2132" y="1628" type="line"/>
-    </contour>
-    <contour>
-      <point x="1068" y="1628" type="line"/>
-      <point x="1068" y="2004" type="line"/>
-      <point x="756" y="2004" type="line" smooth="yes"/>
-      <point x="380" y="2004"/>
-      <point x="176" y="1796"/>
-      <point x="176" y="1452" type="curve" smooth="yes"/>
-      <point x="176" y="1376"/>
-      <point x="180" y="1316"/>
-      <point x="200" y="1240" type="curve"/>
-      <point x="568" y="1240" type="line"/>
-      <point x="560" y="1284"/>
-      <point x="556" y="1324"/>
-      <point x="556" y="1368" type="curve" smooth="yes"/>
-      <point x="556" y="1492"/>
-      <point x="592" y="1628"/>
-      <point x="756" y="1628" type="curve" smooth="yes"/>
+      <point x="2072" y="2048" type="line"/>
+      <point x="732" y="2048" type="line"/>
+      <point x="732" y="1664" type="line"/>
+      <point x="1008" y="1664" type="line"/>
+      <point x="1008" y="0" type="line"/>
+      <point x="1472" y="0" type="line"/>
+      <point x="1472" y="1664" type="line"/>
+      <point x="2072" y="1664" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Trthook_.glif b/src/Inter-UI-Black.ufo/glyphs/Trthook_.glif
index 7f2967845..7bda0b314 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Trthook_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Trthook_.glif
@@ -1,32 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Trthook" format="1">
-  <advance width="1792"/>
+  <advance width="1788"/>
   <unicode hex="01AE"/>
   <outline>
     <contour>
-      <point x="1728" y="2004" type="line"/>
-      <point x="68" y="2004" type="line"/>
-      <point x="68" y="1628" type="line"/>
-      <point x="1728" y="1628" type="line"/>
-    </contour>
-    <contour>
-      <point x="1424" y="-580" type="curve"/>
-      <point x="1404" y="-208" type="line"/>
-      <point x="1360" y="-216"/>
-      <point x="1328" y="-224"/>
-      <point x="1268" y="-224" type="curve" smooth="yes"/>
-      <point x="1172" y="-224"/>
-      <point x="1120" y="-168"/>
-      <point x="1120" y="-20" type="curve" smooth="yes"/>
-      <point x="1120" y="2004" type="line"/>
-      <point x="660" y="2004" type="line"/>
-      <point x="660" y="-20" type="line" smooth="yes"/>
-      <point x="660" y="-396"/>
-      <point x="868" y="-600"/>
-      <point x="1212" y="-600" type="curve" smooth="yes"/>
-      <point x="1288" y="-600"/>
-      <point x="1348" y="-596"/>
+      <point x="1120" y="184" type="line"/>
+      <point x="660" y="184" type="line"/>
+      <point x="660" y="-80" type="line" smooth="yes"/>
+      <point x="660" y="-516"/>
+      <point x="960" y="-576"/>
+      <point x="1200" y="-576" type="curve"/>
+      <point x="1408" y="-576" type="line"/>
+      <point x="1408" y="-220" type="line"/>
+      <point x="1324" y="-220" type="line"/>
+      <point x="1220" y="-220"/>
+      <point x="1120" y="-192"/>
+      <point x="1120" y="-80" type="curve" smooth="yes"/>
     </contour>
+    <component base="T" xOffset="-4"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/V_.glif b/src/Inter-UI-Black.ufo/glyphs/V_.glif
index 5f8172ac1..437764cdf 100644
--- a/src/Inter-UI-Black.ufo/glyphs/V_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/V_.glif
@@ -3,6 +3,16 @@
   <advance width="2048"/>
   <unicode hex="0056"/>
   <outline>
+    <contour>
+      <point x="600" y="2048" type="line"/>
+      <point x="92" y="2048" type="line"/>
+      <point x="776" y="0" type="line"/>
+      <point x="1272" y="0" type="line"/>
+      <point x="1956" y="2048" type="line"/>
+      <point x="1448" y="2048" type="line"/>
+      <point x="1036" y="580" type="line"/>
+      <point x="1012" y="580" type="line"/>
+    </contour>
     <contour>
       <point x="1020" y="2216" type="move" name="top"/>
     </contour>
@@ -18,16 +28,6 @@
     <contour>
       <point x="1952" y="2216" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="600" y="2048" type="line"/>
-      <point x="1012" y="580" type="line"/>
-      <point x="1036" y="580" type="line"/>
-      <point x="1448" y="2048" type="line"/>
-      <point x="1956" y="2048" type="line"/>
-      <point x="1272" y="0" type="line"/>
-      <point x="776" y="0" type="line"/>
-      <point x="92" y="2048" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Yhook_.glif b/src/Inter-UI-Black.ufo/glyphs/Yhook_.glif
index 9e78a1670..c07ac136c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Yhook_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Yhook_.glif
@@ -4,36 +4,27 @@
   <unicode hex="01B3"/>
   <outline>
     <contour>
-      <point x="824" y="896" type="line"/>
-      <point x="880" y="660" type="line"/>
-      <point x="1132" y="660" type="line"/>
-      <point x="1468" y="1320" type="line" smooth="yes"/>
-      <point x="1572" y="1524"/>
-      <point x="1636" y="1644"/>
-      <point x="1736" y="1644" type="curve" smooth="yes"/>
-      <point x="1780" y="1644"/>
-      <point x="1796" y="1636"/>
-      <point x="1840" y="1612" type="curve"/>
-      <point x="2004" y="1952" type="line"/>
-      <point x="1896" y="2000"/>
-      <point x="1796" y="2032"/>
-      <point x="1640" y="2032" type="curve" smooth="yes"/>
-      <point x="1364" y="2032"/>
-      <point x="1232" y="1820"/>
-      <point x="1092" y="1496" type="curve" smooth="yes"/>
+      <point x="592" y="2048" type="line"/>
+      <point x="92" y="2048" type="line"/>
+      <point x="792" y="764" type="line"/>
+      <point x="792" y="0" type="line"/>
+      <point x="1256" y="0" type="line"/>
+      <point x="1256" y="764" type="line"/>
+      <point x="1652" y="1484" type="line"/>
+      <point x="1260" y="1652" type="line"/>
+      <point x="1024" y="1176" type="line"/>
     </contour>
     <contour>
-      <point x="548" y="2004" type="line"/>
-      <point x="44" y="2004" type="line"/>
-      <point x="728" y="660" type="line"/>
-      <point x="976" y="660" type="line"/>
-      <point x="1044" y="876" type="line"/>
-    </contour>
-    <contour>
-      <point x="1164" y="948" type="line"/>
-      <point x="696" y="948" type="line"/>
-      <point x="696" y="0" type="line"/>
-      <point x="1164" y="0" type="line"/>
+      <point x="1652" y="1484" type="line"/>
+      <point x="1680" y="1540" type="line" smooth="yes"/>
+      <point x="1752" y="1680"/>
+      <point x="1828" y="1720"/>
+      <point x="1968" y="1676" type="curve"/>
+      <point x="2056" y="2024" type="line"/>
+      <point x="1800" y="2120"/>
+      <point x="1484" y="2100"/>
+      <point x="1320" y="1772" type="curve" smooth="yes"/>
+      <point x="1260" y="1652" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Zbar_.glif b/src/Inter-UI-Black.ufo/glyphs/Zbar_.glif
index 33c2b9a70..aa54a3c93 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Zbar_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Zbar_.glif
@@ -3,6 +3,8 @@
   <advance width="1792"/>
   <unicode hex="01B5"/>
   <outline>
+    <component base="Z"/>
+    <component base="crossbar" xOffset="244"/>
     <contour>
       <point x="872" y="2200" type="move" name="top"/>
     </contour>
@@ -12,13 +14,6 @@
     <contour>
       <point x="1716" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1556" y="1160" type="line" name="hr00"/>
-      <point x="204" y="1160" type="line"/>
-      <point x="204" y="896" type="line"/>
-      <point x="1556" y="896" type="line"/>
-    </contour>
-    <component base="Z"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10045.glif b/src/Inter-UI-Black.ufo/glyphs/afii10045.glif
index 9dae9b32f..4861c0bcd 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10045.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10045.glif
@@ -3,14 +3,14 @@
   <advance width="2560"/>
   <unicode hex="042B"/>
   <outline>
+    <component base="afii10046" xOffset="80"/>
+    <component base="I" xOffset="1728"/>
     <contour>
       <point x="1324" y="2200" type="move" name="top"/>
     </contour>
     <contour>
       <point x="2536" y="2200" type="move" name="top0315"/>
     </contour>
-    <component base="afii10046" xOffset="80"/>
-    <component base="I" xOffset="1728"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ascript.glif b/src/Inter-UI-Black.ufo/glyphs/ascript.glif
index 748156331..db1baf3ec 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ascript.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ascript.glif
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="ascript" format="1">
-  <advance width="1792"/>
+  <advance width="1618"/>
   <unicode hex="0251"/>
   <outline>
+    <component base="alpha"/>
     <contour>
       <point x="1264" y="900" type="move" name="rhotichook"/>
     </contour>
@@ -15,57 +16,6 @@
     <contour>
       <point x="1712" y="1776" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="148" y="712" type="line"/>
-      <point x="148" y="280"/>
-      <point x="352" y="-28"/>
-      <point x="728" y="-28" type="curve" smooth="yes"/>
-      <point x="1052" y="-28"/>
-      <point x="1184" y="300"/>
-      <point x="1240" y="700" type="curve"/>
-      <point x="1240" y="736" type="line"/>
-      <point x="1184" y="1168"/>
-      <point x="1052" y="1516"/>
-      <point x="732" y="1516" type="curve" smooth="yes"/>
-      <point x="352" y="1516"/>
-      <point x="148" y="1196"/>
-      <point x="148" y="740" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="596" y="740" type="line"/>
-      <point x="596" y="972"/>
-      <point x="660" y="1160"/>
-      <point x="844" y="1160" type="curve" smooth="yes"/>
-      <point x="1024" y="1160"/>
-      <point x="1100" y="1016"/>
-      <point x="1100" y="772" type="curve" smooth="yes"/>
-      <point x="1100" y="664" type="line" smooth="yes"/>
-      <point x="1100" y="452"/>
-      <point x="1024" y="332"/>
-      <point x="840" y="332" type="curve" smooth="yes"/>
-      <point x="652" y="332"/>
-      <point x="596" y="492"/>
-      <point x="596" y="712" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="1100" y="1488" type="line"/>
-      <point x="1044" y="1172" type="line"/>
-      <point x="1044" y="508" type="line" smooth="yes"/>
-      <point x="1044" y="148"/>
-      <point x="1204" y="-28"/>
-      <point x="1472" y="-28" type="curve" smooth="yes"/>
-      <point x="1536" y="-28"/>
-      <point x="1584" y="-24"/>
-      <point x="1644" y="0" type="curve"/>
-      <point x="1608" y="336" type="line"/>
-      <point x="1604" y="332"/>
-      <point x="1596" y="332"/>
-      <point x="1584" y="332" type="curve" smooth="yes"/>
-      <point x="1520" y="332"/>
-      <point x="1488" y="376"/>
-      <point x="1488" y="508" type="curve" smooth="yes"/>
-      <point x="1488" y="1488" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/aturn.glif b/src/Inter-UI-Black.ufo/glyphs/aturn.glif
index 276d92ca3..e66083bd3 100644
--- a/src/Inter-UI-Black.ufo/glyphs/aturn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/aturn.glif
@@ -1,68 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="aturn" format="1">
-  <advance width="1536"/>
+  <advance width="1536.0"/>
   <unicode hex="0250"/>
   <outline>
+    <component base="a" xScale="-1.0" yScale="-1.0" xOffset="1536" yOffset="1536"/>
     <contour>
-      <point x="768" y="0" type="move" name="bottom"/>
+      <point x="800" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="768" y="1776" type="move" name="top"/>
+      <point x="800" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1132" y="848" type="move" name="rhotichook"/>
+      <point x="1164" y="848" type="move" name="rhotichook"/>
     </contour>
     <contour>
-      <point x="1520" y="1776" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="596" y="1116" type="line"/>
-      <point x="596" y="1256"/>
-      <point x="580" y="1396"/>
-      <point x="536" y="1488" type="curve"/>
-      <point x="92" y="1488" type="line"/>
-      <point x="92" y="1464" type="line"/>
-      <point x="132" y="1392"/>
-      <point x="152" y="1308"/>
-      <point x="152" y="1112" type="curve" smooth="yes"/>
-      <point x="152" y="504" type="line"/>
-      <point x="152" y="152"/>
-      <point x="416" y="-28"/>
-      <point x="764" y="-28" type="curve" smooth="yes"/>
-      <point x="1160" y="-28"/>
-      <point x="1412" y="184"/>
-      <point x="1412" y="460" type="curve"/>
-      <point x="968" y="460" type="line"/>
-      <point x="968" y="348"/>
-      <point x="904" y="296"/>
-      <point x="788" y="296" type="curve" smooth="yes"/>
-      <point x="652" y="296"/>
-      <point x="596" y="376"/>
-      <point x="596" y="500" type="curve"/>
-    </contour>
-    <contour>
-      <point x="544" y="580" type="line"/>
-      <point x="752" y="580" type="line"/>
-      <point x="1220" y="580"/>
-      <point x="1444" y="764"/>
-      <point x="1444" y="1068" type="curve" smooth="yes"/>
-      <point x="1444" y="1332"/>
-      <point x="1220" y="1516"/>
-      <point x="940" y="1516" type="curve" smooth="yes"/>
-      <point x="656" y="1516"/>
-      <point x="544" y="1340"/>
-      <point x="476" y="1196" type="curve"/>
-      <point x="580" y="1004" type="line"/>
-      <point x="580" y="1080"/>
-      <point x="676" y="1184"/>
-      <point x="840" y="1184" type="curve" smooth="yes"/>
-      <point x="936" y="1184"/>
-      <point x="1004" y="1128"/>
-      <point x="1004" y="1044" type="curve" smooth="yes"/>
-      <point x="1004" y="932"/>
-      <point x="936" y="828"/>
-      <point x="748" y="828" type="curve"/>
-      <point x="540" y="828" type="line"/>
+      <point x="1552" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/austral.glif b/src/Inter-UI-Black.ufo/glyphs/austral.glif
index 82f8c6a2a..f0f06bc14 100644
--- a/src/Inter-UI-Black.ufo/glyphs/austral.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/austral.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="austral" format="1">
-  <advance width="2048"/>
+  <advance width="2032"/>
   <unicode hex="20B3"/>
   <outline>
     <contour>
-      <point x="1940" y="1268" type="line"/>
-      <point x="36" y="1268" type="line"/>
-      <point x="36" y="912" type="line"/>
-      <point x="1940" y="912" type="line"/>
+      <point x="1968" y="1268" type="line"/>
+      <point x="64" y="1268" type="line"/>
+      <point x="64" y="912" type="line"/>
+      <point x="1968" y="912" type="line"/>
     </contour>
     <contour>
-      <point x="1940" y="748" type="line"/>
-      <point x="36" y="748" type="line"/>
-      <point x="36" y="388" type="line"/>
-      <point x="1940" y="388" type="line"/>
+      <point x="1968" y="748" type="line"/>
+      <point x="64" y="748" type="line"/>
+      <point x="64" y="388" type="line"/>
+      <point x="1968" y="388" type="line"/>
     </contour>
-    <component base="A" xOffset="36"/>
+    <component base="A" xOffset="-8"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/b.glif b/src/Inter-UI-Black.ufo/glyphs/b.glif
index 6e2cd6f52..9ca795c16 100644
--- a/src/Inter-UI-Black.ufo/glyphs/b.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/b.glif
@@ -6,8 +6,8 @@
     <contour>
       <point x="128" y="2048" type="line"/>
       <point x="128" y="0" type="line"/>
-      <point x="544" y="0" type="line"/>
-      <point x="568" y="304" type="line"/>
+      <point x="580" y="0" type="line"/>
+      <point x="580" y="304" type="line"/>
       <point x="420" y="744" type="line"/>
       <point x="588" y="1272" type="line"/>
       <point x="588" y="2048" type="line"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/bhook.cn.glif b/src/Inter-UI-Black.ufo/glyphs/bhook.cn.glif
deleted file mode 100644
index ed0efef83..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/bhook.cn.glif
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="bhook.cn" format="1">
-  <advance width="1792"/>
-  <outline>
-    <contour>
-      <point x="1580" y="788" type="line"/>
-      <point x="1580" y="1256"/>
-      <point x="1408" y="1516"/>
-      <point x="1012" y="1516" type="curve" smooth="yes"/>
-      <point x="672" y="1516"/>
-      <point x="520" y="1204"/>
-      <point x="464" y="816" type="curve"/>
-      <point x="464" y="672" type="line"/>
-      <point x="520" y="284"/>
-      <point x="672" y="-28"/>
-      <point x="1016" y="-28" type="curve" smooth="yes"/>
-      <point x="1408" y="-28"/>
-      <point x="1580" y="220"/>
-      <point x="1580" y="704" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="1136" y="704" type="line"/>
-      <point x="1136" y="428"/>
-      <point x="1096" y="328"/>
-      <point x="892" y="328" type="curve" smooth="yes"/>
-      <point x="684" y="328"/>
-      <point x="616" y="440"/>
-      <point x="616" y="636" type="curve"/>
-      <point x="616" y="856" type="line"/>
-      <point x="616" y="1044"/>
-      <point x="684" y="1160"/>
-      <point x="888" y="1160" type="curve" smooth="yes"/>
-      <point x="1092" y="1160"/>
-      <point x="1136" y="1040"/>
-      <point x="1136" y="788" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="212" y="0" type="line"/>
-      <point x="624" y="0" type="line"/>
-      <point x="656" y="368" type="line"/>
-      <point x="656" y="1648" type="line" smooth="yes"/>
-      <point x="656" y="1800"/>
-      <point x="788" y="1832"/>
-      <point x="892" y="1832" type="curve" smooth="yes"/>
-      <point x="932" y="1832"/>
-      <point x="964" y="1828"/>
-      <point x="1000" y="1824" type="curve"/>
-      <point x="1000" y="2120" type="line"/>
-      <point x="936" y="2136"/>
-      <point x="868" y="2140"/>
-      <point x="768" y="2140" type="curve" smooth="yes"/>
-      <point x="528" y="2140"/>
-      <point x="212" y="2092"/>
-      <point x="212" y="1648" type="curve" smooth="yes"/>
-    </contour>
-  </outline>
-  <lib>
-    <dict>
-      <key>com.typemytype.robofont.mark</key>
-      <array>
-        <real>0.77</real>
-        <real>0.95</real>
-        <real>0.76</real>
-        <real>1.0</real>
-      </array>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 1585, 'leftMargin': 140, 'rightMargin': 79}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/bhook.glif b/src/Inter-UI-Black.ufo/glyphs/bhook.glif
index b661630fb..d1f7d3541 100644
--- a/src/Inter-UI-Black.ufo/glyphs/bhook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/bhook.glif
@@ -1,73 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="bhook" format="1">
-  <advance width="1792"/>
+  <advance width="1620"/>
   <unicode hex="0253"/>
   <outline>
     <contour>
-      <point x="996" y="2340" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1008" y="-16" type="move" name="bottom"/>
+      <point x="588" y="1316" type="line"/>
+      <point x="588" y="1580" type="line" smooth="yes"/>
+      <point x="588" y="1692"/>
+      <point x="704" y="1720"/>
+      <point x="808" y="1720" type="curve" smooth="yes"/>
+      <point x="848" y="1720"/>
+      <point x="884" y="1716"/>
+      <point x="916" y="1712" type="curve"/>
+      <point x="916" y="2060" type="line"/>
+      <point x="860" y="2068"/>
+      <point x="784" y="2076"/>
+      <point x="684" y="2076" type="curve" smooth="yes"/>
+      <point x="444" y="2076"/>
+      <point x="128" y="2024"/>
+      <point x="128" y="1580" type="curve" smooth="yes"/>
+      <point x="128" y="1316" type="line"/>
     </contour>
     <contour>
-      <point x="1660" y="2340" type="move" name="top0315"/>
+      <point x="128" y="1536" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="544" y="0" type="line"/>
+      <point x="552" y="96" type="line"/>
+      <point x="628" y="20"/>
+      <point x="736" y="-28"/>
+      <point x="880" y="-28" type="curve"/>
+      <point x="1264" y="-28"/>
+      <point x="1540" y="304"/>
+      <point x="1540" y="764" type="curve"/>
+      <point x="1540" y="1220"/>
+      <point x="1264" y="1556"/>
+      <point x="884" y="1556" type="curve" smooth="yes"/>
+      <point x="767" y="1556"/>
+      <point x="672" y="1524"/>
+      <point x="604" y="1472" type="curve"/>
+      <point x="588" y="1472" type="line"/>
+      <point x="588" y="1536" type="line"/>
     </contour>
     <contour>
-      <point x="656" y="1416" type="line"/>
-      <point x="656" y="1680" type="line" smooth="yes"/>
-      <point x="656" y="1832"/>
-      <point x="788" y="1868"/>
-      <point x="892" y="1868" type="curve" smooth="yes"/>
-      <point x="932" y="1868"/>
-      <point x="964" y="1864"/>
-      <point x="1000" y="1856" type="curve"/>
-      <point x="1000" y="2152" type="line"/>
-      <point x="936" y="2168"/>
-      <point x="868" y="2176"/>
-      <point x="768" y="2176" type="curve" smooth="yes"/>
-      <point x="528" y="2176"/>
-      <point x="212" y="2124"/>
-      <point x="212" y="1680" type="curve" smooth="yes"/>
-      <point x="212" y="1416" type="line"/>
+      <point x="576" y="548" type="curve"/>
+      <point x="564" y="608"/>
+      <point x="552" y="704"/>
+      <point x="552" y="768" type="curve"/>
+      <point x="552" y="828"/>
+      <point x="560" y="892"/>
+      <point x="572" y="948" type="curve"/>
+      <point x="584" y="1004"/>
+      <point x="628" y="1192"/>
+      <point x="828" y="1192" type="curve"/>
+      <point x="1032" y="1192"/>
+      <point x="1104" y="1000"/>
+      <point x="1104" y="764" type="curve"/>
+      <point x="1104" y="520"/>
+      <point x="1032" y="340"/>
+      <point x="824" y="340" type="curve" smooth="yes"/>
+      <point x="652" y="340"/>
+      <point x="596" y="464"/>
     </contour>
     <contour>
-      <point x="212" y="1596" type="line"/>
-      <point x="212" y="0" type="line"/>
-      <point x="612" y="0" type="line"/>
-      <point x="656" y="368" type="line"/>
-      <point x="656" y="1596" type="line"/>
+      <point x="996" y="2340" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1580" y="760" type="line"/>
-      <point x="1580" y="1196"/>
-      <point x="1396" y="1516"/>
-      <point x="1000" y="1516" type="curve" smooth="yes"/>
-      <point x="640" y="1516"/>
-      <point x="496" y="1176"/>
-      <point x="436" y="764" type="curve"/>
-      <point x="436" y="728" type="line"/>
-      <point x="496" y="308"/>
-      <point x="640" y="-28"/>
-      <point x="1000" y="-28" type="curve" smooth="yes"/>
-      <point x="1396" y="-28"/>
-      <point x="1580" y="284"/>
-      <point x="1580" y="732" type="curve" smooth="yes"/>
+      <point x="1008" y="-16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1136" y="732" type="line"/>
-      <point x="1136" y="492"/>
-      <point x="1096" y="328"/>
-      <point x="892" y="328" type="curve" smooth="yes"/>
-      <point x="684" y="328"/>
-      <point x="616" y="460"/>
-      <point x="616" y="692" type="curve" smooth="yes"/>
-      <point x="616" y="800" type="line" smooth="yes"/>
-      <point x="616" y="1024"/>
-      <point x="684" y="1160"/>
-      <point x="888" y="1160" type="curve" smooth="yes"/>
-      <point x="1092" y="1160"/>
-      <point x="1136" y="976"/>
-      <point x="1136" y="760" type="curve" smooth="yes"/>
+      <point x="1660" y="2340" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/btopbar.glif b/src/Inter-UI-Black.ufo/glyphs/btopbar.glif
index a47185bd0..7649819aa 100644
--- a/src/Inter-UI-Black.ufo/glyphs/btopbar.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/btopbar.glif
@@ -4,10 +4,10 @@
   <unicode hex="0183"/>
   <outline>
     <contour>
-      <point x="1244" y="2112" type="line" name="hr00"/>
-      <point x="308" y="2112" type="line"/>
-      <point x="308" y="1848" type="line"/>
-      <point x="1244" y="1848" type="line"/>
+      <point x="1308" y="2048" type="line" name="hr00"/>
+      <point x="372" y="2048" type="line"/>
+      <point x="372" y="1668" type="line"/>
+      <point x="1308" y="1668" type="line"/>
     </contour>
     <component base="b"/>
   </outline>
diff --git a/src/Inter-UI-Black.ufo/glyphs/caron.glif b/src/Inter-UI-Black.ufo/glyphs/caron.glif
index 7f5f9b855..b94740368 100644
--- a/src/Inter-UI-Black.ufo/glyphs/caron.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/caron.glif
@@ -4,21 +4,21 @@
   <unicode hex="02C7"/>
   <outline>
     <contour>
-      <point x="772" y="1776" type="move" name="_top"/>
+      <point x="568" y="2048" type="line"/>
+      <point x="188" y="2048" type="line"/>
+      <point x="188" y="2036" type="line"/>
+      <point x="628" y="1644" type="line"/>
+      <point x="912" y="1644" type="line"/>
+      <point x="1348" y="2036" type="line"/>
+      <point x="1348" y="2048" type="line"/>
+      <point x="972" y="2048" type="line"/>
+      <point x="772" y="1864" type="line"/>
     </contour>
     <contour>
-      <point x="772" y="2268" type="move" name="mkmktop_acc"/>
+      <point x="772" y="1712" type="move" name="_top"/>
     </contour>
     <contour>
-      <point x="568" y="2112" type="line"/>
-      <point x="188" y="2112" type="line"/>
-      <point x="188" y="2100" type="line"/>
-      <point x="628" y="1708" type="line"/>
-      <point x="912" y="1708" type="line"/>
-      <point x="1348" y="2100" type="line"/>
-      <point x="1348" y="2112" type="line"/>
-      <point x="972" y="2112" type="line"/>
-      <point x="772" y="1928" type="line"/>
+      <point x="772" y="2204" type="move" name="mkmktop_acc"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ccurl.glif b/src/Inter-UI-Black.ufo/glyphs/ccurl.glif
index 17f963538..d6befccd5 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ccurl.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ccurl.glif
@@ -1,64 +1,100 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="ccurl" format="1">
-  <advance width="1536"/>
+  <advance width="1526"/>
   <unicode hex="0255"/>
   <outline>
     <contour>
-      <point x="824" y="1776" type="move" name="top"/>
+      <point x="824" y="332" type="curve" smooth="yes"/>
+      <point x="576" y="332"/>
+      <point x="536" y="480"/>
+      <point x="536" y="728" type="curve" smooth="yes"/>
+      <point x="536" y="760" type="line" smooth="yes"/>
+      <point x="536" y="976"/>
+      <point x="568" y="1160"/>
+      <point x="772" y="1160" type="curve"/>
+      <point x="928" y="1160"/>
+      <point x="996" y="1052"/>
+      <point x="996" y="920" type="curve"/>
+      <point x="1408" y="920" type="line"/>
+      <point x="1408" y="1296"/>
+      <point x="1152" y="1516"/>
+      <point x="784" y="1516" type="curve" smooth="yes"/>
+      <point x="324" y="1516"/>
+      <point x="92" y="1188"/>
+      <point x="92" y="760" type="curve" smooth="yes"/>
+      <point x="92" y="728" type="line" smooth="yes"/>
+      <point x="92" y="296"/>
+      <point x="324" y="-28"/>
+      <point x="784" y="-28" type="curve" smooth="yes"/>
+      <point x="1208" y="-28"/>
+      <point x="1408" y="220"/>
+      <point x="1408" y="464" type="curve" smooth="yes"/>
+      <point x="1408" y="652"/>
+      <point x="1288" y="840"/>
+      <point x="980" y="840" type="curve" smooth="yes"/>
+      <point x="764" y="840"/>
+      <point x="512" y="748"/>
+      <point x="16" y="48" type="curve"/>
+      <point x="308" y="-200" type="line"/>
+      <point x="652" y="324"/>
+      <point x="800" y="504"/>
+      <point x="908" y="504" type="curve" smooth="yes"/>
+      <point x="956" y="504"/>
+      <point x="988" y="484"/>
+      <point x="988" y="436" type="curve" smooth="yes"/>
+      <point x="988" y="364"/>
+      <point x="912" y="332"/>
     </contour>
     <contour>
-      <point x="824" y="0" type="move" name="bottom"/>
+      <point x="784" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1528" y="1776" type="move" name="top0315"/>
+      <point x="784" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="864" y="332" type="curve" smooth="yes"/>
-      <point x="616" y="332"/>
-      <point x="576" y="480"/>
-      <point x="576" y="728" type="curve" smooth="yes"/>
-      <point x="576" y="760" type="line" smooth="yes"/>
-      <point x="576" y="976"/>
-      <point x="608" y="1160"/>
-      <point x="812" y="1160" type="curve"/>
-      <point x="960" y="1160"/>
-      <point x="1036" y="1052"/>
-      <point x="1036" y="920" type="curve"/>
-      <point x="1448" y="920" type="line"/>
-      <point x="1448" y="1296"/>
-      <point x="1192" y="1516"/>
-      <point x="824" y="1516" type="curve" smooth="yes"/>
-      <point x="364" y="1516"/>
-      <point x="132" y="1188"/>
-      <point x="132" y="760" type="curve" smooth="yes"/>
-      <point x="132" y="728" type="line" smooth="yes"/>
-      <point x="132" y="296"/>
-      <point x="364" y="-28"/>
-      <point x="824" y="-28" type="curve" smooth="yes"/>
-      <point x="1248" y="-28"/>
-      <point x="1448" y="196"/>
-      <point x="1448" y="464" type="curve" smooth="yes"/>
-      <point x="1448" y="652"/>
-      <point x="1328" y="840"/>
-      <point x="1020" y="840" type="curve" smooth="yes"/>
-      <point x="720" y="840"/>
-      <point x="560" y="676"/>
-      <point x="268" y="260" type="curve"/>
-      <point x="88" y="0" type="line"/>
-      <point x="348" y="-200" type="line"/>
-      <point x="508" y="44" type="line"/>
-      <point x="696" y="320"/>
-      <point x="840" y="504"/>
-      <point x="948" y="504" type="curve" smooth="yes"/>
-      <point x="996" y="504"/>
-      <point x="1028" y="484"/>
-      <point x="1028" y="436" type="curve" smooth="yes"/>
-      <point x="1028" y="364"/>
-      <point x="952" y="332"/>
+      <point x="1488" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.layerData</key>
+      <dict>
+        <key>reference</key>
+        <dict>
+          <key>anchors</key>
+          <array>
+          </array>
+          <key>components</key>
+          <array>
+            <dict>
+              <key>baseGlyph</key>
+              <string>c</string>
+              <key>transformation</key>
+              <array>
+                <integer>1</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+                <integer>1</integer>
+                <integer>12</integer>
+                <integer>0</integer>
+              </array>
+            </dict>
+          </array>
+          <key>contours</key>
+          <array>
+          </array>
+          <key>lib</key>
+          <dict>
+          </dict>
+          <key>name</key>
+          <string>ccurl</string>
+          <key>unicodes</key>
+          <array>
+          </array>
+          <key>width</key>
+          <integer>1526</integer>
+        </dict>
+      </dict>
       <key>interface.gridadjust.original</key>
       <string>{'width': 1522, 'leftMargin': 80, 'rightMargin': 80}</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/cedi.glif b/src/Inter-UI-Black.ufo/glyphs/cedi.glif
index 04aeed16f..74703dc8d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/cedi.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/cedi.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="cedi" format="1">
-  <advance width="2048"/>
+  <advance width="1876"/>
   <unicode hex="20B5"/>
   <outline>
     <contour>
-      <point x="1120" y="2144" type="line"/>
-      <point x="764" y="2144" type="line"/>
-      <point x="764" y="-172" type="line"/>
-      <point x="1120" y="-172" type="line"/>
+      <point x="1128" y="2304" type="line"/>
+      <point x="772" y="2304" type="line"/>
+      <point x="772" y="-256" type="line"/>
+      <point x="1128" y="-256" type="line"/>
     </contour>
     <component base="C"/>
   </outline>
diff --git a/src/Inter-UI-Black.ufo/glyphs/chook.cn.glif b/src/Inter-UI-Black.ufo/glyphs/chook.cn.glif
deleted file mode 100644
index 22b7ce27d..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/chook.cn.glif
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="chook.cn" format="1">
-  <advance width="1792"/>
-  <outline>
-    <contour>
-      <point x="1384" y="920" type="line"/>
-      <point x="1384" y="1184" type="line" smooth="yes"/>
-      <point x="1384" y="1336"/>
-      <point x="1516" y="1372"/>
-      <point x="1620" y="1372" type="curve" smooth="yes"/>
-      <point x="1656" y="1372"/>
-      <point x="1692" y="1364"/>
-      <point x="1728" y="1360" type="curve"/>
-      <point x="1728" y="1656" type="line"/>
-      <point x="1664" y="1672"/>
-      <point x="1612" y="1680"/>
-      <point x="1548" y="1680" type="curve" smooth="yes"/>
-      <point x="1256" y="1680"/>
-      <point x="1080" y="1504"/>
-      <point x="1080" y="1184" type="curve" smooth="yes"/>
-      <point x="1080" y="920" type="line"/>
-    </contour>
-    <component base="c.cn" xOffset="-16"/>
-  </outline>
-  <lib>
-    <dict>
-      <key>com.typemytype.robofont.mark</key>
-      <array>
-        <real>0.77</real>
-        <real>0.95</real>
-        <real>0.76</real>
-        <real>1.0</real>
-      </array>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 1647, 'leftMargin': 78, 'rightMargin': -97}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/circumflex.glif b/src/Inter-UI-Black.ufo/glyphs/circumflex.glif
index 426b3845d..5e197e295 100644
--- a/src/Inter-UI-Black.ufo/glyphs/circumflex.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/circumflex.glif
@@ -3,13 +3,13 @@
   <advance width="1536"/>
   <unicode hex="02C6"/>
   <outline>
+    <component base="caron" yScale="-1" xOffset="-4" yOffset="3840"/>
     <contour>
       <point x="768" y="1792" type="move" name="_top"/>
     </contour>
     <contour>
       <point x="764" y="2256" type="move" name="mkmktop_acc"/>
     </contour>
-    <component base="caron" yScale="-1" xOffset="-4" yOffset="3840"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/circumflexnosp.glif b/src/Inter-UI-Black.ufo/glyphs/circumflexnosp.glif
index a5aac0648..b92b8519e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/circumflexnosp.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/circumflexnosp.glif
@@ -3,6 +3,7 @@
   <advance width="0"/>
   <unicode hex="0302"/>
   <outline>
+    <component base="circumflex" xOffset="-1500"/>
     <contour>
       <point x="-796" y="1774" type="move" name="_marktop"/>
     </contour>
@@ -12,7 +13,6 @@
     <contour>
       <point x="-796" y="2255" type="move" name="mkmktop"/>
     </contour>
-    <component base="circumflex" xOffset="-1500"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/circumflexsubnosp.glif b/src/Inter-UI-Black.ufo/glyphs/circumflexsubnosp.glif
index 4af96d2d1..353dbc8d8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/circumflexsubnosp.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/circumflexsubnosp.glif
@@ -3,6 +3,7 @@
   <advance width="0"/>
   <unicode hex="032D"/>
   <outline>
+    <component base="circumflex" xOffset="-1500" yOffset="-2225"/>
     <contour>
       <point x="-792" y="0" type="move" name="_bottom"/>
     </contour>
@@ -15,7 +16,6 @@
     <contour>
       <point x="-792" y="0" type="move" name="_bottomu"/>
     </contour>
-    <component base="circumflex" xOffset="-1500" yOffset="-2225"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/coloncurrency.glif b/src/Inter-UI-Black.ufo/glyphs/coloncurrency.glif
index b3eae6bea..358dd0ecf 100644
--- a/src/Inter-UI-Black.ufo/glyphs/coloncurrency.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/coloncurrency.glif
@@ -1,39 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="coloncurrency" format="1">
-  <advance width="2048"/>
+  <advance width="1876"/>
   <unicode hex="20A1"/>
   <outline>
     <contour>
-      <point x="1752" y="2160" type="line"/>
-      <point x="1432" y="2160" type="line"/>
-      <point x="680" y="-172" type="line"/>
-      <point x="996" y="-172" type="line"/>
+      <point x="1752" y="2304" type="line"/>
+      <point x="1432" y="2304" type="line"/>
+      <point x="680" y="-256" type="line"/>
+      <point x="996" y="-256" type="line"/>
     </contour>
     <contour>
-      <point x="1308" y="2160" type="line"/>
-      <point x="988" y="2160" type="line"/>
-      <point x="236" y="-172" type="line"/>
-      <point x="552" y="-172" type="line"/>
+      <point x="1308" y="2304" type="line"/>
+      <point x="988" y="2304" type="line"/>
+      <point x="236" y="-256" type="line"/>
+      <point x="552" y="-256" type="line"/>
     </contour>
     <component base="C"/>
   </outline>
   <lib>
     <dict>
-      <key>com.typemytype.robofont.guides</key>
-      <array>
-        <dict>
-          <key>angle</key>
-          <real>0.0</real>
-          <key>isGlobal</key>
-          <false/>
-          <key>magnetic</key>
-          <integer>5</integer>
-          <key>x</key>
-          <real>0.0</real>
-          <key>y</key>
-          <real>2158.75</real>
-        </dict>
-      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.8</real>
diff --git a/src/Inter-UI-Black.ufo/glyphs/contents.plist b/src/Inter-UI-Black.ufo/glyphs/contents.plist
index 202a59405..2bf1fd079 100644
--- a/src/Inter-UI-Black.ufo/glyphs/contents.plist
+++ b/src/Inter-UI-Black.ufo/glyphs/contents.plist
@@ -30,8 +30,6 @@
 	<string>Cheverticalstrokecyrillic_.glif</string>
 	<key>Chook</key>
 	<string>Chook_.glif</string>
-	<key>Chook.cn</key>
-	<string>Chook_.cn.glif</string>
 	<key>D</key>
 	<string>D_.glif</string>
 	<key>D.cn</key>
@@ -116,14 +114,14 @@
 	<string>Hcedilla_.glif</string>
 	<key>I</key>
 	<string>I_.glif</string>
-	<key>Ibar</key>
-	<string>Ibar_.glif</string>
 	<key>Idieresisacute</key>
 	<string>Idieresisacute_.glif</string>
 	<key>Iota1</key>
 	<string>Iota1_.glif</string>
 	<key>Ismallcap</key>
 	<string>Ismallcap_.glif</string>
+	<key>Istroke</key>
+	<string>Istroke_.glif</string>
 	<key>Itildebelow</key>
 	<string>Itildebelow_.glif</string>
 	<key>J</key>
@@ -150,10 +148,12 @@
 	<string>Ksicyrillic_.glif</string>
 	<key>L</key>
 	<string>L_.glif</string>
+	<key>L_bar</key>
+	<string>L__bar.glif</string>
+	<key>L_slash</key>
+	<string>L__slash.glif</string>
 	<key>Lambda</key>
 	<string>Lambda_.glif</string>
-	<key>Lslash</key>
-	<string>Lslash_.glif</string>
 	<key>Lsmallcap</key>
 	<string>Lsmallcap_.glif</string>
 	<key>M</key>
@@ -184,8 +184,6 @@
 	<string>Omegatitlocyrillic_.glif</string>
 	<key>Oopen</key>
 	<string>Oopen_.glif</string>
-	<key>Oopen.cn</key>
-	<string>Oopen_.cn.glif</string>
 	<key>Oslash</key>
 	<string>Oslash_.glif</string>
 	<key>Otcyrillic</key>
@@ -206,6 +204,8 @@
 	<string>Q_.glif</string>
 	<key>Q.cn</key>
 	<string>Q_.cn.glif</string>
+	<key>Q_rthook</key>
+	<string>Q__rthook.glif</string>
 	<key>R</key>
 	<string>R_.glif</string>
 	<key>Rsmallcap</key>
@@ -482,8 +482,6 @@
 	<string>beta1.glif</string>
 	<key>bhook</key>
 	<string>bhook.glif</string>
-	<key>bhook.cn</key>
-	<string>bhook.cn.glif</string>
 	<key>blackleftpointingtriangle</key>
 	<string>blackleftpointingtriangle.glif</string>
 	<key>braceleft</key>
@@ -590,8 +588,6 @@
 	<string>cheverticalstrokecyrillic.glif</string>
 	<key>chook</key>
 	<string>chook.glif</string>
-	<key>chook.cn</key>
-	<string>chook.cn.glif</string>
 	<key>circleblack</key>
 	<string>circleblack.glif</string>
 	<key>circlewhite</key>
@@ -700,8 +696,6 @@
 	<string>deltaturn.glif</string>
 	<key>dhook</key>
 	<string>dhook.glif</string>
-	<key>dhook.cn</key>
-	<string>dhook.cn.glif</string>
 	<key>diaeresistonosnosp</key>
 	<string>diaeresistonosnosp.glif</string>
 	<key>diamondblack</key>
@@ -892,6 +886,8 @@
 	<string>ezhtail.glif</string>
 	<key>f</key>
 	<string>f.glif</string>
+	<key>feng</key>
+	<string>feng.glif</string>
 	<key>figuredash</key>
 	<string>figuredash.glif</string>
 	<key>figuredash.case</key>
@@ -902,8 +898,6 @@
 	<string>finalkaf.glif</string>
 	<key>finalmem</key>
 	<string>finalmem.glif</string>
-	<key>finalnun</key>
-	<string>finalnun.glif</string>
 	<key>finaltsadi</key>
 	<string>finaltsadi.glif</string>
 	<key>firsttonechinese</key>
@@ -972,8 +966,6 @@
 	<string>gheupturncyrillic.glif</string>
 	<key>ghook</key>
 	<string>ghook.glif</string>
-	<key>ghook.cn</key>
-	<string>ghook.cn.glif</string>
 	<key>glottalstop</key>
 	<string>glottalstop.glif</string>
 	<key>glottalstopbar</key>
@@ -1048,6 +1040,10 @@
 	<string>hsuper.glif</string>
 	<key>hturn</key>
 	<string>hturn.glif</string>
+	<key>hturnhook2</key>
+	<string>hturnhook2.glif</string>
+	<key>hturnlthook</key>
+	<string>hturnlthook.glif</string>
 	<key>hungarumlaut</key>
 	<string>hungarumlaut.glif</string>
 	<key>hv</key>
@@ -1150,6 +1146,8 @@
 	<string>lbar.glif</string>
 	<key>lbelt</key>
 	<string>lbelt.glif</string>
+	<key>lcurl</key>
+	<string>lcurl.glif</string>
 	<key>leftloop.cn</key>
 	<string>leftloop.cn.glif</string>
 	<key>less</key>
@@ -1242,6 +1240,8 @@
 	<string>n.glif</string>
 	<key>naira</key>
 	<string>naira.glif</string>
+	<key>ncurl</key>
+	<string>ncurl.glif</string>
 	<key>nine</key>
 	<string>nine.glif</string>
 	<key>nine.1</key>
@@ -1404,8 +1404,6 @@
 	<string>philatin.glif</string>
 	<key>phook</key>
 	<string>phook.glif</string>
-	<key>phook.cn</key>
-	<string>phook.cn.glif</string>
 	<key>pi</key>
 	<string>pi.glif</string>
 	<key>pipe</key>
@@ -1458,10 +1456,10 @@
 	<string>q.cn.glif</string>
 	<key>qhook</key>
 	<string>qhook.glif</string>
-	<key>qhook.cn</key>
-	<string>qhook.cn.glif</string>
 	<key>qofdagesh</key>
 	<string>qofdagesh.glif</string>
+	<key>qrthook</key>
+	<string>qrthook.glif</string>
 	<key>quarteremspace</key>
 	<string>quarteremspace.glif</string>
 	<key>question</key>
@@ -1656,6 +1654,8 @@
 	<string>slashshortnosp.glif</string>
 	<key>slongdotaccent</key>
 	<string>slongdotaccent.glif</string>
+	<key>slongstroke</key>
+	<string>slongstroke.glif</string>
 	<key>softsigncyrillic</key>
 	<string>softsigncyrillic.glif</string>
 	<key>space</key>
@@ -1694,6 +1694,8 @@
 	<string>tavdages.glif</string>
 	<key>tccurl</key>
 	<string>tccurl.glif</string>
+	<key>tcurl</key>
+	<string>tcurl.glif</string>
 	<key>tecyrillic</key>
 	<string>tecyrillic.glif</string>
 	<key>tel</key>
@@ -1864,14 +1866,6 @@
 	<string>uni0223.glif</string>
 	<key>uni0224</key>
 	<string>uni0224.glif</string>
-	<key>uni0225</key>
-	<string>uni0225.glif</string>
-	<key>uni0234</key>
-	<string>uni0234.glif</string>
-	<key>uni0235</key>
-	<string>uni0235.glif</string>
-	<key>uni0236</key>
-	<string>uni0236.glif</string>
 	<key>uni0238</key>
 	<string>uni0238.glif</string>
 	<key>uni0239</key>
@@ -1882,8 +1876,6 @@
 	<string>uni023B_.glif</string>
 	<key>uni023C</key>
 	<string>uni023C_.glif</string>
-	<key>uni023D</key>
-	<string>uni023D_.glif</string>
 	<key>uni023E</key>
 	<string>uni023E_.glif</string>
 	<key>uni023F</key>
@@ -1910,10 +1902,6 @@
 	<string>uni0249.glif</string>
 	<key>uni0249.ccmp</key>
 	<string>uni0249.ccmp.glif</string>
-	<key>uni024A</key>
-	<string>uni024A_.glif</string>
-	<key>uni024B</key>
-	<string>uni024B_.glif</string>
 	<key>uni024C</key>
 	<string>uni024C_.glif</string>
 	<key>uni024D</key>
@@ -1926,14 +1914,10 @@
 	<string>uni0268.ccmp.glif</string>
 	<key>uni029D.ccmp</key>
 	<string>uni029D_.ccmp.glif</string>
-	<key>uni02A9</key>
-	<string>uni02A9_.glif</string>
 	<key>uni02AB</key>
 	<string>uni02AB__.glif</string>
 	<key>uni02AC</key>
 	<string>uni02AC__.glif</string>
-	<key>uni02AE</key>
-	<string>uni02AE__.glif</string>
 	<key>uni02B2.ccmp</key>
 	<string>uni02B2_.ccmp.glif</string>
 	<key>uni02E5_uni02E5_uni02E6</key>
@@ -2548,8 +2532,6 @@
 	<string>uni1DFE___.glif</string>
 	<key>uni1DFF</key>
 	<string>uni1DFF___.glif</string>
-	<key>uni1E9C</key>
-	<string>uni1E9C__.glif</string>
 	<key>uni1E9D</key>
 	<string>uni1E9D__.glif</string>
 	<key>uni1E9F</key>
@@ -2916,6 +2898,8 @@
 	<string>zhecyrillic.glif</string>
 	<key>zhedescendercyrillic</key>
 	<string>zhedescendercyrillic.glif</string>
+	<key>zhook</key>
+	<string>zhook.glif</string>
 	<key>zrthook</key>
 	<string>zrthook.glif</string>
 </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/d.glif b/src/Inter-UI-Black.ufo/glyphs/d.glif
index 99ff0cca6..ce58fa4ba 100644
--- a/src/Inter-UI-Black.ufo/glyphs/d.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/d.glif
@@ -4,13 +4,13 @@
   <unicode hex="0064"/>
   <outline>
     <contour>
-      <point x="1036" y="308" type="line"/>
-      <point x="1076" y="0" type="line"/>
       <point x="1492" y="0" type="line"/>
       <point x="1492" y="2048" type="line"/>
       <point x="1032" y="2048" type="line"/>
       <point x="1032" y="1256" type="line"/>
       <point x="1188" y="732" type="line"/>
+      <point x="1040" y="308" type="line"/>
+      <point x="1040" y="0" type="line"/>
     </contour>
     <component base="leftloop.cn"/>
     <contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dcroat.glif b/src/Inter-UI-Black.ufo/glyphs/dcroat.glif
index 4b2c89fa9..b23c10120 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dcroat.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dcroat.glif
@@ -3,13 +3,8 @@
   <advance width="1680"/>
   <unicode hex="0111"/>
   <outline>
-    <contour>
-      <point x="1680" y="1868" type="line"/>
-      <point x="688" y="1868" type="line"/>
-      <point x="688" y="1608" type="line"/>
-      <point x="1680" y="1608" type="line"/>
-    </contour>
     <component base="d"/>
+    <component base="crossbar" xOffset="544" yOffset="724"/>
     <contour>
       <point x="1640" y="2112" type="move" name="caron"/>
     </contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dhook.cn.glif b/src/Inter-UI-Black.ufo/glyphs/dhook.cn.glif
deleted file mode 100644
index 7038c433d..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/dhook.cn.glif
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dhook.cn" format="1">
-  <advance width="1792"/>
-  <outline>
-    <contour>
-      <point x="40" y="700" type="line"/>
-      <point x="40" y="232"/>
-      <point x="232" y="-28"/>
-      <point x="604" y="-28" type="curve" smooth="yes"/>
-      <point x="936" y="-28"/>
-      <point x="1104" y="288"/>
-      <point x="1160" y="660" type="curve"/>
-      <point x="1160" y="804" type="line"/>
-      <point x="1104" y="1204"/>
-      <point x="936" y="1516"/>
-      <point x="608" y="1516" type="curve" smooth="yes"/>
-      <point x="232" y="1516"/>
-      <point x="40" y="1272"/>
-      <point x="40" y="784" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="484" y="784" type="line"/>
-      <point x="484" y="1048"/>
-      <point x="552" y="1160"/>
-      <point x="736" y="1160" type="curve" smooth="yes"/>
-      <point x="920" y="1160"/>
-      <point x="1008" y="1048"/>
-      <point x="1008" y="844" type="curve"/>
-      <point x="1008" y="624" type="line"/>
-      <point x="1008" y="444"/>
-      <point x="916" y="332"/>
-      <point x="732" y="332" type="curve" smooth="yes"/>
-      <point x="544" y="332"/>
-      <point x="484" y="440"/>
-      <point x="484" y="700" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="1408" y="0" type="line"/>
-      <point x="1408" y="1680" type="line" smooth="yes"/>
-      <point x="1408" y="1832"/>
-      <point x="1536" y="1868"/>
-      <point x="1644" y="1868" type="curve" smooth="yes"/>
-      <point x="1680" y="1868"/>
-      <point x="1712" y="1864"/>
-      <point x="1752" y="1856" type="curve"/>
-      <point x="1752" y="2152" type="line"/>
-      <point x="1688" y="2168"/>
-      <point x="1620" y="2176"/>
-      <point x="1520" y="2176" type="curve" smooth="yes"/>
-      <point x="1280" y="2176"/>
-      <point x="964" y="2124"/>
-      <point x="964" y="1680" type="curve" smooth="yes"/>
-      <point x="964" y="340" type="line"/>
-      <point x="1008" y="0" type="line"/>
-    </contour>
-  </outline>
-  <lib>
-    <dict>
-      <key>com.typemytype.robofont.mark</key>
-      <array>
-        <real>0.77</real>
-        <real>0.95</real>
-        <real>0.76</real>
-        <real>1.0</real>
-      </array>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 1789, 'leftMargin': 78, 'rightMargin': 0}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dhook.glif b/src/Inter-UI-Black.ufo/glyphs/dhook.glif
index df615cfbd..9552eec78 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dhook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dhook.glif
@@ -4,70 +4,72 @@
   <unicode hex="0257"/>
   <outline>
     <contour>
-      <point x="624" y="2200" type="move" name="top"/>
+      <point x="1032" y="1304" type="line"/>
+      <point x="1492" y="1304" type="line"/>
+      <point x="1492" y="1568" type="line" smooth="yes"/>
+      <point x="1492" y="1724"/>
+      <point x="1648" y="1720"/>
+      <point x="1728" y="1720" type="curve" smooth="yes"/>
+      <point x="1764" y="1720"/>
+      <point x="1796" y="1716"/>
+      <point x="1836" y="1708" type="curve"/>
+      <point x="1836" y="2056" type="line"/>
+      <point x="1788" y="2064"/>
+      <point x="1704" y="2076"/>
+      <point x="1604" y="2076" type="curve" smooth="yes"/>
+      <point x="1384" y="2076"/>
+      <point x="1032" y="2016"/>
+      <point x="1032" y="1568" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="760" y="0" type="move" name="bottom"/>
+      <point x="1076.0" y="0.0" type="line"/>
+      <point x="1492.0" y="0.0" type="line"/>
+      <point x="1492.0" y="1516.0" type="line"/>
+      <point x="1032.0" y="1516.0" type="line"/>
+      <point x="1032.0" y="1460.0" type="line"/>
+      <point x="1020" y="1460" type="line"/>
+      <point x="952" y="1520"/>
+      <point x="857.0" y="1556.0"/>
+      <point x="736.0" y="1556.0" type="curve" smooth="yes"/>
+      <point x="356.0" y="1556.0"/>
+      <point x="80.0" y="1220.0"/>
+      <point x="80.0" y="764.0" type="curve"/>
+      <point x="80.0" y="304.0"/>
+      <point x="356.0" y="-28.0"/>
+      <point x="740.0" y="-28.0" type="curve"/>
+      <point x="876.0" y="-28.0"/>
+      <point x="976.0" y="12.0"/>
+      <point x="1052.0" y="80.0" type="curve"/>
+      <point x="1064.0" y="80.0" type="line"/>
     </contour>
     <contour>
-      <point x="1752" y="2200" type="move" name="top0315"/>
+      <point x="516" y="764" type="curve"/>
+      <point x="516" y="1000"/>
+      <point x="588" y="1192"/>
+      <point x="792" y="1192" type="curve"/>
+      <point x="992" y="1192"/>
+      <point x="1036" y="1004"/>
+      <point x="1048" y="948" type="curve"/>
+      <point x="1060" y="892"/>
+      <point x="1068" y="828"/>
+      <point x="1068" y="768" type="curve"/>
+      <point x="1068" y="704"/>
+      <point x="1056" y="608"/>
+      <point x="1044" y="548" type="curve"/>
+      <point x="1024" y="464"/>
+      <point x="968" y="340"/>
+      <point x="796" y="340" type="curve" smooth="yes"/>
+      <point x="588" y="340"/>
+      <point x="516" y="520"/>
     </contour>
     <contour>
-      <point x="964" y="340" type="line"/>
-      <point x="1024" y="0" type="line"/>
-      <point x="1408" y="0" type="line"/>
-      <point x="1408" y="1596" type="line"/>
-      <point x="964" y="1596" type="line"/>
+      <point x="624.0" y="2200.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="40" y="728" type="line"/>
-      <point x="40" y="292"/>
-      <point x="244" y="-28"/>
-      <point x="620" y="-28" type="curve" smooth="yes"/>
-      <point x="964" y="-28"/>
-      <point x="1128" y="312"/>
-      <point x="1184" y="716" type="curve"/>
-      <point x="1184" y="748" type="line"/>
-      <point x="1128" y="1180"/>
-      <point x="964" y="1516"/>
-      <point x="624" y="1516" type="curve" smooth="yes"/>
-      <point x="244" y="1516"/>
-      <point x="40" y="1208"/>
-      <point x="40" y="756" type="curve" smooth="yes"/>
+      <point x="760.0" y="0.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="484" y="756" type="line"/>
-      <point x="484" y="988"/>
-      <point x="552" y="1160"/>
-      <point x="736" y="1160" type="curve" smooth="yes"/>
-      <point x="920" y="1160"/>
-      <point x="1008" y="1028"/>
-      <point x="1008" y="788" type="curve" smooth="yes"/>
-      <point x="1008" y="680" type="line" smooth="yes"/>
-      <point x="1008" y="468"/>
-      <point x="916" y="332"/>
-      <point x="732" y="332" type="curve" smooth="yes"/>
-      <point x="544" y="332"/>
-      <point x="484" y="504"/>
-      <point x="484" y="728" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="1408" y="1416" type="line"/>
-      <point x="1408" y="1680" type="line" smooth="yes"/>
-      <point x="1408" y="1832"/>
-      <point x="1536" y="1868"/>
-      <point x="1644" y="1868" type="curve" smooth="yes"/>
-      <point x="1680" y="1868"/>
-      <point x="1712" y="1864"/>
-      <point x="1752" y="1856" type="curve"/>
-      <point x="1752" y="2152" type="line"/>
-      <point x="1688" y="2168"/>
-      <point x="1620" y="2176"/>
-      <point x="1520" y="2176" type="curve" smooth="yes"/>
-      <point x="1280" y="2176"/>
-      <point x="964" y="2124"/>
-      <point x="964" y="1680" type="curve" smooth="yes"/>
-      <point x="964" y="1416" type="line"/>
+      <point x="1752.0" y="2200.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dollar.glif b/src/Inter-UI-Black.ufo/glyphs/dollar.glif
index 8a8d559d0..5ab77d98b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dollar.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dollar.glif
@@ -4,8 +4,8 @@
   <unicode hex="0024"/>
   <outline>
     <contour>
-      <point x="800" y="-260" type="line"/>
-      <point x="984" y="-260" type="line"/>
+      <point x="800" y="-256" type="line"/>
+      <point x="984" y="-256" type="line"/>
       <point x="1016" y="2304" type="line"/>
       <point x="832" y="2304" type="line"/>
     </contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/drthook.glif b/src/Inter-UI-Black.ufo/glyphs/drthook.glif
index b5647a056..9bc9159e5 100644
--- a/src/Inter-UI-Black.ufo/glyphs/drthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/drthook.glif
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="drthook" format="1">
-  <advance width="1792"/>
+  <advance width="1828"/>
   <unicode hex="0256"/>
   <outline>
     <contour>
-      <point x="964" y="392" type="line"/>
-      <point x="964" y="-108" type="line" smooth="yes"/>
-      <point x="964" y="-548"/>
-      <point x="1280" y="-600"/>
-      <point x="1520" y="-600" type="curve" smooth="yes"/>
-      <point x="1620" y="-600"/>
-      <point x="1688" y="-592"/>
-      <point x="1752" y="-580" type="curve"/>
-      <point x="1752" y="-284" type="line"/>
-      <point x="1712" y="-288"/>
-      <point x="1680" y="-292"/>
-      <point x="1644" y="-292" type="curve" smooth="yes"/>
-      <point x="1536" y="-292"/>
-      <point x="1408" y="-256"/>
-      <point x="1408" y="-108" type="curve" smooth="yes"/>
-      <point x="1408" y="392" type="line"/>
+      <point x="1492" y="184" type="line"/>
+      <point x="1032" y="184" type="line"/>
+      <point x="1032" y="-80" type="line" smooth="yes"/>
+      <point x="1032" y="-516"/>
+      <point x="1332" y="-576"/>
+      <point x="1572" y="-576" type="curve" smooth="yes"/>
+      <point x="1672" y="-576"/>
+      <point x="1748" y="-568"/>
+      <point x="1804" y="-560" type="curve"/>
+      <point x="1804" y="-212" type="line"/>
+      <point x="1772" y="-216"/>
+      <point x="1736" y="-220"/>
+      <point x="1696" y="-220" type="curve" smooth="yes"/>
+      <point x="1592" y="-220"/>
+      <point x="1492" y="-192"/>
+      <point x="1492" y="-80" type="curve" smooth="yes"/>
     </contour>
-    <component base="d" xOffset="-36"/>
+    <component base="d"/>
     <contour>
-      <point x="624" y="2340" type="move" name="top"/>
+      <point x="660" y="2340" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="760" y="-616" type="move" name="bottom"/>
+      <point x="796" y="-616" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1752" y="2340" type="move" name="top0315"/>
+      <point x="1788" y="2340" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dtopbar.glif b/src/Inter-UI-Black.ufo/glyphs/dtopbar.glif
index 6ad44f5e8..0b57da0f8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dtopbar.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dtopbar.glif
@@ -4,10 +4,10 @@
   <unicode hex="018C"/>
   <outline>
     <contour>
-      <point x="1284" y="2112" type="line" name="hr00"/>
-      <point x="348" y="2112" type="line"/>
-      <point x="348" y="1848" type="line"/>
-      <point x="1284" y="1848" type="line"/>
+      <point x="1220" y="2048" type="line" name="hr00"/>
+      <point x="284" y="2048" type="line"/>
+      <point x="284" y="1668" type="line"/>
+      <point x="1220" y="1668" type="line"/>
     </contour>
     <component base="d" xOffset="8"/>
   </outline>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dyogh.glif b/src/Inter-UI-Black.ufo/glyphs/dyogh.glif
index 177153c99..a8385c5e5 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dyogh.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dyogh.glif
@@ -1,51 +1,91 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="dyogh" format="1">
-  <advance width="2816"/>
+  <advance width="2636"/>
   <unicode hex="02A4"/>
   <outline>
     <contour>
-      <point x="1276" y="1488" type="line"/>
-      <point x="1276" y="1132" type="line"/>
-      <point x="2108" y="1132" type="line"/>
-      <point x="1656" y="632" type="line"/>
-      <point x="1656" y="460" type="line"/>
-      <point x="1976" y="460" type="line"/>
-      <point x="2612" y="1192" type="line"/>
-      <point x="2612" y="1488" type="line"/>
+      <point x="2524" y="1536" type="line"/>
+      <point x="1316" y="1536" type="line"/>
+      <point x="1316" y="1180" type="line"/>
+      <point x="2020" y="1180" type="line"/>
+      <point x="1568" y="632" type="line"/>
+      <point x="1568" y="460" type="line"/>
+      <point x="1888" y="460" type="line"/>
+      <point x="2524" y="1240" type="line"/>
     </contour>
     <contour>
-      <point x="1656" y="624" type="line"/>
-      <point x="1656" y="364" type="line"/>
-      <point x="1836" y="364" type="line" smooth="yes"/>
-      <point x="2072" y="364"/>
-      <point x="2200" y="260"/>
-      <point x="2200" y="40" type="curve" smooth="yes"/>
-      <point x="2200" y="-136"/>
-      <point x="2088" y="-244"/>
-      <point x="1884" y="-244" type="curve" smooth="yes"/>
-      <point x="1680" y="-244"/>
-      <point x="1588" y="-176"/>
-      <point x="1536" y="-84" type="curve"/>
-      <point x="1092" y="-84" type="line"/>
-      <point x="1192" y="-504"/>
-      <point x="1544" y="-600"/>
-      <point x="1896" y="-600" type="curve" smooth="yes"/>
-      <point x="2332" y="-600"/>
-      <point x="2644" y="-384"/>
-      <point x="2644" y="8" type="curve" smooth="yes"/>
-      <point x="2644" y="420"/>
-      <point x="2372" y="652"/>
-      <point x="1908" y="652" type="curve"/>
+      <point x="1568" y="624" type="line"/>
+      <point x="1568" y="364" type="line"/>
+      <point x="1748" y="364" type="line" smooth="yes"/>
+      <point x="1984" y="364"/>
+      <point x="2112" y="260"/>
+      <point x="2112" y="40" type="curve" smooth="yes"/>
+      <point x="2112" y="-136"/>
+      <point x="2000" y="-244"/>
+      <point x="1796" y="-244" type="curve" smooth="yes"/>
+      <point x="1592" y="-244"/>
+      <point x="1500" y="-176"/>
+      <point x="1448" y="-84" type="curve"/>
+      <point x="1004" y="-84" type="line"/>
+      <point x="1104" y="-504"/>
+      <point x="1456" y="-600"/>
+      <point x="1808" y="-600" type="curve" smooth="yes"/>
+      <point x="2244" y="-600"/>
+      <point x="2556" y="-384"/>
+      <point x="2556" y="8" type="curve" smooth="yes"/>
+      <point x="2556" y="420"/>
+      <point x="2284" y="652"/>
+      <point x="1820" y="652" type="curve"/>
     </contour>
-    <component base="d" xOffset="88"/>
     <contour>
-      <point x="1884" y="2200" type="move" name="top"/>
+      <point x="1492" y="0" type="line"/>
+      <point x="1492" y="2048" type="line"/>
+      <point x="1032" y="2048" type="line"/>
+      <point x="1032" y="1460" type="line"/>
+      <point x="1028" y="1460" type="line"/>
+      <point x="956" y="1520"/>
+      <point x="864" y="1556"/>
+      <point x="736" y="1556" type="curve" smooth="yes"/>
+      <point x="356" y="1556"/>
+      <point x="80" y="1220"/>
+      <point x="80" y="764" type="curve"/>
+      <point x="80" y="304"/>
+      <point x="356" y="-28"/>
+      <point x="740" y="-28" type="curve"/>
+      <point x="876" y="-28"/>
+      <point x="976" y="12"/>
+      <point x="1052" y="80" type="curve"/>
+      <point x="1064" y="80" type="line"/>
+      <point x="1076" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="1884" y="-616" type="move" name="bottom"/>
+      <point x="516" y="764" type="curve"/>
+      <point x="516" y="1000"/>
+      <point x="588" y="1192"/>
+      <point x="792" y="1192" type="curve"/>
+      <point x="992" y="1192"/>
+      <point x="1036" y="1004"/>
+      <point x="1048" y="948" type="curve"/>
+      <point x="1060" y="892"/>
+      <point x="1068" y="828"/>
+      <point x="1068" y="768" type="curve"/>
+      <point x="1068" y="704"/>
+      <point x="1056" y="608"/>
+      <point x="1044" y="548" type="curve"/>
+      <point x="1024" y="464"/>
+      <point x="968" y="340"/>
+      <point x="796" y="340" type="curve" smooth="yes"/>
+      <point x="588" y="340"/>
+      <point x="516" y="520"/>
     </contour>
     <contour>
-      <point x="2708" y="2200" type="move" name="top0315"/>
+      <point x="1796" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1796" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="2620" y="2200" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dz.glif b/src/Inter-UI-Black.ufo/glyphs/dz.glif
index 4f7ff6a55..a78d9d0ed 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dz.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dz.glif
@@ -1,29 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="dz" format="1">
-  <advance width="2840"/>
+  <advance width="2940"/>
   <unicode hex="02A3"/>
   <outline>
-    <contour>
-      <point x="2700" y="360" type="line"/>
-      <point x="1556" y="360" type="line"/>
-      <point x="1556" y="0" type="line"/>
-      <point x="2700" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="2684" y="1240" type="line"/>
-      <point x="2684" y="1488" type="line"/>
-      <point x="2380" y="1488" type="line"/>
-      <point x="1444" y="260" type="line"/>
-      <point x="1444" y="0" type="line"/>
-      <point x="1748" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="2536" y="1488" type="line"/>
-      <point x="1416" y="1488" type="line"/>
-      <point x="1416" y="1132" type="line"/>
-      <point x="2536" y="1132" type="line"/>
-    </contour>
     <component base="d"/>
+    <component base="z" xOffset="1428"/>
     <contour>
       <point x="2084" y="2200" type="move" name="top"/>
     </contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dzcaron.glif b/src/Inter-UI-Black.ufo/glyphs/dzcaron.glif
index db8a2bab4..4727ef2ce 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dzcaron.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dzcaron.glif
@@ -1,78 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="dzcaron" format="1">
-  <advance width="2956"/>
+  <advance width="2940"/>
   <unicode hex="01C6"/>
   <outline>
-    <contour>
-      <point x="1004" y="340" type="line"/>
-      <point x="1064" y="0" type="line"/>
-      <point x="1448" y="0" type="line"/>
-      <point x="1448" y="2144" type="line"/>
-      <point x="1004" y="2144" type="line"/>
-    </contour>
-    <contour>
-      <point x="84" y="728" type="line"/>
-      <point x="84" y="292"/>
-      <point x="288" y="-28"/>
-      <point x="660" y="-28" type="curve" smooth="yes"/>
-      <point x="1004" y="-28"/>
-      <point x="1172" y="312"/>
-      <point x="1228" y="716" type="curve"/>
-      <point x="1228" y="748" type="line"/>
-      <point x="1172" y="1180"/>
-      <point x="1004" y="1516"/>
-      <point x="664" y="1516" type="curve" smooth="yes"/>
-      <point x="288" y="1516"/>
-      <point x="84" y="1208"/>
-      <point x="84" y="756" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="524" y="756" type="line"/>
-      <point x="524" y="988"/>
-      <point x="592" y="1160"/>
-      <point x="776" y="1160" type="curve" smooth="yes"/>
-      <point x="960" y="1160"/>
-      <point x="1048" y="1028"/>
-      <point x="1048" y="788" type="curve" smooth="yes"/>
-      <point x="1048" y="680" type="line" smooth="yes"/>
-      <point x="1048" y="468"/>
-      <point x="960" y="332"/>
-      <point x="772" y="332" type="curve" smooth="yes"/>
-      <point x="588" y="332"/>
-      <point x="524" y="504"/>
-      <point x="524" y="728" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="2816" y="360" type="line"/>
-      <point x="1672" y="360" type="line"/>
-      <point x="1672" y="0" type="line"/>
-      <point x="2816" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="2800" y="1240" type="line"/>
-      <point x="2800" y="1488" type="line"/>
-      <point x="2496" y="1488" type="line"/>
-      <point x="1560" y="260" type="line"/>
-      <point x="1560" y="0" type="line"/>
-      <point x="1864" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="2652" y="1488" type="line"/>
-      <point x="1588" y="1488" type="line"/>
-      <point x="1588" y="1132" type="line"/>
-      <point x="2652" y="1132" type="line"/>
-    </contour>
-    <contour>
-      <point x="2024" y="2100" type="line"/>
-      <point x="1648" y="2100" type="line"/>
-      <point x="1648" y="2084" type="line"/>
-      <point x="2044" y="1724" type="line"/>
-      <point x="2356" y="1724" type="line"/>
-      <point x="2752" y="2080" type="line"/>
-      <point x="2752" y="2100" type="line"/>
-      <point x="2376" y="2100" type="line"/>
-      <point x="2200" y="1916" type="line"/>
-    </contour>
+    <component base="dz"/>
+    <component base="caron" xOffset="1456"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dzcurl.glif b/src/Inter-UI-Black.ufo/glyphs/dzcurl.glif
index cf9c3aa24..6ccc1ecff 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dzcurl.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dzcurl.glif
@@ -1,55 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="dzcurl" format="1">
-  <advance width="3252"/>
+  <advance width="3376"/>
   <unicode hex="02A5"/>
   <outline>
-    <contour>
-      <point x="1784" y="-196" type="line"/>
-      <point x="2036" y="-376" type="line"/>
-      <point x="2448" y="236" type="line"/>
-      <point x="2640" y="520"/>
-      <point x="2688" y="576"/>
-      <point x="2748" y="576" type="curve" smooth="yes"/>
-      <point x="2804" y="576"/>
-      <point x="2836" y="548"/>
-      <point x="2836" y="484" type="curve" smooth="yes"/>
-      <point x="2836" y="424"/>
-      <point x="2804" y="360"/>
-      <point x="2684" y="360" type="curve" smooth="yes"/>
-      <point x="2028" y="360" type="line"/>
-      <point x="2028" y="0" type="line"/>
-      <point x="2652" y="0" type="line" smooth="yes"/>
-      <point x="2960" y="0"/>
-      <point x="3156" y="192"/>
-      <point x="3156" y="484" type="curve" smooth="yes"/>
-      <point x="3156" y="736"/>
-      <point x="3036" y="868"/>
-      <point x="2808" y="868" type="curve" smooth="yes"/>
-      <point x="2580" y="868"/>
-      <point x="2424" y="688"/>
-      <point x="2084" y="220" type="curve"/>
-    </contour>
-    <contour>
-      <point x="2616" y="360" type="line"/>
-      <point x="1556" y="360" type="line"/>
-      <point x="1556" y="0" type="line"/>
-      <point x="2616" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="2684" y="1240" type="line"/>
-      <point x="2684" y="1488" type="line"/>
-      <point x="2380" y="1488" type="line"/>
-      <point x="1444" y="260" type="line"/>
-      <point x="1444" y="0" type="line"/>
-      <point x="1744" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="2532" y="1488" type="line"/>
-      <point x="1332" y="1488" type="line"/>
-      <point x="1332" y="1132" type="line"/>
-      <point x="2532" y="1132" type="line"/>
-    </contour>
     <component base="d"/>
+    <component base="zcurl" xOffset="1428"/>
     <contour>
       <point x="2024" y="2200" type="move" name="top"/>
     </contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/eng.glif b/src/Inter-UI-Black.ufo/glyphs/eng.glif
index 87d80adbd..7b68bcc7b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/eng.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/eng.glif
@@ -1,59 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="eng" format="1">
-  <advance width="1536"/>
+  <advance width="1624"/>
   <unicode hex="014B"/>
   <outline>
     <contour>
-      <point x="768" y="1776" type="move" name="top"/>
+      <point x="1036" y="128" type="line"/>
+      <point x="1036" y="-20" type="line" smooth="yes"/>
+      <point x="1036" y="-160"/>
+      <point x="976" y="-224"/>
+      <point x="872" y="-224" type="curve" smooth="yes"/>
+      <point x="812" y="-224"/>
+      <point x="776" y="-216"/>
+      <point x="736" y="-208" type="curve"/>
+      <point x="700" y="-580" type="line"/>
+      <point x="776" y="-596"/>
+      <point x="852" y="-600"/>
+      <point x="928" y="-600" type="curve" smooth="yes"/>
+      <point x="1272" y="-600"/>
+      <point x="1496" y="-396"/>
+      <point x="1496" y="-20" type="curve" smooth="yes"/>
+      <point x="1496" y="128" type="line"/>
     </contour>
+    <component base="n"/>
     <contour>
-      <point x="768" y="16" type="move" name="bottom"/>
+      <point x="768.0" y="1776.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1048" y="-424" type="move" name="parenthesses.w1"/>
+      <point x="768.0" y="16.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="768" y="16" type="move" name="markbottom"/>
+      <point x="1048.0" y="-424.0" type="move" name="parenthesses.w1"/>
     </contour>
     <contour>
-      <point x="1560" y="1776" type="move" name="top0315"/>
+      <point x="768.0" y="16.0" type="move" name="markbottom"/>
     </contour>
     <contour>
-      <point x="548" y="1172" type="line"/>
-      <point x="520" y="1488" type="line"/>
-      <point x="108" y="1488" type="line"/>
-      <point x="108" y="0" type="line"/>
-      <point x="548" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="464" y="796" type="line"/>
-      <point x="464" y="1004"/>
-      <point x="580" y="1160"/>
-      <point x="796" y="1160" type="curve" smooth="yes"/>
-      <point x="916" y="1160"/>
-      <point x="988" y="1096"/>
-      <point x="988" y="896" type="curve" smooth="yes"/>
-      <point x="988" y="-20" type="line" smooth="yes"/>
-      <point x="988" y="-168"/>
-      <point x="928" y="-244"/>
-      <point x="824" y="-244" type="curve" smooth="yes"/>
-      <point x="764" y="-244"/>
-      <point x="732" y="-240"/>
-      <point x="688" y="-228" type="curve"/>
-      <point x="668" y="-580" type="line"/>
-      <point x="744" y="-596"/>
-      <point x="804" y="-600"/>
-      <point x="880" y="-600" type="curve" smooth="yes"/>
-      <point x="1224" y="-600"/>
-      <point x="1432" y="-396"/>
-      <point x="1432" y="-20" type="curve" smooth="yes"/>
-      <point x="1432" y="896" type="line" smooth="yes"/>
-      <point x="1432" y="1348"/>
-      <point x="1240" y="1516"/>
-      <point x="960" y="1516" type="curve" smooth="yes"/>
-      <point x="632" y="1516"/>
-      <point x="412" y="1212"/>
-      <point x="412" y="792" type="curve"/>
+      <point x="1560.0" y="1776.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/feng.glif b/src/Inter-UI-Black.ufo/glyphs/feng.glif
new file mode 100644
index 000000000..a46252586
--- /dev/null
+++ b/src/Inter-UI-Black.ufo/glyphs/feng.glif
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="feng" format="1">
+  <advance width="2464"/>
+  <unicode hex="02A9"/>
+  <outline>
+    <component base="f"/>
+    <component base="eng" xOffset="840"/>
+    <contour>
+      <point x="1796" y="2340" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1796" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="2580" y="2340" type="move" name="top0315"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.adobe.type.autohint</key>
+      <data>
+      </data>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 2493, 'leftMargin': 25, 'rightMargin': 133}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/finalnun.glif b/src/Inter-UI-Black.ufo/glyphs/finalnun.glif
deleted file mode 100644
index 84ed15ae7..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/finalnun.glif
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="finalnun" format="1">
-  <advance width="2304"/>
-  <unicode hex="02AF"/>
-  <outline>
-    <contour>
-      <point x="1112" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1112" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="2192" y="1776" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="1372" y="-24" type="line"/>
-      <point x="1816" y="-24" type="line"/>
-      <point x="1816" y="1488" type="line"/>
-      <point x="1372" y="1488" type="line"/>
-    </contour>
-    <contour>
-      <point x="1428" y="692" type="line"/>
-      <point x="1428" y="484"/>
-      <point x="1376" y="332"/>
-      <point x="1156" y="332" type="curve" smooth="yes"/>
-      <point x="1016" y="332"/>
-      <point x="936" y="388"/>
-      <point x="936" y="632" type="curve" smooth="yes"/>
-      <point x="936" y="940" type="line"/>
-      <point x="492" y="940" type="line"/>
-      <point x="492" y="632" type="line" smooth="yes"/>
-      <point x="492" y="164"/>
-      <point x="692" y="-28"/>
-      <point x="988" y="-28" type="curve" smooth="yes"/>
-      <point x="1320" y="-28"/>
-      <point x="1536" y="280"/>
-      <point x="1536" y="696" type="curve"/>
-    </contour>
-    <contour>
-      <point x="936" y="756" type="line"/>
-      <point x="936" y="1024" type="line" smooth="yes"/>
-      <point x="936" y="1464"/>
-      <point x="620" y="1516"/>
-      <point x="380" y="1516" type="curve" smooth="yes"/>
-      <point x="280" y="1516"/>
-      <point x="212" y="1508"/>
-      <point x="148" y="1496" type="curve"/>
-      <point x="148" y="1200" type="line"/>
-      <point x="184" y="1204"/>
-      <point x="220" y="1208"/>
-      <point x="256" y="1208" type="curve" smooth="yes"/>
-      <point x="360" y="1208"/>
-      <point x="492" y="1172"/>
-      <point x="492" y="1024" type="curve" smooth="yes"/>
-      <point x="492" y="756" type="line"/>
-    </contour>
-    <contour>
-      <point x="1372" y="160" type="line"/>
-      <point x="1372" y="-108" type="line" smooth="yes"/>
-      <point x="1372" y="-548"/>
-      <point x="1688" y="-600"/>
-      <point x="1928" y="-600" type="curve" smooth="yes"/>
-      <point x="2028" y="-600"/>
-      <point x="2096" y="-592"/>
-      <point x="2160" y="-580" type="curve"/>
-      <point x="2160" y="-284" type="line"/>
-      <point x="2120" y="-288"/>
-      <point x="2088" y="-292"/>
-      <point x="2048" y="-292" type="curve" smooth="yes"/>
-      <point x="1944" y="-292"/>
-      <point x="1816" y="-256"/>
-      <point x="1816" y="-108" type="curve" smooth="yes"/>
-      <point x="1816" y="160" type="line"/>
-    </contour>
-  </outline>
-  <lib>
-    <dict>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 2074, 'leftMargin': 30, 'rightMargin': 31}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/gbar.glif b/src/Inter-UI-Black.ufo/glyphs/gbar.glif
index 76e613019..f4f48dbf8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/gbar.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/gbar.glif
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="gbar" format="1">
-  <advance width="1792"/>
+  <advance width="1700"/>
   <unicode hex="01E5"/>
   <outline>
+    <component base="g"/>
+    <component base="crossbar" xOffset="564" yOffset="-244"/>
     <contour>
       <point x="820" y="1776" type="move" name="top"/>
     </contour>
@@ -18,63 +20,6 @@
     <contour>
       <point x="1676" y="1776" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1668" y="-76" type="line" name="hr00"/>
-      <point x="124" y="-76" type="line"/>
-      <point x="124" y="-272" type="line"/>
-      <point x="1668" y="-272" type="line"/>
-    </contour>
-    <contour>
-      <point x="1132" y="1488" type="line"/>
-      <point x="1092" y="1136" type="line"/>
-      <point x="1092" y="-116" type="line" smooth="yes"/>
-      <point x="1092" y="-300"/>
-      <point x="980" y="-408"/>
-      <point x="776" y="-408" type="curve" smooth="yes"/>
-      <point x="624" y="-408"/>
-      <point x="492" y="-376"/>
-      <point x="396" y="-308" type="curve"/>
-      <point x="236" y="-572" type="line"/>
-      <point x="412" y="-720"/>
-      <point x="600" y="-748"/>
-      <point x="792" y="-748" type="curve" smooth="yes"/>
-      <point x="1236" y="-748"/>
-      <point x="1536" y="-524"/>
-      <point x="1536" y="-120" type="curve" smooth="yes"/>
-      <point x="1536" y="1488" type="line"/>
-    </contour>
-    <contour>
-      <point x="140" y="728" type="line"/>
-      <point x="140" y="292"/>
-      <point x="372" y="-28"/>
-      <point x="748" y="-28" type="curve" smooth="yes"/>
-      <point x="1108" y="-28"/>
-      <point x="1252" y="312"/>
-      <point x="1312" y="716" type="curve"/>
-      <point x="1312" y="748" type="line"/>
-      <point x="1252" y="1180"/>
-      <point x="1152" y="1516"/>
-      <point x="748" y="1516" type="curve" smooth="yes"/>
-      <point x="372" y="1516"/>
-      <point x="140" y="1208"/>
-      <point x="140" y="756" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="584" y="756" type="line"/>
-      <point x="584" y="988"/>
-      <point x="676" y="1160"/>
-      <point x="860" y="1160" type="curve" smooth="yes"/>
-      <point x="1064" y="1160"/>
-      <point x="1148" y="1028"/>
-      <point x="1148" y="788" type="curve" smooth="yes"/>
-      <point x="1148" y="680" type="line" smooth="yes"/>
-      <point x="1148" y="468"/>
-      <point x="1064" y="332"/>
-      <point x="860" y="332" type="curve" smooth="yes"/>
-      <point x="672" y="332"/>
-      <point x="584" y="504"/>
-      <point x="584" y="728" type="curve" smooth="yes"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ghook.cn.glif b/src/Inter-UI-Black.ufo/glyphs/ghook.cn.glif
deleted file mode 100644
index 13cadca32..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/ghook.cn.glif
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ghook.cn" format="1">
-  <advance width="2048"/>
-  <outline>
-    <contour>
-      <point x="156" y="700" type="line"/>
-      <point x="156" y="232"/>
-      <point x="372" y="-28"/>
-      <point x="748" y="-28" type="curve" smooth="yes"/>
-      <point x="1092" y="-28"/>
-      <point x="1244" y="288"/>
-      <point x="1300" y="660" type="curve"/>
-      <point x="1300" y="804" type="line"/>
-      <point x="1244" y="1204"/>
-      <point x="1132" y="1516"/>
-      <point x="748" y="1516" type="curve" smooth="yes"/>
-      <point x="372" y="1516"/>
-      <point x="156" y="1272"/>
-      <point x="156" y="784" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="596" y="784" type="line"/>
-      <point x="596" y="1048"/>
-      <point x="692" y="1160"/>
-      <point x="876" y="1160" type="curve" smooth="yes"/>
-      <point x="1076" y="1160"/>
-      <point x="1160" y="1048"/>
-      <point x="1160" y="844" type="curve"/>
-      <point x="1160" y="624" type="line"/>
-      <point x="1160" y="444"/>
-      <point x="1076" y="332"/>
-      <point x="872" y="332" type="curve" smooth="yes"/>
-      <point x="684" y="332"/>
-      <point x="596" y="440"/>
-      <point x="596" y="700" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="820" y="-588" type="curve" smooth="yes"/>
-      <point x="1264" y="-588"/>
-      <point x="1548" y="-412"/>
-      <point x="1548" y="4" type="curve" smooth="yes"/>
-      <point x="1548" y="1460" type="line" smooth="yes"/>
-      <point x="1548" y="1612"/>
-      <point x="1680" y="1648"/>
-      <point x="1784" y="1648" type="curve" smooth="yes"/>
-      <point x="1824" y="1648"/>
-      <point x="1856" y="1644"/>
-      <point x="1896" y="1636" type="curve"/>
-      <point x="1896" y="1932" type="line"/>
-      <point x="1828" y="1948"/>
-      <point x="1760" y="1956"/>
-      <point x="1660" y="1956" type="curve" smooth="yes"/>
-      <point x="1420" y="1956"/>
-      <point x="1108" y="1904"/>
-      <point x="1108" y="1460" type="curve" smooth="yes"/>
-      <point x="1108" y="8" type="line" smooth="yes"/>
-      <point x="1108" y="-188"/>
-      <point x="1008" y="-244"/>
-      <point x="804" y="-244" type="curve" smooth="yes"/>
-      <point x="656" y="-244"/>
-      <point x="504" y="-180"/>
-      <point x="428" y="-120" type="curve"/>
-      <point x="280" y="-420" type="line"/>
-      <point x="400" y="-528"/>
-      <point x="636" y="-588"/>
-    </contour>
-  </outline>
-  <lib>
-    <dict>
-      <key>com.typemytype.robofont.mark</key>
-      <array>
-        <real>0.77</real>
-        <real>0.95</real>
-        <real>0.76</real>
-        <real>1.0</real>
-      </array>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 1821, 'leftMargin': 83, 'rightMargin': -1}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ghook.glif b/src/Inter-UI-Black.ufo/glyphs/ghook.glif
index 780c95a40..a99d43382 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ghook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ghook.glif
@@ -1,8 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="ghook" format="1">
-  <advance width="2048"/>
+  <advance width="1756"/>
   <unicode hex="0260"/>
   <outline>
+    <contour>
+      <point x="1492" y="1316" type="line"/>
+      <point x="1492" y="1580" type="line" smooth="yes"/>
+      <point x="1492" y="1692"/>
+      <point x="1608" y="1720"/>
+      <point x="1712" y="1720" type="curve" smooth="yes"/>
+      <point x="1752" y="1720"/>
+      <point x="1788" y="1716"/>
+      <point x="1820" y="1712" type="curve"/>
+      <point x="1820" y="2060" type="line"/>
+      <point x="1764" y="2068"/>
+      <point x="1688" y="2076"/>
+      <point x="1588" y="2076" type="curve" smooth="yes"/>
+      <point x="1348" y="2076"/>
+      <point x="1072" y="2016"/>
+      <point x="1072" y="1580" type="curve" smooth="yes"/>
+      <point x="1072" y="1316" type="line"/>
+    </contour>
+    <component base="g"/>
     <contour>
       <point x="836" y="1776" type="move" name="top"/>
     </contour>
@@ -12,75 +31,6 @@
     <contour>
       <point x="1896" y="1776" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1548" y="1196" type="line"/>
-      <point x="1548" y="1460" type="line" smooth="yes"/>
-      <point x="1548" y="1612"/>
-      <point x="1680" y="1648"/>
-      <point x="1784" y="1648" type="curve" smooth="yes"/>
-      <point x="1824" y="1648"/>
-      <point x="1856" y="1644"/>
-      <point x="1896" y="1636" type="curve"/>
-      <point x="1896" y="1932" type="line"/>
-      <point x="1828" y="1948"/>
-      <point x="1760" y="1956"/>
-      <point x="1656" y="1956" type="curve" smooth="yes"/>
-      <point x="1420" y="1956"/>
-      <point x="1104" y="1904"/>
-      <point x="1104" y="1460" type="curve" smooth="yes"/>
-      <point x="1104" y="1196" type="line"/>
-    </contour>
-    <contour>
-      <point x="1148" y="1488" type="line"/>
-      <point x="1104" y="1136" type="line"/>
-      <point x="1104" y="60" type="line" smooth="yes"/>
-      <point x="1104" y="-132"/>
-      <point x="992" y="-244"/>
-      <point x="788" y="-244" type="curve" smooth="yes"/>
-      <point x="636" y="-244"/>
-      <point x="520" y="-176"/>
-      <point x="440" y="-92" type="curve"/>
-      <point x="252" y="-364" type="line"/>
-      <point x="376" y="-508"/>
-      <point x="612" y="-588"/>
-      <point x="804" y="-588" type="curve" smooth="yes"/>
-      <point x="1248" y="-588"/>
-      <point x="1548" y="-356"/>
-      <point x="1548" y="60" type="curve" smooth="yes"/>
-      <point x="1548" y="1488" type="line"/>
-    </contour>
-    <contour>
-      <point x="156" y="728" type="line"/>
-      <point x="156" y="292"/>
-      <point x="388" y="-28"/>
-      <point x="760" y="-28" type="curve" smooth="yes"/>
-      <point x="1120" y="-28"/>
-      <point x="1268" y="312"/>
-      <point x="1328" y="716" type="curve"/>
-      <point x="1328" y="748" type="line"/>
-      <point x="1268" y="1180"/>
-      <point x="1164" y="1516"/>
-      <point x="764" y="1516" type="curve" smooth="yes"/>
-      <point x="388" y="1516"/>
-      <point x="156" y="1208"/>
-      <point x="156" y="756" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="596" y="756" type="line"/>
-      <point x="596" y="988"/>
-      <point x="692" y="1160"/>
-      <point x="876" y="1160" type="curve" smooth="yes"/>
-      <point x="1076" y="1160"/>
-      <point x="1160" y="1028"/>
-      <point x="1160" y="788" type="curve" smooth="yes"/>
-      <point x="1160" y="680" type="line" smooth="yes"/>
-      <point x="1160" y="468"/>
-      <point x="1076" y="332"/>
-      <point x="872" y="332" type="curve" smooth="yes"/>
-      <point x="684" y="332"/>
-      <point x="596" y="504"/>
-      <point x="596" y="728" type="curve" smooth="yes"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/guarani.glif b/src/Inter-UI-Black.ufo/glyphs/guarani.glif
index dc440d230..472a22a4a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/guarani.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/guarani.glif
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="guarani" format="1">
-  <advance width="2048"/>
+  <advance width="1904"/>
   <unicode hex="20B2"/>
   <outline>
     <contour>
-      <point x="1196" y="2144" type="line"/>
-      <point x="836" y="2144" type="line"/>
-      <point x="836" y="-172" type="line"/>
-      <point x="1196" y="-172" type="line"/>
+      <point x="1132" y="2304" type="line"/>
+      <point x="772" y="2304" type="line"/>
+      <point x="772" y="-256" type="line"/>
+      <point x="1132" y="-256" type="line"/>
     </contour>
-    <component base="G" xOffset="76"/>
+    <component base="G"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/hcedilla.glif b/src/Inter-UI-Black.ufo/glyphs/hcedilla.glif
index df266aeac..20045fa43 100644
--- a/src/Inter-UI-Black.ufo/glyphs/hcedilla.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/hcedilla.glif
@@ -4,7 +4,7 @@
   <unicode hex="1E29"/>
   <outline>
     <component base="h"/>
-    <component base="cedilla" xOffset="-140"/>
+    <component base="cedilla" xOffset="-20" yOffset="-16"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/henghook.glif b/src/Inter-UI-Black.ufo/glyphs/henghook.glif
index 7dfa101ff..6f6db22a9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/henghook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/henghook.glif
@@ -1,76 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="henghook" format="1">
-  <advance width="1536"/>
+  <advance width="1580"/>
   <unicode hex="0267"/>
   <outline>
     <contour>
-      <point x="836" y="2340" type="move" name="top"/>
+      <point x="580" y="1316" type="line"/>
+      <point x="580" y="1580" type="line" smooth="yes"/>
+      <point x="580" y="1692"/>
+      <point x="680" y="1720"/>
+      <point x="784" y="1720" type="curve" smooth="yes"/>
+      <point x="824" y="1720"/>
+      <point x="860" y="1716"/>
+      <point x="892" y="1712" type="curve"/>
+      <point x="892" y="2060" type="line"/>
+      <point x="836" y="2068"/>
+      <point x="760" y="2076"/>
+      <point x="660" y="2076" type="curve" smooth="yes"/>
+      <point x="420" y="2076"/>
+      <point x="128" y="2016"/>
+      <point x="128" y="1580" type="curve" smooth="yes"/>
+      <point x="128" y="1316" type="line"/>
     </contour>
     <contour>
-      <point x="780" y="-616" type="move" name="bottom"/>
+      <point x="588" y="816" type="line" smooth="yes"/>
+      <point x="588" y="1028"/>
+      <point x="648" y="1192"/>
+      <point x="820" y="1192" type="curve" smooth="yes"/>
+      <point x="948" y="1192"/>
+      <point x="992" y="1100"/>
+      <point x="992" y="964" type="curve" smooth="yes"/>
+      <point x="992" y="0" type="line"/>
+      <point x="1452" y="0" type="line"/>
+      <point x="1452" y="960" type="line" smooth="yes"/>
+      <point x="1452" y="1368"/>
+      <point x="1260" y="1556"/>
+      <point x="984" y="1556" type="curve" smooth="yes"/>
+      <point x="816" y="1556"/>
+      <point x="676" y="1488"/>
+      <point x="588" y="1372" type="curve"/>
+      <point x="572" y="1372" type="line"/>
+      <point x="572" y="1476" type="line"/>
+      <point x="128" y="1476" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="588" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="1564" y="2340" type="move" name="top0315"/>
+      <point x="992" y="184" type="line"/>
+      <point x="992" y="-80" type="line" smooth="yes"/>
+      <point x="992" y="-192"/>
+      <point x="892" y="-220"/>
+      <point x="788" y="-220" type="curve" smooth="yes"/>
+      <point x="748" y="-220"/>
+      <point x="712" y="-216"/>
+      <point x="680" y="-212" type="curve"/>
+      <point x="680" y="-560" type="line"/>
+      <point x="736" y="-568"/>
+      <point x="812" y="-576"/>
+      <point x="912" y="-576" type="curve" smooth="yes"/>
+      <point x="1152" y="-576"/>
+      <point x="1452" y="-516"/>
+      <point x="1452" y="-80" type="curve" smooth="yes"/>
+      <point x="1452" y="184" type="line"/>
     </contour>
     <contour>
-      <point x="988" y="160" type="line"/>
-      <point x="988" y="-108" type="line" smooth="yes"/>
-      <point x="988" y="-256"/>
-      <point x="856" y="-292"/>
-      <point x="752" y="-292" type="curve" smooth="yes"/>
-      <point x="716" y="-292"/>
-      <point x="680" y="-288"/>
-      <point x="644" y="-284" type="curve"/>
-      <point x="644" y="-580" type="line"/>
-      <point x="708" y="-592"/>
-      <point x="776" y="-600"/>
-      <point x="876" y="-600" type="curve" smooth="yes"/>
-      <point x="1116" y="-600"/>
-      <point x="1432" y="-548"/>
-      <point x="1432" y="-108" type="curve" smooth="yes"/>
-      <point x="1432" y="160" type="line"/>
+      <point x="836.0" y="2340.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="548" y="1596" type="line"/>
-      <point x="108" y="1596" type="line"/>
-      <point x="108" y="0" type="line"/>
-      <point x="548" y="0" type="line"/>
+      <point x="780.0" y="-616.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="492" y="796" type="line"/>
-      <point x="492" y="1004"/>
-      <point x="548" y="1160"/>
-      <point x="768" y="1160" type="curve" smooth="yes"/>
-      <point x="904" y="1160"/>
-      <point x="988" y="1108"/>
-      <point x="988" y="928" type="curve" smooth="yes"/>
-      <point x="988" y="0" type="line"/>
-      <point x="1432" y="0" type="line"/>
-      <point x="1432" y="924" type="line" smooth="yes"/>
-      <point x="1432" y="1356"/>
-      <point x="1228" y="1516"/>
-      <point x="936" y="1516" type="curve" smooth="yes"/>
-      <point x="604" y="1516"/>
-      <point x="384" y="1212"/>
-      <point x="384" y="792" type="curve"/>
-    </contour>
-    <contour>
-      <point x="548" y="1416" type="line"/>
-      <point x="548" y="1680" type="line" smooth="yes"/>
-      <point x="548" y="1832"/>
-      <point x="680" y="1868"/>
-      <point x="784" y="1868" type="curve" smooth="yes"/>
-      <point x="824" y="1868"/>
-      <point x="856" y="1864"/>
-      <point x="896" y="1856" type="curve"/>
-      <point x="896" y="2152" type="line"/>
-      <point x="828" y="2168"/>
-      <point x="760" y="2176"/>
-      <point x="660" y="2176" type="curve" smooth="yes"/>
-      <point x="420" y="2176"/>
-      <point x="108" y="2124"/>
-      <point x="108" y="1680" type="curve" smooth="yes"/>
-      <point x="108" y="1416" type="line"/>
+      <point x="1564.0" y="2340.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/hhook.glif b/src/Inter-UI-Black.ufo/glyphs/hhook.glif
index 60c55776a..5bde2caa3 100644
--- a/src/Inter-UI-Black.ufo/glyphs/hhook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/hhook.glif
@@ -1,58 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="hhook" format="1">
-  <advance width="1536"/>
+  <advance width="1580"/>
   <unicode hex="0266"/>
   <outline>
     <contour>
-      <point x="836" y="2340" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="780" y="0" type="move" name="bottom"/>
+      <point x="580" y="1316" type="line"/>
+      <point x="580" y="1580" type="line" smooth="yes"/>
+      <point x="580" y="1692"/>
+      <point x="680" y="1720"/>
+      <point x="784" y="1720" type="curve" smooth="yes"/>
+      <point x="824" y="1720"/>
+      <point x="860" y="1716"/>
+      <point x="892" y="1712" type="curve"/>
+      <point x="892" y="2060" type="line"/>
+      <point x="836" y="2068"/>
+      <point x="760" y="2076"/>
+      <point x="660" y="2076" type="curve" smooth="yes"/>
+      <point x="420" y="2076"/>
+      <point x="128" y="2016"/>
+      <point x="128" y="1580" type="curve" smooth="yes"/>
+      <point x="128" y="1316" type="line"/>
     </contour>
     <contour>
-      <point x="1564" y="2340" type="move" name="top0315"/>
+      <point x="588" y="816" type="line" smooth="yes"/>
+      <point x="588" y="1028"/>
+      <point x="648" y="1192"/>
+      <point x="820" y="1192" type="curve" smooth="yes"/>
+      <point x="948" y="1192"/>
+      <point x="992" y="1100"/>
+      <point x="992" y="964" type="curve" smooth="yes"/>
+      <point x="992" y="0" type="line"/>
+      <point x="1452" y="0" type="line"/>
+      <point x="1452" y="960" type="line" smooth="yes"/>
+      <point x="1452" y="1368"/>
+      <point x="1260" y="1556"/>
+      <point x="984" y="1556" type="curve" smooth="yes"/>
+      <point x="816" y="1556"/>
+      <point x="676" y="1488"/>
+      <point x="588" y="1372" type="curve"/>
+      <point x="572" y="1372" type="line"/>
+      <point x="572" y="1476" type="line"/>
+      <point x="128" y="1476" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="588" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="548" y="1596" type="line"/>
-      <point x="108" y="1596" type="line"/>
-      <point x="108" y="0" type="line"/>
-      <point x="548" y="0" type="line"/>
+      <point x="836" y="2340" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="492" y="796" type="line"/>
-      <point x="492" y="1004"/>
-      <point x="548" y="1160"/>
-      <point x="768" y="1160" type="curve" smooth="yes"/>
-      <point x="904" y="1160"/>
-      <point x="988" y="1108"/>
-      <point x="988" y="928" type="curve" smooth="yes"/>
-      <point x="988" y="0" type="line"/>
-      <point x="1432" y="0" type="line"/>
-      <point x="1432" y="924" type="line" smooth="yes"/>
-      <point x="1432" y="1356"/>
-      <point x="1228" y="1516"/>
-      <point x="936" y="1516" type="curve" smooth="yes"/>
-      <point x="604" y="1516"/>
-      <point x="384" y="1212"/>
-      <point x="384" y="792" type="curve"/>
+      <point x="780" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="548" y="1416" type="line"/>
-      <point x="548" y="1680" type="line" smooth="yes"/>
-      <point x="548" y="1832"/>
-      <point x="680" y="1868"/>
-      <point x="784" y="1868" type="curve" smooth="yes"/>
-      <point x="824" y="1868"/>
-      <point x="856" y="1864"/>
-      <point x="896" y="1856" type="curve"/>
-      <point x="896" y="2152" type="line"/>
-      <point x="828" y="2168"/>
-      <point x="760" y="2176"/>
-      <point x="660" y="2176" type="curve" smooth="yes"/>
-      <point x="420" y="2176"/>
-      <point x="108" y="2124"/>
-      <point x="108" y="1680" type="curve" smooth="yes"/>
-      <point x="108" y="1416" type="line"/>
+      <point x="1564" y="2340" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/hryvnia.glif b/src/Inter-UI-Black.ufo/glyphs/hryvnia.glif
index 6faa913dd..3f4566d84 100644
--- a/src/Inter-UI-Black.ufo/glyphs/hryvnia.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/hryvnia.glif
@@ -4,59 +4,59 @@
   <unicode hex="20B4"/>
   <outline>
     <contour>
-      <point x="1040" y="1664" type="curve" smooth="yes"/>
-      <point x="1164" y="1664"/>
-      <point x="1232" y="1612"/>
-      <point x="1232" y="1532" type="curve" smooth="yes"/>
-      <point x="1232" y="1456"/>
-      <point x="1204" y="1396"/>
-      <point x="1136" y="1348" type="curve"/>
-      <point x="1500" y="1256" type="line"/>
-      <point x="1592" y="1328"/>
-      <point x="1692" y="1436"/>
-      <point x="1692" y="1572" type="curve" smooth="yes"/>
-      <point x="1692" y="1844"/>
-      <point x="1456" y="2032"/>
-      <point x="1032" y="2032" type="curve" smooth="yes"/>
-      <point x="620" y="2032"/>
-      <point x="400" y="1856"/>
-      <point x="372" y="1508" type="curve"/>
-      <point x="836" y="1508" type="line"/>
-      <point x="844" y="1608"/>
-      <point x="908" y="1664"/>
+      <point x="1040" y="1700" type="curve" smooth="yes"/>
+      <point x="1164" y="1700"/>
+      <point x="1232" y="1648"/>
+      <point x="1232" y="1568" type="curve" smooth="yes"/>
+      <point x="1232" y="1488"/>
+      <point x="1204" y="1428"/>
+      <point x="1136" y="1380" type="curve"/>
+      <point x="1500" y="1284" type="line"/>
+      <point x="1592" y="1356"/>
+      <point x="1692" y="1468"/>
+      <point x="1692" y="1608" type="curve" smooth="yes"/>
+      <point x="1692" y="1884"/>
+      <point x="1456" y="2076"/>
+      <point x="1032" y="2076" type="curve" smooth="yes"/>
+      <point x="620" y="2076"/>
+      <point x="400" y="1896"/>
+      <point x="372" y="1540" type="curve"/>
+      <point x="836" y="1540" type="line"/>
+      <point x="844" y="1644"/>
+      <point x="908" y="1700"/>
     </contour>
     <contour>
-      <point x="1816" y="1080" type="line"/>
-      <point x="1816" y="1372" type="line"/>
-      <point x="236" y="1372" type="line"/>
-      <point x="236" y="1080" type="line"/>
+      <point x="1816" y="1104" type="line"/>
+      <point x="1816" y="1404" type="line"/>
+      <point x="236" y="1404" type="line"/>
+      <point x="236" y="1104" type="line"/>
     </contour>
     <contour>
-      <point x="1816" y="656" type="line"/>
-      <point x="1816" y="944" type="line"/>
-      <point x="236" y="944" type="line"/>
-      <point x="236" y="656" type="line"/>
+      <point x="1816" y="672" type="line"/>
+      <point x="1816" y="964" type="line"/>
+      <point x="236" y="964" type="line"/>
+      <point x="236" y="672" type="line"/>
     </contour>
     <contour>
       <point x="1032" y="-28" type="curve" smooth="yes"/>
       <point x="1512" y="-28"/>
-      <point x="1720" y="136"/>
-      <point x="1748" y="524" type="curve"/>
-      <point x="1280" y="524" type="line"/>
-      <point x="1268" y="384"/>
-      <point x="1176" y="336"/>
-      <point x="1032" y="336" type="curve" smooth="yes"/>
-      <point x="892" y="336"/>
-      <point x="800" y="392"/>
-      <point x="800" y="496" type="curve" smooth="yes"/>
-      <point x="800" y="568"/>
-      <point x="840" y="648"/>
-      <point x="908" y="692" type="curve"/>
-      <point x="556" y="788" type="line"/>
-      <point x="444" y="732"/>
-      <point x="340" y="600"/>
-      <point x="340" y="456" type="curve" smooth="yes"/>
-      <point x="340" y="160"/>
+      <point x="1720" y="140"/>
+      <point x="1748" y="536" type="curve"/>
+      <point x="1280" y="536" type="line"/>
+      <point x="1268" y="392"/>
+      <point x="1176" y="344"/>
+      <point x="1032" y="344" type="curve" smooth="yes"/>
+      <point x="892" y="344"/>
+      <point x="800" y="400"/>
+      <point x="800" y="508" type="curve" smooth="yes"/>
+      <point x="800" y="580"/>
+      <point x="840" y="664"/>
+      <point x="908" y="708" type="curve"/>
+      <point x="556" y="804" type="line"/>
+      <point x="444" y="748"/>
+      <point x="340" y="612"/>
+      <point x="340" y="468" type="curve" smooth="yes"/>
+      <point x="340" y="164"/>
       <point x="564" y="-28"/>
     </contour>
   </outline>
diff --git a/src/Inter-UI-Black.ufo/glyphs/hturn.glif b/src/Inter-UI-Black.ufo/glyphs/hturn.glif
index 321071ff5..9df71d1a0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/hturn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/hturn.glif
@@ -1,40 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="hturn" format="1">
-  <advance width="1792"/>
+  <advance width="1580.0"/>
   <unicode hex="0265"/>
   <outline>
+    <component base="h" xScale="-1.0" yScale="-1.0" xOffset="1580" yOffset="1536"/>
     <contour>
-      <point x="884" y="1776" type="move" name="top"/>
+      <point x="804" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="876" y="-616" type="move" name="bottom"/>
+      <point x="780" y="-616" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1688" y="1776" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="1116" y="-572" type="line"/>
-      <point x="1560" y="-572" type="line"/>
-      <point x="1560" y="1488" type="line"/>
-      <point x="1116" y="1488" type="line"/>
-    </contour>
-    <contour>
-      <point x="1172" y="692" type="line"/>
-      <point x="1172" y="484"/>
-      <point x="1120" y="332"/>
-      <point x="900" y="332" type="curve" smooth="yes"/>
-      <point x="760" y="332"/>
-      <point x="680" y="380"/>
-      <point x="680" y="560" type="curve" smooth="yes"/>
-      <point x="680" y="1488" type="line"/>
-      <point x="236" y="1488" type="line"/>
-      <point x="236" y="564" type="line" smooth="yes"/>
-      <point x="236" y="132"/>
-      <point x="436" y="-28"/>
-      <point x="732" y="-28" type="curve" smooth="yes"/>
-      <point x="1064" y="-28"/>
-      <point x="1280" y="280"/>
-      <point x="1280" y="696" type="curve"/>
+      <point x="1556" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/hturnhook2.glif b/src/Inter-UI-Black.ufo/glyphs/hturnhook2.glif
new file mode 100644
index 000000000..76bbff2ff
--- /dev/null
+++ b/src/Inter-UI-Black.ufo/glyphs/hturnhook2.glif
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="hturnhook2" format="1">
+  <advance width="1732"/>
+  <unicode hex="02AF"/>
+  <outline>
+    <contour>
+      <point x="1144" y="720" type="line" smooth="yes"/>
+      <point x="1144" y="508"/>
+      <point x="1084" y="344"/>
+      <point x="912" y="344" type="curve" smooth="yes"/>
+      <point x="784" y="344"/>
+      <point x="740" y="436"/>
+      <point x="740" y="572" type="curve" smooth="yes"/>
+      <point x="740" y="1016" type="line"/>
+      <point x="280" y="1016" type="line"/>
+      <point x="280" y="576" type="line" smooth="yes"/>
+      <point x="280" y="168"/>
+      <point x="472" y="-20"/>
+      <point x="748" y="-20" type="curve" smooth="yes"/>
+      <point x="916" y="-20"/>
+      <point x="1056" y="48"/>
+      <point x="1144" y="164" type="curve"/>
+      <point x="1160" y="164" type="line"/>
+      <point x="1160" y="60" type="line"/>
+      <point x="1604" y="60" type="line"/>
+      <point x="1604" y="1536" type="line"/>
+      <point x="1144" y="1536" type="line"/>
+    </contour>
+    <contour>
+      <point x="280" y="796" type="line"/>
+      <point x="740" y="796" type="line"/>
+      <point x="740" y="1060" type="line" smooth="yes"/>
+      <point x="740" y="1496"/>
+      <point x="440" y="1556"/>
+      <point x="200" y="1556" type="curve" smooth="yes"/>
+      <point x="100" y="1556"/>
+      <point x="24" y="1548"/>
+      <point x="-32" y="1540" type="curve"/>
+      <point x="-32" y="1192" type="line"/>
+      <point x="0" y="1196"/>
+      <point x="36" y="1200"/>
+      <point x="76" y="1200" type="curve" smooth="yes"/>
+      <point x="180" y="1200"/>
+      <point x="280" y="1172"/>
+      <point x="280" y="1060" type="curve" smooth="yes"/>
+    </contour>
+    <contour>
+      <point x="1604" y="184" type="line"/>
+      <point x="1152" y="184" type="line"/>
+      <point x="1152" y="-80" type="line" smooth="yes"/>
+      <point x="1152" y="-516"/>
+      <point x="1444" y="-576"/>
+      <point x="1684" y="-576" type="curve" smooth="yes"/>
+      <point x="1784" y="-576"/>
+      <point x="1860" y="-568"/>
+      <point x="1916" y="-560" type="curve"/>
+      <point x="1916" y="-212" type="line"/>
+      <point x="1884" y="-216"/>
+      <point x="1848" y="-220"/>
+      <point x="1808" y="-220" type="curve" smooth="yes"/>
+      <point x="1704" y="-220"/>
+      <point x="1604" y="-192"/>
+      <point x="1604" y="-80" type="curve" smooth="yes"/>
+    </contour>
+    <contour>
+      <point x="1260" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1260" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="2340" y="1776" type="move" name="top0315"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 2074, 'leftMargin': 30, 'rightMargin': 31}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/hturnlthook.glif b/src/Inter-UI-Black.ufo/glyphs/hturnlthook.glif
new file mode 100644
index 000000000..5f5de2622
--- /dev/null
+++ b/src/Inter-UI-Black.ufo/glyphs/hturnlthook.glif
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="hturnlthook" format="1">
+  <advance width="1732"/>
+  <unicode hex="02AE"/>
+  <outline>
+    <contour>
+      <point x="1144" y="720" type="line" smooth="yes"/>
+      <point x="1144" y="508"/>
+      <point x="1084" y="344"/>
+      <point x="912" y="344" type="curve" smooth="yes"/>
+      <point x="784" y="344"/>
+      <point x="740" y="436"/>
+      <point x="740" y="572" type="curve" smooth="yes"/>
+      <point x="740" y="1016" type="line"/>
+      <point x="280" y="1016" type="line"/>
+      <point x="280" y="576" type="line" smooth="yes"/>
+      <point x="280" y="168"/>
+      <point x="472" y="-20"/>
+      <point x="748" y="-20" type="curve" smooth="yes"/>
+      <point x="916" y="-20"/>
+      <point x="1056" y="48"/>
+      <point x="1144" y="164" type="curve"/>
+      <point x="1160" y="164" type="line"/>
+      <point x="1160" y="-576" type="line"/>
+      <point x="1604" y="-576" type="line"/>
+      <point x="1604" y="1536" type="line"/>
+      <point x="1144" y="1536" type="line"/>
+    </contour>
+    <contour>
+      <point x="280" y="796" type="line"/>
+      <point x="740" y="796" type="line"/>
+      <point x="740" y="1060" type="line" smooth="yes"/>
+      <point x="740" y="1496"/>
+      <point x="440" y="1556"/>
+      <point x="200" y="1556" type="curve" smooth="yes"/>
+      <point x="100" y="1556"/>
+      <point x="24" y="1548"/>
+      <point x="-32" y="1540" type="curve"/>
+      <point x="-32" y="1192" type="line"/>
+      <point x="0" y="1196"/>
+      <point x="36" y="1200"/>
+      <point x="76" y="1200" type="curve" smooth="yes"/>
+      <point x="180" y="1200"/>
+      <point x="280" y="1172"/>
+      <point x="280" y="1060" type="curve" smooth="yes"/>
+    </contour>
+    <contour>
+      <point x="1028.0" y="1776.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1028.0" y="-616.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1872.0" y="1776.0" type="move" name="top0315"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1838, 'leftMargin': 30, 'rightMargin': 140}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/hv.glif b/src/Inter-UI-Black.ufo/glyphs/hv.glif
index 85eac6bf6..e5f1e9c9d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/hv.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/hv.glif
@@ -1,51 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="hv" format="1">
-  <advance width="2304"/>
+  <advance width="2428"/>
   <unicode hex="0195"/>
   <outline>
     <contour>
-      <point x="520" y="2048" type="line"/>
-      <point x="76" y="2048" type="line"/>
-      <point x="76" y="0" type="line"/>
-      <point x="520" y="0" type="line"/>
+      <point x="1644" y="-28" type="curve" smooth="yes"/>
+      <point x="2072" y="-28"/>
+      <point x="2300" y="256"/>
+      <point x="2300" y="596" type="curve" smooth="yes"/>
+      <point x="2300" y="1536" type="line"/>
+      <point x="1840" y="1536" type="line"/>
+      <point x="1840" y="596" type="line" smooth="yes"/>
+      <point x="1840" y="436"/>
+      <point x="1768" y="352"/>
+      <point x="1644" y="352" type="curve" smooth="yes"/>
+      <point x="1520" y="352"/>
+      <point x="1452" y="436"/>
+      <point x="1452" y="596" type="curve" smooth="yes"/>
+      <point x="1452" y="740" type="line"/>
+      <point x="992" y="740" type="line"/>
+      <point x="992" y="596" type="line" smooth="yes"/>
+      <point x="992" y="256"/>
+      <point x="1216" y="-28"/>
     </contour>
     <contour>
-      <point x="516" y="816" type="line"/>
-      <point x="516" y="968"/>
-      <point x="492" y="1192"/>
-      <point x="736" y="1192" type="curve" smooth="yes"/>
-      <point x="928" y="1192"/>
-      <point x="956" y="1084"/>
-      <point x="956" y="932" type="curve" smooth="yes"/>
-      <point x="956" y="708" type="line"/>
-      <point x="1400" y="708" type="line"/>
-      <point x="1400" y="932" type="line" smooth="yes"/>
-      <point x="1400" y="1256"/>
-      <point x="1308" y="1556"/>
-      <point x="904" y="1556" type="curve" smooth="yes"/>
-      <point x="572" y="1556"/>
-      <point x="352" y="1244"/>
-      <point x="352" y="812" type="curve"/>
-    </contour>
-    <contour>
-      <point x="1592" y="-28" type="curve" smooth="yes"/>
-      <point x="2028" y="-28"/>
-      <point x="2232" y="268"/>
-      <point x="2232" y="596" type="curve" smooth="yes"/>
-      <point x="2232" y="1536" type="line"/>
-      <point x="1788" y="1536" type="line"/>
-      <point x="1788" y="596" type="line" smooth="yes"/>
-      <point x="1788" y="436"/>
-      <point x="1716" y="352"/>
-      <point x="1592" y="352" type="curve" smooth="yes"/>
-      <point x="1472" y="352"/>
-      <point x="1400" y="436"/>
-      <point x="1400" y="596" type="curve" smooth="yes"/>
-      <point x="1400" y="740" type="line"/>
-      <point x="956" y="740" type="line"/>
-      <point x="956" y="596" type="line" smooth="yes"/>
-      <point x="956" y="268"/>
-      <point x="1156" y="-28"/>
+      <point x="588" y="816" type="line" smooth="yes"/>
+      <point x="588" y="1028"/>
+      <point x="648" y="1192"/>
+      <point x="820" y="1192" type="curve" smooth="yes"/>
+      <point x="948" y="1192"/>
+      <point x="992" y="1100"/>
+      <point x="992" y="964" type="curve" smooth="yes"/>
+      <point x="992" y="672" type="line"/>
+      <point x="1452" y="672" type="line"/>
+      <point x="1452" y="960" type="line" smooth="yes"/>
+      <point x="1452" y="1368"/>
+      <point x="1260" y="1556"/>
+      <point x="984" y="1556" type="curve" smooth="yes"/>
+      <point x="816" y="1556"/>
+      <point x="676" y="1488"/>
+      <point x="588" y="1372" type="curve"/>
+      <point x="572" y="1372" type="line"/>
+      <point x="572" y="2048" type="line"/>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="588" y="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 87470a010..c883cbdd6 100644
--- a/src/Inter-UI-Black.ufo/glyphs/jdotlessbar.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/jdotlessbar.glif
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="jdotlessbar" format="1">
-  <advance width="1280"/>
+  <advance width="1044"/>
   <unicode hex="025F"/>
   <outline>
+    <component base="dotlessj"/>
+    <component base="crossbar" xOffset="-92" yOffset="-896"/>
     <contour>
       <point x="696" y="1776" type="move" name="top"/>
     </contour>
@@ -12,30 +14,6 @@
     <contour>
       <point x="1148" y="1776" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1132" y="264" type="line"/>
-      <point x="176" y="264" type="line"/>
-      <point x="176" y="0" type="line"/>
-      <point x="1132" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="472" y="1488" type="line"/>
-      <point x="472" y="-48" type="line" smooth="yes"/>
-      <point x="472" y="-176"/>
-      <point x="404" y="-240"/>
-      <point x="280" y="-240" type="curve" smooth="yes"/>
-      <point x="236" y="-240"/>
-      <point x="196" y="-236"/>
-      <point x="152" y="-228" type="curve"/>
-      <point x="152" y="-580" type="line"/>
-      <point x="228" y="-596"/>
-      <point x="288" y="-600"/>
-      <point x="364" y="-600" type="curve" smooth="yes"/>
-      <point x="708" y="-600"/>
-      <point x="916" y="-408"/>
-      <point x="916" y="-48" type="curve" smooth="yes"/>
-      <point x="916" y="1488" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/khook.glif b/src/Inter-UI-Black.ufo/glyphs/khook.glif
index 4dae33fbf..5a6b919bf 100644
--- a/src/Inter-UI-Black.ufo/glyphs/khook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/khook.glif
@@ -1,45 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="khook" format="1">
-  <advance width="1536"/>
+  <advance width="1556"/>
   <unicode hex="0199"/>
   <outline>
     <contour>
-      <point x="496" y="1416" type="line" name="hr00"/>
-      <point x="56" y="1416" type="line"/>
-      <point x="56" y="0" type="line"/>
-      <point x="496" y="0" type="line"/>
+      <point x="1076" y="0" type="line"/>
+      <point x="1572" y="0" type="line"/>
+      <point x="996" y="880" type="line"/>
+      <point x="1548" y="1536" type="line"/>
+      <point x="1016" y="1536" type="line"/>
+      <point x="608" y="1028" type="line"/>
+      <point x="588" y="1028" type="line"/>
+      <point x="588" y="1472" type="line"/>
+      <point x="128" y="1472" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="588" y="0" type="line"/>
+      <point x="588" y="396" type="line"/>
+      <point x="720" y="552" type="line"/>
     </contour>
     <contour>
-      <point x="1444" y="1488" type="line"/>
-      <point x="912" y="1488" type="line"/>
-      <point x="552" y="1052" type="line"/>
-      <point x="272" y="688" type="line"/>
-      <point x="456" y="392" type="line"/>
-      <point x="800" y="732" type="line"/>
-    </contour>
-    <contour>
-      <point x="976" y="0" type="line"/>
-      <point x="1484" y="0" type="line"/>
-      <point x="884" y="920" type="line"/>
-      <point x="564" y="680" type="line"/>
-    </contour>
-    <contour>
-      <point x="496" y="1384" type="line"/>
-      <point x="496" y="1648" type="line" smooth="yes"/>
-      <point x="496" y="1800"/>
-      <point x="628" y="1832"/>
-      <point x="732" y="1832" type="curve" smooth="yes"/>
-      <point x="772" y="1832"/>
-      <point x="804" y="1828"/>
-      <point x="844" y="1824" type="curve"/>
-      <point x="844" y="2120" type="line"/>
-      <point x="780" y="2136"/>
-      <point x="676" y="2140"/>
-      <point x="612" y="2140" type="curve" smooth="yes"/>
-      <point x="224" y="2140"/>
-      <point x="56" y="1980"/>
-      <point x="56" y="1648" type="curve" smooth="yes"/>
-      <point x="56" y="1384" type="line"/>
+      <point x="588" y="1316" type="line"/>
+      <point x="588" y="1580" type="line" smooth="yes"/>
+      <point x="588" y="1692"/>
+      <point x="688" y="1720"/>
+      <point x="792" y="1720" type="curve" smooth="yes"/>
+      <point x="832" y="1720"/>
+      <point x="868" y="1716"/>
+      <point x="900" y="1712" type="curve"/>
+      <point x="900" y="2060" type="line"/>
+      <point x="844" y="2068"/>
+      <point x="756" y="2076"/>
+      <point x="668" y="2076" type="curve" smooth="yes"/>
+      <point x="432" y="2076"/>
+      <point x="128" y="2016"/>
+      <point x="128" y="1580" type="curve" smooth="yes"/>
+      <point x="128" y="1316" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/kip.glif b/src/Inter-UI-Black.ufo/glyphs/kip.glif
index b09246c6d..e99ee0f9a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/kip.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/kip.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="kip" format="1">
-  <advance width="2304"/>
+  <advance width="2216"/>
   <unicode hex="20AD"/>
   <outline>
     <contour>
-      <point x="2096" y="1204" type="line"/>
-      <point x="172" y="1204" type="line"/>
-      <point x="172" y="816" type="line"/>
-      <point x="2096" y="816" type="line"/>
+      <point x="2052" y="1304" type="line"/>
+      <point x="128" y="1304" type="line"/>
+      <point x="128" y="916" type="line"/>
+      <point x="2052" y="916" type="line"/>
     </contour>
     <component base="K" xOffset="280"/>
   </outline>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ksicyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/ksicyrillic.glif
index fe8226023..0e9c42c86 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ksicyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ksicyrillic.glif
@@ -3,12 +3,6 @@
   <advance width="1536"/>
   <unicode hex="046F"/>
   <outline>
-    <contour>
-      <point x="764" y="2392" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1560" y="2392" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="284" y="1488" type="line"/>
       <point x="284" y="1172" type="line"/>
@@ -62,6 +56,12 @@
       <point x="664" y="796" type="curve" smooth="yes"/>
     </contour>
     <component base="caron" xOffset="100" yOffset="-16"/>
+    <contour>
+      <point x="764" y="2392" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1560" y="2392" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/kturn.glif b/src/Inter-UI-Black.ufo/glyphs/kturn.glif
index b48ab1936..6861b82d4 100644
--- a/src/Inter-UI-Black.ufo/glyphs/kturn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/kturn.glif
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="kturn" format="1">
-  <advance width="1536"/>
+  <advance width="1556.0"/>
   <unicode hex="029E"/>
   <outline>
+    <component base="k" xScale="-1.0" yScale="-1.0" xOffset="1556" yOffset="1536"/>
     <contour>
-      <point x="820" y="1776" type="move" name="top"/>
+      <point x="672" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="820" y="-616" type="move" name="bottom"/>
+      <point x="672" y="-616" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1624" y="1776" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="1040" y="-572" type="line"/>
-      <point x="1484" y="-572" type="line"/>
-      <point x="1484" y="1488" type="line"/>
-      <point x="1040" y="1488" type="line"/>
-    </contour>
-    <contour>
-      <point x="92" y="0" type="line"/>
-      <point x="624" y="0" type="line"/>
-      <point x="984" y="436" type="line"/>
-      <point x="1264" y="804" type="line"/>
-      <point x="1080" y="1096" type="line"/>
-      <point x="740" y="760" type="line"/>
-    </contour>
-    <contour>
-      <point x="564" y="1488" type="line"/>
-      <point x="56" y="1488" type="line"/>
-      <point x="652" y="568" type="line"/>
-      <point x="972" y="812" type="line"/>
+      <point x="1476" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/lari.glif b/src/Inter-UI-Black.ufo/glyphs/lari.glif
index 8b2683309..0e6723aaf 100644
--- a/src/Inter-UI-Black.ufo/glyphs/lari.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/lari.glif
@@ -4,16 +4,16 @@
   <unicode hex="20BE"/>
   <outline>
     <contour>
-      <point x="1324" y="936" type="line"/>
-      <point x="1324" y="2032" type="line"/>
-      <point x="1092" y="2032" type="line"/>
-      <point x="1092" y="936" type="line"/>
+      <point x="1324" y="952" type="line"/>
+      <point x="1324" y="2048" type="line"/>
+      <point x="1092" y="2048" type="line"/>
+      <point x="1092" y="952" type="line"/>
     </contour>
     <contour>
-      <point x="960" y="936" type="line"/>
-      <point x="960" y="2032" type="line"/>
-      <point x="732" y="2032" type="line"/>
-      <point x="732" y="936" type="line"/>
+      <point x="960" y="952" type="line"/>
+      <point x="960" y="2048" type="line"/>
+      <point x="732" y="2048" type="line"/>
+      <point x="732" y="952" type="line"/>
     </contour>
     <contour>
       <point x="164" y="0" type="line"/>
@@ -25,22 +25,22 @@
       <point x="1164" y="0" type="curve"/>
       <point x="1028" y="360" type="line"/>
       <point x="748" y="360"/>
-      <point x="596" y="580"/>
-      <point x="596" y="952" type="curve" smooth="yes"/>
-      <point x="596" y="1360"/>
-      <point x="744" y="1496"/>
-      <point x="1024" y="1496" type="curve" smooth="yes"/>
-      <point x="1296" y="1496"/>
-      <point x="1452" y="1356"/>
-      <point x="1452" y="936" type="curve"/>
-      <point x="1892" y="936" type="line"/>
-      <point x="1892" y="1508"/>
-      <point x="1532" y="1856"/>
-      <point x="1024" y="1856" type="curve" smooth="yes"/>
-      <point x="512" y="1856"/>
-      <point x="156" y="1512"/>
-      <point x="156" y="956" type="curve" smooth="yes"/>
-      <point x="156" y="404"/>
+      <point x="596" y="596"/>
+      <point x="596" y="968" type="curve" smooth="yes"/>
+      <point x="596" y="1376"/>
+      <point x="744" y="1512"/>
+      <point x="1024" y="1512" type="curve" smooth="yes"/>
+      <point x="1296" y="1512"/>
+      <point x="1452" y="1372"/>
+      <point x="1452" y="952" type="curve"/>
+      <point x="1892" y="952" type="line"/>
+      <point x="1892" y="1524"/>
+      <point x="1532" y="1872"/>
+      <point x="1024" y="1872" type="curve" smooth="yes"/>
+      <point x="512" y="1872"/>
+      <point x="156" y="1528"/>
+      <point x="156" y="972" type="curve" smooth="yes"/>
+      <point x="156" y="420"/>
       <point x="572" y="0"/>
     </contour>
   </outline>
diff --git a/src/Inter-UI-Black.ufo/glyphs/lbelt.glif b/src/Inter-UI-Black.ufo/glyphs/lbelt.glif
index 7cb7d18fb..a89cc0132 100644
--- a/src/Inter-UI-Black.ufo/glyphs/lbelt.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/lbelt.glif
@@ -4,30 +4,30 @@
   <unicode hex="026C"/>
   <outline>
     <contour>
-      <point x="1244" y="968" type="line"/>
-      <point x="1244" y="1272"/>
-      <point x="1120" y="1516"/>
-      <point x="688" y="1516" type="curve" smooth="yes"/>
-      <point x="340" y="1516"/>
-      <point x="176" y="1360"/>
-      <point x="176" y="1128" type="curve" smooth="yes"/>
-      <point x="176" y="896"/>
-      <point x="340" y="744"/>
-      <point x="648" y="744" type="curve" smooth="yes"/>
-      <point x="1620" y="744" type="line"/>
-      <point x="1620" y="1044" type="line"/>
-      <point x="696" y="1044" type="line" smooth="yes"/>
-      <point x="612" y="1044"/>
-      <point x="556" y="1072"/>
-      <point x="556" y="1140" type="curve" smooth="yes"/>
-      <point x="556" y="1216"/>
-      <point x="616" y="1240"/>
-      <point x="680" y="1240" type="curve" smooth="yes"/>
-      <point x="768" y="1240"/>
-      <point x="800" y="1180"/>
-      <point x="800" y="1084" type="curve" smooth="yes"/>
-      <point x="800" y="576" type="line"/>
-      <point x="1244" y="576" type="line"/>
+      <point x="1604" y="744" type="line"/>
+      <point x="1604" y="1044" type="line"/>
+      <point x="664" y="1044" type="line" smooth="yes"/>
+      <point x="580" y="1044"/>
+      <point x="544" y="1092"/>
+      <point x="544" y="1140" type="curve" smooth="yes"/>
+      <point x="544" y="1192"/>
+      <point x="596" y="1236"/>
+      <point x="664" y="1236" type="curve" smooth="yes"/>
+      <point x="732" y="1236"/>
+      <point x="768" y="1192"/>
+      <point x="768" y="1084" type="curve" smooth="yes"/>
+      <point x="768" y="576" type="line"/>
+      <point x="1228" y="576" type="line"/>
+      <point x="1228" y="968" type="line" smooth="yes"/>
+      <point x="1228" y="1272"/>
+      <point x="1104" y="1556"/>
+      <point x="672" y="1556" type="curve" smooth="yes"/>
+      <point x="324" y="1556"/>
+      <point x="160" y="1360"/>
+      <point x="160" y="1128" type="curve" smooth="yes"/>
+      <point x="160" y="904"/>
+      <point x="308" y="744"/>
+      <point x="616" y="744" type="curve" smooth="yes"/>
     </contour>
     <component base="l" xOffset="640"/>
     <contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/lcurl.glif b/src/Inter-UI-Black.ufo/glyphs/lcurl.glif
new file mode 100644
index 000000000..5a051b5a1
--- /dev/null
+++ b/src/Inter-UI-Black.ufo/glyphs/lcurl.glif
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="lcurl" format="1">
+  <advance width="1184"/>
+  <unicode hex="0234"/>
+  <outline>
+    <contour>
+      <point x="128" y="400" type="line"/>
+      <point x="128" y="4" type="line"/>
+      <point x="128" y="-396"/>
+      <point x="452" y="-576"/>
+      <point x="704" y="-576" type="curve" smooth="yes"/>
+      <point x="980" y="-576"/>
+      <point x="1152" y="-364"/>
+      <point x="1152" y="-152" type="curve" smooth="yes"/>
+      <point x="1152" y="56"/>
+      <point x="988" y="240"/>
+      <point x="740" y="240" type="curve" smooth="yes"/>
+      <point x="504" y="240"/>
+      <point x="176" y="84"/>
+      <point x="-60" y="-104" type="curve" smooth="yes"/>
+      <point x="-256" y="-260" type="line"/>
+      <point x="-40" y="-516" type="line"/>
+      <point x="232" y="-292" type="line" smooth="yes"/>
+      <point x="416" y="-140"/>
+      <point x="548" y="-68"/>
+      <point x="696" y="-68" type="curve" smooth="yes"/>
+      <point x="760" y="-68"/>
+      <point x="796" y="-124"/>
+      <point x="796" y="-164" type="curve" smooth="yes"/>
+      <point x="796" y="-220"/>
+      <point x="756" y="-268"/>
+      <point x="708" y="-268" type="curve" smooth="yes"/>
+      <point x="620" y="-268"/>
+      <point x="588" y="-208"/>
+      <point x="588" y="-112" type="curve" smooth="yes"/>
+      <point x="588" y="-72"/>
+      <point x="588" y="400"/>
+      <point x="588" y="400" type="curve"/>
+    </contour>
+    <component base="l"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.adobe.type.autohint</key>
+      <data>
+      </data>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1513, 'leftMargin': 28, 'rightMargin': 42}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/leftloop.cn.glif b/src/Inter-UI-Black.ufo/glyphs/leftloop.cn.glif
index cb570fc2b..1f32b3662 100644
--- a/src/Inter-UI-Black.ufo/glyphs/leftloop.cn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/leftloop.cn.glif
@@ -8,9 +8,9 @@
       <point x="1060" y="1556"/>
       <point x="736" y="1556" type="curve" smooth="yes"/>
       <point x="356" y="1556"/>
-      <point x="80.0" y="1220.0"/>
-      <point x="80.0" y="764.0" type="curve"/>
-      <point x="80.0" y="304.0"/>
+      <point x="80" y="1220"/>
+      <point x="80" y="764" type="curve"/>
+      <point x="80" y="304"/>
       <point x="356" y="-28"/>
       <point x="740" y="-28" type="curve"/>
       <point x="1060" y="-28"/>
@@ -20,17 +20,17 @@
       <point x="1068" y="784" type="line"/>
       <point x="1068" y="720"/>
       <point x="1056" y="612"/>
-      <point x="1044.0" y="548.0" type="curve"/>
-      <point x="1024.0" y="464.0"/>
-      <point x="968.0" y="340.0"/>
-      <point x="796.0" y="340.0" type="curve" smooth="yes"/>
-      <point x="588.0" y="340.0"/>
-      <point x="516.0" y="520.0"/>
-      <point x="516.0" y="764.0" type="curve"/>
-      <point x="516.0" y="1000.0"/>
-      <point x="588.0" y="1192.0"/>
-      <point x="792.0" y="1192.0" type="curve"/>
-      <point x="992.0" y="1192.0"/>
+      <point x="1044" y="548" type="curve"/>
+      <point x="1024" y="464"/>
+      <point x="968" y="340"/>
+      <point x="796" y="340" type="curve" smooth="yes"/>
+      <point x="588" y="340"/>
+      <point x="516" y="520"/>
+      <point x="516" y="764" type="curve"/>
+      <point x="516" y="1000"/>
+      <point x="588" y="1192"/>
+      <point x="792" y="1192" type="curve"/>
+      <point x="992" y="1192"/>
       <point x="1036" y="1004"/>
       <point x="1048" y="948" type="curve"/>
       <point x="1060" y="888"/>
@@ -39,16 +39,16 @@
       <point x="1256" y="752" type="line"/>
     </contour>
     <contour>
-      <point x="1044" y="96" type="line"/>
-      <point x="1188" y="96" type="line"/>
-      <point x="1188" y="312" type="line"/>
-      <point x="1044" y="312" type="line"/>
+      <point x="1004" y="60" type="line"/>
+      <point x="1148" y="60" type="line"/>
+      <point x="1148" y="276" type="line"/>
+      <point x="1004" y="276" type="line"/>
     </contour>
     <contour>
-      <point x="1052" y="1168" type="line"/>
-      <point x="1200" y="1168" type="line"/>
-      <point x="1200" y="1416" type="line"/>
-      <point x="1052" y="1416" type="line"/>
+      <point x="1000" y="1220" type="line"/>
+      <point x="1148" y="1220" type="line"/>
+      <point x="1148" y="1468" type="line"/>
+      <point x="1000" y="1468" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/lira.glif b/src/Inter-UI-Black.ufo/glyphs/lira.glif
index b648053d4..59e5832c2 100644
--- a/src/Inter-UI-Black.ufo/glyphs/lira.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/lira.glif
@@ -10,27 +10,27 @@
       <point x="164" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="820" y="1428" type="line"/>
-      <point x="820" y="1584"/>
-      <point x="892" y="1656"/>
-      <point x="992" y="1656" type="curve" smooth="yes"/>
-      <point x="1104" y="1656"/>
-      <point x="1196" y="1604"/>
-      <point x="1196" y="1440" type="curve"/>
-      <point x="1632" y="1440" type="line"/>
-      <point x="1632" y="1792"/>
-      <point x="1400" y="2028"/>
-      <point x="988" y="2028" type="curve" smooth="yes"/>
-      <point x="608" y="2028"/>
-      <point x="364" y="1808"/>
-      <point x="364" y="1428" type="curve" smooth="yes"/>
+      <point x="820" y="1476" type="line"/>
+      <point x="820" y="1632"/>
+      <point x="892" y="1704"/>
+      <point x="992" y="1704" type="curve" smooth="yes"/>
+      <point x="1104" y="1704"/>
+      <point x="1196" y="1652"/>
+      <point x="1196" y="1488" type="curve"/>
+      <point x="1632" y="1488" type="line"/>
+      <point x="1632" y="1840"/>
+      <point x="1400" y="2076"/>
+      <point x="988" y="2076" type="curve" smooth="yes"/>
+      <point x="608" y="2076"/>
+      <point x="352" y="1856"/>
+      <point x="364" y="1476" type="curve" smooth="yes"/>
       <point x="388" y="588" type="line" smooth="yes"/>
-      <point x="388" y="484"/>
+      <point x="392" y="484"/>
       <point x="384" y="392"/>
       <point x="300" y="372" type="curve"/>
       <point x="568" y="236" type="line"/>
       <point x="784" y="324"/>
-      <point x="856" y="432"/>
+      <point x="864" y="432"/>
       <point x="856" y="616" type="curve" smooth="yes"/>
     </contour>
     <contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/lrthook.glif b/src/Inter-UI-Black.ufo/glyphs/lrthook.glif
index b2a6643d5..3d366a507 100644
--- a/src/Inter-UI-Black.ufo/glyphs/lrthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/lrthook.glif
@@ -1,8 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="lrthook" format="1">
-  <advance width="1024"/>
+  <advance width="716"/>
   <unicode hex="026D"/>
   <outline>
+    <contour>
+      <point x="588" y="184" type="line"/>
+      <point x="128" y="184" type="line"/>
+      <point x="128" y="-80" type="line" smooth="yes"/>
+      <point x="128" y="-516"/>
+      <point x="428" y="-576"/>
+      <point x="668" y="-576" type="curve" smooth="yes"/>
+      <point x="768" y="-576"/>
+      <point x="844" y="-568"/>
+      <point x="900" y="-560" type="curve"/>
+      <point x="900" y="-212" type="line"/>
+      <point x="868" y="-216"/>
+      <point x="832" y="-220"/>
+      <point x="792" y="-220" type="curve" smooth="yes"/>
+      <point x="688" y="-220"/>
+      <point x="588" y="-192"/>
+      <point x="588" y="-80" type="curve" smooth="yes"/>
+    </contour>
+    <component base="l"/>
     <contour>
       <point x="336" y="2200" type="move" name="top"/>
     </contour>
@@ -12,24 +31,6 @@
     <contour>
       <point x="908" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="120" y="2112" type="line"/>
-      <point x="120" y="-108" type="line" smooth="yes"/>
-      <point x="120" y="-548"/>
-      <point x="432" y="-600"/>
-      <point x="672" y="-600" type="curve" smooth="yes"/>
-      <point x="772" y="-600"/>
-      <point x="840" y="-592"/>
-      <point x="908" y="-580" type="curve"/>
-      <point x="908" y="-284" type="line"/>
-      <point x="868" y="-288"/>
-      <point x="836" y="-292"/>
-      <point x="796" y="-292" type="curve" smooth="yes"/>
-      <point x="692" y="-292"/>
-      <point x="564" y="-256"/>
-      <point x="564" y="-108" type="curve" smooth="yes"/>
-      <point x="564" y="2112" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/manat.glif b/src/Inter-UI-Black.ufo/glyphs/manat.glif
index f98e9f69b..e7e477b2c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/manat.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/manat.glif
@@ -24,8 +24,8 @@
       <point x="1472" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="1248" y="1488" type="line"/>
-      <point x="804" y="1488" type="line"/>
+      <point x="1248" y="1536" type="line"/>
+      <point x="804" y="1536" type="line"/>
       <point x="804" y="0" type="line"/>
       <point x="1248" y="0" type="line"/>
     </contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/mhook.glif b/src/Inter-UI-Black.ufo/glyphs/mhook.glif
index eebc56bb5..171038ef4 100644
--- a/src/Inter-UI-Black.ufo/glyphs/mhook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/mhook.glif
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="mhook" format="1">
-  <advance width="2304"/>
+  <advance width="2408"/>
   <unicode hex="0271"/>
   <outline>
     <contour>
-      <point x="1812" y="296" type="line"/>
-      <point x="1812" y="-108" type="line" smooth="yes"/>
-      <point x="1812" y="-256"/>
-      <point x="1684" y="-292"/>
-      <point x="1580" y="-292" type="curve" smooth="yes"/>
-      <point x="1540" y="-292"/>
-      <point x="1508" y="-288"/>
-      <point x="1472" y="-284" type="curve"/>
-      <point x="1472" y="-580" type="line"/>
-      <point x="1536" y="-592"/>
-      <point x="1604" y="-600"/>
-      <point x="1704" y="-600" type="curve" smooth="yes"/>
-      <point x="1944" y="-600"/>
-      <point x="2256" y="-548"/>
-      <point x="2256" y="-108" type="curve" smooth="yes"/>
-      <point x="2256" y="296" type="line"/>
+      <point x="1820" y="184" type="line"/>
+      <point x="1820" y="-80" type="line" smooth="yes"/>
+      <point x="1820" y="-192"/>
+      <point x="1720" y="-220"/>
+      <point x="1616" y="-220" type="curve" smooth="yes"/>
+      <point x="1576" y="-220"/>
+      <point x="1540" y="-216"/>
+      <point x="1508" y="-212" type="curve"/>
+      <point x="1508" y="-560" type="line"/>
+      <point x="1564" y="-568"/>
+      <point x="1640" y="-576"/>
+      <point x="1740" y="-576" type="curve" smooth="yes"/>
+      <point x="1980" y="-576"/>
+      <point x="2280" y="-516"/>
+      <point x="2280" y="-80" type="curve" smooth="yes"/>
+      <point x="2280" y="184" type="line"/>
     </contour>
-    <component base="m" xOffset="-32"/>
+    <component base="m"/>
     <contour>
       <point x="1188" y="1776" type="move" name="top"/>
     </contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/mturn.glif b/src/Inter-UI-Black.ufo/glyphs/mturn.glif
index 3ed178059..e7d17580b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/mturn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/mturn.glif
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="mturn" format="1">
-  <advance width="2304"/>
+  <advance width="2408"/>
   <unicode hex="026F"/>
   <outline>
+    <component base="m" xScale="-1.0" yScale="-1.0" xOffset="2408" yOffset="1536"/>
     <contour>
       <point x="1160" y="1776" type="move" name="top"/>
     </contour>
@@ -12,49 +13,6 @@
     <contour>
       <point x="2368" y="1776" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="548" y="-28" type="curve" smooth="yes"/>
-      <point x="924" y="-28"/>
-      <point x="1116" y="280"/>
-      <point x="1116" y="696" type="curve"/>
-      <point x="980" y="692" type="line"/>
-      <point x="980" y="484"/>
-      <point x="896" y="332"/>
-      <point x="716" y="332" type="curve" smooth="yes"/>
-      <point x="596" y="332"/>
-      <point x="524" y="368"/>
-      <point x="524" y="552" type="curve" smooth="yes"/>
-      <point x="524" y="1488" type="line"/>
-      <point x="80" y="1488" type="line"/>
-      <point x="80" y="552" type="line" smooth="yes"/>
-      <point x="80" y="120"/>
-      <point x="268" y="-28"/>
-    </contour>
-    <contour>
-      <point x="1372" y="-28" type="curve" smooth="yes"/>
-      <point x="1748" y="-28"/>
-      <point x="1952" y="280"/>
-      <point x="1952" y="696" type="curve"/>
-      <point x="1840" y="692" type="line"/>
-      <point x="1840" y="484"/>
-      <point x="1748" y="332"/>
-      <point x="1568" y="332" type="curve" smooth="yes"/>
-      <point x="1448" y="332"/>
-      <point x="1376" y="368"/>
-      <point x="1376" y="556" type="curve" smooth="yes"/>
-      <point x="1376" y="1488" type="line"/>
-      <point x="932" y="1488" type="line"/>
-      <point x="932" y="496" type="line" smooth="yes"/>
-      <point x="932" y="124"/>
-      <point x="1112" y="-28"/>
-    </contour>
-    <contour>
-      <point x="1784" y="316" type="line"/>
-      <point x="1812" y="0" type="line"/>
-      <point x="2228" y="0" type="line"/>
-      <point x="2228" y="1488" type="line"/>
-      <point x="1784" y="1488" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/mturndescend.glif b/src/Inter-UI-Black.ufo/glyphs/mturndescend.glif
index f48a8807c..68aac4537 100644
--- a/src/Inter-UI-Black.ufo/glyphs/mturndescend.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/mturndescend.glif
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="mturndescend" format="1">
-  <advance width="2304"/>
+  <advance width="2408"/>
   <unicode hex="0270"/>
   <outline>
+    <contour>
+      <point x="1832" y="-576" type="line"/>
+      <point x="2280" y="-576" type="line"/>
+      <point x="2280" y="24" type="line"/>
+      <point x="1832" y="24" type="line"/>
+    </contour>
+    <component base="m" xScale="-1.0" yScale="-1.0" xOffset="2408" yOffset="1536"/>
     <contour>
       <point x="1160" y="1776" type="move" name="top"/>
     </contour>
@@ -12,49 +19,6 @@
     <contour>
       <point x="2368" y="1776" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1784" y="316" type="line"/>
-      <point x="1784" y="-572" type="line"/>
-      <point x="2228" y="-572" type="line"/>
-      <point x="2228" y="1488" type="line"/>
-      <point x="1784" y="1488" type="line"/>
-    </contour>
-    <contour>
-      <point x="1840" y="692" type="line"/>
-      <point x="1840" y="484"/>
-      <point x="1748" y="332"/>
-      <point x="1568" y="332" type="curve" smooth="yes"/>
-      <point x="1448" y="332"/>
-      <point x="1376" y="368"/>
-      <point x="1376" y="556" type="curve"/>
-      <point x="1376" y="1488" type="line"/>
-      <point x="932" y="1488" type="line"/>
-      <point x="932" y="496" type="line"/>
-      <point x="932" y="124"/>
-      <point x="1112" y="-28"/>
-      <point x="1372" y="-28" type="curve" smooth="yes"/>
-      <point x="1748" y="-28"/>
-      <point x="1952" y="280"/>
-      <point x="1952" y="696" type="curve"/>
-    </contour>
-    <contour>
-      <point x="980" y="692" type="line"/>
-      <point x="980" y="484"/>
-      <point x="896" y="332"/>
-      <point x="716" y="332" type="curve" smooth="yes"/>
-      <point x="596" y="332"/>
-      <point x="524" y="368"/>
-      <point x="524" y="552" type="curve" smooth="yes"/>
-      <point x="524" y="1488" type="line"/>
-      <point x="80" y="1488" type="line"/>
-      <point x="80" y="552" type="line" smooth="yes"/>
-      <point x="80" y="120"/>
-      <point x="268" y="-28"/>
-      <point x="548" y="-28" type="curve" smooth="yes"/>
-      <point x="924" y="-28"/>
-      <point x="1116" y="280"/>
-      <point x="1116" y="696" type="curve"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/mu.glif b/src/Inter-UI-Black.ufo/glyphs/mu.glif
index 8eeae9a95..b0f675f9a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/mu.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/mu.glif
@@ -1,37 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="mu" format="1">
-  <advance width="1792"/>
+  <advance width="1632"/>
   <unicode hex="00B5"/>
   <outline>
     <contour>
-      <point x="1140" y="1488" type="line"/>
-      <point x="1140" y="344" type="line"/>
-      <point x="1168" y="0" type="line"/>
-      <point x="1584" y="0" type="line"/>
-      <point x="1584" y="1488" type="line"/>
+      <point x="1060" y="1536" type="line"/>
+      <point x="1060" y="344" type="line"/>
+      <point x="1088" y="0" type="line"/>
+      <point x="1504" y="0" type="line"/>
+      <point x="1504" y="1536" type="line"/>
     </contour>
     <contour>
-      <point x="1192" y="692" type="line"/>
-      <point x="1192" y="488"/>
-      <point x="1116" y="336"/>
-      <point x="884" y="336" type="curve" smooth="yes"/>
-      <point x="740" y="336"/>
-      <point x="652" y="388"/>
-      <point x="652" y="636" type="curve"/>
-      <point x="420" y="636" type="line"/>
-      <point x="452" y="296" type="line"/>
-      <point x="528" y="72"/>
-      <point x="672" y="-28"/>
-      <point x="868" y="-28" type="curve" smooth="yes"/>
-      <point x="1204" y="-28"/>
-      <point x="1376" y="280"/>
-      <point x="1376" y="696" type="curve"/>
+      <point x="1060" y="692" type="line"/>
+      <point x="1060" y="492"/>
+      <point x="1000" y="336"/>
+      <point x="804" y="336" type="curve" smooth="yes"/>
+      <point x="652" y="336"/>
+      <point x="572" y="432"/>
+      <point x="572" y="684" type="curve"/>
+      <point x="340" y="684" type="line"/>
+      <point x="396" y="108"/>
+      <point x="592" y="-28"/>
+      <point x="788" y="-28" type="curve" smooth="yes"/>
+      <point x="1124" y="-28"/>
+      <point x="1296" y="280"/>
+      <point x="1296" y="696" type="curve"/>
     </contour>
     <contour>
-      <point x="208" y="1488" type="line"/>
-      <point x="208" y="-572" type="line"/>
-      <point x="652" y="-572" type="line"/>
-      <point x="652" y="1488" type="line"/>
+      <point x="128" y="1536" type="line"/>
+      <point x="128" y="-572" type="line"/>
+      <point x="572" y="-572" type="line"/>
+      <point x="572" y="1536" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/naira.glif b/src/Inter-UI-Black.ufo/glyphs/naira.glif
index a8adf01d4..4936d4070 100644
--- a/src/Inter-UI-Black.ufo/glyphs/naira.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/naira.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="naira" format="1">
-  <advance width="2560"/>
+  <advance width="2328"/>
   <unicode hex="20A6"/>
   <outline>
     <contour>
-      <point x="2380" y="1380" type="line"/>
-      <point x="180" y="1380" type="line"/>
-      <point x="180" y="1160" type="line"/>
-      <point x="2380" y="1160" type="line"/>
+      <point x="2264" y="1380" type="line"/>
+      <point x="64" y="1380" type="line"/>
+      <point x="64" y="1160" type="line"/>
+      <point x="2264" y="1160" type="line"/>
     </contour>
     <contour>
-      <point x="2380" y="924" type="line"/>
-      <point x="180" y="924" type="line"/>
-      <point x="180" y="704" type="line"/>
-      <point x="2380" y="704" type="line"/>
+      <point x="2264" y="924" type="line"/>
+      <point x="64" y="924" type="line"/>
+      <point x="64" y="704" type="line"/>
+      <point x="2264" y="704" type="line"/>
     </contour>
-    <component base="N" xOffset="288"/>
+    <component base="N" xOffset="204"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ncurl.glif b/src/Inter-UI-Black.ufo/glyphs/ncurl.glif
new file mode 100644
index 000000000..7dd529242
--- /dev/null
+++ b/src/Inter-UI-Black.ufo/glyphs/ncurl.glif
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="ncurl" format="1">
+  <advance width="2092"/>
+  <unicode hex="0235"/>
+  <outline>
+    <contour>
+      <point x="1036" y="400" type="line"/>
+      <point x="1036" y="4" type="line"/>
+      <point x="1036" y="-396"/>
+      <point x="1360" y="-576"/>
+      <point x="1612" y="-576" type="curve" smooth="yes"/>
+      <point x="1888" y="-576"/>
+      <point x="2060" y="-364"/>
+      <point x="2060" y="-152" type="curve" smooth="yes"/>
+      <point x="2060" y="56"/>
+      <point x="1896" y="240"/>
+      <point x="1648" y="240" type="curve" smooth="yes"/>
+      <point x="1412" y="240"/>
+      <point x="1084" y="84"/>
+      <point x="848" y="-104" type="curve" smooth="yes"/>
+      <point x="652" y="-260" type="line"/>
+      <point x="868" y="-516" type="line"/>
+      <point x="1140" y="-292" type="line" smooth="yes"/>
+      <point x="1324" y="-140"/>
+      <point x="1456" y="-68"/>
+      <point x="1604" y="-68" type="curve" smooth="yes"/>
+      <point x="1668" y="-68"/>
+      <point x="1704" y="-124"/>
+      <point x="1704" y="-164" type="curve" smooth="yes"/>
+      <point x="1704" y="-220"/>
+      <point x="1664" y="-268"/>
+      <point x="1616" y="-268" type="curve" smooth="yes"/>
+      <point x="1528" y="-268"/>
+      <point x="1496" y="-208"/>
+      <point x="1496" y="-112" type="curve" smooth="yes"/>
+      <point x="1496" y="-72"/>
+      <point x="1496" y="400"/>
+      <point x="1496" y="400" type="curve"/>
+    </contour>
+    <component base="n"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 2120, 'leftMargin': 129, 'rightMargin': 41}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/nlfthook.glif b/src/Inter-UI-Black.ufo/glyphs/nlfthook.glif
index 439523a7a..1c4d194ba 100644
--- a/src/Inter-UI-Black.ufo/glyphs/nlfthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/nlfthook.glif
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="nlfthook" format="1">
-  <advance width="1792"/>
+  <advance width="1744"/>
   <unicode hex="0272"/>
   <outline>
     <contour>
-      <point x="416" y="296" type="line"/>
-      <point x="416" y="-108" type="line" smooth="yes"/>
-      <point x="416" y="-256"/>
-      <point x="288" y="-292"/>
-      <point x="184" y="-292" type="curve" smooth="yes"/>
-      <point x="144" y="-292"/>
-      <point x="112" y="-288"/>
-      <point x="72" y="-284" type="curve"/>
-      <point x="72" y="-580" type="line"/>
-      <point x="136" y="-592"/>
-      <point x="204" y="-600"/>
-      <point x="308" y="-600" type="curve" smooth="yes"/>
-      <point x="544" y="-600"/>
-      <point x="860" y="-548"/>
-      <point x="860" y="-108" type="curve" smooth="yes"/>
-      <point x="860" y="296" type="line"/>
+      <point x="248" y="184" type="line"/>
+      <point x="248" y="-80" type="line" smooth="yes"/>
+      <point x="248" y="-192"/>
+      <point x="148" y="-220"/>
+      <point x="44" y="-220" type="curve" smooth="yes"/>
+      <point x="4" y="-220"/>
+      <point x="-32" y="-216"/>
+      <point x="-64" y="-212" type="curve"/>
+      <point x="-64" y="-560" type="line"/>
+      <point x="-8" y="-568"/>
+      <point x="68" y="-576"/>
+      <point x="168" y="-576" type="curve" smooth="yes"/>
+      <point x="408" y="-576"/>
+      <point x="708" y="-516"/>
+      <point x="708" y="-80" type="curve" smooth="yes"/>
+      <point x="708" y="184" type="line"/>
     </contour>
-    <component base="n" xOffset="288"/>
+    <component base="n" xOffset="120"/>
     <contour>
-      <point x="1096" y="1776" type="move" name="top"/>
+      <point x="1216" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1096" y="-616" type="move" name="bottom"/>
+      <point x="1216" y="-616" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1872" y="1776" type="move" name="top0315"/>
+      <point x="1992" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/nrthook.glif b/src/Inter-UI-Black.ufo/glyphs/nrthook.glif
index 4b448ff48..036f6d1af 100644
--- a/src/Inter-UI-Black.ufo/glyphs/nrthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/nrthook.glif
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="nrthook" format="1">
-  <advance width="2048"/>
+  <advance width="1744"/>
   <unicode hex="0273"/>
   <outline>
     <contour>
-      <point x="1072" y="296" type="line"/>
-      <point x="1072" y="-108" type="line" smooth="yes"/>
-      <point x="1072" y="-548"/>
-      <point x="1384" y="-600"/>
-      <point x="1624" y="-600" type="curve" smooth="yes"/>
-      <point x="1724" y="-600"/>
-      <point x="1792" y="-592"/>
-      <point x="1860" y="-580" type="curve"/>
-      <point x="1860" y="-284" type="line"/>
-      <point x="1820" y="-288"/>
-      <point x="1788" y="-292"/>
-      <point x="1748" y="-292" type="curve" smooth="yes"/>
-      <point x="1644" y="-292"/>
-      <point x="1516" y="-256"/>
-      <point x="1516" y="-108" type="curve" smooth="yes"/>
-      <point x="1516" y="296" type="line"/>
+      <point x="1496" y="184" type="line"/>
+      <point x="1036" y="184" type="line"/>
+      <point x="1036" y="-80" type="line" smooth="yes"/>
+      <point x="1036" y="-516"/>
+      <point x="1336" y="-576"/>
+      <point x="1576" y="-576" type="curve" smooth="yes"/>
+      <point x="1676" y="-576"/>
+      <point x="1752" y="-568"/>
+      <point x="1808" y="-560" type="curve"/>
+      <point x="1808" y="-212" type="line"/>
+      <point x="1776" y="-216"/>
+      <point x="1740" y="-220"/>
+      <point x="1700" y="-220" type="curve" smooth="yes"/>
+      <point x="1596" y="-220"/>
+      <point x="1496" y="-192"/>
+      <point x="1496" y="-80" type="curve" smooth="yes"/>
     </contour>
-    <component base="n" xOffset="64"/>
+    <component base="n"/>
     <contour>
       <point x="856" y="1776" type="move" name="top"/>
     </contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/p.glif b/src/Inter-UI-Black.ufo/glyphs/p.glif
index c54d2abc7..9d47b829f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/p.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/p.glif
@@ -8,9 +8,9 @@
       <point x="588" y="-576" type="line"/>
       <point x="588" y="292" type="line"/>
       <point x="420" y="736" type="line"/>
-      <point x="572" y="1192" type="line"/>
-      <point x="572" y="1244" type="line"/>
-      <point x="544" y="1536" type="line"/>
+      <point x="580" y="1192" type="line"/>
+      <point x="580" y="1244" type="line"/>
+      <point x="580" y="1536" type="line"/>
       <point x="128" y="1536" type="line"/>
     </contour>
     <component base="rightloop.cn" xOffset="-36"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/peseta.glif b/src/Inter-UI-Black.ufo/glyphs/peseta.glif
index 348659166..57a855735 100644
--- a/src/Inter-UI-Black.ufo/glyphs/peseta.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/peseta.glif
@@ -4,26 +4,26 @@
   <unicode hex="20A7"/>
   <outline>
     <contour>
-      <point x="784" y="688" type="line"/>
-      <point x="1276" y="688"/>
-      <point x="1544" y="968"/>
-      <point x="1544" y="1360" type="curve"/>
-      <point x="1544" y="1728"/>
-      <point x="1276" y="2004"/>
-      <point x="784" y="2004" type="curve"/>
-      <point x="212" y="2004" type="line"/>
+      <point x="784" y="732" type="line"/>
+      <point x="1276" y="732"/>
+      <point x="1544" y="1012"/>
+      <point x="1544" y="1404" type="curve"/>
+      <point x="1544" y="1772"/>
+      <point x="1276" y="2048"/>
+      <point x="784" y="2048" type="curve"/>
+      <point x="212" y="2048" type="line"/>
       <point x="212" y="0" type="line"/>
       <point x="684" y="0" type="line"/>
-      <point x="684" y="1612" type="line"/>
-      <point x="784" y="1612" type="line"/>
-      <point x="992" y="1612"/>
-      <point x="1072" y="1488"/>
-      <point x="1072" y="1356" type="curve"/>
-      <point x="1072" y="1216"/>
-      <point x="992" y="1080"/>
-      <point x="784" y="1080" type="curve"/>
-      <point x="516" y="1080" type="line"/>
-      <point x="516" y="688" type="line"/>
+      <point x="684" y="1656" type="line"/>
+      <point x="784" y="1656" type="line"/>
+      <point x="992" y="1656"/>
+      <point x="1072" y="1532"/>
+      <point x="1072" y="1400" type="curve"/>
+      <point x="1072" y="1260"/>
+      <point x="992" y="1124"/>
+      <point x="784" y="1124" type="curve"/>
+      <point x="516" y="1124" type="line"/>
+      <point x="516" y="732" type="line"/>
     </contour>
     <component base="t" xOffset="1424"/>
   </outline>
diff --git a/src/Inter-UI-Black.ufo/glyphs/peso.glif b/src/Inter-UI-Black.ufo/glyphs/peso.glif
index 69dd86e48..a660bc112 100644
--- a/src/Inter-UI-Black.ufo/glyphs/peso.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/peso.glif
@@ -4,38 +4,38 @@
   <unicode hex="20B1"/>
   <outline>
     <contour>
-      <point x="2156" y="1584" type="line"/>
-      <point x="148" y="1584" type="line"/>
-      <point x="148" y="1364" type="line"/>
-      <point x="2156" y="1364" type="line"/>
+      <point x="2156" y="1596" type="line"/>
+      <point x="148" y="1596" type="line"/>
+      <point x="148" y="1376" type="line"/>
+      <point x="2156" y="1376" type="line"/>
     </contour>
     <contour>
-      <point x="2156" y="1288" type="line"/>
-      <point x="148" y="1288" type="line"/>
-      <point x="148" y="1068" type="line"/>
-      <point x="2156" y="1068" type="line"/>
+      <point x="2156" y="1300" type="line"/>
+      <point x="148" y="1300" type="line"/>
+      <point x="148" y="1080" type="line"/>
+      <point x="2156" y="1080" type="line"/>
     </contour>
     <contour>
-      <point x="1160" y="680" type="line"/>
-      <point x="1640" y="680"/>
-      <point x="1932" y="936"/>
-      <point x="1932" y="1324" type="curve" smooth="yes"/>
-      <point x="1932" y="1716"/>
-      <point x="1640" y="2004"/>
-      <point x="1160" y="2004" type="curve" smooth="yes"/>
-      <point x="368" y="2004" type="line"/>
+      <point x="1160" y="656" type="line"/>
+      <point x="1640" y="656"/>
+      <point x="1932" y="956"/>
+      <point x="1932" y="1344" type="curve" smooth="yes"/>
+      <point x="1932" y="1736"/>
+      <point x="1640" y="2048"/>
+      <point x="1160" y="2048" type="curve" smooth="yes"/>
+      <point x="368" y="2048" type="line"/>
       <point x="368" y="0" type="line"/>
       <point x="828" y="0" type="line"/>
-      <point x="828" y="1628" type="line"/>
-      <point x="1160" y="1628" type="line" smooth="yes"/>
-      <point x="1376" y="1628"/>
-      <point x="1464" y="1484"/>
-      <point x="1464" y="1320" type="curve" smooth="yes"/>
-      <point x="1464" y="1164"/>
-      <point x="1376" y="1052"/>
-      <point x="1160" y="1052" type="curve" smooth="yes"/>
-      <point x="660" y="1052" type="line"/>
-      <point x="660" y="680" type="line"/>
+      <point x="828" y="1672" type="line"/>
+      <point x="1160" y="1672" type="line" smooth="yes"/>
+      <point x="1376" y="1672"/>
+      <point x="1464" y="1504"/>
+      <point x="1464" y="1340" type="curve" smooth="yes"/>
+      <point x="1464" y="1184"/>
+      <point x="1376" y="1028"/>
+      <point x="1160" y="1028" type="curve" smooth="yes"/>
+      <point x="660" y="1028" type="line"/>
+      <point x="660" y="656" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/phook.cn.glif b/src/Inter-UI-Black.ufo/glyphs/phook.cn.glif
deleted file mode 100644
index d25d924b3..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/phook.cn.glif
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="phook.cn" format="1">
-  <advance width="1792"/>
-  <outline>
-    <contour>
-      <point x="1580" y="788" type="line"/>
-      <point x="1580" y="1276"/>
-      <point x="1392" y="1516"/>
-      <point x="1012" y="1516" type="curve" smooth="yes"/>
-      <point x="672" y="1516"/>
-      <point x="520" y="1212"/>
-      <point x="464" y="812" type="curve"/>
-      <point x="464" y="664" type="line"/>
-      <point x="520" y="292"/>
-      <point x="672" y="-28"/>
-      <point x="1016" y="-28" type="curve" smooth="yes"/>
-      <point x="1392" y="-28"/>
-      <point x="1580" y="240"/>
-      <point x="1580" y="704" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="1136" y="704" type="line"/>
-      <point x="1136" y="448"/>
-      <point x="1076" y="332"/>
-      <point x="892" y="332" type="curve" smooth="yes"/>
-      <point x="684" y="332"/>
-      <point x="616" y="452"/>
-      <point x="616" y="628" type="curve"/>
-      <point x="616" y="848" type="line"/>
-      <point x="616" y="1056"/>
-      <point x="684" y="1160"/>
-      <point x="888" y="1160" type="curve" smooth="yes"/>
-      <point x="1072" y="1160"/>
-      <point x="1136" y="1060"/>
-      <point x="1136" y="788" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="212" y="-572" type="line"/>
-      <point x="656" y="-572" type="line"/>
-      <point x="656" y="1460" type="line" smooth="yes"/>
-      <point x="656" y="1612"/>
-      <point x="788" y="1648"/>
-      <point x="892" y="1648" type="curve" smooth="yes"/>
-      <point x="932" y="1648"/>
-      <point x="964" y="1644"/>
-      <point x="1000" y="1636" type="curve"/>
-      <point x="1000" y="1932" type="line"/>
-      <point x="936" y="1948"/>
-      <point x="868" y="1956"/>
-      <point x="768" y="1956" type="curve" smooth="yes"/>
-      <point x="536" y="1956"/>
-      <point x="212" y="1908"/>
-      <point x="212" y="1488" type="curve" smooth="yes"/>
-    </contour>
-  </outline>
-  <lib>
-    <dict>
-      <key>com.typemytype.robofont.mark</key>
-      <array>
-        <real>0.77</real>
-        <real>0.95</real>
-        <real>0.76</real>
-        <real>1.0</real>
-      </array>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 1585, 'leftMargin': 140, 'rightMargin': 79}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/phook.glif b/src/Inter-UI-Black.ufo/glyphs/phook.glif
index 39bd10d6f..ab1748ae7 100644
--- a/src/Inter-UI-Black.ufo/glyphs/phook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/phook.glif
@@ -1,64 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="phook" format="1">
-  <advance width="1792"/>
+  <advance width="1620"/>
   <unicode hex="01A5"/>
   <outline>
     <contour>
-      <point x="656" y="1196" type="line"/>
-      <point x="656" y="1460" type="line" smooth="yes"/>
-      <point x="656" y="1612"/>
-      <point x="788" y="1648"/>
-      <point x="892" y="1648" type="curve" smooth="yes"/>
-      <point x="932" y="1648"/>
-      <point x="964" y="1644"/>
-      <point x="1000" y="1636" type="curve"/>
-      <point x="1000" y="1932" type="line"/>
-      <point x="936" y="1948"/>
-      <point x="868" y="1956"/>
-      <point x="768" y="1956" type="curve" smooth="yes"/>
-      <point x="528" y="1956"/>
-      <point x="212" y="1904"/>
-      <point x="212" y="1460" type="curve" smooth="yes"/>
-      <point x="212" y="1196" type="line"/>
+      <point x="128.0" y="-576.0" type="line"/>
+      <point x="588.0" y="-576.0" type="line"/>
+      <point x="588" y="64" type="line"/>
+      <point x="604" y="64" type="line"/>
+      <point x="668" y="4"/>
+      <point x="756.0" y="-28.0"/>
+      <point x="880.0" y="-28.0" type="curve"/>
+      <point x="1264.0" y="-28.0"/>
+      <point x="1540.0" y="304.0"/>
+      <point x="1540.0" y="764.0" type="curve"/>
+      <point x="1540.0" y="1220.0"/>
+      <point x="1264.0" y="1556.0"/>
+      <point x="884.0" y="1556.0" type="curve" smooth="yes"/>
+      <point x="736.0" y="1556.0"/>
+      <point x="636.0" y="1508.0"/>
+      <point x="564.0" y="1428.0" type="curve"/>
+      <point x="544.0" y="1428.0" type="line"/>
+      <point x="544.0" y="1444.0" type="line"/>
+      <point x="128.0" y="1444.0" type="line"/>
     </contour>
     <contour>
-      <point x="656" y="1204" type="line"/>
-      <point x="628" y="1488" type="line"/>
-      <point x="212" y="1488" type="line"/>
-      <point x="212" y="-572" type="line"/>
-      <point x="656" y="-572" type="line"/>
+      <point x="576" y="548" type="curve"/>
+      <point x="564" y="608"/>
+      <point x="552" y="704"/>
+      <point x="552" y="768" type="curve"/>
+      <point x="552" y="828"/>
+      <point x="560" y="892"/>
+      <point x="572" y="948" type="curve"/>
+      <point x="584" y="1004"/>
+      <point x="628" y="1192"/>
+      <point x="828" y="1192" type="curve"/>
+      <point x="1032" y="1192"/>
+      <point x="1104" y="1000"/>
+      <point x="1104" y="764" type="curve"/>
+      <point x="1104" y="520"/>
+      <point x="1032" y="340"/>
+      <point x="824" y="340" type="curve" smooth="yes"/>
+      <point x="652" y="340"/>
+      <point x="596" y="464"/>
     </contour>
     <contour>
-      <point x="1580" y="764" type="line"/>
-      <point x="1580" y="1216"/>
-      <point x="1376" y="1516"/>
-      <point x="1000" y="1516" type="curve" smooth="yes"/>
-      <point x="640" y="1516"/>
-      <point x="496" y="1188"/>
-      <point x="436" y="756" type="curve"/>
-      <point x="436" y="720" type="line"/>
-      <point x="496" y="320"/>
-      <point x="640" y="-28"/>
-      <point x="1000" y="-28" type="curve" smooth="yes"/>
-      <point x="1376" y="-28"/>
-      <point x="1580" y="300"/>
-      <point x="1580" y="732" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="1136" y="732" type="line"/>
-      <point x="1136" y="512"/>
-      <point x="1076" y="332"/>
-      <point x="892" y="332" type="curve" smooth="yes"/>
-      <point x="684" y="332"/>
-      <point x="616" y="472"/>
-      <point x="616" y="680" type="curve" smooth="yes"/>
-      <point x="616" y="792" type="line" smooth="yes"/>
-      <point x="616" y="1036"/>
-      <point x="684" y="1160"/>
-      <point x="888" y="1160" type="curve" smooth="yes"/>
-      <point x="1072" y="1160"/>
-      <point x="1136" y="992"/>
-      <point x="1136" y="764" type="curve" smooth="yes"/>
+      <point x="548" y="1188" type="line"/>
+      <point x="548" y="1452" type="line" smooth="yes"/>
+      <point x="548" y="1564"/>
+      <point x="624" y="1628"/>
+      <point x="728" y="1628" type="curve" smooth="yes"/>
+      <point x="792" y="1628"/>
+      <point x="852" y="1612"/>
+      <point x="876" y="1604" type="curve"/>
+      <point x="876" y="1924" type="line"/>
+      <point x="828" y="1936"/>
+      <point x="756" y="1952"/>
+      <point x="644" y="1952" type="curve" smooth="yes"/>
+      <point x="404" y="1952"/>
+      <point x="128" y="1888"/>
+      <point x="128" y="1452" type="curve" smooth="yes"/>
+      <point x="128" y="1188" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/pipedblbar.glif b/src/Inter-UI-Black.ufo/glyphs/pipedblbar.glif
index 8d500a9ec..671c4587e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/pipedblbar.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/pipedblbar.glif
@@ -3,7 +3,7 @@
   <advance width="1280"/>
   <unicode hex="01C2"/>
   <outline>
-    <component base="pipe" xOffset="368"/>
+    <component base="pipe" xOffset="256"/>
     <component base="crossbar" yOffset="332"/>
     <component base="crossbar" yOffset="-280"/>
   </outline>
diff --git a/src/Inter-UI-Black.ufo/glyphs/q.glif b/src/Inter-UI-Black.ufo/glyphs/q.glif
index 56a7ab0e6..30227d1f2 100644
--- a/src/Inter-UI-Black.ufo/glyphs/q.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/q.glif
@@ -5,9 +5,9 @@
   <outline>
     <contour>
       <point x="1492" y="1536" type="line"/>
-      <point x="1076" y="1536" type="line"/>
-      <point x="1056" y="1264" type="line"/>
-      <point x="1052" y="1196" type="line"/>
+      <point x="1040" y="1536" type="line"/>
+      <point x="1040" y="1264" type="line"/>
+      <point x="1040" y="1196" type="line"/>
       <point x="1184" y="748" type="line"/>
       <point x="1032" y="276" type="line"/>
       <point x="1032" y="-576" type="line"/>
@@ -15,22 +15,22 @@
     </contour>
     <component base="leftloop.cn"/>
     <contour>
-      <point x="744" y="1776" type="move" name="top"/>
+      <point x="744.0" y="1776.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1224" y="-560" type="move" name="bottom"/>
+      <point x="1224.0" y="-560.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="744" y="1776" type="move" name="marktop"/>
+      <point x="744.0" y="1776.0" type="move" name="marktop"/>
     </contour>
     <contour>
-      <point x="1592" y="2200" type="move" name="top_dd"/>
+      <point x="1592.0" y="2200.0" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1592" y="-560" type="move" name="bottom_dd"/>
+      <point x="1592.0" y="-560.0" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1592" y="1776" type="move" name="top0315"/>
+      <point x="1592.0" y="1776.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/qhook.cn.glif b/src/Inter-UI-Black.ufo/glyphs/qhook.cn.glif
deleted file mode 100644
index 227252164..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/qhook.cn.glif
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="qhook.cn" format="1">
-  <advance width="1792"/>
-  <outline>
-    <contour>
-      <point x="40" y="704" type="line"/>
-      <point x="40" y="236"/>
-      <point x="232" y="-28"/>
-      <point x="604" y="-28" type="curve" smooth="yes"/>
-      <point x="948" y="-28"/>
-      <point x="1100" y="292"/>
-      <point x="1156" y="664" type="curve"/>
-      <point x="1156" y="808" type="line"/>
-      <point x="1100" y="1208"/>
-      <point x="948" y="1516"/>
-      <point x="608" y="1516" type="curve" smooth="yes"/>
-      <point x="232" y="1516"/>
-      <point x="40" y="1276"/>
-      <point x="40" y="788" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="484" y="788" type="line"/>
-      <point x="484" y="1052"/>
-      <point x="548" y="1160"/>
-      <point x="732" y="1160" type="curve" smooth="yes"/>
-      <point x="936" y="1160"/>
-      <point x="1008" y="1052"/>
-      <point x="1008" y="848" type="curve"/>
-      <point x="1008" y="628" type="line"/>
-      <point x="1008" y="448"/>
-      <point x="936" y="332"/>
-      <point x="732" y="332" type="curve" smooth="yes"/>
-      <point x="544" y="332"/>
-      <point x="484" y="444"/>
-      <point x="484" y="704" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="1408" y="-572" type="line"/>
-      <point x="1408" y="1460" type="line" smooth="yes"/>
-      <point x="1408" y="1612"/>
-      <point x="1540" y="1648"/>
-      <point x="1644" y="1648" type="curve" smooth="yes"/>
-      <point x="1680" y="1648"/>
-      <point x="1716" y="1644"/>
-      <point x="1752" y="1636" type="curve"/>
-      <point x="1752" y="1932" type="line"/>
-      <point x="1688" y="1948"/>
-      <point x="1620" y="1956"/>
-      <point x="1520" y="1956" type="curve" smooth="yes"/>
-      <point x="1280" y="1956"/>
-      <point x="964" y="1904"/>
-      <point x="964" y="1460" type="curve" smooth="yes"/>
-      <point x="964" y="-572" type="line"/>
-    </contour>
-  </outline>
-  <lib>
-    <dict>
-      <key>com.typemytype.robofont.mark</key>
-      <array>
-        <real>0.77</real>
-        <real>0.95</real>
-        <real>0.76</real>
-        <real>1.0</real>
-      </array>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 1790, 'leftMargin': 78, 'rightMargin': 0}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/qhook.glif b/src/Inter-UI-Black.ufo/glyphs/qhook.glif
index 3e90c6b31..bbb6dced9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/qhook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/qhook.glif
@@ -1,8 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="qhook" format="1">
-  <advance width="1792"/>
+  <advance width="1740"/>
   <unicode hex="02A0"/>
   <outline>
+    <contour>
+      <point x="1492" y="1136" type="line"/>
+      <point x="1492" y="1400" type="line" smooth="yes"/>
+      <point x="1492" y="1512"/>
+      <point x="1592" y="1540"/>
+      <point x="1696" y="1540" type="curve" smooth="yes"/>
+      <point x="1736" y="1540"/>
+      <point x="1772" y="1536"/>
+      <point x="1804" y="1532" type="curve"/>
+      <point x="1804" y="1880" type="line"/>
+      <point x="1748" y="1888"/>
+      <point x="1660" y="1896"/>
+      <point x="1572" y="1896" type="curve" smooth="yes"/>
+      <point x="1336" y="1896"/>
+      <point x="1032" y="1836"/>
+      <point x="1032" y="1400" type="curve" smooth="yes"/>
+      <point x="1032" y="1136" type="line"/>
+    </contour>
+    <component base="q"/>
     <contour>
       <point x="688" y="2200" type="move" name="top"/>
     </contour>
@@ -12,63 +31,6 @@
     <contour>
       <point x="1752" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1408" y="1196" type="line"/>
-      <point x="1408" y="1460" type="line" smooth="yes"/>
-      <point x="1408" y="1612"/>
-      <point x="1540" y="1648"/>
-      <point x="1644" y="1648" type="curve" smooth="yes"/>
-      <point x="1680" y="1648"/>
-      <point x="1716" y="1644"/>
-      <point x="1752" y="1636" type="curve"/>
-      <point x="1752" y="1932" type="line"/>
-      <point x="1688" y="1948"/>
-      <point x="1620" y="1956"/>
-      <point x="1520" y="1956" type="curve" smooth="yes"/>
-      <point x="1280" y="1956"/>
-      <point x="964" y="1904"/>
-      <point x="964" y="1460" type="curve" smooth="yes"/>
-      <point x="964" y="1196" type="line"/>
-    </contour>
-    <contour>
-      <point x="964" y="-572" type="line"/>
-      <point x="1408" y="-572" type="line"/>
-      <point x="1408" y="1488" type="line"/>
-      <point x="1024" y="1488" type="line"/>
-      <point x="964" y="1176" type="line"/>
-    </contour>
-    <contour>
-      <point x="40" y="732" type="line"/>
-      <point x="40" y="296"/>
-      <point x="244" y="-28"/>
-      <point x="620" y="-28" type="curve" smooth="yes"/>
-      <point x="980" y="-28"/>
-      <point x="1124" y="316"/>
-      <point x="1184" y="720" type="curve"/>
-      <point x="1184" y="756" type="line"/>
-      <point x="1124" y="1184"/>
-      <point x="980" y="1516"/>
-      <point x="620" y="1516" type="curve" smooth="yes"/>
-      <point x="244" y="1516"/>
-      <point x="40" y="1212"/>
-      <point x="40" y="760" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="484" y="760" type="line"/>
-      <point x="484" y="992"/>
-      <point x="548" y="1160"/>
-      <point x="732" y="1160" type="curve" smooth="yes"/>
-      <point x="936" y="1160"/>
-      <point x="1008" y="1032"/>
-      <point x="1008" y="792" type="curve" smooth="yes"/>
-      <point x="1008" y="684" type="line" smooth="yes"/>
-      <point x="1008" y="472"/>
-      <point x="936" y="332"/>
-      <point x="732" y="332" type="curve" smooth="yes"/>
-      <point x="544" y="332"/>
-      <point x="484" y="508"/>
-      <point x="484" y="732" type="curve" smooth="yes"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/qrthook.glif b/src/Inter-UI-Black.ufo/glyphs/qrthook.glif
new file mode 100644
index 000000000..b7e732858
--- /dev/null
+++ b/src/Inter-UI-Black.ufo/glyphs/qrthook.glif
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="qrthook" format="1">
+  <advance width="1740"/>
+  <unicode hex="024B"/>
+  <outline>
+    <contour>
+      <point x="1492.0" y="1536.0" type="line"/>
+      <point x="1076.0" y="1536.0" type="line"/>
+      <point x="1068.0" y="1436.0" type="line"/>
+      <point x="1056.0" y="1436.0" type="line"/>
+      <point x="980.0" y="1512.0"/>
+      <point x="876.0" y="1556.0"/>
+      <point x="736.0" y="1556.0" type="curve" smooth="yes"/>
+      <point x="356.0" y="1556.0"/>
+      <point x="80.0" y="1220.0"/>
+      <point x="80.0" y="764.0" type="curve"/>
+      <point x="80.0" y="304.0"/>
+      <point x="356.0" y="-28.0"/>
+      <point x="740.0" y="-28.0" type="curve"/>
+      <point x="864.0" y="-28.0"/>
+      <point x="948" y="4"/>
+      <point x="1016" y="64" type="curve"/>
+      <point x="1032" y="64" type="line"/>
+      <point x="1032.0" y="0.0" type="line"/>
+      <point x="1492.0" y="0.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="516" y="764" type="curve"/>
+      <point x="516" y="1000"/>
+      <point x="588" y="1192"/>
+      <point x="792" y="1192" type="curve"/>
+      <point x="992" y="1192"/>
+      <point x="1036" y="1004"/>
+      <point x="1048" y="948" type="curve"/>
+      <point x="1060" y="892"/>
+      <point x="1068" y="828"/>
+      <point x="1068" y="768" type="curve"/>
+      <point x="1068" y="704"/>
+      <point x="1056" y="608"/>
+      <point x="1044" y="548" type="curve"/>
+      <point x="1024" y="464"/>
+      <point x="968" y="340"/>
+      <point x="796" y="340" type="curve" smooth="yes"/>
+      <point x="588" y="340"/>
+      <point x="516" y="520"/>
+    </contour>
+    <contour>
+      <point x="1492" y="184" type="line"/>
+      <point x="1032" y="184" type="line"/>
+      <point x="1032" y="-80" type="line" smooth="yes"/>
+      <point x="1032" y="-516"/>
+      <point x="1332" y="-576"/>
+      <point x="1572" y="-576" type="curve" smooth="yes"/>
+      <point x="1672" y="-576"/>
+      <point x="1748" y="-568"/>
+      <point x="1804" y="-560" type="curve"/>
+      <point x="1804" y="-212" type="line"/>
+      <point x="1772" y="-216"/>
+      <point x="1736" y="-220"/>
+      <point x="1696" y="-220" type="curve" smooth="yes"/>
+      <point x="1592" y="-220"/>
+      <point x="1492" y="-192"/>
+      <point x="1492" y="-80" type="curve" smooth="yes"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1789, 'leftMargin': 78, 'rightMargin': 0}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/rightloop.cn.glif b/src/Inter-UI-Black.ufo/glyphs/rightloop.cn.glif
index 1e0e81574..f891dfd9d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/rightloop.cn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/rightloop.cn.glif
@@ -39,16 +39,16 @@
       <point x="468" y="1316"/>
     </contour>
     <contour>
-      <point x="612" y="96" type="line"/>
-      <point x="612" y="312" type="line"/>
-      <point x="468" y="312" type="line"/>
-      <point x="468" y="96" type="line"/>
+      <point x="644" y="60" type="line"/>
+      <point x="644" y="276" type="line"/>
+      <point x="500" y="276" type="line"/>
+      <point x="500" y="60" type="line"/>
     </contour>
     <contour>
-      <point x="604" y="1168" type="line"/>
-      <point x="604" y="1416" type="line"/>
-      <point x="456" y="1416" type="line"/>
-      <point x="456" y="1168" type="line"/>
+      <point x="656" y="1220" type="line"/>
+      <point x="656" y="1468" type="line"/>
+      <point x="508" y="1468" type="line"/>
+      <point x="508" y="1220" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/rrthook.glif b/src/Inter-UI-Black.ufo/glyphs/rrthook.glif
index f14a44a71..abd4115f0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/rrthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/rrthook.glif
@@ -4,22 +4,22 @@
   <unicode hex="027D"/>
   <outline>
     <contour>
-      <point x="200" y="296" type="line" name="hr00"/>
-      <point x="200" y="-108" type="line" smooth="yes"/>
-      <point x="200" y="-548"/>
-      <point x="512" y="-600"/>
-      <point x="752" y="-600" type="curve" smooth="yes"/>
-      <point x="852" y="-600"/>
-      <point x="920" y="-592"/>
-      <point x="984" y="-580" type="curve"/>
-      <point x="984" y="-284" type="line"/>
-      <point x="948" y="-288"/>
-      <point x="912" y="-292"/>
-      <point x="876" y="-292" type="curve" smooth="yes"/>
-      <point x="772" y="-292"/>
-      <point x="640" y="-256"/>
-      <point x="640" y="-108" type="curve" smooth="yes"/>
-      <point x="640" y="296" type="line"/>
+      <point x="648" y="184" type="line"/>
+      <point x="188" y="184" type="line"/>
+      <point x="188" y="-80" type="line" smooth="yes"/>
+      <point x="188" y="-516"/>
+      <point x="488" y="-576"/>
+      <point x="728" y="-576" type="curve" smooth="yes"/>
+      <point x="828" y="-576"/>
+      <point x="904" y="-568"/>
+      <point x="960" y="-560" type="curve"/>
+      <point x="960" y="-212" type="line"/>
+      <point x="928" y="-216"/>
+      <point x="892" y="-220"/>
+      <point x="852" y="-220" type="curve" smooth="yes"/>
+      <point x="748" y="-220"/>
+      <point x="648" y="-192"/>
+      <point x="648" y="-80" type="curve" smooth="yes"/>
     </contour>
     <component base="r" xOffset="60"/>
     <contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/rturn.glif b/src/Inter-UI-Black.ufo/glyphs/rturn.glif
index b160b5563..4e6a93b0e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/rturn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/rturn.glif
@@ -1,39 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="rturn" format="1">
-  <advance width="1024"/>
+  <advance width="1020.0"/>
   <unicode hex="0279"/>
   <outline>
+    <component base="r" xScale="-1.0" yScale="-1.0" xOffset="1020" yOffset="1536"/>
     <contour>
-      <point x="356" y="1776" type="move" name="top"/>
+      <point x="652" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="356" y="0" type="move" name="bottom"/>
+      <point x="528" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1096" y="1776" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="196" y="-28" type="curve" smooth="yes"/>
-      <point x="464" y="-28"/>
-      <point x="624" y="248"/>
-      <point x="624" y="648" type="curve"/>
-      <point x="540" y="700" type="line"/>
-      <point x="540" y="508"/>
-      <point x="448" y="408"/>
-      <point x="228" y="408" type="curve" smooth="yes"/>
-      <point x="188" y="408"/>
-      <point x="116" y="416"/>
-      <point x="76" y="420" type="curve"/>
-      <point x="72" y="-12" type="line"/>
-      <point x="104" y="-24"/>
-      <point x="152" y="-28"/>
-    </contour>
-    <contour>
-      <point x="512" y="368" type="line"/>
-      <point x="540" y="0" type="line"/>
-      <point x="956" y="0" type="line"/>
-      <point x="956" y="1488" type="line"/>
-      <point x="512" y="1488" type="line"/>
+      <point x="1012" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/slongstroke.glif b/src/Inter-UI-Black.ufo/glyphs/slongstroke.glif
new file mode 100644
index 000000000..7e7feb5a1
--- /dev/null
+++ b/src/Inter-UI-Black.ufo/glyphs/slongstroke.glif
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="slongstroke" format="1">
+  <advance width="1024"/>
+  <unicode hex="1E9C"/>
+  <outline>
+    <contour>
+      <point x="912" y="1176" type="line" name="hr00"/>
+      <point x="16" y="896" type="line"/>
+      <point x="16" y="608" type="line"/>
+      <point x="912" y="892" type="line"/>
+    </contour>
+    <contour>
+      <point x="676" y="0" type="line"/>
+      <point x="676" y="1608" type="line" smooth="yes"/>
+      <point x="676" y="1724"/>
+      <point x="756" y="1784"/>
+      <point x="892" y="1784" type="curve" smooth="yes"/>
+      <point x="940" y="1784"/>
+      <point x="976" y="1780"/>
+      <point x="1008" y="1772" type="curve"/>
+      <point x="1008" y="2112" type="line"/>
+      <point x="944" y="2128"/>
+      <point x="872" y="2140"/>
+      <point x="796" y="2140" type="curve" smooth="yes"/>
+      <point x="452" y="2140"/>
+      <point x="232" y="1956"/>
+      <point x="232" y="1608" type="curve" smooth="yes"/>
+      <point x="232" y="0" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.adobe.type.autohint</key>
+      <data>
+      </data>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1018, 'leftMargin': 25, 'rightMargin': 0}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/srthook.glif b/src/Inter-UI-Black.ufo/glyphs/srthook.glif
index a2a2edb0a..f7597c1c0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/srthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/srthook.glif
@@ -4,22 +4,22 @@
   <unicode hex="0282"/>
   <outline>
     <contour>
-      <point x="88" y="476" type="line"/>
-      <point x="88" y="-80" type="line" smooth="yes"/>
-      <point x="88" y="-396"/>
-      <point x="264" y="-572"/>
-      <point x="556" y="-572" type="curve" smooth="yes"/>
-      <point x="620" y="-572"/>
-      <point x="672" y="-568"/>
-      <point x="740" y="-552" type="curve"/>
-      <point x="740" y="-256" type="line"/>
-      <point x="700" y="-260"/>
-      <point x="668" y="-264"/>
-      <point x="628" y="-264" type="curve" smooth="yes"/>
-      <point x="524" y="-264"/>
-      <point x="392" y="-232"/>
-      <point x="392" y="-80" type="curve" smooth="yes"/>
-      <point x="392" y="476" type="line"/>
+      <point x="104" y="268" type="line"/>
+      <point x="104" y="-84" type="line" smooth="yes"/>
+      <point x="104" y="-400"/>
+      <point x="280" y="-576"/>
+      <point x="572" y="-576" type="curve" smooth="yes"/>
+      <point x="636" y="-576"/>
+      <point x="688" y="-572"/>
+      <point x="756" y="-556" type="curve"/>
+      <point x="756" y="-260" type="line"/>
+      <point x="716" y="-264"/>
+      <point x="684" y="-268"/>
+      <point x="644" y="-268" type="curve" smooth="yes"/>
+      <point x="540" y="-268"/>
+      <point x="408" y="-236"/>
+      <point x="408" y="-84" type="curve" smooth="yes"/>
+      <point x="408" y="268" type="line"/>
     </contour>
     <component base="s" xOffset="32"/>
     <contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tccurl.glif b/src/Inter-UI-Black.ufo/glyphs/tccurl.glif
index dbe3ff467..0f4202931 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tccurl.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tccurl.glif
@@ -1,76 +1,76 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="tccurl" format="1">
-  <advance width="2304"/>
+  <advance width="2272"/>
   <unicode hex="02A8"/>
   <outline>
     <contour>
-      <point x="1580" y="2200" type="move" name="top"/>
+      <point x="1612" y="332" type="curve" smooth="yes"/>
+      <point x="1356" y="332"/>
+      <point x="1320" y="508"/>
+      <point x="1320" y="728" type="curve" smooth="yes"/>
+      <point x="1320" y="760" type="line" smooth="yes"/>
+      <point x="1320" y="976"/>
+      <point x="1348" y="1200"/>
+      <point x="1560" y="1200" type="curve" smooth="yes"/>
+      <point x="1708" y="1200"/>
+      <point x="1780" y="1092"/>
+      <point x="1780" y="960" type="curve"/>
+      <point x="2196" y="960" type="line"/>
+      <point x="2196" y="1336"/>
+      <point x="1940" y="1556"/>
+      <point x="1568" y="1556" type="curve" smooth="yes"/>
+      <point x="1092" y="1556"/>
+      <point x="880" y="1188"/>
+      <point x="880" y="760" type="curve" smooth="yes"/>
+      <point x="880" y="728" type="line" smooth="yes"/>
+      <point x="880" y="296"/>
+      <point x="1108" y="-28"/>
+      <point x="1572" y="-28" type="curve" smooth="yes"/>
+      <point x="1996" y="-28"/>
+      <point x="2196" y="228"/>
+      <point x="2196" y="464" type="curve" smooth="yes"/>
+      <point x="2196" y="664"/>
+      <point x="2052" y="840"/>
+      <point x="1796" y="840" type="curve" smooth="yes"/>
+      <point x="1364" y="840"/>
+      <point x="1016" y="336"/>
+      <point x="812" y="336" type="curve"/>
+      <point x="712" y="-28" type="line"/>
+      <point x="1200" y="-28"/>
+      <point x="1516" y="504"/>
+      <point x="1696" y="504" type="curve" smooth="yes"/>
+      <point x="1740" y="504"/>
+      <point x="1776" y="484"/>
+      <point x="1776" y="436" type="curve" smooth="yes"/>
+      <point x="1776" y="364"/>
+      <point x="1696" y="332"/>
     </contour>
     <contour>
-      <point x="1580" y="0" type="move" name="bottom"/>
+      <point x="892" y="1536" type="line"/>
+      <point x="60" y="1536" type="line"/>
+      <point x="60" y="1216" type="line"/>
+      <point x="892" y="1216" type="line"/>
     </contour>
     <contour>
-      <point x="2288" y="2200" type="move" name="top0315"/>
+      <point x="260" y="1860" type="line"/>
+      <point x="260" y="484" type="line" smooth="yes"/>
+      <point x="260" y="120"/>
+      <point x="452" y="-28"/>
+      <point x="712" y="-28" type="curve"/>
+      <point x="812" y="336" type="line"/>
+      <point x="728" y="336"/>
+      <point x="700" y="372"/>
+      <point x="700" y="484" type="curve" smooth="yes"/>
+      <point x="700" y="1860" type="line"/>
     </contour>
     <contour>
-      <point x="1636" y="332" type="curve" smooth="yes"/>
-      <point x="1380" y="332"/>
-      <point x="1344" y="508"/>
-      <point x="1344" y="728" type="curve" smooth="yes"/>
-      <point x="1344" y="760" type="line" smooth="yes"/>
-      <point x="1344" y="976"/>
-      <point x="1380" y="1160"/>
-      <point x="1584" y="1160" type="curve" smooth="yes"/>
-      <point x="1732" y="1160"/>
-      <point x="1804" y="1052"/>
-      <point x="1804" y="920" type="curve"/>
-      <point x="2220" y="920" type="line"/>
-      <point x="2220" y="1296"/>
-      <point x="1964" y="1516"/>
-      <point x="1592" y="1516" type="curve" smooth="yes"/>
-      <point x="1132" y="1516"/>
-      <point x="904" y="1188"/>
-      <point x="904" y="760" type="curve" smooth="yes"/>
-      <point x="904" y="728" type="line" smooth="yes"/>
-      <point x="904" y="296"/>
-      <point x="1132" y="-28"/>
-      <point x="1596" y="-28" type="curve" smooth="yes"/>
-      <point x="2020" y="-28"/>
-      <point x="2220" y="196"/>
-      <point x="2220" y="464" type="curve" smooth="yes"/>
-      <point x="2220" y="652"/>
-      <point x="2100" y="840"/>
-      <point x="1820" y="840" type="curve" smooth="yes"/>
-      <point x="1444" y="840"/>
-      <point x="1040" y="336"/>
-      <point x="836" y="336" type="curve"/>
-      <point x="736" y="-28" type="line"/>
-      <point x="1160" y="-28"/>
-      <point x="1540" y="504"/>
-      <point x="1720" y="504" type="curve" smooth="yes"/>
-      <point x="1764" y="504"/>
-      <point x="1800" y="484"/>
-      <point x="1800" y="436" type="curve" smooth="yes"/>
-      <point x="1800" y="364"/>
-      <point x="1720" y="332"/>
+      <point x="1556" y="2200" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="916" y="1488" type="line"/>
-      <point x="84" y="1488" type="line"/>
-      <point x="84" y="1168" type="line"/>
-      <point x="916" y="1168" type="line"/>
+      <point x="1556" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="284" y="1860" type="line"/>
-      <point x="284" y="484" type="line" smooth="yes"/>
-      <point x="284" y="120"/>
-      <point x="452" y="-28"/>
-      <point x="736" y="-28" type="curve"/>
-      <point x="836" y="336" type="line"/>
-      <point x="752" y="336"/>
-      <point x="724" y="372"/>
-      <point x="724" y="484" type="curve" smooth="yes"/>
-      <point x="724" y="1860" type="line"/>
+      <point x="2264" y="2200" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tcurl.glif b/src/Inter-UI-Black.ufo/glyphs/tcurl.glif
new file mode 100644
index 000000000..8a48ad7cb
--- /dev/null
+++ b/src/Inter-UI-Black.ufo/glyphs/tcurl.glif
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="tcurl" format="1">
+  <advance width="1364"/>
+  <unicode hex="0236"/>
+  <outline>
+    <contour>
+      <point x="308" y="944" type="line"/>
+      <point x="308" y="548" type="line"/>
+      <point x="308" y="148"/>
+      <point x="632" y="-32"/>
+      <point x="884" y="-32" type="curve" smooth="yes"/>
+      <point x="1160" y="-32"/>
+      <point x="1332" y="180"/>
+      <point x="1332" y="392" type="curve" smooth="yes"/>
+      <point x="1332" y="600"/>
+      <point x="1168" y="784"/>
+      <point x="920" y="784" type="curve" smooth="yes"/>
+      <point x="684" y="784"/>
+      <point x="356" y="628"/>
+      <point x="120" y="440" type="curve" smooth="yes"/>
+      <point x="-76" y="284" type="line"/>
+      <point x="140" y="28" type="line"/>
+      <point x="412" y="252" type="line" smooth="yes"/>
+      <point x="596" y="404"/>
+      <point x="728" y="476"/>
+      <point x="876" y="476" type="curve" smooth="yes"/>
+      <point x="940" y="476"/>
+      <point x="976" y="420"/>
+      <point x="976" y="380" type="curve" smooth="yes"/>
+      <point x="976" y="324"/>
+      <point x="936" y="276"/>
+      <point x="888" y="276" type="curve" smooth="yes"/>
+      <point x="800" y="276"/>
+      <point x="768" y="336"/>
+      <point x="768" y="432" type="curve" smooth="yes"/>
+      <point x="768" y="472"/>
+      <point x="768" y="944"/>
+      <point x="768" y="944" type="curve"/>
+    </contour>
+    <contour>
+      <point x="1008" y="1536" type="line"/>
+      <point x="120" y="1536" type="line"/>
+      <point x="120" y="1216" type="line"/>
+      <point x="1008" y="1216" type="line"/>
+    </contour>
+    <contour>
+      <point x="308" y="1864" type="line"/>
+      <point x="308" y="796" type="line"/>
+      <point x="768" y="796" type="line"/>
+      <point x="768" y="1864" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1513, 'leftMargin': 28, 'rightMargin': 42}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tenge.glif b/src/Inter-UI-Black.ufo/glyphs/tenge.glif
index 6209d435b..c79693349 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tenge.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tenge.glif
@@ -4,22 +4,22 @@
   <unicode hex="20B8"/>
   <outline>
     <contour>
-      <point x="1120" y="1468" type="line"/>
-      <point x="660" y="1468" type="line"/>
+      <point x="1120" y="1512" type="line"/>
+      <point x="660" y="1512" type="line"/>
       <point x="660" y="0" type="line"/>
       <point x="1120" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="1728" y="1468" type="line"/>
-      <point x="68" y="1468" type="line"/>
-      <point x="68" y="1092" type="line"/>
-      <point x="1728" y="1092" type="line"/>
+      <point x="1728" y="1512" type="line"/>
+      <point x="68" y="1512" type="line"/>
+      <point x="68" y="1136" type="line"/>
+      <point x="1728" y="1136" type="line"/>
     </contour>
     <contour>
-      <point x="1728" y="2004" type="line"/>
-      <point x="68" y="2004" type="line"/>
-      <point x="68" y="1628" type="line"/>
-      <point x="1728" y="1628" type="line"/>
+      <point x="1728" y="2048" type="line"/>
+      <point x="68" y="2048" type="line"/>
+      <point x="68" y="1672" type="line"/>
+      <point x="1728" y="1672" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tpalatalhook.glif b/src/Inter-UI-Black.ufo/glyphs/tpalatalhook.glif
index 62c1ca791..e10ae0ef5 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tpalatalhook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tpalatalhook.glif
@@ -4,22 +4,22 @@
   <unicode hex="01AB"/>
   <outline>
     <contour>
-      <point x="620" y="188" type="line"/>
-      <point x="620" y="-80" type="line" smooth="yes"/>
-      <point x="620" y="-232"/>
-      <point x="488" y="-264"/>
-      <point x="384" y="-264" type="curve" smooth="yes"/>
-      <point x="344" y="-264"/>
-      <point x="312" y="-260"/>
-      <point x="272" y="-256" type="curve"/>
-      <point x="272" y="-552" type="line"/>
-      <point x="340" y="-568"/>
-      <point x="392" y="-572"/>
-      <point x="456" y="-572" type="curve" smooth="yes"/>
-      <point x="748" y="-572"/>
-      <point x="924" y="-396"/>
-      <point x="924" y="-80" type="curve" smooth="yes"/>
-      <point x="924" y="16" type="line"/>
+      <point x="660" y="80" type="line"/>
+      <point x="660" y="-80" type="line" smooth="yes"/>
+      <point x="660" y="-232"/>
+      <point x="528" y="-264"/>
+      <point x="424" y="-264" type="curve" smooth="yes"/>
+      <point x="384" y="-264"/>
+      <point x="352" y="-260"/>
+      <point x="312" y="-256" type="curve"/>
+      <point x="312" y="-552" type="line"/>
+      <point x="380" y="-568"/>
+      <point x="432" y="-572"/>
+      <point x="496" y="-572" type="curve" smooth="yes"/>
+      <point x="788" y="-572"/>
+      <point x="964" y="-396"/>
+      <point x="964" y="-80" type="curve" smooth="yes"/>
+      <point x="964" y="80" type="line"/>
     </contour>
     <component base="t" xOffset="-4"/>
   </outline>
diff --git a/src/Inter-UI-Black.ufo/glyphs/trthook.glif b/src/Inter-UI-Black.ufo/glyphs/trthook.glif
index 3e99c477e..5b8aee509 100644
--- a/src/Inter-UI-Black.ufo/glyphs/trthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/trthook.glif
@@ -4,19 +4,10 @@
   <unicode hex="0288"/>
   <outline>
     <contour>
-      <point x="576" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="832" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1172" y="2200" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="1036" y="1488" type="line" name="hr00"/>
-      <point x="148" y="1488" type="line"/>
-      <point x="148" y="1168" type="line"/>
-      <point x="1036" y="1168" type="line"/>
+      <point x="1036" y="1536" type="line" name="hr00"/>
+      <point x="148" y="1536" type="line"/>
+      <point x="148" y="1216" type="line"/>
+      <point x="1036" y="1216" type="line"/>
     </contour>
     <contour>
       <point x="348" y="1860" type="line"/>
@@ -36,6 +27,15 @@
       <point x="788" y="-108" type="curve" smooth="yes"/>
       <point x="788" y="1860" type="line"/>
     </contour>
+    <contour>
+      <point x="576" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="832" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1172" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tturn.glif b/src/Inter-UI-Black.ufo/glyphs/tturn.glif
index 5f5b725be..183ace592 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tturn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tturn.glif
@@ -1,40 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="tturn" format="1">
-  <advance width="1024"/>
+  <advance width="1024.0"/>
   <unicode hex="0287"/>
   <outline>
+    <component base="t" xScale="-1.0" yScale="-1.0" xOffset="1024" yOffset="1864"/>
     <contour>
-      <point x="356" y="2200" type="move" name="top"/>
+      <point x="440" y="2200" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="536" y="0" type="move" name="bottom"/>
+      <point x="544" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="984" y="2200" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="80" y="372" type="line"/>
-      <point x="968" y="372" type="line"/>
-      <point x="968" y="692" type="line"/>
-      <point x="80" y="692" type="line"/>
-    </contour>
-    <contour>
-      <point x="768" y="0" type="line"/>
-      <point x="768" y="1432" type="line"/>
-      <point x="768" y="1752"/>
-      <point x="600" y="1884"/>
-      <point x="312" y="1884" type="curve" smooth="yes"/>
-      <point x="216" y="1884"/>
-      <point x="136" y="1872"/>
-      <point x="60" y="1844" type="curve"/>
-      <point x="60" y="1516" type="line"/>
-      <point x="88" y="1520"/>
-      <point x="124" y="1524"/>
-      <point x="176" y="1524" type="curve" smooth="yes"/>
-      <point x="284" y="1524"/>
-      <point x="324" y="1492"/>
-      <point x="324" y="1372" type="curve"/>
-      <point x="324" y="0" type="line"/>
+      <point x="976" y="2200" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tugrik.glif b/src/Inter-UI-Black.ufo/glyphs/tugrik.glif
index 95527ce93..a54259f34 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tugrik.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tugrik.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="tugrik" format="1">
-  <advance width="1792"/>
+  <advance width="1724"/>
   <unicode hex="20AE"/>
   <outline>
     <contour>
-      <point x="1336" y="1428" type="line"/>
-      <point x="412" y="1168" type="line"/>
-      <point x="412" y="884" type="line"/>
-      <point x="1336" y="1140" type="line"/>
+      <point x="1324" y="1428" type="line"/>
+      <point x="400" y="1168" type="line"/>
+      <point x="400" y="884" type="line"/>
+      <point x="1324" y="1140" type="line"/>
     </contour>
     <contour>
-      <point x="1336" y="972" type="line"/>
-      <point x="412" y="716" type="line"/>
-      <point x="412" y="428" type="line"/>
-      <point x="1336" y="688" type="line"/>
+      <point x="1324" y="972" type="line"/>
+      <point x="400" y="716" type="line"/>
+      <point x="400" y="428" type="line"/>
+      <point x="1324" y="688" type="line"/>
     </contour>
-    <component base="T" xOffset="16"/>
+    <component base="T" xOffset="-32"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/twostroke.glif b/src/Inter-UI-Black.ufo/glyphs/twostroke.glif
index 0005f34b7..e51d23731 100644
--- a/src/Inter-UI-Black.ufo/glyphs/twostroke.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/twostroke.glif
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="twostroke" format="1">
-  <advance width="1792"/>
+  <advance width="1664"/>
   <unicode hex="01BB"/>
   <outline>
-    <contour>
-      <point x="1608" y="1160" type="line"/>
-      <point x="356" y="1160" type="line"/>
-      <point x="356" y="896" type="line"/>
-      <point x="1608" y="896" type="line"/>
-    </contour>
     <component base="two"/>
+    <component base="crossbar" xOffset="400"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni01F6_.glif b/src/Inter-UI-Black.ufo/glyphs/uni01F6_.glif
index 076e044c7..947d2ef0f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni01F6_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni01F6_.glif
@@ -3,24 +3,6 @@
   <advance width="3072"/>
   <unicode hex="01F6"/>
   <outline>
-    <contour>
-      <point x="1540" y="1208" type="line"/>
-      <point x="508" y="1208" type="line"/>
-      <point x="508" y="836" type="line"/>
-      <point x="1540" y="836" type="line"/>
-    </contour>
-    <contour>
-      <point x="656" y="2004" type="line"/>
-      <point x="196" y="2004" type="line"/>
-      <point x="196" y="0" type="line"/>
-      <point x="656" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1856" y="2004" type="line"/>
-      <point x="1396" y="2004" type="line"/>
-      <point x="1396" y="688" type="line"/>
-      <point x="1856" y="688" type="line"/>
-    </contour>
     <contour>
       <point x="2416" y="1488" type="line"/>
       <point x="2416" y="696" type="line" smooth="yes"/>
@@ -41,6 +23,24 @@
       <point x="2876" y="696" type="curve" smooth="yes"/>
       <point x="2876" y="1488" type="line"/>
     </contour>
+    <contour>
+      <point x="1540" y="1208" type="line"/>
+      <point x="508" y="1208" type="line"/>
+      <point x="508" y="836" type="line"/>
+      <point x="1540" y="836" type="line"/>
+    </contour>
+    <contour>
+      <point x="656" y="2004" type="line"/>
+      <point x="196" y="2004" type="line"/>
+      <point x="196" y="0" type="line"/>
+      <point x="656" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="1856" y="2004" type="line"/>
+      <point x="1396" y="2004" type="line"/>
+      <point x="1396" y="688" type="line"/>
+      <point x="1856" y="688" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0224.glif b/src/Inter-UI-Black.ufo/glyphs/uni0224.glif
index 5e32237c6..e82ac5d87 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0224.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0224.glif
@@ -1,39 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni0224" format="1">
-  <advance width="2048"/>
+  <advance width="1792"/>
   <unicode hex="0224"/>
   <outline>
     <contour>
-      <point x="1708" y="1756" type="line"/>
-      <point x="1708" y="2004" type="line"/>
-      <point x="1392" y="2004" type="line"/>
-      <point x="176" y="256" type="line"/>
-      <point x="176" y="0" type="line"/>
-      <point x="504" y="0" type="line"/>
+      <point x="1032" y="384" type="line"/>
+      <point x="696" y="384" type="line"/>
+      <point x="1672" y="1776" type="line"/>
+      <point x="1672" y="2048" type="line"/>
+      <point x="120" y="2048" type="line"/>
+      <point x="120" y="1664" type="line"/>
+      <point x="1096" y="1664" type="line"/>
+      <point x="120" y="272" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="1032" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="1556" y="2004" type="line"/>
-      <point x="172" y="2004" type="line"/>
-      <point x="172" y="1628" type="line"/>
-      <point x="1556" y="1628" type="line"/>
-    </contour>
-    <contour>
-      <point x="1856" y="-408" type="line"/>
-      <point x="1872" y="-332"/>
-      <point x="1880" y="-268"/>
-      <point x="1880" y="-192" type="curve" smooth="yes"/>
-      <point x="1880" y="152"/>
-      <point x="1672" y="372"/>
-      <point x="1296" y="372" type="curve" smooth="yes"/>
-      <point x="284" y="372" type="line"/>
-      <point x="284" y="0" type="line"/>
-      <point x="1296" y="0" type="line" smooth="yes"/>
-      <point x="1476" y="0"/>
-      <point x="1496" y="-156"/>
-      <point x="1496" y="-276" type="curve" smooth="yes"/>
-      <point x="1496" y="-324"/>
-      <point x="1492" y="-360"/>
-      <point x="1484" y="-408" type="curve"/>
+      <point x="876" y="384" type="line"/>
+      <point x="876" y="0" type="line"/>
+      <point x="1124" y="0" type="line" smooth="yes"/>
+      <point x="1300" y="0"/>
+      <point x="1328" y="-128"/>
+      <point x="1328" y="-252" type="curve"/>
+      <point x="1328" y="-360" type="line"/>
+      <point x="1704" y="-360" type="line"/>
+      <point x="1704" y="-168" type="line"/>
+      <point x="1704" y="176"/>
+      <point x="1500" y="384"/>
+      <point x="1124" y="384" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0225.glif b/src/Inter-UI-Black.ufo/glyphs/uni0225.glif
deleted file mode 100644
index 68760e74c..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/uni0225.glif
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0225" format="1">
-  <advance width="1792"/>
-  <unicode hex="0225"/>
-  <outline>
-    <contour>
-      <point x="860" y="360" type="line"/>
-      <point x="264" y="360" type="line"/>
-      <point x="264" y="0" type="line"/>
-      <point x="860" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1392" y="1240" type="line"/>
-      <point x="1392" y="1488" type="line"/>
-      <point x="1088" y="1488" type="line"/>
-      <point x="156" y="260" type="line"/>
-      <point x="156" y="0" type="line"/>
-      <point x="456" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1244" y="1488" type="line"/>
-      <point x="180" y="1488" type="line"/>
-      <point x="180" y="1132" type="line"/>
-      <point x="1244" y="1132" type="line"/>
-    </contour>
-    <contour>
-      <point x="748" y="0" type="line"/>
-      <point x="1060" y="0" type="line" smooth="yes"/>
-      <point x="1236" y="0"/>
-      <point x="1276" y="-156"/>
-      <point x="1276" y="-276" type="curve" smooth="yes"/>
-      <point x="1276" y="-324"/>
-      <point x="1272" y="-360"/>
-      <point x="1264" y="-408" type="curve"/>
-      <point x="1616" y="-408" type="line"/>
-      <point x="1632" y="-332"/>
-      <point x="1640" y="-268"/>
-      <point x="1640" y="-192" type="curve" smooth="yes"/>
-      <point x="1640" y="152"/>
-      <point x="1436" y="360"/>
-      <point x="1060" y="360" type="curve" smooth="yes"/>
-      <point x="748" y="360" type="line"/>
-    </contour>
-  </outline>
-  <lib>
-    <dict>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 1621, 'leftMargin': 95, 'rightMargin': 41}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0234.glif b/src/Inter-UI-Black.ufo/glyphs/uni0234.glif
deleted file mode 100644
index 91ccb21cc..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/uni0234.glif
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0234" format="1">
-  <advance width="1536"/>
-  <unicode hex="0234"/>
-  <outline>
-    <contour>
-      <point x="420" y="344" type="line" name="hr00"/>
-      <point x="420" y="-52" type="line"/>
-      <point x="420" y="-352"/>
-      <point x="544" y="-600"/>
-      <point x="980" y="-600" type="curve" smooth="yes"/>
-      <point x="1324" y="-600"/>
-      <point x="1492" y="-440"/>
-      <point x="1492" y="-208" type="curve" smooth="yes"/>
-      <point x="1492" y="24"/>
-      <point x="1328" y="172"/>
-      <point x="1016" y="172" type="curve" smooth="yes"/>
-      <point x="776" y="172"/>
-      <point x="608" y="120"/>
-      <point x="444" y="16" type="curve"/>
-      <point x="48" y="-300" type="line"/>
-      <point x="236" y="-572" type="line"/>
-      <point x="508" y="-348" type="line"/>
-      <point x="696" y="-200"/>
-      <point x="824" y="-124"/>
-      <point x="972" y="-124" type="curve" smooth="yes"/>
-      <point x="1052" y="-124"/>
-      <point x="1108" y="-156"/>
-      <point x="1108" y="-220" type="curve" smooth="yes"/>
-      <point x="1108" y="-296"/>
-      <point x="1048" y="-324"/>
-      <point x="984" y="-324" type="curve" smooth="yes"/>
-      <point x="896" y="-324"/>
-      <point x="864" y="-264"/>
-      <point x="864" y="-168" type="curve" smooth="yes"/>
-      <point x="864" y="-128"/>
-      <point x="864" y="344"/>
-      <point x="864" y="344" type="curve"/>
-    </contour>
-    <component base="l" xOffset="260"/>
-  </outline>
-  <lib>
-    <dict>
-      <key>com.adobe.type.autohint</key>
-      <data>
-      </data>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 1513, 'leftMargin': 28, 'rightMargin': 42}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0235.glif b/src/Inter-UI-Black.ufo/glyphs/uni0235.glif
deleted file mode 100644
index de7d518bd..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/uni0235.glif
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0235" format="1">
-  <advance width="2304"/>
-  <unicode hex="0235"/>
-  <outline>
-    <contour>
-      <point x="1056" y="344" type="line"/>
-      <point x="1056" y="-52" type="line"/>
-      <point x="1056" y="-352"/>
-      <point x="1180" y="-600"/>
-      <point x="1616" y="-600" type="curve" smooth="yes"/>
-      <point x="1960" y="-600"/>
-      <point x="2128" y="-440"/>
-      <point x="2128" y="-208" type="curve" smooth="yes"/>
-      <point x="2128" y="24"/>
-      <point x="1964" y="172"/>
-      <point x="1652" y="172" type="curve" smooth="yes"/>
-      <point x="1412" y="172"/>
-      <point x="1248" y="120"/>
-      <point x="1080" y="16" type="curve"/>
-      <point x="684" y="-300" type="line"/>
-      <point x="872" y="-572" type="line"/>
-      <point x="1144" y="-348" type="line"/>
-      <point x="1332" y="-200"/>
-      <point x="1460" y="-124"/>
-      <point x="1608" y="-124" type="curve" smooth="yes"/>
-      <point x="1688" y="-124"/>
-      <point x="1744" y="-156"/>
-      <point x="1744" y="-220" type="curve" smooth="yes"/>
-      <point x="1744" y="-296"/>
-      <point x="1684" y="-324"/>
-      <point x="1620" y="-324" type="curve" smooth="yes"/>
-      <point x="1532" y="-324"/>
-      <point x="1500" y="-264"/>
-      <point x="1500" y="-168" type="curve" smooth="yes"/>
-      <point x="1500" y="-128"/>
-      <point x="1500" y="344"/>
-      <point x="1500" y="344" type="curve"/>
-    </contour>
-    <contour>
-      <point x="620" y="1172" type="line"/>
-      <point x="592" y="1488" type="line"/>
-      <point x="176" y="1488" type="line"/>
-      <point x="176" y="0" type="line"/>
-      <point x="620" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="564" y="796" type="line"/>
-      <point x="564" y="1004"/>
-      <point x="640" y="1160"/>
-      <point x="836" y="1160" type="curve" smooth="yes"/>
-      <point x="976" y="1160"/>
-      <point x="1056" y="1116"/>
-      <point x="1056" y="940" type="curve" smooth="yes"/>
-      <point x="1056" y="0" type="line"/>
-      <point x="1500" y="0" type="line"/>
-      <point x="1500" y="936" type="line" smooth="yes"/>
-      <point x="1500" y="1368"/>
-      <point x="1312" y="1516"/>
-      <point x="1032" y="1516" type="curve" smooth="yes"/>
-      <point x="688" y="1516"/>
-      <point x="456" y="1248"/>
-      <point x="456" y="792" type="curve"/>
-    </contour>
-  </outline>
-  <lib>
-    <dict>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 2120, 'leftMargin': 129, 'rightMargin': 41}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0236.glif b/src/Inter-UI-Black.ufo/glyphs/uni0236.glif
deleted file mode 100644
index c394db17b..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/uni0236.glif
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0236" format="1">
-  <advance width="1536"/>
-  <unicode hex="0236"/>
-  <outline>
-    <contour>
-      <point x="420" y="1860" type="line"/>
-      <point x="420" y="520" type="line"/>
-      <point x="420" y="220"/>
-      <point x="544" y="-28"/>
-      <point x="980" y="-28" type="curve" smooth="yes"/>
-      <point x="1324" y="-28"/>
-      <point x="1492" y="132"/>
-      <point x="1492" y="364" type="curve" smooth="yes"/>
-      <point x="1492" y="596"/>
-      <point x="1328" y="744"/>
-      <point x="1016" y="744" type="curve" smooth="yes"/>
-      <point x="792" y="744"/>
-      <point x="608" y="696"/>
-      <point x="444" y="588" type="curve"/>
-      <point x="48" y="276" type="line"/>
-      <point x="236" y="0" type="line"/>
-      <point x="508" y="224" type="line"/>
-      <point x="692" y="372"/>
-      <point x="824" y="448"/>
-      <point x="972" y="448" type="curve" smooth="yes"/>
-      <point x="1052" y="448"/>
-      <point x="1108" y="420"/>
-      <point x="1108" y="352" type="curve" smooth="yes"/>
-      <point x="1108" y="276"/>
-      <point x="1048" y="252"/>
-      <point x="984" y="252" type="curve" smooth="yes"/>
-      <point x="896" y="252"/>
-      <point x="864" y="308"/>
-      <point x="864" y="404" type="curve" smooth="yes"/>
-      <point x="864" y="444"/>
-      <point x="864" y="1860"/>
-      <point x="864" y="1860" type="curve"/>
-    </contour>
-    <contour>
-      <point x="1112" y="1488" type="line"/>
-      <point x="224" y="1488" type="line"/>
-      <point x="224" y="1168" type="line"/>
-      <point x="1112" y="1168" type="line"/>
-    </contour>
-  </outline>
-  <lib>
-    <dict>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 1513, 'leftMargin': 28, 'rightMargin': 42}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni023D_.glif b/src/Inter-UI-Black.ufo/glyphs/uni023D_.glif
deleted file mode 100644
index bdbd126bb..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/uni023D_.glif
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni023D" format="1">
-  <advance width="1792"/>
-  <unicode hex="023D"/>
-  <outline>
-    <contour>
-      <point x="608" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1760" y="2200" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="924" y="16" type="move" name="bottom"/>
-    </contour>
-    <component base="L" xOffset="232"/>
-    <component base="crossbar" xOffset="-60"/>
-  </outline>
-  <lib>
-    <dict>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 1653, 'leftMargin': -20, 'rightMargin': 53}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0240.glif b/src/Inter-UI-Black.ufo/glyphs/uni0240.glif
index f4ebc92bf..b92001415 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0240.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0240.glif
@@ -1,39 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni0240" format="1">
-  <advance width="1792"/>
+  <advance width="1512"/>
   <unicode hex="0240"/>
   <outline>
     <contour>
-      <point x="132" y="360" type="line"/>
-      <point x="132" y="0" type="line"/>
-      <point x="532" y="0" type="line" smooth="yes"/>
-      <point x="896" y="0"/>
-      <point x="872" y="-600"/>
-      <point x="1352" y="-600" type="curve" smooth="yes"/>
-      <point x="1524" y="-600"/>
-      <point x="1672" y="-504"/>
-      <point x="1768" y="-412" type="curve"/>
-      <point x="1620" y="-156" type="line"/>
-      <point x="1576" y="-196"/>
-      <point x="1484" y="-268"/>
-      <point x="1400" y="-268" type="curve" smooth="yes"/>
-      <point x="1148" y="-268"/>
-      <point x="1124" y="360"/>
-      <point x="652" y="360" type="curve" smooth="yes"/>
+      <point x="260" y="360" type="line"/>
+      <point x="260" y="0" type="line"/>
+      <point x="596" y="0" type="line" smooth="yes"/>
+      <point x="968" y="0"/>
+      <point x="972" y="-576"/>
+      <point x="1416" y="-576" type="curve" smooth="yes"/>
+      <point x="1596" y="-576"/>
+      <point x="1736" y="-480"/>
+      <point x="1832" y="-388" type="curve"/>
+      <point x="1684" y="-88" type="line"/>
+      <point x="1640" y="-128"/>
+      <point x="1544" y="-200"/>
+      <point x="1460" y="-200" type="curve" smooth="yes"/>
+      <point x="1208" y="-200"/>
+      <point x="1188" y="360"/>
+      <point x="716" y="360" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="1260" y="1240" type="line"/>
-      <point x="1260" y="1488" type="line"/>
-      <point x="960" y="1488" type="line"/>
-      <point x="24" y="260" type="line"/>
-      <point x="24" y="0" type="line"/>
-      <point x="324" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1112" y="1488" type="line"/>
-      <point x="48" y="1488" type="line"/>
-      <point x="48" y="1132" type="line"/>
-      <point x="1112" y="1132" type="line"/>
+      <point x="696" y="360" type="line"/>
+      <point x="1368" y="1276" type="line"/>
+      <point x="1368" y="1536" type="line"/>
+      <point x="156" y="1536" type="line"/>
+      <point x="156" y="1176" type="line"/>
+      <point x="800" y="1176" type="line"/>
+      <point x="128" y="260" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="696" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0247.glif b/src/Inter-UI-Black.ufo/glyphs/uni0247.glif
index 3fc4662f0..5fbb412d8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0247.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0247.glif
@@ -4,45 +4,12 @@
   <unicode hex="0247"/>
   <outline>
     <contour>
-      <point x="1300" y="2004" type="line"/>
-      <point x="1048" y="2004" type="line"/>
-      <point x="220" y="-572" type="line"/>
-      <point x="472" y="-572" type="line"/>
-    </contour>
-    <contour>
-      <point x="836" y="-28" type="curve" smooth="yes"/>
-      <point x="1124" y="-28"/>
-      <point x="1328" y="104"/>
-      <point x="1420" y="236" type="curve"/>
-      <point x="1216" y="484" type="line"/>
-      <point x="1124" y="376"/>
-      <point x="988" y="332"/>
-      <point x="852" y="332" type="curve" smooth="yes"/>
-      <point x="628" y="332"/>
-      <point x="480" y="440"/>
-      <point x="480" y="612" type="curve" smooth="yes"/>
-      <point x="480" y="872" type="line" smooth="yes"/>
-      <point x="480" y="1012"/>
-      <point x="568" y="1160"/>
-      <point x="760" y="1160" type="curve" smooth="yes"/>
-      <point x="956" y="1160"/>
-      <point x="1052" y="1064"/>
-      <point x="1052" y="924" type="curve" smooth="yes"/>
-      <point x="1052" y="888" type="line"/>
-      <point x="252" y="888" type="line"/>
-      <point x="252" y="600" type="line"/>
-      <point x="1460" y="600" type="line"/>
-      <point x="1460" y="788" type="line" smooth="yes"/>
-      <point x="1460" y="1232"/>
-      <point x="1212" y="1516"/>
-      <point x="788" y="1516" type="curve" smooth="yes"/>
-      <point x="328" y="1516"/>
-      <point x="80" y="1180"/>
-      <point x="80" y="748" type="curve" smooth="yes"/>
-      <point x="80" y="696" type="line" smooth="yes"/>
-      <point x="80" y="304"/>
-      <point x="360" y="-28"/>
+      <point x="1312" y="2048" type="line"/>
+      <point x="1060" y="2048" type="line"/>
+      <point x="232" y="-576" type="line"/>
+      <point x="484" y="-576" type="line"/>
     </contour>
+    <component base="e"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0248.glif b/src/Inter-UI-Black.ufo/glyphs/uni0248.glif
index ca755596d..ce40a4cc4 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0248.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0248.glif
@@ -3,6 +3,8 @@
   <advance width="1792"/>
   <unicode hex="0248"/>
   <outline>
+    <component base="J" xOffset="60"/>
+    <component base="crossbar" xOffset="548"/>
     <contour>
       <point x="1240" y="2200" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="764" y="-16" type="move" name="bottom"/>
     </contour>
-    <component base="J" xOffset="60"/>
-    <component base="crossbar" xOffset="548"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0249.ccmp.glif b/src/Inter-UI-Black.ufo/glyphs/uni0249.ccmp.glif
index 8fc535c72..5292f0d77 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0249.ccmp.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0249.ccmp.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni0249.ccmp" format="1">
-  <advance width="1280"/>
+  <advance width="1096"/>
   <outline>
-    <component base="dotlessj" xOffset="272"/>
-    <component base="crossbar" yOffset="-160"/>
+    <component base="dotlessj" xOffset="28"/>
+    <component base="crossbar" xOffset="-72" yOffset="-160"/>
     <contour>
-      <point x="648" y="1744" type="move" name="top"/>
+      <point x="404" y="1744" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1200" y="1744" type="move" name="top0315"/>
+      <point x="956" y="1744" type="move" name="top0315"/>
     </contour>
     <contour>
-      <point x="648" y="-632" type="move" name="bottom"/>
+      <point x="404" y="-632" type="move" name="bottom"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0249.glif b/src/Inter-UI-Black.ufo/glyphs/uni0249.glif
index 2f8ea1a59..92033968d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0249.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0249.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni0249" format="1">
-  <advance width="1280"/>
+  <advance width="1092"/>
   <unicode hex="0249"/>
   <outline>
-    <component base="j" xOffset="308"/>
-    <component base="crossbar" yOffset="-244"/>
+    <component base="j" xOffset="28"/>
+    <component base="crossbar" xOffset="-76" yOffset="-244"/>
     <contour>
-      <point x="692" y="2200" type="move" name="top"/>
+      <point x="412" y="2200" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1212" y="2200" type="move" name="top0315"/>
+      <point x="932" y="2200" type="move" name="top0315"/>
     </contour>
     <contour>
-      <point x="644" y="-632" type="move" name="bottom"/>
+      <point x="364" y="-632" type="move" name="bottom"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni024A_.glif b/src/Inter-UI-Black.ufo/glyphs/uni024A_.glif
deleted file mode 100644
index c8859e6ee..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/uni024A_.glif
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni024A" format="1">
-  <advance width="2304"/>
-  <unicode hex="024A"/>
-  <outline>
-    <contour>
-      <point x="1796" y="1204" type="line" name="hr00"/>
-      <point x="1336" y="1204" type="line"/>
-      <point x="1336" y="440" type="line"/>
-      <point x="1292" y="400"/>
-      <point x="1212" y="348"/>
-      <point x="1032" y="348" type="curve" smooth="yes"/>
-      <point x="732" y="348"/>
-      <point x="588" y="556"/>
-      <point x="588" y="944" type="curve" smooth="yes"/>
-      <point x="588" y="1036" type="line"/>
-      <point x="120" y="1032" type="line"/>
-      <point x="120" y="944" type="line" smooth="yes"/>
-      <point x="120" y="316"/>
-      <point x="508" y="-28"/>
-      <point x="1008" y="-28" type="curve" smooth="yes"/>
-      <point x="1444" y="-28"/>
-      <point x="1696" y="140"/>
-      <point x="1796" y="252" type="curve"/>
-    </contour>
-    <contour>
-      <point x="1796" y="1752" type="line"/>
-      <point x="1696" y="1864"/>
-      <point x="1444" y="2032"/>
-      <point x="1008" y="2032" type="curve" smooth="yes"/>
-      <point x="488" y="2032"/>
-      <point x="120" y="1664"/>
-      <point x="120" y="1060" type="curve" smooth="yes"/>
-      <point x="120" y="960" type="line"/>
-      <point x="588" y="956" type="line"/>
-      <point x="588" y="1060" type="line" smooth="yes"/>
-      <point x="588" y="1444"/>
-      <point x="732" y="1652"/>
-      <point x="1032" y="1652" type="curve" smooth="yes"/>
-      <point x="1212" y="1652"/>
-      <point x="1292" y="1604"/>
-      <point x="1336" y="1564" type="curve"/>
-      <point x="1336" y="800" type="line"/>
-      <point x="1796" y="804" type="line"/>
-    </contour>
-    <contour>
-      <point x="1796" y="2004" type="line"/>
-      <point x="1452" y="2004" type="line"/>
-      <point x="1336" y="1476" type="line"/>
-      <point x="1336" y="0" type="line"/>
-      <point x="1796" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1336" y="292" type="line"/>
-      <point x="1336" y="-20" type="line" smooth="yes"/>
-      <point x="1336" y="-396"/>
-      <point x="1636" y="-600"/>
-      <point x="1972" y="-600" type="curve" smooth="yes"/>
-      <point x="2056" y="-600"/>
-      <point x="2108" y="-596"/>
-      <point x="2184" y="-580" type="curve"/>
-      <point x="2184" y="-208" type="line"/>
-      <point x="2140" y="-216"/>
-      <point x="2108" y="-220"/>
-      <point x="2056" y="-220" type="curve" smooth="yes"/>
-      <point x="1936" y="-220"/>
-      <point x="1796" y="-184"/>
-      <point x="1796" y="-20" type="curve" smooth="yes"/>
-      <point x="1796" y="292" type="line"/>
-    </contour>
-  </outline>
-  <lib>
-    <dict>
-      <key>com.adobe.type.autohint</key>
-      <data>
-      </data>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 2181, 'leftMargin': 103, 'rightMargin': 14}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni024B_.glif b/src/Inter-UI-Black.ufo/glyphs/uni024B_.glif
deleted file mode 100644
index 5f500cf46..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/uni024B_.glif
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni024B" format="1">
-  <advance width="1792"/>
-  <unicode hex="024B"/>
-  <outline>
-    <contour>
-      <point x="964" y="-76" type="line"/>
-      <point x="1408" y="-76" type="line"/>
-      <point x="1408" y="1488" type="line"/>
-      <point x="1024" y="1488" type="line"/>
-      <point x="964" y="1176" type="line"/>
-    </contour>
-    <contour>
-      <point x="40" y="732" type="line"/>
-      <point x="40" y="296"/>
-      <point x="244" y="-28"/>
-      <point x="620" y="-28" type="curve" smooth="yes"/>
-      <point x="980" y="-28"/>
-      <point x="1128" y="316"/>
-      <point x="1184" y="720" type="curve"/>
-      <point x="1184" y="756" type="line"/>
-      <point x="1128" y="1184"/>
-      <point x="980" y="1516"/>
-      <point x="624" y="1516" type="curve" smooth="yes"/>
-      <point x="244" y="1516"/>
-      <point x="40" y="1212"/>
-      <point x="40" y="760" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="484" y="760" type="line"/>
-      <point x="484" y="992"/>
-      <point x="552" y="1160"/>
-      <point x="736" y="1160" type="curve" smooth="yes"/>
-      <point x="936" y="1160"/>
-      <point x="1008" y="1032"/>
-      <point x="1008" y="792" type="curve" smooth="yes"/>
-      <point x="1008" y="684" type="line" smooth="yes"/>
-      <point x="1008" y="472"/>
-      <point x="936" y="332"/>
-      <point x="732" y="332" type="curve" smooth="yes"/>
-      <point x="544" y="332"/>
-      <point x="484" y="508"/>
-      <point x="484" y="732" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="964" y="24" type="line"/>
-      <point x="964" y="-108" type="line" smooth="yes"/>
-      <point x="964" y="-548"/>
-      <point x="1280" y="-600"/>
-      <point x="1520" y="-600" type="curve" smooth="yes"/>
-      <point x="1620" y="-600"/>
-      <point x="1688" y="-592"/>
-      <point x="1752" y="-580" type="curve"/>
-      <point x="1752" y="-284" type="line"/>
-      <point x="1712" y="-288"/>
-      <point x="1680" y="-292"/>
-      <point x="1644" y="-292" type="curve" smooth="yes"/>
-      <point x="1536" y="-292"/>
-      <point x="1408" y="-256"/>
-      <point x="1408" y="-108" type="curve" smooth="yes"/>
-      <point x="1408" y="24" type="line"/>
-    </contour>
-  </outline>
-  <lib>
-    <dict>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 1789, 'leftMargin': 78, 'rightMargin': 0}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni024E_.glif b/src/Inter-UI-Black.ufo/glyphs/uni024E_.glif
index cf7af1df8..68f85b31c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni024E_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni024E_.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni024E" format="1">
-  <advance width="2304"/>
+  <advance width="2020"/>
   <unicode hex="024E"/>
   <outline>
     <contour>
-      <point x="1152" y="2200" type="move" name="top"/>
+      <point x="1988" y="1620" type="line"/>
+      <point x="36" y="1620" type="line"/>
+      <point x="36" y="1388" type="line"/>
+      <point x="1988" y="1388" type="line"/>
     </contour>
+    <component base="Y" xOffset="-16"/>
     <contour>
-      <point x="1152" y="64" type="move" name="bottom"/>
+      <point x="960" y="2200" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="2184" y="2200" type="move" name="top0315"/>
+      <point x="960" y="64" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="2128" y="1620" type="line"/>
-      <point x="176" y="1620" type="line"/>
-      <point x="176" y="1388" type="line"/>
-      <point x="2128" y="1388" type="line"/>
+      <point x="1992" y="2200" type="move" name="top0315"/>
     </contour>
-    <component base="Y" xOffset="272"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni02A9_.glif b/src/Inter-UI-Black.ufo/glyphs/uni02A9_.glif
deleted file mode 100644
index 42869c041..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/uni02A9_.glif
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02A9" format="1">
-  <advance width="2560"/>
-  <unicode hex="02A9"/>
-  <outline>
-    <contour>
-      <point x="1796" y="2340" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1796" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="2580" y="2340" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="1568" y="1488" type="line"/>
-      <point x="1124" y="1488" type="line"/>
-      <point x="1124" y="0" type="line"/>
-      <point x="1568" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1512" y="796" type="line"/>
-      <point x="1512" y="1004"/>
-      <point x="1564" y="1160"/>
-      <point x="1784" y="1160" type="curve" smooth="yes"/>
-      <point x="1924" y="1160"/>
-      <point x="2004" y="1100"/>
-      <point x="2004" y="860" type="curve" smooth="yes"/>
-      <point x="2004" y="0" type="line"/>
-      <point x="2448" y="0" type="line"/>
-      <point x="2448" y="856" type="line" smooth="yes"/>
-      <point x="2448" y="1328"/>
-      <point x="2244" y="1516"/>
-      <point x="1952" y="1516" type="curve" smooth="yes"/>
-      <point x="1620" y="1516"/>
-      <point x="1400" y="1212"/>
-      <point x="1400" y="792" type="curve"/>
-    </contour>
-    <contour>
-      <point x="2004" y="160" type="line"/>
-      <point x="2004" y="-108" type="line" smooth="yes"/>
-      <point x="2004" y="-256"/>
-      <point x="1876" y="-292"/>
-      <point x="1772" y="-292" type="curve" smooth="yes"/>
-      <point x="1732" y="-292"/>
-      <point x="1700" y="-288"/>
-      <point x="1660" y="-284" type="curve"/>
-      <point x="1660" y="-580" type="line"/>
-      <point x="1724" y="-592"/>
-      <point x="1792" y="-600"/>
-      <point x="1892" y="-600" type="curve" smooth="yes"/>
-      <point x="2132" y="-600"/>
-      <point x="2448" y="-548"/>
-      <point x="2448" y="-108" type="curve" smooth="yes"/>
-      <point x="2448" y="160" type="line"/>
-    </contour>
-    <contour>
-      <point x="776" y="0" type="line" name="hr01"/>
-      <point x="776" y="1608" type="line" smooth="yes"/>
-      <point x="776" y="1724"/>
-      <point x="852" y="1784"/>
-      <point x="988" y="1784" type="curve" smooth="yes"/>
-      <point x="1040" y="1784"/>
-      <point x="1072" y="1780"/>
-      <point x="1108" y="1772" type="curve"/>
-      <point x="1108" y="2112" type="line"/>
-      <point x="1040" y="2128"/>
-      <point x="968" y="2140"/>
-      <point x="892" y="2140" type="curve" smooth="yes"/>
-      <point x="548" y="2140"/>
-      <point x="332" y="1956"/>
-      <point x="332" y="1608" type="curve" smooth="yes"/>
-      <point x="332" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1204" y="1488" type="line"/>
-      <point x="112" y="1488" type="line"/>
-      <point x="112" y="1168" type="line"/>
-      <point x="1204" y="1168" type="line"/>
-    </contour>
-  </outline>
-  <lib>
-    <dict>
-      <key>com.adobe.type.autohint</key>
-      <data>
-      </data>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 2493, 'leftMargin': 25, 'rightMargin': 133}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni02AE__.glif b/src/Inter-UI-Black.ufo/glyphs/uni02AE__.glif
deleted file mode 100644
index 3df787c3c..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/uni02AE__.glif
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02AE" format="1">
-  <advance width="1792"/>
-  <unicode hex="02AE"/>
-  <outline>
-    <contour>
-      <point x="1028" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1028" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1872" y="1776" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="1288" y="-572" type="line"/>
-      <point x="1732" y="-572" type="line"/>
-      <point x="1732" y="1488" type="line"/>
-      <point x="1288" y="1488" type="line"/>
-    </contour>
-    <contour>
-      <point x="1344" y="692" type="line"/>
-      <point x="1344" y="484"/>
-      <point x="1292" y="332"/>
-      <point x="1072" y="332" type="curve" smooth="yes"/>
-      <point x="932" y="332"/>
-      <point x="852" y="388"/>
-      <point x="852" y="632" type="curve" smooth="yes"/>
-      <point x="852" y="940" type="line"/>
-      <point x="408" y="940" type="line"/>
-      <point x="408" y="632" type="line" smooth="yes"/>
-      <point x="408" y="164"/>
-      <point x="608" y="-28"/>
-      <point x="904" y="-28" type="curve" smooth="yes"/>
-      <point x="1236" y="-28"/>
-      <point x="1452" y="280"/>
-      <point x="1452" y="696" type="curve"/>
-    </contour>
-    <contour>
-      <point x="852" y="760" type="line"/>
-      <point x="852" y="1024" type="line" smooth="yes"/>
-      <point x="852" y="1468"/>
-      <point x="536" y="1516"/>
-      <point x="296" y="1516" type="curve" smooth="yes"/>
-      <point x="196" y="1516"/>
-      <point x="128" y="1512"/>
-      <point x="64" y="1496" type="curve"/>
-      <point x="64" y="1200" type="line"/>
-      <point x="100" y="1204"/>
-      <point x="136" y="1208"/>
-      <point x="172" y="1208" type="curve" smooth="yes"/>
-      <point x="276" y="1208"/>
-      <point x="408" y="1176"/>
-      <point x="408" y="1024" type="curve" smooth="yes"/>
-      <point x="408" y="760" type="line"/>
-    </contour>
-  </outline>
-  <lib>
-    <dict>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 1838, 'leftMargin': 30, 'rightMargin': 140}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni04C9_.glif b/src/Inter-UI-Black.ufo/glyphs/uni04C9_.glif
index 88eb09910..f5e63c4d8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni04C9_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni04C9_.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni04C9" format="1">
-  <advance width="2216"/>
+  <advance width="2184"/>
   <unicode hex="04C9"/>
   <outline>
     <component base="H"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1E9C__.glif b/src/Inter-UI-Black.ufo/glyphs/uni1E9C__.glif
deleted file mode 100644
index 860defc62..000000000
--- a/src/Inter-UI-Black.ufo/glyphs/uni1E9C__.glif
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni1E9C" format="1">
-  <advance width="1024"/>
-  <unicode hex="1E9C"/>
-  <outline>
-    <contour>
-      <point x="912" y="1176" type="line" name="hr00"/>
-      <point x="16" y="896" type="line"/>
-      <point x="16" y="608" type="line"/>
-      <point x="912" y="892" type="line"/>
-    </contour>
-    <contour>
-      <point x="676" y="0" type="line"/>
-      <point x="676" y="1608" type="line" smooth="yes"/>
-      <point x="676" y="1724"/>
-      <point x="756" y="1784"/>
-      <point x="892" y="1784" type="curve" smooth="yes"/>
-      <point x="940" y="1784"/>
-      <point x="976" y="1780"/>
-      <point x="1008" y="1772" type="curve"/>
-      <point x="1008" y="2112" type="line"/>
-      <point x="944" y="2128"/>
-      <point x="872" y="2140"/>
-      <point x="796" y="2140" type="curve" smooth="yes"/>
-      <point x="452" y="2140"/>
-      <point x="232" y="1956"/>
-      <point x="232" y="1608" type="curve" smooth="yes"/>
-      <point x="232" y="0" type="line"/>
-    </contour>
-  </outline>
-  <lib>
-    <dict>
-      <key>com.adobe.type.autohint</key>
-      <data>
-      </data>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 1018, 'leftMargin': 25, 'rightMargin': 0}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni20AF__.glif b/src/Inter-UI-Black.ufo/glyphs/uni20AF__.glif
index bf1870ffb..97f45c90a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni20AF__.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni20AF__.glif
@@ -6,30 +6,30 @@
     <contour>
       <point x="1456" y="-28" type="line"/>
       <point x="1968" y="-28"/>
-      <point x="2252" y="288"/>
-      <point x="2252" y="960" type="curve" smooth="yes"/>
-      <point x="2252" y="1044" type="line" smooth="yes"/>
-      <point x="2252" y="1612"/>
-      <point x="1932" y="2028"/>
-      <point x="1332" y="2028" type="curve" smooth="yes"/>
-      <point x="1000" y="2028"/>
-      <point x="672" y="1960"/>
-      <point x="336" y="1880" type="curve"/>
-      <point x="336" y="1520" type="line"/>
-      <point x="732" y="1608"/>
-      <point x="1000" y="1672"/>
-      <point x="1300" y="1672" type="curve" smooth="yes"/>
-      <point x="1672" y="1672"/>
-      <point x="1808" y="1440"/>
-      <point x="1808" y="1048" type="curve" smooth="yes"/>
-      <point x="1808" y="960" type="line" smooth="yes"/>
-      <point x="1808" y="568"/>
+      <point x="2252" y="300"/>
+      <point x="2252" y="972" type="curve" smooth="yes"/>
+      <point x="2252" y="1056" type="line" smooth="yes"/>
+      <point x="2252" y="1624"/>
+      <point x="1932" y="2076"/>
+      <point x="1332" y="2076" type="curve" smooth="yes"/>
+      <point x="1000" y="2076"/>
+      <point x="672" y="2008"/>
+      <point x="336" y="1928" type="curve"/>
+      <point x="336" y="1568" type="line"/>
+      <point x="732" y="1656"/>
+      <point x="1000" y="1720"/>
+      <point x="1300" y="1720" type="curve" smooth="yes"/>
+      <point x="1672" y="1720"/>
+      <point x="1808" y="1452"/>
+      <point x="1808" y="1060" type="curve" smooth="yes"/>
+      <point x="1808" y="972" type="line" smooth="yes"/>
+      <point x="1808" y="580"/>
       <point x="1768" y="332"/>
       <point x="1456" y="332" type="curve"/>
     </contour>
     <contour>
-      <point x="1148" y="2288" type="line"/>
-      <point x="704" y="2288" type="line"/>
+      <point x="1148" y="2304" type="line"/>
+      <point x="704" y="2304" type="line"/>
       <point x="704" y="404" type="line" smooth="yes"/>
       <point x="704" y="308"/>
       <point x="672" y="248"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni20B9_.glif b/src/Inter-UI-Black.ufo/glyphs/uni20B9_.glif
index 7881fa22b..08f4281f9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni20B9_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni20B9_.glif
@@ -4,39 +4,39 @@
   <unicode hex="20B9"/>
   <outline>
     <contour>
-      <point x="1456" y="1492" type="line" name="hr00"/>
-      <point x="152" y="1492" type="line"/>
-      <point x="80" y="1204" type="line"/>
-      <point x="1384" y="1204" type="line"/>
+      <point x="1456" y="1536" type="line" name="hr00"/>
+      <point x="152" y="1536" type="line"/>
+      <point x="80" y="1248" type="line"/>
+      <point x="1384" y="1248" type="line"/>
     </contour>
     <contour>
       <point x="760" y="0" type="line"/>
       <point x="1256" y="0" type="line"/>
       <point x="1256" y="20" type="line"/>
-      <point x="684" y="708" type="line"/>
-      <point x="1044" y="812"/>
-      <point x="1192" y="1020"/>
-      <point x="1192" y="1372" type="curve" smooth="yes"/>
-      <point x="1192" y="1768"/>
-      <point x="936" y="2004"/>
-      <point x="436" y="2004" type="curve" smooth="yes"/>
-      <point x="164" y="2004" type="line"/>
-      <point x="80" y="1628" type="line"/>
-      <point x="436" y="1628" type="line" smooth="yes"/>
-      <point x="656" y="1628"/>
-      <point x="736" y="1504"/>
-      <point x="736" y="1332" type="curve" smooth="yes"/>
-      <point x="736" y="1156"/>
-      <point x="640" y="1020"/>
-      <point x="436" y="1020" type="curve" smooth="yes"/>
-      <point x="116" y="1020" type="line"/>
-      <point x="116" y="756" type="line"/>
+      <point x="684" y="752" type="line"/>
+      <point x="1044" y="856"/>
+      <point x="1192" y="1064"/>
+      <point x="1192" y="1416" type="curve" smooth="yes"/>
+      <point x="1192" y="1812"/>
+      <point x="936" y="2048"/>
+      <point x="436" y="2048" type="curve" smooth="yes"/>
+      <point x="164" y="2048" type="line"/>
+      <point x="80" y="1672" type="line"/>
+      <point x="436" y="1672" type="line" smooth="yes"/>
+      <point x="656" y="1672"/>
+      <point x="736" y="1548"/>
+      <point x="736" y="1376" type="curve" smooth="yes"/>
+      <point x="736" y="1200"/>
+      <point x="640" y="1064"/>
+      <point x="436" y="1064" type="curve" smooth="yes"/>
+      <point x="116" y="1064" type="line"/>
+      <point x="116" y="800" type="line"/>
     </contour>
     <contour>
-      <point x="1460" y="2004" type="line"/>
-      <point x="372" y="2004" type="line"/>
-      <point x="300" y="1712" type="line"/>
-      <point x="1384" y="1712" type="line"/>
+      <point x="1460" y="2048" type="line"/>
+      <point x="372" y="2048" type="line"/>
+      <point x="300" y="1756" type="line"/>
+      <point x="1384" y="1756" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni20BA__.glif b/src/Inter-UI-Black.ufo/glyphs/uni20BA__.glif
index 6efb4c2a5..e65f5eae3 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni20BA__.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni20BA__.glif
@@ -4,8 +4,8 @@
   <unicode hex="20BA"/>
   <outline>
     <contour>
-      <point x="808" y="2004" type="line"/>
-      <point x="348" y="2004" type="line"/>
+      <point x="808" y="2048" type="line"/>
+      <point x="348" y="2048" type="line"/>
       <point x="348" y="0" type="line"/>
       <point x="808" y="0" type="line"/>
     </contour>
@@ -25,16 +25,16 @@
       <point x="1672" y="1048" type="line"/>
     </contour>
     <contour>
-      <point x="1048" y="1840" type="line"/>
-      <point x="124" y="1580" type="line"/>
-      <point x="124" y="1276" type="line"/>
-      <point x="1048" y="1532" type="line"/>
+      <point x="1048" y="1884" type="line"/>
+      <point x="124" y="1624" type="line"/>
+      <point x="124" y="1320" type="line"/>
+      <point x="1048" y="1576" type="line"/>
     </contour>
     <contour>
-      <point x="1048" y="1384" type="line"/>
-      <point x="124" y="1128" type="line"/>
-      <point x="124" y="824" type="line"/>
-      <point x="1048" y="1080" type="line"/>
+      <point x="1048" y="1428" type="line"/>
+      <point x="124" y="1172" type="line"/>
+      <point x="124" y="868" type="line"/>
+      <point x="1048" y="1124" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni2C7F__.glif b/src/Inter-UI-Black.ufo/glyphs/uni2C7F__.glif
index 40bac717e..9be83a842 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni2C7F__.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni2C7F__.glif
@@ -3,20 +3,6 @@
   <advance width="1792"/>
   <unicode hex="2C7F"/>
   <outline>
-    <contour>
-      <point x="1652" y="1756" type="line"/>
-      <point x="1652" y="2004" type="line"/>
-      <point x="1336" y="2004" type="line"/>
-      <point x="116" y="252" type="line"/>
-      <point x="124" y="0" type="line"/>
-      <point x="448" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1504" y="2004" type="line"/>
-      <point x="116" y="2004" type="line"/>
-      <point x="116" y="1632" type="line"/>
-      <point x="1504" y="1632" type="line"/>
-    </contour>
     <contour>
       <point x="256" y="0" type="line"/>
       <point x="820" y="0"/>
@@ -33,6 +19,20 @@
       <point x="992" y="376"/>
       <point x="392" y="376" type="curve"/>
     </contour>
+    <contour>
+      <point x="1652" y="1756" type="line"/>
+      <point x="1652" y="2004" type="line"/>
+      <point x="1336" y="2004" type="line"/>
+      <point x="116" y="252" type="line"/>
+      <point x="124" y="0" type="line"/>
+      <point x="448" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="1504" y="2004" type="line"/>
+      <point x="116" y="2004" type="line"/>
+      <point x="116" y="1632" type="line"/>
+      <point x="1504" y="1632" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/verticalbardbl.glif b/src/Inter-UI-Black.ufo/glyphs/verticalbardbl.glif
index 5f2f22a8a..bf2f5450c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/verticalbardbl.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/verticalbardbl.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="verticalbardbl" format="1">
-  <advance width="1280"/>
+  <advance width="1392"/>
   <unicode hex="2016"/>
   <outline>
-    <component base="bar" xOffset="24"/>
-    <component base="bar" xOffset="492"/>
+    <component base="bar"/>
+    <component base="bar" xOffset="472"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/vturn.glif b/src/Inter-UI-Black.ufo/glyphs/vturn.glif
index d6aca7a2b..2957662d1 100644
--- a/src/Inter-UI-Black.ufo/glyphs/vturn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/vturn.glif
@@ -3,6 +3,7 @@
   <advance width="1536"/>
   <unicode hex="028C"/>
   <outline>
+    <component base="v" xScale="-1.0" yScale="-1.0" xOffset="1536" yOffset="1536"/>
     <contour>
       <point x="772" y="1776" type="move" name="top"/>
     </contour>
@@ -12,20 +13,6 @@
     <contour>
       <point x="1488" y="1776" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="824" y="1172" type="line"/>
-      <point x="824" y="1488" type="line"/>
-      <point x="548" y="1488" type="line"/>
-      <point x="56" y="0" type="line"/>
-      <point x="520" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1016" y="0" type="line"/>
-      <point x="1480" y="0" type="line"/>
-      <point x="992" y="1488" type="line"/>
-      <point x="712" y="1488" type="line"/>
-      <point x="712" y="1172" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/won.glif b/src/Inter-UI-Black.ufo/glyphs/won.glif
index ea119789c..fc0505583 100644
--- a/src/Inter-UI-Black.ufo/glyphs/won.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/won.glif
@@ -18,14 +18,14 @@
     <contour>
       <point x="888" y="0" type="line"/>
       <point x="1140" y="0" type="line"/>
-      <point x="1416" y="1848" type="line"/>
-      <point x="1312" y="2004" type="line"/>
-      <point x="1080" y="2004" type="line"/>
+      <point x="1416" y="1892" type="line"/>
+      <point x="1312" y="2048" type="line"/>
+      <point x="1080" y="2048" type="line"/>
       <point x="832" y="184" type="line"/>
     </contour>
     <contour>
-      <point x="752" y="2004" type="line"/>
-      <point x="292" y="2004" type="line"/>
+      <point x="752" y="2048" type="line"/>
+      <point x="292" y="2048" type="line"/>
       <point x="668" y="0" type="line"/>
       <point x="960" y="0" type="line"/>
       <point x="988" y="168" type="line"/>
@@ -33,14 +33,14 @@
     <contour>
       <point x="1592" y="0" type="line"/>
       <point x="1880" y="0" type="line"/>
-      <point x="2256" y="2004" type="line"/>
-      <point x="1800" y="2004" type="line"/>
+      <point x="2256" y="2048" type="line"/>
+      <point x="1800" y="2048" type="line"/>
       <point x="1568" y="176" type="line"/>
     </contour>
     <contour>
-      <point x="1468" y="2004" type="line"/>
-      <point x="1236" y="2004" type="line"/>
-      <point x="1128" y="1848" type="line"/>
+      <point x="1468" y="2048" type="line"/>
+      <point x="1236" y="2048" type="line"/>
+      <point x="1128" y="1892" type="line"/>
       <point x="1408" y="0" type="line"/>
       <point x="1664" y="0" type="line"/>
       <point x="1724" y="172" type="line"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/wturn.glif b/src/Inter-UI-Black.ufo/glyphs/wturn.glif
index cfa14201e..373750a7c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/wturn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/wturn.glif
@@ -1,46 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="wturn" format="1">
-  <advance width="2304"/>
+  <advance width="2172.0"/>
   <unicode hex="028D"/>
   <outline>
+    <component base="w" xScale="-1.0" yScale="-1.0" xOffset="2172" yOffset="1536"/>
     <contour>
-      <point x="1152" y="1776" type="move" name="top"/>
+      <point x="1148" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1152" y="0" type="move" name="bottom"/>
+      <point x="1148" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="2180" y="1776" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="776" y="1016" type="line"/>
-      <point x="792" y="1488" type="line"/>
-      <point x="520" y="1488" type="line"/>
-      <point x="164" y="0" type="line"/>
-      <point x="588" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="996" y="0" type="line"/>
-      <point x="1268" y="0" type="line"/>
-      <point x="1176" y="528" type="line"/>
-      <point x="896" y="1488" type="line"/>
-      <point x="668" y="1488" type="line"/>
-      <point x="708" y="1044" type="line"/>
-    </contour>
-    <contour>
-      <point x="1596" y="1044" type="line"/>
-      <point x="1636" y="1488" type="line"/>
-      <point x="1412" y="1488" type="line"/>
-      <point x="1128" y="524" type="line"/>
-      <point x="1032" y="0" type="line"/>
-      <point x="1308" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1720" y="0" type="line"/>
-      <point x="2144" y="0" type="line"/>
-      <point x="1784" y="1488" type="line"/>
-      <point x="1512" y="1488" type="line"/>
-      <point x="1532" y="1036" type="line"/>
+      <point x="2176" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/y.glif b/src/Inter-UI-Black.ufo/glyphs/y.glif
index 42b6031ae..45586b9b5 100644
--- a/src/Inter-UI-Black.ufo/glyphs/y.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/y.glif
@@ -9,8 +9,8 @@
       <point x="460" y="-224"/>
       <point x="284" y="-224" type="curve" smooth="yes"/>
       <point x="264" y="-224"/>
-      <point x="248" y="-224"/>
-      <point x="224" y="-224" type="curve"/>
+      <point x="260" y="-224"/>
+      <point x="224" y="-220" type="curve"/>
       <point x="224" y="-572" type="line"/>
       <point x="300" y="-596"/>
       <point x="328" y="-600"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/yen.glif b/src/Inter-UI-Black.ufo/glyphs/yen.glif
index d6403c882..6139a1d67 100644
--- a/src/Inter-UI-Black.ufo/glyphs/yen.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/yen.glif
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="yen" format="1">
-  <advance width="1536"/>
+  <advance width="1532"/>
   <unicode hex="00A5"/>
   <outline>
     <contour>
-      <point x="1372" y="1064" type="line"/>
-      <point x="116" y="1064" type="line"/>
-      <point x="116" y="804" type="line"/>
-      <point x="1372" y="804" type="line"/>
+      <point x="1368" y="1064" type="line"/>
+      <point x="112" y="1064" type="line"/>
+      <point x="112" y="804" type="line"/>
+      <point x="1368" y="804" type="line"/>
     </contour>
     <contour>
-      <point x="1372" y="668" type="line"/>
-      <point x="116" y="668" type="line"/>
-      <point x="116" y="408" type="line"/>
-      <point x="1372" y="408" type="line"/>
+      <point x="1368" y="668" type="line"/>
+      <point x="112" y="668" type="line"/>
+      <point x="112" y="408" type="line"/>
+      <point x="1368" y="408" type="line"/>
     </contour>
     <contour>
-      <point x="668" y="1048" type="line"/>
-      <point x="724" y="788" type="line"/>
-      <point x="968" y="788" type="line"/>
-      <point x="1516" y="2048" type="line"/>
-      <point x="1044" y="2048" type="line"/>
+      <point x="664" y="1048" type="line"/>
+      <point x="720" y="788" type="line"/>
+      <point x="964" y="788" type="line"/>
+      <point x="1512" y="2048" type="line"/>
+      <point x="1040" y="2048" type="line"/>
     </contour>
     <contour>
-      <point x="496" y="2048" type="line"/>
-      <point x="24" y="2048" type="line"/>
-      <point x="568" y="788" type="line"/>
-      <point x="816" y="788" type="line"/>
-      <point x="876" y="1036" type="line"/>
+      <point x="492" y="2048" type="line"/>
+      <point x="20" y="2048" type="line"/>
+      <point x="564" y="788" type="line"/>
+      <point x="812" y="788" type="line"/>
+      <point x="872" y="1036" type="line"/>
     </contour>
     <contour>
-      <point x="992" y="1080" type="line"/>
-      <point x="532" y="1080" type="line"/>
-      <point x="532" y="0" type="line"/>
-      <point x="992" y="0" type="line"/>
+      <point x="988" y="1080" type="line"/>
+      <point x="528" y="1080" type="line"/>
+      <point x="528" y="0" type="line"/>
+      <point x="988" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/yhook.glif b/src/Inter-UI-Black.ufo/glyphs/yhook.glif
index 79a48e8e9..31ac87ac2 100644
--- a/src/Inter-UI-Black.ufo/glyphs/yhook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/yhook.glif
@@ -1,45 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="yhook" format="1">
-  <advance width="1792"/>
+  <advance width="1620"/>
   <unicode hex="01B4"/>
   <outline>
     <contour>
-      <point x="632" y="176" type="line" name="hr00"/>
-      <point x="520" y="-112" type="line" smooth="yes"/>
-      <point x="488" y="-196"/>
-      <point x="436" y="-244"/>
-      <point x="284" y="-244" type="curve" smooth="yes"/>
-      <point x="264" y="-244"/>
-      <point x="244" y="-244"/>
-      <point x="224" y="-244" type="curve"/>
+      <point x="1412" y="1272" type="line"/>
+      <point x="1432" y="1332" type="line" smooth="yes"/>
+      <point x="1460" y="1432"/>
+      <point x="1508" y="1492"/>
+      <point x="1584" y="1516" type="curve" smooth="yes"/>
+      <point x="1628" y="1532"/>
+      <point x="1644" y="1524"/>
+      <point x="1692" y="1516" type="curve"/>
+      <point x="1716" y="1876" type="line"/>
+      <point x="1608" y="1892"/>
+      <point x="1504" y="1904"/>
+      <point x="1364" y="1856" type="curve" smooth="yes"/>
+      <point x="1176" y="1792"/>
+      <point x="1064" y="1664"/>
+      <point x="1016" y="1512" type="curve" smooth="yes"/>
+      <point x="976" y="1384" type="line"/>
+    </contour>
+    <contour>
+      <point x="564" y="-24" type="line" smooth="yes"/>
+      <point x="528" y="-148"/>
+      <point x="460" y="-224"/>
+      <point x="284" y="-224" type="curve"/>
+      <point x="269.0" y="-224.0"/>
+      <point x="252" y="-224"/>
+      <point x="224" y="-220" type="curve"/>
       <point x="224" y="-572" type="line"/>
       <point x="300" y="-596"/>
-      <point x="324" y="-600"/>
+      <point x="328" y="-600"/>
       <point x="412" y="-600" type="curve" smooth="yes"/>
       <point x="744" y="-600"/>
-      <point x="848" y="-372"/>
-      <point x="896" y="-220" type="curve" smooth="yes"/>
-      <point x="1372" y="1208" type="line" smooth="yes"/>
-      <point x="1432" y="1388"/>
-      <point x="1472" y="1456"/>
-      <point x="1544" y="1456" type="curve" smooth="yes"/>
-      <point x="1584" y="1456"/>
-      <point x="1612" y="1444"/>
-      <point x="1652" y="1424" type="curve"/>
-      <point x="1752" y="1700" type="line"/>
-      <point x="1664" y="1772"/>
-      <point x="1552" y="1832"/>
-      <point x="1412" y="1832" type="curve" smooth="yes"/>
-      <point x="1140" y="1832"/>
-      <point x="1056" y="1596"/>
-      <point x="972" y="1316" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="516" y="1488" type="line"/>
-      <point x="40" y="1488" type="line"/>
-      <point x="572" y="-44" type="line"/>
-      <point x="868" y="-44" type="line"/>
-      <point x="756" y="656" type="line"/>
+      <point x="904" y="-372"/>
+      <point x="952" y="-220" type="curve" smooth="yes"/>
+      <point x="1412" y="1272" type="line"/>
+      <point x="976" y="1384" type="line"/>
+      <point x="780" y="716" type="line"/>
+      <point x="516" y="1536" type="line"/>
+      <point x="40" y="1536" type="line"/>
+      <point x="584" y="48" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/yturn.glif b/src/Inter-UI-Black.ufo/glyphs/yturn.glif
index 1f837b923..c065e3c3f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/yturn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/yturn.glif
@@ -3,6 +3,7 @@
   <advance width="1536"/>
   <unicode hex="028E"/>
   <outline>
+    <component base="y" xScale="-1.0" yScale="-1.0" xOffset="1536" yOffset="1536"/>
     <contour>
       <point x="772" y="2200" type="move" name="top"/>
     </contour>
@@ -12,32 +13,6 @@
     <contour>
       <point x="1496" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="904" y="1312" type="line"/>
-      <point x="1016" y="1600" type="line"/>
-      <point x="1048" y="1684"/>
-      <point x="1100" y="1732"/>
-      <point x="1252" y="1732" type="curve" smooth="yes"/>
-      <point x="1272" y="1732"/>
-      <point x="1292" y="1732"/>
-      <point x="1312" y="1732" type="curve"/>
-      <point x="1312" y="2060" type="line"/>
-      <point x="1236" y="2084"/>
-      <point x="1212" y="2088"/>
-      <point x="1128" y="2088" type="curve" smooth="yes"/>
-      <point x="796" y="2088"/>
-      <point x="692" y="1860"/>
-      <point x="640" y="1708" type="curve" smooth="yes"/>
-      <point x="44" y="0" type="line"/>
-      <point x="516" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1020" y="0" type="line"/>
-      <point x="1496" y="0" type="line"/>
-      <point x="964" y="1532" type="line"/>
-      <point x="668" y="1532" type="line"/>
-      <point x="720" y="1040" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/zbar.glif b/src/Inter-UI-Black.ufo/glyphs/zbar.glif
index 1e2c6b1be..59c6c57a1 100644
--- a/src/Inter-UI-Black.ufo/glyphs/zbar.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/zbar.glif
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="zbar" format="1">
-  <advance width="1536"/>
+  <advance width="1512"/>
   <unicode hex="01B6"/>
   <outline>
-    <contour>
-      <point x="1312" y="896" type="line"/>
-      <point x="224" y="896" type="line"/>
-      <point x="224" y="636" type="line"/>
-      <point x="1312" y="636" type="line"/>
-    </contour>
-    <component base="z" xOffset="48"/>
+    <component base="z"/>
+    <component base="crossbar" xOffset="116" yOffset="-244"/>
     <contour>
       <point x="768" y="1776" type="move" name="top"/>
     </contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/zcurl.glif b/src/Inter-UI-Black.ufo/glyphs/zcurl.glif
index e09849bf6..ea8c85db5 100644
--- a/src/Inter-UI-Black.ufo/glyphs/zcurl.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/zcurl.glif
@@ -1,62 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="zcurl" format="1">
-  <advance width="2048"/>
+  <advance width="1948"/>
   <unicode hex="0291"/>
   <outline>
-    <contour>
-      <point x="776" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="776" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1924" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="752" y="0" type="line"/>
       <point x="1376" y="0" type="line" smooth="yes"/>
-      <point x="1684" y="0"/>
-      <point x="1880" y="192"/>
-      <point x="1880" y="484" type="curve" smooth="yes"/>
-      <point x="1880" y="736"/>
-      <point x="1760" y="868"/>
+      <point x="1748" y="0"/>
+      <point x="1916" y="256"/>
+      <point x="1916" y="484" type="curve" smooth="yes"/>
+      <point x="1916" y="716"/>
+      <point x="1740" y="868"/>
       <point x="1532" y="868" type="curve" smooth="yes"/>
       <point x="1272" y="868"/>
-      <point x="1092" y="636"/>
-      <point x="660" y="20" type="curve"/>
-      <point x="508" y="-196" type="line"/>
-      <point x="760" y="-376" type="line"/>
-      <point x="1024" y="24" type="line"/>
-      <point x="1336" y="492"/>
-      <point x="1400" y="576"/>
-      <point x="1472" y="576" type="curve" smooth="yes"/>
-      <point x="1528" y="576"/>
-      <point x="1560" y="548"/>
-      <point x="1560" y="484" type="curve" smooth="yes"/>
-      <point x="1560" y="424"/>
+      <point x="1084" y="640"/>
+      <point x="660" y="20" type="curve" smooth="yes"/>
+      <point x="512" y="-196" type="line"/>
+      <point x="792" y="-368" type="line"/>
+      <point x="1072" y="24" type="line" smooth="yes"/>
+      <point x="1340" y="400"/>
+      <point x="1404" y="520"/>
+      <point x="1488" y="520" type="curve" smooth="yes"/>
+      <point x="1528" y="520"/>
+      <point x="1560" y="496"/>
+      <point x="1560" y="464" type="curve" smooth="yes"/>
+      <point x="1560" y="404"/>
       <point x="1528" y="360"/>
       <point x="1404" y="360" type="curve" smooth="yes"/>
       <point x="752" y="360" type="line"/>
     </contour>
     <contour>
-      <point x="1340" y="360" type="line"/>
-      <point x="280" y="360" type="line"/>
-      <point x="280" y="0" type="line"/>
-      <point x="1340" y="0" type="line"/>
+      <point x="1192" y="360" type="line"/>
+      <point x="696" y="360" type="line"/>
+      <point x="1368" y="1276" type="line"/>
+      <point x="1368" y="1536" type="line"/>
+      <point x="156" y="1536" type="line"/>
+      <point x="156" y="1176" type="line"/>
+      <point x="800" y="1176" type="line"/>
+      <point x="128" y="260" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="1192" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="1404" y="1240" type="line"/>
-      <point x="1404" y="1488" type="line"/>
-      <point x="1104" y="1488" type="line"/>
-      <point x="168" y="260" type="line"/>
-      <point x="168" y="0" type="line"/>
-      <point x="468" y="0" type="line"/>
+      <point x="776" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1256" y="1488" type="line"/>
-      <point x="196" y="1488" type="line"/>
-      <point x="196" y="1132" type="line"/>
-      <point x="1256" y="1132" type="line"/>
+      <point x="776" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1924" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/zhook.glif b/src/Inter-UI-Black.ufo/glyphs/zhook.glif
new file mode 100644
index 000000000..d6321da73
--- /dev/null
+++ b/src/Inter-UI-Black.ufo/glyphs/zhook.glif
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="zhook" format="1">
+  <advance width="1512"/>
+  <unicode hex="0225"/>
+  <outline>
+    <contour>
+      <point x="748" y="360" type="line"/>
+      <point x="748" y="0" type="line"/>
+      <point x="868" y="0" type="line" smooth="yes"/>
+      <point x="1044" y="0"/>
+      <point x="1072" y="-152"/>
+      <point x="1072" y="-276" type="curve" smooth="yes"/>
+      <point x="1072" y="-384" type="line"/>
+      <point x="1448" y="-384" type="line"/>
+      <point x="1448" y="-192" type="line" smooth="yes"/>
+      <point x="1448" y="152"/>
+      <point x="1244" y="360"/>
+      <point x="868" y="360" type="curve" smooth="yes"/>
+    </contour>
+    <contour>
+      <point x="808" y="360" type="line"/>
+      <point x="696" y="360" type="line"/>
+      <point x="1368" y="1276" type="line"/>
+      <point x="1368" y="1536" type="line"/>
+      <point x="156" y="1536" type="line"/>
+      <point x="156" y="1176" type="line"/>
+      <point x="800" y="1176" type="line"/>
+      <point x="128" y="260" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="808" y="0" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1621, 'leftMargin': 95, 'rightMargin': 41}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/zrthook.glif b/src/Inter-UI-Black.ufo/glyphs/zrthook.glif
index 247294579..641d24c07 100644
--- a/src/Inter-UI-Black.ufo/glyphs/zrthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/zrthook.glif
@@ -1,54 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="zrthook" format="1">
-  <advance width="1792"/>
+  <advance width="1512"/>
   <unicode hex="0290"/>
   <outline>
     <contour>
-      <point x="656" y="1776" type="move" name="top"/>
+      <point x="1080" y="360" type="line"/>
+      <point x="1080" y="-108" type="line" smooth="yes"/>
+      <point x="1080" y="-424"/>
+      <point x="1256" y="-600"/>
+      <point x="1548" y="-600" type="curve" smooth="yes"/>
+      <point x="1612" y="-600"/>
+      <point x="1664" y="-596"/>
+      <point x="1728" y="-580" type="curve"/>
+      <point x="1728" y="-284" type="line"/>
+      <point x="1688" y="-288"/>
+      <point x="1656" y="-292"/>
+      <point x="1616" y="-292" type="curve" smooth="yes"/>
+      <point x="1512" y="-292"/>
+      <point x="1384" y="-256"/>
+      <point x="1384" y="-108" type="curve" smooth="yes"/>
+      <point x="1384" y="360" type="line"/>
     </contour>
+    <component base="z"/>
     <contour>
-      <point x="656" y="-616" type="move" name="bottom"/>
+      <point x="656.0" y="1776.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1724" y="1776" type="move" name="top0315"/>
+      <point x="656.0" y="-616.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1256" y="360" type="line"/>
-      <point x="180" y="360" type="line"/>
-      <point x="180" y="0" type="line"/>
-      <point x="1256" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1308" y="1240" type="line"/>
-      <point x="1308" y="1488" type="line"/>
-      <point x="1004" y="1488" type="line"/>
-      <point x="68" y="260" type="line"/>
-      <point x="68" y="0" type="line"/>
-      <point x="372" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1160" y="1488" type="line"/>
-      <point x="96" y="1488" type="line"/>
-      <point x="96" y="1132" type="line"/>
-      <point x="1160" y="1132" type="line"/>
-    </contour>
-    <contour>
-      <point x="1076" y="360" type="line"/>
-      <point x="1076" y="-108" type="line" smooth="yes"/>
-      <point x="1076" y="-424"/>
-      <point x="1252" y="-600"/>
-      <point x="1544" y="-600" type="curve" smooth="yes"/>
-      <point x="1608" y="-600"/>
-      <point x="1660" y="-596"/>
-      <point x="1724" y="-580" type="curve"/>
-      <point x="1724" y="-284" type="line"/>
-      <point x="1684" y="-288"/>
-      <point x="1652" y="-292"/>
-      <point x="1612" y="-292" type="curve" smooth="yes"/>
-      <point x="1508" y="-292"/>
-      <point x="1380" y="-256"/>
-      <point x="1380" y="-108" type="curve" smooth="yes"/>
-      <point x="1380" y="360" type="line"/>
+      <point x="1724.0" y="1776.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/groups.plist b/src/Inter-UI-Black.ufo/groups.plist
index 8e00f063b..248d3d088 100644
--- a/src/Inter-UI-Black.ufo/groups.plist
+++ b/src/Inter-UI-Black.ufo/groups.plist
@@ -33,10 +33,13 @@
 	<key>@KERN_LEFT_B</key>
 	<array>
 		<string>B</string>
+		<string>Bhook</string>
 	</array>
 	<key>@KERN_LEFT_C</key>
 	<array>
 		<string>C</string>
+		<string>coloncurrency</string>
+		<string>cedi</string>
 		<string>Ccedilla</string>
 		<string>Cacute</string>
 		<string>Ccircumflex</string>
@@ -47,6 +50,7 @@
 	<array>
 		<string>Oslash</string>
 		<string>D</string>
+		<string>Dhook</string>
 		<string>Q</string>
 		<string>O</string>
 		<string>Eth</string>
@@ -101,10 +105,13 @@
 	<key>@KERN_LEFT_F</key>
 	<array>
 		<string>F</string>
+		<string>Fhook</string>
 	</array>
 	<key>@KERN_LEFT_G</key>
 	<array>
 		<string>G</string>
+		<string>guarani</string>
+		<string>Gbar</string>
 		<string>Gcircumflex</string>
 		<string>Gbreve</string>
 		<string>Gcommaaccent</string>
@@ -124,7 +131,10 @@
 		<string>l</string>
 		<string>M</string>
 		<string>N</string>
+		<string>Nhook</string>
+		<string>Eng</string>
 		<string>H</string>
+		<string>Enhookcyrillic</string>
 		<string>Igrave</string>
 		<string>Iacute</string>
 		<string>Icircumflex</string>
@@ -168,6 +178,7 @@
 	<key>@KERN_LEFT_K</key>
 	<array>
 		<string>K</string>
+		<string>Khook</string>
 		<string>Kcommaaccent</string>
 		<string>Kcaron</string>
 		<string>Kacyr</string>
@@ -248,6 +259,7 @@
 	<key>@KERN_LEFT_Y</key>
 	<array>
 		<string>Y</string>
+		<string>Yhook</string>
 		<string>Yacute</string>
 		<string>Ycircumflex</string>
 		<string>Ydieresis</string>
@@ -256,6 +268,8 @@
 	<key>@KERN_LEFT_Z</key>
 	<array>
 		<string>Z</string>
+		<string>Zbar</string>
+		<string>uni0224</string>
 		<string>Zacute</string>
 		<string>Zdotaccent</string>
 		<string>Zcaron</string>
@@ -265,8 +279,13 @@
 		<string>hcedilla</string>
 		<string>a</string>
 		<string>h</string>
+		<string>hhook</string>
+		<string>henghook</string>
 		<string>m</string>
+		<string>mhook</string>
 		<string>n</string>
+		<string>feng</string>
+		<string>eng</string>
 		<string>eta</string>
 		<string>hbar</string>
 		<string>agrave</string>
@@ -295,6 +314,9 @@
 	<array>
 		<string>ae</string>
 		<string>e</string>
+		<string>uni0247</string>
+		<string>tccurl</string>
+		<string>ccurl</string>
 		<string>oe</string>
 		<string>egrave</string>
 		<string>eacute</string>
@@ -334,6 +356,7 @@
 		<string>thorn</string>
 		<string>o</string>
 		<string>p</string>
+		<string>phook</string>
 		<string>ograve</string>
 		<string>oacute</string>
 		<string>ocircumflex</string>
@@ -551,6 +574,7 @@
 	<key>@KERN_LEFT_k</key>
 	<array>
 		<string>k</string>
+		<string>khook</string>
 		<string>kcommaaccent</string>
 		<string>kcaron</string>
 	</array>
@@ -620,9 +644,14 @@
 		<string>t</string>
 		<string>tcaron</string>
 	</array>
+	<key>@KERN_LEFT_two</key>
+	<array>
+		<string>two</string>
+	</array>
 	<key>@KERN_LEFT_u</key>
 	<array>
 		<string>u</string>
+		<string>mu</string>
 		<string>ugrave</string>
 		<string>uacute</string>
 		<string>ucircumflex</string>
@@ -642,6 +671,7 @@
 	<key>@KERN_LEFT_v</key>
 	<array>
 		<string>y</string>
+		<string>yhook</string>
 		<string>v</string>
 		<string>yacute</string>
 		<string>ydieresis</string>
@@ -670,6 +700,9 @@
 		<string>Dzcaron_</string>
 		<string>dzcaron</string>
 		<string>z</string>
+		<string>zbar</string>
+		<string>zhook</string>
+		<string>dz</string>
 		<string>zacute</string>
 		<string>zdotaccent</string>
 		<string>zcaron</string>
@@ -702,17 +735,21 @@
 		<string>numero</string>
 		<string>D</string>
 		<string>H</string>
+		<string>Enhookcyrillic</string>
 		<string>L</string>
 		<string>P</string>
 		<string>I</string>
 		<string>K</string>
+		<string>Khook</string>
 		<string>Kacyr</string>
-		<string>k</string>
 		<string>Idieresisacute</string>
 		<string>Hcedilla</string>
 		<string>B</string>
 		<string>F</string>
+		<string>Fhook</string>
 		<string>N</string>
+		<string>Nhook</string>
+		<string>Eng</string>
 		<string>R</string>
 		<string>Dzcaron_</string>
 		<string>Itildebelow</string>
@@ -759,7 +796,12 @@
 		<string>OE</string>
 		<string>Oslash</string>
 		<string>C</string>
+		<string>coloncurrency</string>
+		<string>cedi</string>
+		<string>Chook</string>
 		<string>G</string>
+		<string>guarani</string>
+		<string>Gbar</string>
 		<string>O</string>
 		<string>Q</string>
 		<string>Ccedilla</string>
@@ -862,6 +904,7 @@
 	<key>@KERN_RIGHT_Y</key>
 	<array>
 		<string>Y</string>
+		<string>Yhook</string>
 		<string>Yacute</string>
 		<string>Ycircumflex</string>
 		<string>Ydieresis</string>
@@ -870,6 +913,8 @@
 	<key>@KERN_RIGHT_Z</key>
 	<array>
 		<string>Z</string>
+		<string>Zbar</string>
+		<string>uni0224</string>
 		<string>Zacute</string>
 		<string>Zdotaccent</string>
 		<string>Zcaron</string>
@@ -918,7 +963,10 @@
 		<string>hcedilla</string>
 		<string>b</string>
 		<string>h</string>
+		<string>hhook</string>
+		<string>henghook</string>
 		<string>k</string>
+		<string>khook</string>
 		<string>l</string>
 		<string>thorn</string>
 		<string>hcircumflex</string>
@@ -943,13 +991,21 @@
 	<key>@KERN_RIGHT_c</key>
 	<array>
 		<string>dzcaron</string>
+		<string>dzcurl</string>
 		<string>ohorn</string>
 		<string>dcroat</string>
 		<string>oslash</string>
 		<string>d</string>
+		<string>drthook</string>
+		<string>dz</string>
+		<string>dhook</string>
+		<string>dcroat</string>
 		<string>g</string>
+		<string>ghook</string>
+		<string>gbar</string>
 		<string>c</string>
 		<string>e</string>
+		<string>uni0247</string>
 		<string>oe</string>
 		<string>o</string>
 		<string>q</string>
@@ -1133,6 +1189,7 @@
 	<key>@KERN_RIGHT_f</key>
 	<array>
 		<string>f</string>
+		<string>feng</string>
 	</array>
 	<key>@KERN_RIGHT_gammagreek</key>
 	<array>
@@ -1155,8 +1212,13 @@
 	<key>@KERN_RIGHT_m</key>
 	<array>
 		<string>n</string>
+		<string>ncurl</string>
+		<string>eng</string>
 		<string>p</string>
+		<string>phook</string>
+		<string>mu</string>
 		<string>m</string>
+		<string>mhook</string>
 		<string>r</string>
 		<string>eta</string>
 		<string>ntilde</string>
@@ -1215,8 +1277,14 @@
 	<key>@KERN_RIGHT_t</key>
 	<array>
 		<string>t</string>
+		<string>tccurl</string>
 		<string>tcaron</string>
 	</array>
+	<key>@KERN_RIGHT_two</key>
+	<array>
+		<string>two</string>
+		<string>twostroke</string>
+	</array>
 	<key>@KERN_RIGHT_u</key>
 	<array>
 		<string>uhorn</string>
@@ -1236,6 +1304,7 @@
 	<key>@KERN_RIGHT_v</key>
 	<array>
 		<string>y</string>
+		<string>yhook</string>
 		<string>v</string>
 		<string>yacute</string>
 		<string>ydieresis</string>
@@ -1257,6 +1326,9 @@
 	<key>@KERN_RIGHT_z</key>
 	<array>
 		<string>z</string>
+		<string>zbar</string>
+		<string>uni0240</string>
+		<string>zhook</string>
 		<string>zacute</string>
 		<string>zdotaccent</string>
 		<string>zcaron</string>
diff --git a/src/Inter-UI-Black.ufo/kerning.plist b/src/Inter-UI-Black.ufo/kerning.plist
index faae1a404..250c5d77f 100644
--- a/src/Inter-UI-Black.ufo/kerning.plist
+++ b/src/Inter-UI-Black.ufo/kerning.plist
@@ -248,7 +248,7 @@
 		<key>@KERN_RIGHT_X</key>
 		<integer>-256</integer>
 		<key>@KERN_RIGHT_Y</key>
-		<integer>-116</integer>
+		<integer>-292</integer>
 		<key>@KERN_RIGHT_Z</key>
 		<integer>-116</integer>
 		<key>@KERN_RIGHT_a</key>
@@ -256,7 +256,7 @@
 		<key>@KERN_RIGHT_braceright.case</key>
 		<integer>-80</integer>
 		<key>@KERN_RIGHT_c</key>
-		<integer>-64</integer>
+		<integer>-48</integer>
 		<key>@KERN_RIGHT_comma</key>
 		<integer>-138</integer>
 		<key>@KERN_RIGHT_dagger</key>
@@ -271,6 +271,8 @@
 		<integer>-83</integer>
 		<key>@KERN_RIGHT_s</key>
 		<integer>-8</integer>
+		<key>@KERN_RIGHT_v</key>
+		<integer>-32</integer>
 		<key>@KERN_RIGHT_x</key>
 		<integer>-28</integer>
 		<key>backslash</key>
@@ -447,6 +449,8 @@
 		<integer>-254</integer>
 		<key>@KERN_RIGHT_six</key>
 		<integer>-42</integer>
+		<key>@KERN_RIGHT_two</key>
+		<integer>-14</integer>
 		<key>@KERN_RIGHT_u</key>
 		<integer>-167</integer>
 		<key>@KERN_RIGHT_v</key>
@@ -471,8 +475,6 @@
 		<integer>-103</integer>
 		<key>three</key>
 		<integer>-14</integer>
-		<key>two</key>
-		<integer>-14</integer>
 		<key>underscore</key>
 		<integer>-173</integer>
 	</dict>
@@ -487,7 +489,7 @@
 		<key>@KERN_RIGHT_X</key>
 		<integer>-196</integer>
 		<key>@KERN_RIGHT_Y</key>
-		<integer>-56</integer>
+		<integer>-216</integer>
 		<key>@KERN_RIGHT_a</key>
 		<integer>-13</integer>
 		<key>@KERN_RIGHT_braceright.case</key>
@@ -535,6 +537,8 @@
 		<integer>-400</integer>
 		<key>@KERN_RIGHT_six</key>
 		<integer>-77</integer>
+		<key>@KERN_RIGHT_two</key>
+		<integer>-14</integer>
 		<key>afii10021</key>
 		<integer>-48</integer>
 		<key>afii10024</key>
@@ -593,8 +597,6 @@
 		<integer>-130</integer>
 		<key>three</key>
 		<integer>-29</integer>
-		<key>two</key>
-		<integer>-14</integer>
 		<key>underscore</key>
 		<integer>-180</integer>
 		<key>uni20BD</key>
@@ -877,7 +879,7 @@
 		<integer>-27</integer>
 		<key>Hbar</key>
 		<integer>62</integer>
-		<key>Lslash</key>
+		<key>L_slash</key>
 		<integer>82</integer>
 		<key>Tbar</key>
 		<integer>109</integer>
@@ -1042,6 +1044,8 @@
 		<integer>-88</integer>
 		<key>@KERN_RIGHT_t</key>
 		<integer>7</integer>
+		<key>@KERN_RIGHT_two</key>
+		<integer>-8</integer>
 		<key>@KERN_RIGHT_v</key>
 		<integer>-5</integer>
 		<key>ampersand</key>
@@ -1056,8 +1060,6 @@
 		<integer>-42</integer>
 		<key>slash</key>
 		<integer>-315</integer>
-		<key>two</key>
-		<integer>-8</integer>
 		<key>underscore</key>
 		<integer>-288</integer>
 	</dict>
@@ -1202,6 +1204,8 @@
 		<integer>-432</integer>
 		<key>@KERN_RIGHT_six</key>
 		<integer>-48</integer>
+		<key>@KERN_RIGHT_two</key>
+		<integer>-63</integer>
 		<key>afii10021</key>
 		<integer>-54</integer>
 		<key>afii10024</key>
@@ -1264,8 +1268,6 @@
 		<integer>-6</integer>
 		<key>three</key>
 		<integer>-63</integer>
-		<key>two</key>
-		<integer>-63</integer>
 		<key>underscore</key>
 		<integer>-268</integer>
 		<key>uni20BD</key>
@@ -1629,6 +1631,8 @@
 		<integer>-75</integer>
 		<key>@KERN_RIGHT_t</key>
 		<integer>-96</integer>
+		<key>@KERN_RIGHT_two</key>
+		<integer>-33</integer>
 		<key>@KERN_RIGHT_u</key>
 		<integer>-84</integer>
 		<key>@KERN_RIGHT_v</key>
@@ -1659,8 +1663,6 @@
 		<integer>-40</integer>
 		<key>three</key>
 		<integer>-48</integer>
-		<key>two</key>
-		<integer>-33</integer>
 	</dict>
 	<key>@KERN_LEFT_Y</key>
 	<dict>
@@ -1712,6 +1714,8 @@
 		<integer>-125</integer>
 		<key>@KERN_RIGHT_t</key>
 		<integer>-70</integer>
+		<key>@KERN_RIGHT_two</key>
+		<integer>-40</integer>
 		<key>@KERN_RIGHT_u</key>
 		<integer>-151</integer>
 		<key>@KERN_RIGHT_v</key>
@@ -1756,8 +1760,6 @@
 		<integer>-206</integer>
 		<key>three</key>
 		<integer>-70</integer>
-		<key>two</key>
-		<integer>-40</integer>
 		<key>underscore</key>
 		<integer>-288</integer>
 	</dict>
@@ -2069,6 +2071,8 @@
 		<integer>-7</integer>
 		<key>@KERN_RIGHT_quotedblbase</key>
 		<integer>-33</integer>
+		<key>@KERN_RIGHT_two</key>
+		<integer>-27</integer>
 		<key>checyrillic</key>
 		<integer>-14</integer>
 		<key>decyrillic</key>
@@ -2089,8 +2093,6 @@
 		<integer>-40</integer>
 		<key>three</key>
 		<integer>-21</integer>
-		<key>two</key>
-		<integer>-27</integer>
 		<key>zecyrillic</key>
 		<integer>-28</integer>
 		<key>zhecyrillic</key>
@@ -2185,6 +2187,8 @@
 		<integer>-158</integer>
 		<key>@KERN_RIGHT_quotedblleft</key>
 		<integer>-62</integer>
+		<key>@KERN_RIGHT_two</key>
+		<integer>8</integer>
 		<key>Psi</key>
 		<integer>-157</integer>
 		<key>afii10044</key>
@@ -2197,8 +2201,6 @@
 		<integer>-14</integer>
 		<key>three</key>
 		<integer>-7</integer>
-		<key>two</key>
-		<integer>8</integer>
 	</dict>
 	<key>@KERN_LEFT_colon.case</key>
 	<dict>
@@ -2206,14 +2208,14 @@
 		<integer>-27</integer>
 		<key>@KERN_RIGHT_six</key>
 		<integer>-20</integer>
+		<key>@KERN_RIGHT_two</key>
+		<integer>8</integer>
 		<key>five</key>
 		<integer>24</integer>
 		<key>seven</key>
 		<integer>-14</integer>
 		<key>three</key>
 		<integer>-7</integer>
-		<key>two</key>
-		<integer>8</integer>
 	</dict>
 	<key>@KERN_LEFT_comma</key>
 	<dict>
@@ -2305,6 +2307,8 @@
 		<integer>88</integer>
 		<key>@KERN_RIGHT_quotedblright</key>
 		<integer>56</integer>
+		<key>@KERN_RIGHT_two</key>
+		<integer>62</integer>
 		<key>Hbar</key>
 		<integer>144</integer>
 		<key>Tbar</key>
@@ -2325,8 +2329,6 @@
 		<integer>109</integer>
 		<key>three</key>
 		<integer>6</integer>
-		<key>two</key>
-		<integer>62</integer>
 	</dict>
 	<key>@KERN_LEFT_decyrillic</key>
 	<dict>
@@ -2973,6 +2975,8 @@
 		<integer>-116</integer>
 		<key>@KERN_RIGHT_t</key>
 		<integer>-48</integer>
+		<key>@KERN_RIGHT_two</key>
+		<integer>-96</integer>
 		<key>@KERN_RIGHT_v</key>
 		<integer>-109</integer>
 		<key>@KERN_RIGHT_w</key>
@@ -3017,8 +3021,6 @@
 		<integer>-15</integer>
 		<key>three</key>
 		<integer>-61</integer>
-		<key>two</key>
-		<integer>-96</integer>
 		<key>zecyrillic</key>
 		<integer>-56</integer>
 		<key>zhecyrillic</key>
@@ -3036,6 +3038,8 @@
 		<integer>-34</integer>
 		<key>@KERN_RIGHT_quotedblright</key>
 		<integer>-76</integer>
+		<key>@KERN_RIGHT_two</key>
+		<integer>-14</integer>
 		<key>checyrillic</key>
 		<integer>-34</integer>
 		<key>hardsigncyrillic</key>
@@ -3050,8 +3054,6 @@
 		<integer>-42</integer>
 		<key>tecyrillic</key>
 		<integer>-83</integer>
-		<key>two</key>
-		<integer>-14</integer>
 		<key>zecyrillic</key>
 		<integer>-13</integer>
 		<key>zhecyrillic</key>
@@ -3339,7 +3341,7 @@
 		<integer>54</integer>
 		<key>Hbar</key>
 		<integer>103</integer>
-		<key>Lslash</key>
+		<key>L_slash</key>
 		<integer>22</integer>
 		<key>ampersand</key>
 		<integer>-15</integer>
@@ -3889,6 +3891,47 @@
 		<key>periodcentered</key>
 		<integer>-13</integer>
 	</dict>
+	<key>@KERN_LEFT_two</key>
+	<dict>
+		<key>@KERN_RIGHT_Ucyrillic</key>
+		<integer>-15</integer>
+		<key>@KERN_RIGHT_Y</key>
+		<integer>-29</integer>
+		<key>@KERN_RIGHT_alphagreek</key>
+		<integer>-8</integer>
+		<key>@KERN_RIGHT_c</key>
+		<integer>-7</integer>
+		<key>@KERN_RIGHT_comma</key>
+		<integer>-21</integer>
+		<key>@KERN_RIGHT_dagger</key>
+		<integer>-21</integer>
+		<key>@KERN_RIGHT_deltagreek</key>
+		<integer>-8</integer>
+		<key>@KERN_RIGHT_epsilongreek</key>
+		<integer>-6</integer>
+		<key>@KERN_RIGHT_guillemotleft</key>
+		<integer>-70</integer>
+		<key>@KERN_RIGHT_iotadieresisgreek</key>
+		<integer>-6</integer>
+		<key>@KERN_RIGHT_omegagreek</key>
+		<integer>-6</integer>
+		<key>Psi</key>
+		<integer>-29</integer>
+		<key>afii10024</key>
+		<integer>-7</integer>
+		<key>at</key>
+		<integer>-6</integer>
+		<key>eight</key>
+		<integer>-16</integer>
+		<key>four</key>
+		<integer>-21</integer>
+		<key>rho</key>
+		<integer>-6</integer>
+		<key>theta</key>
+		<integer>-6</integer>
+		<key>xi</key>
+		<integer>-7</integer>
+	</dict>
 	<key>@KERN_LEFT_u</key>
 	<dict>
 		<key>@KERN_RIGHT_T</key>
@@ -3956,9 +3999,11 @@
 		<integer>-48</integer>
 		<key>@KERN_RIGHT_t</key>
 		<integer>42</integer>
+		<key>@KERN_RIGHT_two</key>
+		<integer>13</integer>
 		<key>Hbar</key>
 		<integer>63</integer>
-		<key>Lslash</key>
+		<key>L_slash</key>
 		<integer>22</integer>
 		<key>ampersand</key>
 		<integer>-20</integer>
@@ -4030,8 +4075,6 @@
 		<integer>21</integer>
 		<key>threequarters</key>
 		<integer>21</integer>
-		<key>two</key>
-		<integer>13</integer>
 		<key>underscore</key>
 		<integer>-96</integer>
 	</dict>
@@ -4393,14 +4436,7 @@
 		<key>quotereversed</key>
 		<integer>-128</integer>
 	</dict>
-	<key>Lambda</key>
-	<dict>
-		<key>asterisk.case</key>
-		<integer>-128</integer>
-		<key>eth</key>
-		<integer>-21</integer>
-	</dict>
-	<key>Lslash</key>
+	<key>L_slash</key>
 	<dict>
 		<key>@KERN_RIGHT_C</key>
 		<integer>-61</integer>
@@ -4437,6 +4473,13 @@
 		<key>question</key>
 		<integer>-69</integer>
 	</dict>
+	<key>Lambda</key>
+	<dict>
+		<key>asterisk.case</key>
+		<integer>-128</integer>
+		<key>eth</key>
+		<integer>-21</integer>
+	</dict>
 	<key>Ohorn</key>
 	<dict>
 		<key>M</key>
@@ -4488,6 +4531,8 @@
 		<integer>-275</integer>
 		<key>@KERN_RIGHT_six</key>
 		<integer>-125</integer>
+		<key>@KERN_RIGHT_two</key>
+		<integer>-42</integer>
 		<key>Omega</key>
 		<integer>-27</integer>
 		<key>ampersand</key>
@@ -4530,8 +4575,6 @@
 		<integer>-27</integer>
 		<key>three</key>
 		<integer>-69</integer>
-		<key>two</key>
-		<integer>-42</integer>
 		<key>underscore</key>
 		<integer>-171</integer>
 		<key>xi</key>
@@ -4777,6 +4820,8 @@
 		<integer>-55</integer>
 		<key>@KERN_RIGHT_six</key>
 		<integer>-48</integer>
+		<key>@KERN_RIGHT_two</key>
+		<integer>-13</integer>
 		<key>afii10024</key>
 		<integer>-13</integer>
 		<key>afii10025</key>
@@ -4839,8 +4884,6 @@
 		<integer>-61</integer>
 		<key>three</key>
 		<integer>-48</integer>
-		<key>two</key>
-		<integer>-13</integer>
 		<key>zecyrillic</key>
 		<integer>-83</integer>
 		<key>zhecyrillic</key>
@@ -5096,6 +5139,8 @@
 		<integer>-20</integer>
 		<key>@KERN_RIGHT_quotedblleft</key>
 		<integer>-83</integer>
+		<key>@KERN_RIGHT_two</key>
+		<integer>-13</integer>
 		<key>@KERN_RIGHT_v</key>
 		<integer>-40</integer>
 		<key>@KERN_RIGHT_w</key>
@@ -5110,8 +5155,6 @@
 		<integer>-70</integer>
 		<key>tenge</key>
 		<integer>-21</integer>
-		<key>two</key>
-		<integer>-13</integer>
 	</dict>
 	<key>backslash</key>
 	<dict>
@@ -5145,6 +5188,8 @@
 		<integer>-268</integer>
 		<key>@KERN_RIGHT_quotedblright</key>
 		<integer>-233</integer>
+		<key>@KERN_RIGHT_two</key>
+		<integer>13</integer>
 		<key>@KERN_RIGHT_v</key>
 		<integer>-84</integer>
 		<key>@KERN_RIGHT_w</key>
@@ -5165,8 +5210,6 @@
 		<integer>-28</integer>
 		<key>tenge</key>
 		<integer>-88</integer>
-		<key>two</key>
-		<integer>13</integer>
 	</dict>
 	<key>beta</key>
 	<dict>
@@ -5248,9 +5291,9 @@
 	</dict>
 	<key>eight</key>
 	<dict>
-		<key>seven</key>
+		<key>@KERN_RIGHT_two</key>
 		<integer>-48</integer>
-		<key>two</key>
+		<key>seven</key>
 		<integer>-48</integer>
 	</dict>
 	<key>emdash</key>
@@ -5807,6 +5850,8 @@
 		<integer>-34</integer>
 		<key>@KERN_RIGHT_quotedblright</key>
 		<integer>-35</integer>
+		<key>@KERN_RIGHT_two</key>
+		<integer>-80</integer>
 		<key>ampersand</key>
 		<integer>-14</integer>
 		<key>eight</key>
@@ -5831,8 +5876,6 @@
 		<integer>-112</integer>
 		<key>three</key>
 		<integer>-160</integer>
-		<key>two</key>
-		<integer>-80</integer>
 	</dict>
 	<key>percent</key>
 	<dict>
@@ -5900,7 +5943,7 @@
 		<integer>-63</integer>
 		<key>@KERN_RIGHT_z</key>
 		<integer>-33</integer>
-		<key>Lslash</key>
+		<key>L_slash</key>
 		<integer>33</integer>
 		<key>Tbar</key>
 		<integer>-84</integer>
@@ -6506,47 +6549,6 @@
 		<key>nine.1</key>
 		<integer>-82</integer>
 	</dict>
-	<key>two</key>
-	<dict>
-		<key>@KERN_RIGHT_Ucyrillic</key>
-		<integer>-15</integer>
-		<key>@KERN_RIGHT_Y</key>
-		<integer>-29</integer>
-		<key>@KERN_RIGHT_alphagreek</key>
-		<integer>-8</integer>
-		<key>@KERN_RIGHT_c</key>
-		<integer>-7</integer>
-		<key>@KERN_RIGHT_comma</key>
-		<integer>-21</integer>
-		<key>@KERN_RIGHT_dagger</key>
-		<integer>-21</integer>
-		<key>@KERN_RIGHT_deltagreek</key>
-		<integer>-8</integer>
-		<key>@KERN_RIGHT_epsilongreek</key>
-		<integer>-6</integer>
-		<key>@KERN_RIGHT_guillemotleft</key>
-		<integer>-70</integer>
-		<key>@KERN_RIGHT_iotadieresisgreek</key>
-		<integer>-6</integer>
-		<key>@KERN_RIGHT_omegagreek</key>
-		<integer>-6</integer>
-		<key>Psi</key>
-		<integer>-29</integer>
-		<key>afii10024</key>
-		<integer>-7</integer>
-		<key>at</key>
-		<integer>-6</integer>
-		<key>eight</key>
-		<integer>-16</integer>
-		<key>four</key>
-		<integer>-21</integer>
-		<key>rho</key>
-		<integer>-6</integer>
-		<key>theta</key>
-		<integer>-6</integer>
-		<key>xi</key>
-		<integer>-7</integer>
-	</dict>
 	<key>underscore</key>
 	<dict>
 		<key>@KERN_RIGHT_C</key>
diff --git a/src/Inter-UI-Black.ufo/lib.plist b/src/Inter-UI-Black.ufo/lib.plist
index 69f128bcf..f7bf1212a 100644
--- a/src/Inter-UI-Black.ufo/lib.plist
+++ b/src/Inter-UI-Black.ufo/lib.plist
@@ -178,6 +178,20 @@
 			<key>y</key>
 			<integer>384</integer>
 		</dict>
+		<dict>
+			<key>angle</key>
+			<integer>0</integer>
+			<key>isGlobal</key>
+			<true/>
+			<key>magnetic</key>
+			<integer>5</integer>
+			<key>name</key>
+			<string></string>
+			<key>x</key>
+			<integer>1624</integer>
+			<key>y</key>
+			<integer>-576</integer>
+		</dict>
 	</array>
 	<key>com.typemytype.robofont.italicSlantOffset</key>
 	<integer>0</integer>
@@ -224,7 +238,7 @@
 				<string>K</string>
 				<string>Kacyr</string>
 				<string>L</string>
-				<string>Lslash</string>
+				<string>L_slash</string>
 				<string>M</string>
 				<string>uni04CD</string>
 				<string>N</string>
@@ -319,6 +333,7 @@
 				<string>g</string>
 				<string>h</string>
 				<string>hcedilla</string>
+				<string>hturnhook2</string>
 				<string>dotlessi</string>
 				<string>i</string>
 				<string>idieresisacute</string>
@@ -328,6 +343,7 @@
 				<string>k</string>
 				<string>l</string>
 				<string>lslash</string>
+				<string>lrthook</string>
 				<string>m</string>
 				<string>n</string>
 				<string>o</string>
@@ -456,6 +472,7 @@
 				<string>cedi</string>
 				<string>cruzeiro</string>
 				<string>tugrik</string>
+				<string>uni20AF</string>
 				<string>mill</string>
 				<string>afii57636</string>
 				<string>manat</string>
@@ -778,12 +795,12 @@
 				<string>degreefarenheit</string>
 				<string>Upsilon2</string>
 				<string>degreekelvin</string>
-				<string>uni02AE</string>
+				<string>hturnlthook</string>
 				<string>uni02AB</string>
 				<string>uni02AC</string>
 				<string>uni1FCD</string>
 				<string>kappa1</string>
-				<string>uni02A9</string>
+				<string>feng</string>
 				<string>onethird</string>
 				<string>vturn</string>
 				<string>uni2159</string>
@@ -835,7 +852,7 @@
 				<string>undertie</string>
 				<string>barmidshortnosp</string>
 				<string>glottalstoprevinv</string>
-				<string>uni023D</string>
+				<string>L_bar</string>
 				<string>uni037C</string>
 				<string>uni037B</string>
 				<string>uni037D</string>
@@ -956,7 +973,7 @@
 				<string>uni1E9D</string>
 				<string>uni1E9F</string>
 				<string>slongdotaccent</string>
-				<string>uni1E9C</string>
+				<string>slongstroke</string>
 				<string>Dtopbar</string>
 				<string>uni1EFE</string>
 				<string>uni1EFD</string>
@@ -1027,7 +1044,7 @@
 				<string>uni0220</string>
 				<string>uni0223</string>
 				<string>uni035F</string>
-				<string>uni0225</string>
+				<string>zhook</string>
 				<string>uni0224</string>
 				<string>uni035C</string>
 				<string>uni035B</string>
@@ -1097,9 +1114,9 @@
 				<string>perispomenigreekcmb</string>
 				<string>koroniscmb</string>
 				<string>uni0347</string>
-				<string>uni0236</string>
-				<string>uni0234</string>
-				<string>uni0235</string>
+				<string>tcurl</string>
+				<string>lcurl</string>
+				<string>ncurl</string>
 				<string>nlfthook</string>
 				<string>uni0238</string>
 				<string>uni0239</string>
@@ -1134,7 +1151,6 @@
 				<string>phi1</string>
 				<string>uni02E5_uni02E5_uni02E8</string>
 				<string>uni02E5_uni02E5_uni02E9</string>
-				<string>phook.cn</string>
 				<string>breveacutecomb</string>
 				<string>mhook</string>
 				<string>wynn</string>
@@ -1148,7 +1164,6 @@
 				<string>hyphen__</string>
 				<string>uni02E5_uni02E9_uni02E8</string>
 				<string>uni02E5_uni02E9_uni02E9</string>
-				<string>lrthook</string>
 				<string>diaeresistonosnosp</string>
 				<string>stigma</string>
 				<string>afii57596</string>
@@ -1159,8 +1174,8 @@
 				<string>romanfivehundred</string>
 				<string>uni0069.ccmp</string>
 				<string>caret</string>
-				<string>uni024B</string>
-				<string>uni024A</string>
+				<string>qrthook</string>
+				<string>Q_rthook</string>
 				<string>uni024F</string>
 				<string>uni024E</string>
 				<string>uni024D</string>
@@ -1197,7 +1212,6 @@
 				<string>uni02FA</string>
 				<string>uni02FC</string>
 				<string>uni02FB</string>
-				<string>dhook.cn</string>
 				<string>uni2185.cn</string>
 				<string>angstrom</string>
 				<string>macrongravecomb.lc</string>
@@ -1226,7 +1240,6 @@
 				<string>Esh</string>
 				<string>zero.sup</string>
 				<string>acutedotcomb</string>
-				<string>ghook.cn</string>
 				<string>uni02E7_uni02E6_uni02E5</string>
 				<string>uni02E7_uni02E6_uni02E7</string>
 				<string>uni02E7_uni02E6_uni02E6</string>
@@ -1265,7 +1278,6 @@
 				<string>uni037D.cn</string>
 				<string>macronacutecomb.lc</string>
 				<string>c.cn</string>
-				<string>Oopen.cn</string>
 				<string>oopen_uni02DE</string>
 				<string>four.frac</string>
 				<string>hhook</string>
@@ -1305,7 +1317,6 @@
 				<string>uniFE28</string>
 				<string>hooksubretronosp</string>
 				<string>circumflexhookcomb</string>
-				<string>qhook.cn</string>
 				<string>ghook</string>
 				<string>Eturn</string>
 				<string>primerev1</string>
@@ -1314,7 +1325,6 @@
 				<string>trthook</string>
 				<string>uni02E5_uni02E6</string>
 				<string>twodotleader</string>
-				<string>Chook.cn</string>
 				<string>uni02E8_uni02E6</string>
 				<string>uni02E8_uni02E7</string>
 				<string>uni02E8_uni02E5</string>
@@ -1364,8 +1374,7 @@
 				<string>uni1DE9</string>
 				<string>nine.sup</string>
 				<string>kturn</string>
-				<string>uni20AF</string>
-				<string>Ibar</string>
+				<string>Istroke</string>
 				<string>Omegaroundcyrillic</string>
 				<string>omegaroundcyrillic</string>
 				<string>Omegatitlocyrillic</string>
@@ -1454,7 +1463,6 @@
 				<string>tildemacroncomb</string>
 				<string>uni0221</string>
 				<string>gamma1</string>
-				<string>bhook.cn</string>
 				<string>pipedblbar</string>
 				<string>YR</string>
 				<string>kgreenlandic</string>
@@ -1590,7 +1598,6 @@
 				<string>uniFE2B</string>
 				<string>uniFE2C</string>
 				<string>uniFE2D</string>
-				<string>finalnun</string>
 				<string>brevehookcomb</string>
 				<string>gammasuper</string>
 				<string>chook</string>
@@ -1629,7 +1636,6 @@
 				<string>uni1DEB</string>
 				<string>pipedbl</string>
 				<string>yhook</string>
-				<string>chook.cn</string>
 				<string>uni029D.ccmp</string>
 				<string>wturn</string>
 				<string>hv</string>
@@ -1692,7 +1698,7 @@
 		<string>K</string>
 		<string>Kacyr</string>
 		<string>L</string>
-		<string>Lslash</string>
+		<string>L_slash</string>
 		<string>M</string>
 		<string>uni04CD</string>
 		<string>N</string>
@@ -1787,6 +1793,7 @@
 		<string>g</string>
 		<string>h</string>
 		<string>hcedilla</string>
+		<string>hturnhook2</string>
 		<string>dotlessi</string>
 		<string>i</string>
 		<string>idieresisacute</string>
@@ -1796,6 +1803,7 @@
 		<string>k</string>
 		<string>l</string>
 		<string>lslash</string>
+		<string>lrthook</string>
 		<string>m</string>
 		<string>n</string>
 		<string>o</string>
@@ -1924,6 +1932,7 @@
 		<string>cedi</string>
 		<string>cruzeiro</string>
 		<string>tugrik</string>
+		<string>uni20AF</string>
 		<string>mill</string>
 		<string>afii57636</string>
 		<string>manat</string>
@@ -2246,12 +2255,12 @@
 		<string>degreefarenheit</string>
 		<string>Upsilon2</string>
 		<string>degreekelvin</string>
-		<string>uni02AE</string>
+		<string>hturnlthook</string>
 		<string>uni02AB</string>
 		<string>uni02AC</string>
 		<string>uni1FCD</string>
 		<string>kappa1</string>
-		<string>uni02A9</string>
+		<string>feng</string>
 		<string>onethird</string>
 		<string>vturn</string>
 		<string>uni2159</string>
@@ -2303,7 +2312,7 @@
 		<string>undertie</string>
 		<string>barmidshortnosp</string>
 		<string>glottalstoprevinv</string>
-		<string>uni023D</string>
+		<string>L_bar</string>
 		<string>uni037C</string>
 		<string>uni037B</string>
 		<string>uni037D</string>
@@ -2424,7 +2433,7 @@
 		<string>uni1E9D</string>
 		<string>uni1E9F</string>
 		<string>slongdotaccent</string>
-		<string>uni1E9C</string>
+		<string>slongstroke</string>
 		<string>Dtopbar</string>
 		<string>uni1EFE</string>
 		<string>uni1EFD</string>
@@ -2495,7 +2504,7 @@
 		<string>uni0220</string>
 		<string>uni0223</string>
 		<string>uni035F</string>
-		<string>uni0225</string>
+		<string>zhook</string>
 		<string>uni0224</string>
 		<string>uni035C</string>
 		<string>uni035B</string>
@@ -2565,9 +2574,9 @@
 		<string>perispomenigreekcmb</string>
 		<string>koroniscmb</string>
 		<string>uni0347</string>
-		<string>uni0236</string>
-		<string>uni0234</string>
-		<string>uni0235</string>
+		<string>tcurl</string>
+		<string>lcurl</string>
+		<string>ncurl</string>
 		<string>nlfthook</string>
 		<string>uni0238</string>
 		<string>uni0239</string>
@@ -2602,7 +2611,6 @@
 		<string>phi1</string>
 		<string>uni02E5_uni02E5_uni02E8</string>
 		<string>uni02E5_uni02E5_uni02E9</string>
-		<string>phook.cn</string>
 		<string>breveacutecomb</string>
 		<string>mhook</string>
 		<string>wynn</string>
@@ -2616,7 +2624,6 @@
 		<string>hyphen__</string>
 		<string>uni02E5_uni02E9_uni02E8</string>
 		<string>uni02E5_uni02E9_uni02E9</string>
-		<string>lrthook</string>
 		<string>diaeresistonosnosp</string>
 		<string>stigma</string>
 		<string>afii57596</string>
@@ -2627,8 +2634,8 @@
 		<string>romanfivehundred</string>
 		<string>uni0069.ccmp</string>
 		<string>caret</string>
-		<string>uni024B</string>
-		<string>uni024A</string>
+		<string>qrthook</string>
+		<string>Q_rthook</string>
 		<string>uni024F</string>
 		<string>uni024E</string>
 		<string>uni024D</string>
@@ -2665,7 +2672,6 @@
 		<string>uni02FA</string>
 		<string>uni02FC</string>
 		<string>uni02FB</string>
-		<string>dhook.cn</string>
 		<string>uni2185.cn</string>
 		<string>angstrom</string>
 		<string>macrongravecomb.lc</string>
@@ -2694,7 +2700,6 @@
 		<string>Esh</string>
 		<string>zero.sup</string>
 		<string>acutedotcomb</string>
-		<string>ghook.cn</string>
 		<string>uni02E7_uni02E6_uni02E5</string>
 		<string>uni02E7_uni02E6_uni02E7</string>
 		<string>uni02E7_uni02E6_uni02E6</string>
@@ -2733,7 +2738,6 @@
 		<string>uni037D.cn</string>
 		<string>macronacutecomb.lc</string>
 		<string>c.cn</string>
-		<string>Oopen.cn</string>
 		<string>oopen_uni02DE</string>
 		<string>four.frac</string>
 		<string>hhook</string>
@@ -2773,7 +2777,6 @@
 		<string>uniFE28</string>
 		<string>hooksubretronosp</string>
 		<string>circumflexhookcomb</string>
-		<string>qhook.cn</string>
 		<string>ghook</string>
 		<string>Eturn</string>
 		<string>primerev1</string>
@@ -2782,7 +2785,6 @@
 		<string>trthook</string>
 		<string>uni02E5_uni02E6</string>
 		<string>twodotleader</string>
-		<string>Chook.cn</string>
 		<string>uni02E8_uni02E6</string>
 		<string>uni02E8_uni02E7</string>
 		<string>uni02E8_uni02E5</string>
@@ -2832,8 +2834,7 @@
 		<string>uni1DE9</string>
 		<string>nine.sup</string>
 		<string>kturn</string>
-		<string>uni20AF</string>
-		<string>Ibar</string>
+		<string>Istroke</string>
 		<string>Omegaroundcyrillic</string>
 		<string>omegaroundcyrillic</string>
 		<string>Omegatitlocyrillic</string>
@@ -2922,7 +2923,6 @@
 		<string>tildemacroncomb</string>
 		<string>uni0221</string>
 		<string>gamma1</string>
-		<string>bhook.cn</string>
 		<string>pipedblbar</string>
 		<string>YR</string>
 		<string>kgreenlandic</string>
@@ -3058,7 +3058,6 @@
 		<string>uniFE2B</string>
 		<string>uniFE2C</string>
 		<string>uniFE2D</string>
-		<string>finalnun</string>
 		<string>brevehookcomb</string>
 		<string>gammasuper</string>
 		<string>chook</string>
@@ -3097,7 +3096,6 @@
 		<string>uni1DEB</string>
 		<string>pipedbl</string>
 		<string>yhook</string>
-		<string>chook.cn</string>
 		<string>uni029D.ccmp</string>
 		<string>wturn</string>
 		<string>hv</string>
-- 
cgit v1.2.3