From 5e86f690135771678fcbb6dae053195e7dbad61a Mon Sep 17 00:00:00 2001
From: Rasmus Andersson <rasmus@notion.se>
Date: Wed, 10 Jan 2018 09:31:37 -0800
Subject: Cleanup some unused component glyphs

Removed using misc/rmglyph.py:

  b.cn, C.cn, c.cn, D.cn, d.cn, G.cn, g.cn, Ghook.cn, o.cn, oopen.cn,
  p.cn, Q.cn, q.cn, s.cn, srthook.cn, st.cn, U.cn, uni037B.cn, uni037D.cn,
  uni03FD.cn, uni03FF.cn, uni2183.cn, uni2184.cn, uni2185.cn
---
 src/Inter-UI-Regular.ufo/glyphs/A_.glif            | 14 ++--
 src/Inter-UI-Regular.ufo/glyphs/C_.cn.glif         | 53 ----------------
 src/Inter-UI-Regular.ufo/glyphs/D_.cn.glif         | 51 ---------------
 src/Inter-UI-Regular.ufo/glyphs/E_.glif            | 42 ++++++------
 src/Inter-UI-Regular.ufo/glyphs/Eng_.glif          | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/F_.glif            | 36 +++++------
 src/Inter-UI-Regular.ufo/glyphs/G_.cn.glif         | 57 -----------------
 src/Inter-UI-Regular.ufo/glyphs/Gbar_.glif         | 14 ++--
 src/Inter-UI-Regular.ufo/glyphs/Ghook_.cn.glif     | 42 ------------
 .../glyphs/Idieresisacute_.glif                    |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/Istroke_.glif      |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/Itildebelow_.glif  |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/K_.glif            | 42 ++++++------
 src/Inter-UI-Regular.ufo/glyphs/L__bar.glif        |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/L__slash.glif      | 14 ++--
 src/Inter-UI-Regular.ufo/glyphs/OE__.glif          | 30 ++++-----
 src/Inter-UI-Regular.ufo/glyphs/O_.glif            | 36 +++++------
 src/Inter-UI-Regular.ufo/glyphs/Ohorn_.glif        | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/Oslash_.glif       | 14 ++--
 src/Inter-UI-Regular.ufo/glyphs/Q_.cn.glif         | 61 ------------------
 src/Inter-UI-Regular.ufo/glyphs/Q_.glif            | 22 +++----
 src/Inter-UI-Regular.ufo/glyphs/U_.cn.glif         | 43 -------------
 src/Inter-UI-Regular.ufo/glyphs/V_.glif            | 20 +++---
 src/Inter-UI-Regular.ufo/glyphs/Zbar_.glif         |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/a_uni02DE__.glif   |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/afii10045.glif     |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/afii10046.glif     |  6 +-
 src/Inter-UI-Regular.ufo/glyphs/afii10047.glif     | 12 ++--
 src/Inter-UI-Regular.ufo/glyphs/afii10048.glif     |  6 +-
 src/Inter-UI-Regular.ufo/glyphs/afii10147.glif     | 12 ++--
 src/Inter-UI-Regular.ufo/glyphs/alpha.glif         | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/ascript.glif       |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/aturn.glif         |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/b.cn.glif          | 62 ------------------
 src/Inter-UI-Regular.ufo/glyphs/b.glif             | 20 +++---
 src/Inter-UI-Regular.ufo/glyphs/bbar.glif          |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/bhook.glif         | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/bullseye.glif      | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/c.cn.glif          | 53 ----------------
 src/Inter-UI-Regular.ufo/glyphs/caron.glif         | 12 ++--
 src/Inter-UI-Regular.ufo/glyphs/casetilde.cn.glif  |  2 +-
 .../glyphs/cheabkhasiancyrillic.glif               |  6 +-
 src/Inter-UI-Regular.ufo/glyphs/circumflex.glif    |  2 +-
 .../glyphs/circumflexnosp.glif                     |  2 +-
 .../glyphs/circumflexsubnosp.glif                  |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/comma.glif         | 12 ++--
 src/Inter-UI-Regular.ufo/glyphs/comma.tnum.glif    | 12 ++--
 src/Inter-UI-Regular.ufo/glyphs/contents.plist     | 48 --------------
 src/Inter-UI-Regular.ufo/glyphs/crossbar.glif      |  6 +-
 src/Inter-UI-Regular.ufo/glyphs/d.cn.glif          | 62 ------------------
 src/Inter-UI-Regular.ufo/glyphs/d.glif             | 20 +++---
 src/Inter-UI-Regular.ufo/glyphs/dcroat.glif        |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/dhook.glif         | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/dieresis.glif      | 12 ++--
 .../glyphs/dieresisacutecomb.glif                  |  6 +-
 src/Inter-UI-Regular.ufo/glyphs/dieresisnosp.glif  |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/dotlessi.glif      | 12 ++--
 src/Inter-UI-Regular.ufo/glyphs/dotlessj.glif      | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/drthook.glif       | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/dyogh.glif         | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/dz.glif            |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/dzcurl.glif        |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/ecyrillic.glif     | 12 ++--
 src/Inter-UI-Regular.ufo/glyphs/eng.glif           | 30 ++++-----
 src/Inter-UI-Regular.ufo/glyphs/eshcurl.glif       | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/eta.glif           | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/ezhcurl.glif       | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/feng.glif          |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/finalkaf.glif      | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/fitacyrillic.glif  | 12 ++--
 src/Inter-UI-Regular.ufo/glyphs/g.cn.glif          | 74 ----------------------
 src/Inter-UI-Regular.ufo/glyphs/gamma1.glif        | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/gbar.glif          |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/gcursive.glif      |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/gecyrillic.glif    | 16 ++---
 src/Inter-UI-Regular.ufo/glyphs/ghook.glif         | 18 +++---
 .../glyphs/glottalstopbarrev.glif                  |  4 +-
 .../glyphs/hadescendercyrillic.glif                |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/henghook.glif      | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/hhook.glif         | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/hturn.glif         |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/hturnhook2.glif    | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/hturnlthook.glif   | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/i.glif             | 30 ++++-----
 src/Inter-UI-Regular.ufo/glyphs/ibar.glif          |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/idieresis.glif     |  4 +-
 .../glyphs/idieresisacute.glif                     |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/iota.glif          | 12 ++--
 src/Inter-UI-Regular.ufo/glyphs/itildebelow.glif   |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/iucyrillic.glif    | 12 ++--
 src/Inter-UI-Regular.ufo/glyphs/j.glif             | 30 ++++-----
 src/Inter-UI-Regular.ufo/glyphs/jcrosstail.glif    | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/jdotlessbar.glif   |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/jhookdblbar.glif   |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/k.glif             | 42 ++++++------
 src/Inter-UI-Regular.ufo/glyphs/ksicyrillic.glif   | 12 ++--
 src/Inter-UI-Regular.ufo/glyphs/kturn.glif         |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/l.glif             | 12 ++--
 src/Inter-UI-Regular.ufo/glyphs/lbar.glif          |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/lbelt.glif         | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/lmidtilde.glif     |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/lrthook.glif       | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/lslash.glif        | 14 ++--
 src/Inter-UI-Regular.ufo/glyphs/lyogh.glif         | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/mhook.glif         | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/mturn.glif         |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/mturndescend.glif  | 14 ++--
 src/Inter-UI-Regular.ufo/glyphs/nlfthook.glif      | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/nrthook.glif       | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/o.cn.glif          | 55 ----------------
 src/Inter-UI-Regular.ufo/glyphs/o_uni02DE__.glif   |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/oe.glif            |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/ohorn.glif         | 18 +++---
 .../glyphs/omegaroundcyrillic.glif                 | 12 ++--
 src/Inter-UI-Regular.ufo/glyphs/oopen.cn.glif      | 53 ----------------
 src/Inter-UI-Regular.ufo/glyphs/oslash.glif        | 14 ++--
 src/Inter-UI-Regular.ufo/glyphs/p.cn.glif          | 62 ------------------
 src/Inter-UI-Regular.ufo/glyphs/p.glif             | 22 +++----
 .../glyphs/perispomenigreekcmb.glif                |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/q.cn.glif          | 62 ------------------
 src/Inter-UI-Regular.ufo/glyphs/q.glif             | 22 +++----
 src/Inter-UI-Regular.ufo/glyphs/qhook.glif         | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/r.glif             | 30 ++++-----
 src/Inter-UI-Regular.ufo/glyphs/rdescend.glif      | 14 ++--
 src/Inter-UI-Regular.ufo/glyphs/rfishhookrev.glif  | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/rho.glif           | 12 ++--
 src/Inter-UI-Regular.ufo/glyphs/rhotichookmod.glif |  6 +-
 src/Inter-UI-Regular.ufo/glyphs/ringhalfright.glif | 12 ++--
 .../glyphs/ringrighthalfsubnosp.glif               |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/rrthook.glif       | 24 +++----
 src/Inter-UI-Regular.ufo/glyphs/rturn.glif         |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/rturnrthook.glif   | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/s.cn.glif          | 63 ------------------
 src/Inter-UI-Regular.ufo/glyphs/s.glif             | 30 ++++-----
 src/Inter-UI-Regular.ufo/glyphs/srthook.cn.glif    | 42 ------------
 src/Inter-UI-Regular.ufo/glyphs/srthook.glif       | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/st.cn.glif         | 70 --------------------
 src/Inter-UI-Regular.ufo/glyphs/tccurl.glif        | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/tilde.glif         | 12 ++--
 src/Inter-UI-Regular.ufo/glyphs/tildecomb.glif     |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/tildesubnosp.glif  |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/trthook.glif       | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/tturn.glif         |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/u.glif             | 46 +++++++-------
 src/Inter-UI-Regular.ufo/glyphs/ubar.glif          | 14 ++--
 src/Inter-UI-Regular.ufo/glyphs/uhorn.glif         | 22 +++----
 src/Inter-UI-Regular.ufo/glyphs/uni0069.ccmp.glif  |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/uni006A_.ccmp.glif |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/uni012F_.ccmp.glif |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/uni0243.glif       |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/uni0244.glif       | 14 ++--
 src/Inter-UI-Regular.ufo/glyphs/uni0248.glif       |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/uni0249.ccmp.glif  |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/uni0249.glif       |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/uni024C_.glif      | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/uni024D_.glif      |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/uni024F_.glif      | 14 ++--
 src/Inter-UI-Regular.ufo/glyphs/uni0268.ccmp.glif  |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/uni029D_.ccmp.glif | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/uni02AB__.glif     | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/uni034A_.glif      | 12 ++--
 src/Inter-UI-Regular.ufo/glyphs/uni0357.glif       |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/uni037B_.cn.glif   | 53 ----------------
 src/Inter-UI-Regular.ufo/glyphs/uni037D_.cn.glif   | 67 --------------------
 src/Inter-UI-Regular.ufo/glyphs/uni03F3_.ccmp.glif |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/uni03FD__.cn.glif  | 53 ----------------
 src/Inter-UI-Regular.ufo/glyphs/uni03FF__.cn.glif  | 67 --------------------
 src/Inter-UI-Regular.ufo/glyphs/uni0456.ccmp.glif  |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/uni0458.ccmp.glif  |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/uni048A_.glif      |  6 +-
 src/Inter-UI-Regular.ufo/glyphs/uni048B_.glif      |  6 +-
 src/Inter-UI-Regular.ufo/glyphs/uni04C6_.glif      |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/uni04C9_.glif      |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/uni04CA__.glif     |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/uni04CD__.glif     |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/uni04CE__.glif     |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/uni04FC__.glif     |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/uni04FD__.glif     |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/uni1FC0__.glif     |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/uni20DB__.glif     |  6 +-
 src/Inter-UI-Regular.ufo/glyphs/uni20DC__.glif     |  6 +-
 src/Inter-UI-Regular.ufo/glyphs/uni2183.cn.glif    | 53 ----------------
 src/Inter-UI-Regular.ufo/glyphs/uni2184.cn.glif    | 53 ----------------
 src/Inter-UI-Regular.ufo/glyphs/uni2185.cn.glif    | 30 ---------
 src/Inter-UI-Regular.ufo/glyphs/upsilon.glif       | 12 ++--
 src/Inter-UI-Regular.ufo/glyphs/v.glif             | 20 +++---
 src/Inter-UI-Regular.ufo/glyphs/vturn.glif         |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/w.glif             | 36 +++++------
 src/Inter-UI-Regular.ufo/glyphs/wturn.glif         |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/x.glif             | 28 ++++----
 src/Inter-UI-Regular.ufo/glyphs/yericyrillic.glif  |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/yturn.glif         |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/z.glif             | 30 ++++-----
 src/Inter-UI-Regular.ufo/glyphs/zbar.glif          |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/zcurl.glif         | 18 +++---
 src/Inter-UI-Regular.ufo/glyphs/zrthook.glif       | 18 +++---
 src/Inter-UI-Regular.ufo/groups.plist              |  1 -
 src/Inter-UI-Regular.ufo/kerning.plist             | 43 +------------
 src/Inter-UI-Regular.ufo/lib.plist                 | 48 --------------
 199 files changed, 1036 insertions(+), 2515 deletions(-)
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/C_.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/D_.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/G_.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/Ghook_.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/Q_.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/U_.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/b.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/c.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/d.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/g.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/o.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/oopen.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/p.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/q.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/s.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/srthook.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/st.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/uni037B_.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/uni037D_.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/uni03FD__.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/uni03FF__.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/uni2183.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/uni2184.cn.glif
 delete mode 100644 src/Inter-UI-Regular.ufo/glyphs/uni2185.cn.glif

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

diff --git a/src/Inter-UI-Regular.ufo/glyphs/A_.glif b/src/Inter-UI-Regular.ufo/glyphs/A_.glif
index e56f11442..03caa1f48 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/A_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/A_.glif
@@ -3,13 +3,6 @@
   <advance width="1792"/>
   <unicode hex="0041"/>
   <outline>
-    <contour>
-      <point x="1412" y="768" type="line"/>
-      <point x="400" y="768" type="line"/>
-      <point x="400" y="548" type="line"/>
-      <point x="1412" y="548" type="line"/>
-    </contour>
-    <component base="Lambda"/>
     <contour>
       <point x="896.0" y="2304.0" type="move" name="top"/>
     </contour>
@@ -34,6 +27,13 @@
     <contour>
       <point x="1840.0" y="2200.0" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="1412" y="768" type="line"/>
+      <point x="400" y="768" type="line"/>
+      <point x="400" y="548" type="line"/>
+      <point x="1412" y="548" type="line"/>
+    </contour>
+    <component base="Lambda"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/C_.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/C_.cn.glif
deleted file mode 100644
index 9993dfd01..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/C_.cn.glif
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="C.cn" format="1">
-  <advance width="2016"/>
-  <outline>
-    <contour>
-      <point x="1492" y="640" type="line"/>
-      <point x="1460" y="332"/>
-      <point x="1348" y="200"/>
-      <point x="1012" y="200" type="curve" smooth="yes"/>
-      <point x="660" y="200"/>
-      <point x="524" y="480"/>
-      <point x="524" y="820" type="curve" smooth="yes"/>
-      <point x="524" y="1184" type="line" smooth="yes"/>
-      <point x="524" y="1556"/>
-      <point x="688" y="1800"/>
-      <point x="1040" y="1800" type="curve" smooth="yes"/>
-      <point x="1340" y="1800"/>
-      <point x="1464" y="1664"/>
-      <point x="1492" y="1356" type="curve"/>
-      <point x="1776" y="1356" type="line"/>
-      <point x="1756" y="1784"/>
-      <point x="1500" y="2032"/>
-      <point x="1040" y="2032" type="curve" smooth="yes"/>
-      <point x="536" y="2032"/>
-      <point x="240" y="1696"/>
-      <point x="240" y="1180" type="curve"/>
-      <point x="240" y="820" type="line"/>
-      <point x="240" y="304"/>
-      <point x="540" y="-28"/>
-      <point x="1012" y="-28" type="curve" smooth="yes"/>
-      <point x="1504" y="-28"/>
-      <point x="1752" y="232"/>
-      <point x="1776" y="640" 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': 1834, 'leftMargin': 175, 'rightMargin': 121}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/D_.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/D_.cn.glif
deleted file mode 100644
index a4203c7d9..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/D_.cn.glif
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="D.cn" format="1">
-  <advance width="1760"/>
-  <outline>
-    <contour>
-      <point x="700" y="0" type="line"/>
-      <point x="1264" y="0"/>
-      <point x="1604" y="284"/>
-      <point x="1604" y="836" type="curve"/>
-      <point x="1604" y="1164" type="line"/>
-      <point x="1604" y="1716"/>
-      <point x="1260" y="2004"/>
-      <point x="728" y="2004" type="curve"/>
-      <point x="280" y="2004" type="line"/>
-      <point x="280" y="1772" type="line"/>
-      <point x="728" y="1772" type="line"/>
-      <point x="1120" y="1772"/>
-      <point x="1320" y="1592"/>
-      <point x="1320" y="1168" type="curve"/>
-      <point x="1320" y="836" type="line" smooth="yes"/>
-      <point x="1320" y="432"/>
-      <point x="1128" y="228"/>
-      <point x="700" y="228" type="curve"/>
-      <point x="292" y="228" type="line"/>
-      <point x="288" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="444" y="2004" type="line"/>
-      <point x="160" y="2004" type="line"/>
-      <point x="160" y="0" type="line"/>
-      <point x="444" 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': 1848.0, 'leftMargin': 228, 'rightMargin': 177.0}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/E_.glif b/src/Inter-UI-Regular.ufo/glyphs/E_.glif
index 2f938d3d6..f8972ef88 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/E_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/E_.glif
@@ -3,6 +3,27 @@
   <advance width="1668"/>
   <unicode hex="0045"/>
   <outline>
+    <contour>
+      <point x="880.0" y="2304.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="880.0" y="16.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="0.0" y="2048.0" type="move" name="tonos"/>
+    </contour>
+    <contour>
+      <point x="1432.0" y="0.0" type="move" name="ogonek"/>
+    </contour>
+    <contour>
+      <point x="1628.0" y="2200.0" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1628.0" y="-560.0" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1628.0" y="2216.0" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1492" y="220" type="line"/>
       <point x="424" y="220" type="line"/>
@@ -27,27 +48,6 @@
       <point x="424" y="1828" type="line"/>
       <point x="1476" y="1828" type="line"/>
     </contour>
-    <contour>
-      <point x="880.0" y="2304.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="880.0" y="16.0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="0.0" y="2048.0" type="move" name="tonos"/>
-    </contour>
-    <contour>
-      <point x="1432.0" y="0.0" type="move" name="ogonek"/>
-    </contour>
-    <contour>
-      <point x="1628.0" y="2200.0" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1628.0" y="-560.0" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1628.0" y="2216.0" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/Eng_.glif b/src/Inter-UI-Regular.ufo/glyphs/Eng_.glif
index aff4317f4..75ff81363 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/Eng_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/Eng_.glif
@@ -3,6 +3,15 @@
   <advance width="2064"/>
   <unicode hex="014A"/>
   <outline>
+    <contour>
+      <point x="1028" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1020" y="16" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1976" y="2200" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1576" y="36" type="line"/>
       <point x="1576" y="-160" type="line" smooth="yes"/>
@@ -22,15 +31,6 @@
       <point x="1824" y="36" type="line"/>
     </contour>
     <component base="N"/>
-    <contour>
-      <point x="1028" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1020" y="16" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1976" y="2200" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/F_.glif b/src/Inter-UI-Regular.ufo/glyphs/F_.glif
index 4f9d713ea..d89d4da31 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/F_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/F_.glif
@@ -3,24 +3,6 @@
   <advance width="1636"/>
   <unicode hex="0046"/>
   <outline>
-    <contour>
-      <point x="488" y="2048" type="line"/>
-      <point x="240" y="2048" type="line"/>
-      <point x="240" y="0" type="line"/>
-      <point x="488" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1336" y="1136" type="line"/>
-      <point x="460" y="1136" type="line"/>
-      <point x="460" y="916" type="line"/>
-      <point x="1336" y="916" type="line"/>
-    </contour>
-    <contour>
-      <point x="1468" y="2048" type="line"/>
-      <point x="460" y="2048" type="line"/>
-      <point x="460" y="1828" type="line"/>
-      <point x="1468" y="1828" type="line"/>
-    </contour>
     <contour>
       <point x="488.0" y="464.0" type="move" name="cross"/>
     </contour>
@@ -39,6 +21,24 @@
     <contour>
       <point x="1580.0" y="2216.0" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="488" y="2048" type="line"/>
+      <point x="240" y="2048" type="line"/>
+      <point x="240" y="0" type="line"/>
+      <point x="488" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="1336" y="1136" type="line"/>
+      <point x="460" y="1136" type="line"/>
+      <point x="460" y="916" type="line"/>
+      <point x="1336" y="916" type="line"/>
+    </contour>
+    <contour>
+      <point x="1468" y="2048" type="line"/>
+      <point x="460" y="2048" type="line"/>
+      <point x="460" y="1828" type="line"/>
+      <point x="1468" y="1828" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/G_.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/G_.cn.glif
deleted file mode 100644
index bccf820fa..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/G_.cn.glif
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="G.cn" format="1">
-  <advance width="1760"/>
-  <outline>
-    <contour>
-      <point x="1652" y="1004" type="line"/>
-      <point x="916" y="1004" type="line"/>
-      <point x="916" y="780" type="line"/>
-      <point x="1364" y="780" type="line"/>
-      <point x="1364" y="328" type="line"/>
-      <point x="1312" y="292"/>
-      <point x="1220" y="200"/>
-      <point x="940" y="200" type="curve" smooth="yes"/>
-      <point x="608" y="200"/>
-      <point x="396" y="396"/>
-      <point x="396" y="820" type="curve" smooth="yes"/>
-      <point x="396" y="1184" type="line" smooth="yes"/>
-      <point x="396" y="1600"/>
-      <point x="540" y="1800"/>
-      <point x="908" y="1800" type="curve" smooth="yes"/>
-      <point x="1204" y="1800"/>
-      <point x="1340" y="1656"/>
-      <point x="1364" y="1412" type="curve"/>
-      <point x="1652" y="1412" type="line"/>
-      <point x="1624" y="1800"/>
-      <point x="1368" y="2032"/>
-      <point x="908" y="2032" type="curve" smooth="yes"/>
-      <point x="384" y="2032"/>
-      <point x="112" y="1752"/>
-      <point x="112" y="1180" type="curve" smooth="yes"/>
-      <point x="112" y="820" type="line" smooth="yes"/>
-      <point x="112" y="252"/>
-      <point x="448" y="-28"/>
-      <point x="940" y="-28" type="curve" smooth="yes"/>
-      <point x="1396" y="-28"/>
-      <point x="1572" y="164"/>
-      <point x="1652" y="252" 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': 1917, 'leftMargin': 175, 'rightMargin': 202}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/Gbar_.glif b/src/Inter-UI-Regular.ufo/glyphs/Gbar_.glif
index 48e98198f..208ebd5aa 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/Gbar_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/Gbar_.glif
@@ -3,13 +3,6 @@
   <advance width="2016"/>
   <unicode hex="01E4"/>
   <outline>
-    <contour>
-      <point x="1908" y="616" type="line"/>
-      <point x="1024" y="616" type="line"/>
-      <point x="1024" y="396" type="line"/>
-      <point x="1908" y="396" type="line"/>
-    </contour>
-    <component base="G" xOffset="-76"/>
     <contour>
       <point x="844" y="2244" type="move" name="top"/>
     </contour>
@@ -19,6 +12,13 @@
     <contour>
       <point x="1844" y="2244" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="1908" y="616" type="line"/>
+      <point x="1024" y="616" type="line"/>
+      <point x="1024" y="396" type="line"/>
+      <point x="1908" y="396" type="line"/>
+    </contour>
+    <component base="G" xOffset="-76"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/Ghook_.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/Ghook_.cn.glif
deleted file mode 100644
index 9045e03a7..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/Ghook_.cn.glif
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ghook.cn" format="1">
-  <advance width="2016"/>
-  <outline>
-    <contour>
-      <point x="1552" y="1412" type="line"/>
-      <point x="1552" y="1592" type="line" smooth="yes"/>
-      <point x="1552" y="1780"/>
-      <point x="1644" y="1844"/>
-      <point x="1792" y="1844" type="curve" smooth="yes"/>
-      <point x="1816" y="1844"/>
-      <point x="1852" y="1840"/>
-      <point x="1880" y="1832" type="curve"/>
-      <point x="1880" y="2048" type="line"/>
-      <point x="1836" y="2060"/>
-      <point x="1768" y="2072"/>
-      <point x="1720" y="2072" type="curve" smooth="yes"/>
-      <point x="1456" y="2072"/>
-      <point x="1328" y="1904"/>
-      <point x="1328" y="1592" type="curve" smooth="yes"/>
-      <point x="1328" y="1412" type="line"/>
-    </contour>
-    <component base="G.cn" xOffset="-100"/>
-  </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': 1998, 'leftMargin': 175, 'rightMargin': -45}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/Idieresisacute_.glif b/src/Inter-UI-Regular.ufo/glyphs/Idieresisacute_.glif
index 0bcded20d..564a2e3e8 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/Idieresisacute_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/Idieresisacute_.glif
@@ -3,8 +3,6 @@
   <advance width="1016"/>
   <unicode hex="1E2E"/>
   <outline>
-    <component base="I" xOffset="144"/>
-    <component base="dieresisacutecomb" xOffset="1316" yOffset="480"/>
     <contour>
       <point x="644" y="0" type="move" name="right"/>
     </contour>
@@ -29,6 +27,8 @@
     <contour>
       <point x="892" y="-560" type="move" name="bottom_dd"/>
     </contour>
+    <component base="I" xOffset="144"/>
+    <component base="dieresisacutecomb" xOffset="1316" yOffset="480"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/Istroke_.glif b/src/Inter-UI-Regular.ufo/glyphs/Istroke_.glif
index 42a8d5d78..65ab44c21 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/Istroke_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/Istroke_.glif
@@ -3,8 +3,6 @@
   <advance width="784"/>
   <unicode hex="0197"/>
   <outline>
-    <component base="I" xOffset="40"/>
-    <component base="crossbar" xOffset="-236" yOffset="96"/>
     <contour>
       <point x="432" y="2216" type="move" name="top"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="432" y="16" type="move" name="bottom"/>
     </contour>
+    <component base="I" xOffset="40"/>
+    <component base="crossbar" xOffset="-236" yOffset="96"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/Itildebelow_.glif b/src/Inter-UI-Regular.ufo/glyphs/Itildebelow_.glif
index 6770c0a52..8569a456c 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/Itildebelow_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/Itildebelow_.glif
@@ -3,8 +3,6 @@
   <advance width="1004"/>
   <unicode hex="1E2C"/>
   <outline>
-    <component base="I" xOffset="144"/>
-    <component base="tilde" xOffset="-132" yOffset="-2216"/>
     <contour>
       <point x="684" y="0" type="move" name="right"/>
     </contour>
@@ -32,6 +30,8 @@
     <contour>
       <point x="932" y="-560" type="move" name="bottom_dd"/>
     </contour>
+    <component base="I" xOffset="144"/>
+    <component base="tilde" xOffset="-132" yOffset="-2216"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/K_.glif b/src/Inter-UI-Regular.ufo/glyphs/K_.glif
index 82ea9da2e..aa0168664 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/K_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/K_.glif
@@ -3,27 +3,6 @@
   <advance width="1664"/>
   <unicode hex="004B"/>
   <outline>
-    <contour>
-      <point x="488" y="2048" type="line"/>
-      <point x="240" y="2048" type="line"/>
-      <point x="240" y="0" type="line"/>
-      <point x="488" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1588.0" y="2048.0" type="line"/>
-      <point x="1300" y="2048" type="line"/>
-      <point x="512.0" y="1020.0" type="line"/>
-      <point x="440.0" y="1020.0" type="line"/>
-      <point x="440" y="596" type="line"/>
-      <point x="748" y="988" type="line"/>
-      <point x="772" y="988" type="line"/>
-    </contour>
-    <contour>
-      <point x="1288" y="0" type="line"/>
-      <point x="1568" y="0" type="line"/>
-      <point x="828" y="1140" type="line"/>
-      <point x="676" y="948" type="line"/>
-    </contour>
     <contour>
       <point x="912" y="120" type="move" name="bottom"/>
     </contour>
@@ -45,6 +24,27 @@
     <contour>
       <point x="1764" y="2200" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="488" y="2048" type="line"/>
+      <point x="240" y="2048" type="line"/>
+      <point x="240" y="0" type="line"/>
+      <point x="488" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="1588.0" y="2048.0" type="line"/>
+      <point x="1300" y="2048" type="line"/>
+      <point x="512.0" y="1020.0" type="line"/>
+      <point x="440.0" y="1020.0" type="line"/>
+      <point x="440" y="596" type="line"/>
+      <point x="748" y="988" type="line"/>
+      <point x="772" y="988" type="line"/>
+    </contour>
+    <contour>
+      <point x="1288" y="0" type="line"/>
+      <point x="1568" y="0" type="line"/>
+      <point x="828" y="1140" type="line"/>
+      <point x="676" y="948" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/L__bar.glif b/src/Inter-UI-Regular.ufo/glyphs/L__bar.glif
index a96f1c859..f5cdb82b7 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/L__bar.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/L__bar.glif
@@ -3,8 +3,6 @@
   <advance width="1536"/>
   <unicode hex="023D"/>
   <outline>
-    <component base="crossbar" xOffset="-188" yOffset="96"/>
-    <component base="L"/>
     <contour>
       <point x="556.0" y="2200.0" type="move" name="top"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="956.0" y="16.0" type="move" name="bottom"/>
     </contour>
+    <component base="crossbar" xOffset="-188" yOffset="96"/>
+    <component base="L"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/L__slash.glif b/src/Inter-UI-Regular.ufo/glyphs/L__slash.glif
index 9af8ec314..fb901c349 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/L__slash.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/L__slash.glif
@@ -3,13 +3,6 @@
   <advance width="1536"/>
   <unicode hex="0141"/>
   <outline>
-    <contour>
-      <point x="864" y="1280" type="line"/>
-      <point x="52" y="1024" type="line"/>
-      <point x="52" y="844" type="line"/>
-      <point x="864" y="1100" type="line"/>
-    </contour>
-    <component base="L"/>
     <contour>
       <point x="364" y="2304" type="move" name="top"/>
     </contour>
@@ -19,6 +12,13 @@
     <contour>
       <point x="1524" y="2200" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="864" y="1280" type="line"/>
+      <point x="52" y="1024" type="line"/>
+      <point x="52" y="844" type="line"/>
+      <point x="864" y="1100" type="line"/>
+    </contour>
+    <component base="L"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/OE__.glif b/src/Inter-UI-Regular.ufo/glyphs/OE__.glif
index bd30d4a21..d69909412 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/OE__.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/OE__.glif
@@ -3,6 +3,21 @@
   <advance width="2636"/>
   <unicode hex="0152"/>
   <outline>
+    <contour>
+      <point x="1340" y="2304" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1340" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="2728" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="2728" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="2728" y="2200" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="944" y="2048" type="line"/>
       <point x="484" y="2048"/>
@@ -26,21 +41,6 @@
       <point x="1340" y="2048" type="line"/>
     </contour>
     <component base="E" xOffset="1004"/>
-    <contour>
-      <point x="1340" y="2304" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1340" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="2728" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="2728" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="2728" y="2200" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/O_.glif b/src/Inter-UI-Regular.ufo/glyphs/O_.glif
index 281bb6c15..4ba58e013 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/O_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/O_.glif
@@ -3,6 +3,24 @@
   <advance width="2032"/>
   <unicode hex="004F"/>
   <outline>
+    <contour>
+      <point x="1012.0" y="2304.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1024.0" y="0.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="176.0" y="2048.0" type="move" name="tonos"/>
+    </contour>
+    <contour>
+      <point x="1928.0" y="2200.0" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1992.0" y="-560.0" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1928.0" y="2200.0" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1856" y="1024" type="curve"/>
       <point x="1856" y="1672"/>
@@ -31,24 +49,6 @@
       <point x="1356" y="1844"/>
       <point x="1616" y="1556"/>
     </contour>
-    <contour>
-      <point x="1012.0" y="2304.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1024.0" y="0.0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="176.0" y="2048.0" type="move" name="tonos"/>
-    </contour>
-    <contour>
-      <point x="1928.0" y="2200.0" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1992.0" y="-560.0" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1928.0" y="2200.0" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/Ohorn_.glif b/src/Inter-UI-Regular.ufo/glyphs/Ohorn_.glif
index e6988c1c1..109364c52 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/Ohorn_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/Ohorn_.glif
@@ -3,6 +3,15 @@
   <advance width="2032"/>
   <unicode hex="01A0"/>
   <outline>
+    <contour>
+      <point x="1012" y="2304" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="980" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1956" y="2192" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1756" y="2196" type="line"/>
       <point x="1756" y="1964"/>
@@ -14,15 +23,6 @@
       <point x="2004" y="2196" type="curve"/>
     </contour>
     <component base="O"/>
-    <contour>
-      <point x="1012" y="2304" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="980" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1956" y="2192" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/Oslash_.glif b/src/Inter-UI-Regular.ufo/glyphs/Oslash_.glif
index 8c96057fb..4a1e6e0bf 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/Oslash_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/Oslash_.glif
@@ -3,13 +3,6 @@
   <advance width="2032"/>
   <unicode hex="00D8"/>
   <outline>
-    <contour>
-      <point x="376" y="-84" type="line"/>
-      <point x="1800" y="2024" type="line"/>
-      <point x="1648" y="2128" type="line"/>
-      <point x="224" y="20" type="line"/>
-    </contour>
-    <component base="O"/>
     <contour>
       <point x="1012.0" y="2304.0" type="move" name="top"/>
     </contour>
@@ -19,6 +12,13 @@
     <contour>
       <point x="1964.0" y="2304.0" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="376" y="-84" type="line"/>
+      <point x="1800" y="2024" type="line"/>
+      <point x="1648" y="2128" type="line"/>
+      <point x="224" y="20" type="line"/>
+    </contour>
+    <component base="O"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/Q_.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/Q_.cn.glif
deleted file mode 100644
index f796fa0d5..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/Q_.cn.glif
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Q.cn" format="1">
-  <advance width="2016"/>
-  <outline>
-    <contour>
-      <point x="1300" y="244" type="line"/>
-      <point x="1116" y="64" type="line"/>
-      <point x="1628" y="-336" type="line"/>
-      <point x="1820" y="-160" type="line"/>
-    </contour>
-    <contour>
-      <point x="1792" y="1168" type="line"/>
-      <point x="1792" y="1740"/>
-      <point x="1484" y="2032"/>
-      <point x="992" y="2032" type="curve" smooth="yes"/>
-      <point x="516" y="2032"/>
-      <point x="196" y="1740"/>
-      <point x="196" y="1168" type="curve"/>
-      <point x="196" y="836" type="line"/>
-      <point x="196" y="260"/>
-      <point x="520" y="-28"/>
-      <point x="996" y="-28" type="curve" smooth="yes"/>
-      <point x="1488" y="-28"/>
-      <point x="1792" y="260"/>
-      <point x="1792" y="836" type="curve"/>
-    </contour>
-    <contour>
-      <point x="1508" y="836" type="line"/>
-      <point x="1508" y="392"/>
-      <point x="1332" y="212"/>
-      <point x="996" y="212" type="curve" smooth="yes"/>
-      <point x="680" y="212"/>
-      <point x="484" y="392"/>
-      <point x="484" y="836" type="curve" smooth="yes"/>
-      <point x="484" y="1168" type="line" smooth="yes"/>
-      <point x="484" y="1612"/>
-      <point x="680" y="1792"/>
-      <point x="992" y="1792" type="curve" smooth="yes"/>
-      <point x="1328" y="1792"/>
-      <point x="1508" y="1612"/>
-      <point x="1508" y="1168" 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': 1944, 'leftMargin': 161, 'rightMargin': 161}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/Q_.glif b/src/Inter-UI-Regular.ufo/glyphs/Q_.glif
index 9c3421d2e..3b973efb3 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/Q_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/Q_.glif
@@ -3,17 +3,6 @@
   <advance width="2032"/>
   <unicode hex="0051"/>
   <outline>
-    <contour>
-      <point x="936.0" y="640.0" type="line"/>
-      <point x="1282.0" y="182.0" type="line"/>
-      <point x="1339.0" y="106.0" type="line"/>
-      <point x="1564.0" y="-192.0" type="line"/>
-      <point x="1836" y="-192" type="line"/>
-      <point x="1496" y="260" type="line"/>
-      <point x="1436" y="340" type="line"/>
-      <point x="1208" y="640" type="line"/>
-    </contour>
-    <component base="O"/>
     <contour>
       <point x="1012.0" y="2304.0" type="move" name="top"/>
     </contour>
@@ -29,6 +18,17 @@
     <contour>
       <point x="1944.0" y="2200.0" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="936.0" y="640.0" type="line"/>
+      <point x="1282.0" y="182.0" type="line"/>
+      <point x="1339.0" y="106.0" type="line"/>
+      <point x="1564.0" y="-192.0" type="line"/>
+      <point x="1836" y="-192" type="line"/>
+      <point x="1496" y="260" type="line"/>
+      <point x="1436" y="340" type="line"/>
+      <point x="1208" y="640" type="line"/>
+    </contour>
+    <component base="O"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/U_.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/U_.cn.glif
deleted file mode 100644
index aeb43e4f3..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/U_.cn.glif
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="U.cn" format="1">
-  <advance width="1760"/>
-  <outline>
-    <contour>
-      <point x="1324" y="2004" type="line"/>
-      <point x="1324" y="592" type="line" smooth="yes"/>
-      <point x="1324" y="288"/>
-      <point x="1148" y="200"/>
-      <point x="880" y="200" type="curve" smooth="yes"/>
-      <point x="612" y="200"/>
-      <point x="436" y="288"/>
-      <point x="436" y="592" type="curve" smooth="yes"/>
-      <point x="436" y="2004" type="line"/>
-      <point x="152" y="2004" type="line"/>
-      <point x="152" y="592" type="line"/>
-      <point x="152" y="144"/>
-      <point x="468" y="-28"/>
-      <point x="880" y="-28" type="curve" smooth="yes"/>
-      <point x="1268" y="-28"/>
-      <point x="1612" y="144"/>
-      <point x="1612" y="592" type="curve"/>
-      <point x="1612" y="2004" 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': 1821, 'leftMargin': 186, 'rightMargin': 176}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/V_.glif b/src/Inter-UI-Regular.ufo/glyphs/V_.glif
index de31a127c..eb04d471c 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/V_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/V_.glif
@@ -3,16 +3,6 @@
   <advance width="1792"/>
   <unicode hex="0056"/>
   <outline>
-    <contour>
-      <point x="328" y="2048" type="line"/>
-      <point x="64" y="2048" type="line"/>
-      <point x="768" y="0" type="line"/>
-      <point x="1024" y="0" type="line"/>
-      <point x="1728" y="2048" type="line"/>
-      <point x="1464" y="2048" type="line"/>
-      <point x="912" y="380" type="line"/>
-      <point x="884" y="380" type="line"/>
-    </contour>
     <contour>
       <point x="896" y="2304" type="move" name="top"/>
     </contour>
@@ -28,6 +18,16 @@
     <contour>
       <point x="1916" y="2216" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="328" y="2048" type="line"/>
+      <point x="64" y="2048" type="line"/>
+      <point x="768" y="0" type="line"/>
+      <point x="1024" y="0" type="line"/>
+      <point x="1728" y="2048" type="line"/>
+      <point x="1464" y="2048" type="line"/>
+      <point x="912" y="380" type="line"/>
+      <point x="884" y="380" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/Zbar_.glif b/src/Inter-UI-Regular.ufo/glyphs/Zbar_.glif
index 75ac4a075..276872c92 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/Zbar_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/Zbar_.glif
@@ -3,8 +3,6 @@
   <advance width="1632"/>
   <unicode hex="01B5"/>
   <outline>
-    <component base="Z"/>
-    <component base="crossbar" xOffset="176"/>
     <contour>
       <point x="848" y="2200" type="move" name="top"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="1688" y="2200" type="move" name="top0315"/>
     </contour>
+    <component base="Z"/>
+    <component base="crossbar" xOffset="176"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/a_uni02DE__.glif b/src/Inter-UI-Regular.ufo/glyphs/a_uni02DE__.glif
index bf5260223..9cf7fb9ad 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/a_uni02DE__.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/a_uni02DE__.glif
@@ -2,8 +2,6 @@
 <glyph name="a_uni02DE" format="1">
   <advance width="2108"/>
   <outline>
-    <component base="a"/>
-    <component base="rhotichookmod" xOffset="1288" yOffset="-60"/>
     <contour>
       <point x="688" y="0" type="move" name="bottom"/>
     </contour>
@@ -28,6 +26,8 @@
     <contour>
       <point x="764" y="1776" type="move" name="rhalfring"/>
     </contour>
+    <component base="a"/>
+    <component base="rhotichookmod" xOffset="1288" yOffset="-60"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/afii10045.glif b/src/Inter-UI-Regular.ufo/glyphs/afii10045.glif
index 2fe8b3241..b7bcc53bf 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/afii10045.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/afii10045.glif
@@ -3,14 +3,14 @@
   <advance width="2312"/>
   <unicode hex="042B"/>
   <outline>
-    <component base="afii10046"/>
-    <component base="I" xOffset="1648"/>
     <contour>
       <point x="1204" y="2216" type="move" name="top"/>
     </contour>
     <contour>
       <point x="2428" y="2216" type="move" name="top0315"/>
     </contour>
+    <component base="afii10046"/>
+    <component base="I" xOffset="1648"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/afii10046.glif b/src/Inter-UI-Regular.ufo/glyphs/afii10046.glif
index 9ff14803e..72cbe7bc0 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/afii10046.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/afii10046.glif
@@ -3,6 +3,9 @@
   <advance width="1772"/>
   <unicode hex="042C"/>
   <outline>
+    <contour>
+      <point x="336" y="1616" type="move" name="cross"/>
+    </contour>
     <contour>
       <point x="376" y="1188" type="line"/>
       <point x="376" y="968" type="line"/>
@@ -25,9 +28,6 @@
       <point x="1400" y="1188"/>
       <point x="960" y="1188" type="curve"/>
     </contour>
-    <contour>
-      <point x="336" y="1616" type="move" name="cross"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/afii10047.glif b/src/Inter-UI-Regular.ufo/glyphs/afii10047.glif
index ea9cabcf0..3c046110d 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/afii10047.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/afii10047.glif
@@ -3,6 +3,12 @@
   <advance width="1888"/>
   <unicode hex="042D"/>
   <outline>
+    <contour>
+      <point x="908.0" y="2248.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1864.0" y="2248.0" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1492" y="1108" type="line"/>
       <point x="648" y="1108" type="line"/>
@@ -39,12 +45,6 @@
       <point x="460" y="352"/>
       <point x="416" y="640" type="curve"/>
     </contour>
-    <contour>
-      <point x="908.0" y="2248.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1864.0" y="2248.0" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/afii10048.glif b/src/Inter-UI-Regular.ufo/glyphs/afii10048.glif
index e853a0fc0..74000f615 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/afii10048.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/afii10048.glif
@@ -3,15 +3,15 @@
   <advance width="2528"/>
   <unicode hex="042E"/>
   <outline>
-    <component base="I" xOffset="-80"/>
-    <component base="hyphen" xScale="0.7" xOffset="96" yOffset="128"/>
-    <component base="O" xOffset="560"/>
     <contour>
       <point x="1184" y="2200" type="move" name="top"/>
     </contour>
     <contour>
       <point x="2432" y="2200" type="move" name="top0315"/>
     </contour>
+    <component base="I" xOffset="-80"/>
+    <component base="hyphen" xScale="0.7" xOffset="96" yOffset="128"/>
+    <component base="O" xOffset="560"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/afii10147.glif b/src/Inter-UI-Regular.ufo/glyphs/afii10147.glif
index 84733491b..610b3ced2 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/afii10147.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/afii10147.glif
@@ -3,6 +3,12 @@
   <advance width="2016"/>
   <unicode hex="0472"/>
   <outline>
+    <contour>
+      <point x="996.0" y="2212.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1928.0" y="2212.0" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1640" y="1136" type="line"/>
       <point x="1128" y="1024"/>
@@ -14,12 +20,6 @@
       <point x="1640" y="916" type="curve"/>
     </contour>
     <component base="O" xOffset="-16"/>
-    <contour>
-      <point x="996.0" y="2212.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1928.0" y="2212.0" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/alpha.glif b/src/Inter-UI-Regular.ufo/glyphs/alpha.glif
index 305acfee8..f0f529bad 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/alpha.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/alpha.glif
@@ -3,6 +3,15 @@
   <advance width="1608"/>
   <unicode hex="03B1"/>
   <outline>
+    <contour>
+      <point x="860" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="756" y="-16" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1592" y="1776" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="136" y="688" type="line"/>
       <point x="136" y="272"/>
@@ -54,15 +63,6 @@
       <point x="1392" y="348" type="curve" smooth="yes"/>
       <point x="1392" y="1488" type="line"/>
     </contour>
-    <contour>
-      <point x="860" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="756" y="-16" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1592" y="1776" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ascript.glif b/src/Inter-UI-Regular.ufo/glyphs/ascript.glif
index 732f8c339..98606bf69 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ascript.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ascript.glif
@@ -3,7 +3,6 @@
   <advance width="1608"/>
   <unicode hex="0251"/>
   <outline>
-    <component base="alpha"/>
     <contour>
       <point x="1292" y="932" type="move" name="rhotichook"/>
     </contour>
@@ -16,6 +15,7 @@
     <contour>
       <point x="1692" y="1776" type="move" name="top0315"/>
     </contour>
+    <component base="alpha"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/aturn.glif b/src/Inter-UI-Regular.ufo/glyphs/aturn.glif
index 2306d3726..bd1e27df2 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/aturn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/aturn.glif
@@ -3,7 +3,6 @@
   <advance width="1572.0"/>
   <unicode hex="0250"/>
   <outline>
-    <component base="a" xScale="-1.0" yScale="-1.0" xOffset="1572" yOffset="1524"/>
     <contour>
       <point x="824" y="0" type="move" name="bottom"/>
     </contour>
@@ -16,6 +15,7 @@
     <contour>
       <point x="1592" y="1776" type="move" name="top0315"/>
     </contour>
+    <component base="a" xScale="-1.0" yScale="-1.0" xOffset="1572" yOffset="1524"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/b.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/b.cn.glif
deleted file mode 100644
index 55972ed7a..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/b.cn.glif
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="b.cn" format="1">
-  <advance width="1760"/>
-  <outline>
-    <contour>
-      <point x="244" y="2112" type="line"/>
-      <point x="244" y="0" type="line"/>
-      <point x="496" y="0" type="line"/>
-      <point x="520" y="288" type="line"/>
-      <point x="520" y="2112" type="line"/>
-    </contour>
-    <contour>
-      <point x="1516" y="812" type="line"/>
-      <point x="1516" y="1300"/>
-      <point x="1308" y="1516"/>
-      <point x="936" y="1516" type="curve" smooth="yes"/>
-      <point x="572" y="1516"/>
-      <point x="412" y="1252"/>
-      <point x="372" y="816" type="curve"/>
-      <point x="372" y="676" type="line"/>
-      <point x="412" y="240"/>
-      <point x="572" y="-28"/>
-      <point x="936" y="-28" type="curve" smooth="yes"/>
-      <point x="1308" y="-28"/>
-      <point x="1516" y="204"/>
-      <point x="1516" y="672" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="1244" y="672" type="line"/>
-      <point x="1244" y="348"/>
-      <point x="1136" y="200"/>
-      <point x="868" y="200" type="curve" smooth="yes"/>
-      <point x="620" y="200"/>
-      <point x="504" y="380"/>
-      <point x="464" y="560" type="curve"/>
-      <point x="464" y="928" type="line"/>
-      <point x="504" y="1120"/>
-      <point x="620" y="1288"/>
-      <point x="864" y="1288" type="curve" smooth="yes"/>
-      <point x="1148" y="1288"/>
-      <point x="1244" y="1132"/>
-      <point x="1244" y="812" 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': 188, 'rightMargin': 123}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/b.glif b/src/Inter-UI-Regular.ufo/glyphs/b.glif
index 73fca628a..6ca3909a0 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/b.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/b.glif
@@ -3,16 +3,6 @@
   <advance width="1700"/>
   <unicode hex="0062"/>
   <outline>
-    <contour>
-      <point x="208" y="2048" type="line"/>
-      <point x="208" y="0" type="line"/>
-      <point x="436" y="0" type="line"/>
-      <point x="436" y="288" type="line"/>
-      <point x="364" y="784" type="line"/>
-      <point x="444" y="1172" type="line"/>
-      <point x="444" y="2048" type="line"/>
-    </contour>
-    <component base="rightloop.cn" xOffset="52"/>
     <contour>
       <point x="892" y="2304" type="move" name="top"/>
     </contour>
@@ -28,6 +18,16 @@
     <contour>
       <point x="1692" y="2216" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="208" y="2048" type="line"/>
+      <point x="208" y="0" type="line"/>
+      <point x="436" y="0" type="line"/>
+      <point x="436" y="288" type="line"/>
+      <point x="364" y="784" type="line"/>
+      <point x="444" y="1172" type="line"/>
+      <point x="444" y="2048" type="line"/>
+    </contour>
+    <component base="rightloop.cn" xOffset="52"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/bbar.glif b/src/Inter-UI-Regular.ufo/glyphs/bbar.glif
index 6fdbf7eba..914f59e4f 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/bbar.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/bbar.glif
@@ -3,8 +3,6 @@
   <advance width="1716"/>
   <unicode hex="0180"/>
   <outline>
-    <component base="b" xOffset="16"/>
-    <component base="crossbar" xOffset="-188" yOffset="824"/>
     <contour>
       <point x="924" y="0" type="move" name="markbottom"/>
     </contour>
@@ -20,6 +18,8 @@
     <contour>
       <point x="924" y="0" type="move" name="bottom"/>
     </contour>
+    <component base="b" xOffset="16"/>
+    <component base="crossbar" xOffset="-188" yOffset="824"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/bhook.glif b/src/Inter-UI-Regular.ufo/glyphs/bhook.glif
index d906ece50..7be428b94 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/bhook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/bhook.glif
@@ -3,6 +3,15 @@
   <advance width="1700"/>
   <unicode hex="0253"/>
   <outline>
+    <contour>
+      <point x="920" y="2340" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="880" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1644" y="2340" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="444" y="1400" type="line"/>
       <point x="444" y="1664" type="line" smooth="yes"/>
@@ -56,15 +65,6 @@
       <point x="1180" y="1344"/>
       <point x="1328" y="1092"/>
     </contour>
-    <contour>
-      <point x="920" y="2340" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="880" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1644" y="2340" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/bullseye.glif b/src/Inter-UI-Regular.ufo/glyphs/bullseye.glif
index 598ffcb5b..4f0804e4a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/bullseye.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/bullseye.glif
@@ -3,6 +3,15 @@
   <advance width="2016"/>
   <unicode hex="0298"/>
   <outline>
+    <contour>
+      <point x="960" y="2244" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="960" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1928" y="2244" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="836" y="1024" type="curve" smooth="yes"/>
       <point x="836" y="936"/>
@@ -18,15 +27,6 @@
       <point x="836" y="1112"/>
     </contour>
     <component base="O" xOffset="-16"/>
-    <contour>
-      <point x="960" y="2244" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="960" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1928" y="2244" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/c.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/c.cn.glif
deleted file mode 100644
index ae78bac5f..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/c.cn.glif
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c.cn" format="1">
-  <advance width="1504"/>
-  <outline>
-    <contour>
-      <point x="788" y="192" type="curve" smooth="yes"/>
-      <point x="476" y="192"/>
-      <point x="396" y="380"/>
-      <point x="396" y="660" type="curve" smooth="yes"/>
-      <point x="396" y="828" type="line" smooth="yes"/>
-      <point x="396" y="1108"/>
-      <point x="480" y="1296"/>
-      <point x="788" y="1296" type="curve"/>
-      <point x="988" y="1296"/>
-      <point x="1112" y="1184"/>
-      <point x="1124" y="976" type="curve"/>
-      <point x="1384" y="976" type="line"/>
-      <point x="1372" y="1312"/>
-      <point x="1144" y="1516"/>
-      <point x="788" y="1516" type="curve" smooth="yes"/>
-      <point x="336" y="1516"/>
-      <point x="120" y="1256"/>
-      <point x="120" y="828" type="curve" smooth="yes"/>
-      <point x="120" y="660" type="line" smooth="yes"/>
-      <point x="120" y="232"/>
-      <point x="332" y="-28"/>
-      <point x="788" y="-28" type="curve"/>
-      <point x="1104" y="-28"/>
-      <point x="1372" y="176"/>
-      <point x="1384" y="472" type="curve"/>
-      <point x="1124" y="472" type="line"/>
-      <point x="1112" y="276"/>
-      <point x="964" y="192"/>
-    </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': 1480, 'leftMargin': 127, 'rightMargin': 88}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/caron.glif b/src/Inter-UI-Regular.ufo/glyphs/caron.glif
index 66f464bbe..ba799b391 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/caron.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/caron.glif
@@ -3,6 +3,12 @@
   <advance width="1280"/>
   <unicode hex="02C7"/>
   <outline>
+    <contour>
+      <point x="640" y="1724" type="move" name="_top"/>
+    </contour>
+    <contour>
+      <point x="624" y="2180" type="move" name="mkmktop_acc"/>
+    </contour>
     <contour>
       <point x="400" y="2048" type="line"/>
       <point x="208" y="2048" type="line"/>
@@ -14,12 +20,6 @@
       <point x="884" y="2048" type="line"/>
       <point x="640" y="1808" type="line"/>
     </contour>
-    <contour>
-      <point x="640" y="1724" type="move" name="_top"/>
-    </contour>
-    <contour>
-      <point x="624" y="2180" type="move" name="mkmktop_acc"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/casetilde.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/casetilde.cn.glif
index 03d61dcc1..fd582f00c 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/casetilde.cn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/casetilde.cn.glif
@@ -2,10 +2,10 @@
 <glyph name="casetilde.cn" format="1">
   <advance width="1248"/>
   <outline>
-    <component base="tilde" yOffset="532"/>
     <contour>
       <point x="624.0" y="2304.0" type="move" name="_top"/>
     </contour>
+    <component base="tilde" yOffset="532"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/cheabkhasiancyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/cheabkhasiancyrillic.glif
index 89c996b86..f66f7e99b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/cheabkhasiancyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/cheabkhasiancyrillic.glif
@@ -3,6 +3,9 @@
   <advance width="1760"/>
   <unicode hex="04BD"/>
   <outline>
+    <contour>
+      <point x="1040" y="-4" type="move" name="bottom"/>
+    </contour>
     <contour>
       <point x="12" y="1180" type="line"/>
       <point x="12" y="876"/>
@@ -14,9 +17,6 @@
       <point x="228" y="1180" type="curve"/>
     </contour>
     <component base="e" xOffset="216"/>
-    <contour>
-      <point x="1040" y="-4" type="move" name="bottom"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/circumflex.glif b/src/Inter-UI-Regular.ufo/glyphs/circumflex.glif
index 84c468fb5..e6cf66e38 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/circumflex.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/circumflex.glif
@@ -3,13 +3,13 @@
   <advance width="1280"/>
   <unicode hex="02C6"/>
   <outline>
-    <component base="caron" yScale="-1" yOffset="3840"/>
     <contour>
       <point x="640" y="1792" type="move" name="_top"/>
     </contour>
     <contour>
       <point x="640" y="2256" type="move" name="mkmktop_acc"/>
     </contour>
+    <component base="caron" yScale="-1" yOffset="3840"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/circumflexnosp.glif b/src/Inter-UI-Regular.ufo/glyphs/circumflexnosp.glif
index b1f557a98..30080cfb0 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/circumflexnosp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/circumflexnosp.glif
@@ -3,7 +3,6 @@
   <advance width="0"/>
   <unicode hex="0302"/>
   <outline>
-    <component base="circumflex" xOffset="-1471"/>
     <contour>
       <point x="-832" y="1776" type="move" name="_marktop"/>
     </contour>
@@ -13,6 +12,7 @@
     <contour>
       <point x="-832" y="2256" type="move" name="mkmktop"/>
     </contour>
+    <component base="circumflex" xOffset="-1471"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/circumflexsubnosp.glif b/src/Inter-UI-Regular.ufo/glyphs/circumflexsubnosp.glif
index a979506e8..1919819c6 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/circumflexsubnosp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/circumflexsubnosp.glif
@@ -3,7 +3,6 @@
   <advance width="0"/>
   <unicode hex="032D"/>
   <outline>
-    <component base="circumflex" xOffset="-1448" yOffset="-2304"/>
     <contour>
       <point x="-808" y="0" type="move" name="_bottom"/>
     </contour>
@@ -16,6 +15,7 @@
     <contour>
       <point x="-809" y="0" type="move" name="_bottomu"/>
     </contour>
+    <component base="circumflex" xOffset="-1448" yOffset="-2304"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/comma.glif b/src/Inter-UI-Regular.ufo/glyphs/comma.glif
index b47e12b42..813d249c1 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/comma.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/comma.glif
@@ -3,6 +3,12 @@
   <advance width="760"/>
   <unicode hex="002C"/>
   <outline>
+    <contour>
+      <point x="420" y="308" type="move" name="_bottom"/>
+    </contour>
+    <contour>
+      <point x="152" y="100" type="move" name="_right"/>
+    </contour>
     <contour>
       <point x="540" y="256" type="line"/>
       <point x="284" y="256" type="line"/>
@@ -15,12 +21,6 @@
       <point x="536" y="-108"/>
       <point x="540" y="68" type="curve"/>
     </contour>
-    <contour>
-      <point x="420" y="308" type="move" name="_bottom"/>
-    </contour>
-    <contour>
-      <point x="152" y="100" type="move" name="_right"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/comma.tnum.glif b/src/Inter-UI-Regular.ufo/glyphs/comma.tnum.glif
index 5f97684d3..7843288dc 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/comma.tnum.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/comma.tnum.glif
@@ -2,6 +2,12 @@
 <glyph name="comma.tnum" format="1">
   <advance width="760"/>
   <outline>
+    <contour>
+      <point x="420.0" y="308.0" type="move" name="_bottom"/>
+    </contour>
+    <contour>
+      <point x="152.0" y="100.0" type="move" name="_right"/>
+    </contour>
     <contour>
       <point x="540" y="256" type="line"/>
       <point x="284" y="256" type="line"/>
@@ -14,12 +20,6 @@
       <point x="536" y="-108"/>
       <point x="540" y="68" type="curve"/>
     </contour>
-    <contour>
-      <point x="420.0" y="308.0" type="move" name="_bottom"/>
-    </contour>
-    <contour>
-      <point x="152.0" y="100.0" type="move" name="_right"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/contents.plist b/src/Inter-UI-Regular.ufo/glyphs/contents.plist
index 95a963c5c..6b98b8fe5 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/contents.plist
+++ b/src/Inter-UI-Regular.ufo/glyphs/contents.plist
@@ -22,8 +22,6 @@
 	<string>Btopbar_.glif</string>
 	<key>C</key>
 	<string>C_.glif</string>
-	<key>C.cn</key>
-	<string>C_.cn.glif</string>
 	<key>CR</key>
 	<string>CR__.glif</string>
 	<key>Cheabkhasiancyrillic</key>
@@ -36,8 +34,6 @@
 	<string>Chook_.glif</string>
 	<key>D</key>
 	<string>D_.glif</string>
-	<key>D.cn</key>
-	<string>D_.cn.glif</string>
 	<key>Dbar1</key>
 	<string>Dbar1_.glif</string>
 	<key>Delta</key>
@@ -86,8 +82,6 @@
 	<string>Fturn_.glif</string>
 	<key>G</key>
 	<string>G_.glif</string>
-	<key>G.cn</key>
-	<string>G_.cn.glif</string>
 	<key>Gamma</key>
 	<string>Gamma_.glif</string>
 	<key>Gamma1</key>
@@ -100,8 +94,6 @@
 	<string>Ghemiddlehookcyrillic_.glif</string>
 	<key>Ghook</key>
 	<string>Ghook_.glif</string>
-	<key>Ghook.cn</key>
-	<string>Ghook_.cn.glif</string>
 	<key>Gsmallcap</key>
 	<string>Gsmallcap_.glif</string>
 	<key>Gsmallcaphook</key>
@@ -212,8 +204,6 @@
 	<string>Psi_.glif</string>
 	<key>Q</key>
 	<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>
@@ -260,8 +250,6 @@
 	<string>Trthook_.glif</string>
 	<key>U</key>
 	<string>U_.glif</string>
-	<key>U.cn</key>
-	<string>U_.cn.glif</string>
 	<key>Uhorn</key>
 	<string>Uhorn_.glif</string>
 	<key>Upsilon2</key>
@@ -474,8 +462,6 @@
 	<string>austral.glif</string>
 	<key>b</key>
 	<string>b.glif</string>
-	<key>b.cn</key>
-	<string>b.cn.glif</string>
 	<key>babygamma</key>
 	<string>babygamma.glif</string>
 	<key>backslash</key>
@@ -554,8 +540,6 @@
 	<string>bullseye.glif</string>
 	<key>c</key>
 	<string>c.glif</string>
-	<key>c.cn</key>
-	<string>c.cn.glif</string>
 	<key>cadauna</key>
 	<string>cadauna.glif</string>
 	<key>candrabindunosp</key>
@@ -680,8 +664,6 @@
 	<string>cyrillictic.glif</string>
 	<key>d</key>
 	<string>d.glif</string>
-	<key>d.cn</key>
-	<string>d.cn.glif</string>
 	<key>dagger</key>
 	<string>dagger.glif</string>
 	<key>daggerdbl</key>
@@ -962,8 +944,6 @@
 	<string>fraction.glif</string>
 	<key>g</key>
 	<string>g.glif</string>
-	<key>g.cn</key>
-	<string>g.cn.glif</string>
 	<key>gamma</key>
 	<string>gamma.glif</string>
 	<key>gamma1</key>
@@ -1304,8 +1284,6 @@
 	<string>numero.glif</string>
 	<key>o</key>
 	<string>o.glif</string>
-	<key>o.cn</key>
-	<string>o.cn.glif</string>
 	<key>o_uni02DE</key>
 	<string>o_uni02DE__.glif</string>
 	<key>odieresis</key>
@@ -1358,8 +1336,6 @@
 	<string>onethird.glif</string>
 	<key>oopen</key>
 	<string>oopen.glif</string>
-	<key>oopen.cn</key>
-	<string>oopen.cn.glif</string>
 	<key>oopen_uni02DE</key>
 	<string>oopen_uni02DE__.glif</string>
 	<key>ordfeminine</key>
@@ -1382,8 +1358,6 @@
 	<string>overscorenosp.glif</string>
 	<key>p</key>
 	<string>p.glif</string>
-	<key>p.cn</key>
-	<string>p.cn.glif</string>
 	<key>palatalizationcyrilliccmb</key>
 	<string>palatalizationcyrilliccmb.glif</string>
 	<key>paragraph</key>
@@ -1486,8 +1460,6 @@
 	<string>punctuationspace.glif</string>
 	<key>q</key>
 	<string>q.glif</string>
-	<key>q.cn</key>
-	<string>q.cn.glif</string>
 	<key>qhook</key>
 	<string>qhook.glif</string>
 	<key>qofdagesh</key>
@@ -1616,8 +1588,6 @@
 	<string>rupee.glif</string>
 	<key>s</key>
 	<string>s.glif</string>
-	<key>s.cn</key>
-	<string>s.cn.glif</string>
 	<key>sampi</key>
 	<string>sampi.glif</string>
 	<key>schwa</key>
@@ -1698,12 +1668,8 @@
 	<string>squaresubnosp.glif</string>
 	<key>srthook</key>
 	<string>srthook.glif</string>
-	<key>srthook.cn</key>
-	<string>srthook.cn.glif</string>
 	<key>st</key>
 	<string>st.glif</string>
-	<key>st.cn</key>
-	<string>st.cn.glif</string>
 	<key>sterling</key>
 	<string>sterling.glif</string>
 	<key>stigma</key>
@@ -2368,14 +2334,10 @@
 	<string>uni0377.glif</string>
 	<key>uni037B</key>
 	<string>uni037B_.glif</string>
-	<key>uni037B.cn</key>
-	<string>uni037B_.cn.glif</string>
 	<key>uni037C</key>
 	<string>uni037C_.glif</string>
 	<key>uni037D</key>
 	<string>uni037D_.glif</string>
-	<key>uni037D.cn</key>
-	<string>uni037D_.cn.glif</string>
 	<key>uni03CF</key>
 	<string>uni03CF__.glif</string>
 	<key>uni03D7</key>
@@ -2396,14 +2358,10 @@
 	<string>uni03FC__.glif</string>
 	<key>uni03FD</key>
 	<string>uni03FD__.glif</string>
-	<key>uni03FD.cn</key>
-	<string>uni03FD__.cn.glif</string>
 	<key>uni03FE</key>
 	<string>uni03FE__.glif</string>
 	<key>uni03FF</key>
 	<string>uni03FF__.glif</string>
-	<key>uni03FF.cn</key>
-	<string>uni03FF__.cn.glif</string>
 	<key>uni0456.ccmp</key>
 	<string>uni0456.ccmp.glif</string>
 	<key>uni0458.ccmp</key>
@@ -2756,16 +2714,10 @@
 	<string>uni2182.glif</string>
 	<key>uni2183</key>
 	<string>uni2183.glif</string>
-	<key>uni2183.cn</key>
-	<string>uni2183.cn.glif</string>
 	<key>uni2184</key>
 	<string>uni2184.glif</string>
-	<key>uni2184.cn</key>
-	<string>uni2184.cn.glif</string>
 	<key>uni2185</key>
 	<string>uni2185.glif</string>
-	<key>uni2185.cn</key>
-	<string>uni2185.cn.glif</string>
 	<key>uni2186</key>
 	<string>uni2186.glif</string>
 	<key>uni2187</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/crossbar.glif b/src/Inter-UI-Regular.ufo/glyphs/crossbar.glif
index 41aa1de4b..bb93964cf 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/crossbar.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/crossbar.glif
@@ -2,15 +2,15 @@
 <glyph name="crossbar" format="1">
   <advance width="1248"/>
   <outline>
+    <contour>
+      <point x="624.0" y="992.0" type="move" name="_cross"/>
+    </contour>
     <contour>
       <point x="1068" y="1096" type="line"/>
       <point x="188" y="1096" type="line"/>
       <point x="188" y="912" type="line"/>
       <point x="1068" y="912" type="line"/>
     </contour>
-    <contour>
-      <point x="624.0" y="992.0" type="move" name="_cross"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/d.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/d.cn.glif
deleted file mode 100644
index 239ddbc45..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/d.cn.glif
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="d.cn" format="1">
-  <advance width="1504"/>
-  <outline>
-    <contour>
-      <point x="1112" y="288" type="line"/>
-      <point x="1136" y="0" type="line"/>
-      <point x="1388" y="0" type="line"/>
-      <point x="1388" y="2112" type="line"/>
-      <point x="1112" y="2112" type="line"/>
-    </contour>
-    <contour>
-      <point x="120" y="672" type="line"/>
-      <point x="120" y="204"/>
-      <point x="356" y="-28"/>
-      <point x="708" y="-28" type="curve" smooth="yes"/>
-      <point x="1072" y="-28"/>
-      <point x="1232" y="240"/>
-      <point x="1272" y="676" type="curve"/>
-      <point x="1272" y="816" type="line"/>
-      <point x="1232" y="1252"/>
-      <point x="1072" y="1516"/>
-      <point x="708" y="1516" type="curve" smooth="yes"/>
-      <point x="356" y="1516"/>
-      <point x="120" y="1300"/>
-      <point x="120" y="812" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="392" y="812" type="line"/>
-      <point x="392" y="1136"/>
-      <point x="508" y="1288"/>
-      <point x="780" y="1288" type="curve" smooth="yes"/>
-      <point x="1024" y="1288"/>
-      <point x="1140" y="1120"/>
-      <point x="1180" y="928" type="curve"/>
-      <point x="1180" y="560" type="line"/>
-      <point x="1124" y="368"/>
-      <point x="1024" y="200"/>
-      <point x="776" y="200" type="curve" smooth="yes"/>
-      <point x="508" y="200"/>
-      <point x="392" y="348"/>
-      <point x="392" y="672" 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': 1594, 'leftMargin': 127, 'rightMargin': 198}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/d.glif b/src/Inter-UI-Regular.ufo/glyphs/d.glif
index eae6dbdf4..a6115fd1c 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/d.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/d.glif
@@ -3,16 +3,6 @@
   <advance width="1700"/>
   <unicode hex="0064"/>
   <outline>
-    <contour>
-      <point x="1492" y="0" type="line"/>
-      <point x="1492" y="2048" type="line"/>
-      <point x="1256" y="2048" type="line"/>
-      <point x="1256" y="1156" type="line"/>
-      <point x="1328" y="748" type="line"/>
-      <point x="1264" y="344" type="line"/>
-      <point x="1264" y="0" type="line"/>
-    </contour>
-    <component base="leftloop.cn" xOffset="8"/>
     <contour>
       <point x="1552.0" y="2112.0" type="move" name="caron"/>
     </contour>
@@ -34,6 +24,16 @@
     <contour>
       <point x="1612.0" y="2216.0" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="1492" y="0" type="line"/>
+      <point x="1492" y="2048" type="line"/>
+      <point x="1256" y="2048" type="line"/>
+      <point x="1256" y="1156" type="line"/>
+      <point x="1328" y="748" type="line"/>
+      <point x="1264" y="344" type="line"/>
+      <point x="1264" y="0" type="line"/>
+    </contour>
+    <component base="leftloop.cn" xOffset="8"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dcroat.glif b/src/Inter-UI-Regular.ufo/glyphs/dcroat.glif
index 22ee76d69..283908125 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dcroat.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dcroat.glif
@@ -3,8 +3,6 @@
   <advance width="1732"/>
   <unicode hex="0111"/>
   <outline>
-    <component base="d"/>
-    <component base="crossbar" xOffset="664" yOffset="824"/>
     <contour>
       <point x="1540.0" y="2112.0" type="move" name="caron"/>
     </contour>
@@ -29,6 +27,8 @@
     <contour>
       <point x="1220.0" y="1800.0" type="move" name="parenthesses.w2"/>
     </contour>
+    <component base="d"/>
+    <component base="crossbar" xOffset="664" yOffset="824"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dhook.glif b/src/Inter-UI-Regular.ufo/glyphs/dhook.glif
index 4cab5a1ba..23ec6f601 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dhook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dhook.glif
@@ -3,6 +3,15 @@
   <advance width="1716"/>
   <unicode hex="0257"/>
   <outline>
+    <contour>
+      <point x="748.0" y="2200.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="828.0" y="0.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1644.0" y="2200.0" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1256" y="1392" type="line"/>
       <point x="1492" y="1392" type="line"/>
@@ -56,15 +65,6 @@
       <point x="524" y="180"/>
       <point x="372" y="440"/>
     </contour>
-    <contour>
-      <point x="748.0" y="2200.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="828.0" y="0.0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1644.0" y="2200.0" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dieresis.glif b/src/Inter-UI-Regular.ufo/glyphs/dieresis.glif
index 5763632fb..e3d75b527 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dieresis.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dieresis.glif
@@ -3,6 +3,12 @@
   <advance width="1632"/>
   <unicode hex="00A8"/>
   <outline>
+    <contour>
+      <point x="816.0" y="1792.0" type="move" name="_top"/>
+    </contour>
+    <contour>
+      <point x="816.0" y="2172.0" type="move" name="mkmktop_acc"/>
+    </contour>
     <contour>
       <point x="532" y="1756" type="curve" smooth="yes"/>
       <point x="624" y="1756"/>
@@ -31,12 +37,6 @@
       <point x="940" y="1832"/>
       <point x="1016" y="1756"/>
     </contour>
-    <contour>
-      <point x="816.0" y="1792.0" type="move" name="_top"/>
-    </contour>
-    <contour>
-      <point x="816.0" y="2172.0" type="move" name="mkmktop_acc"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dieresisacutecomb.glif b/src/Inter-UI-Regular.ufo/glyphs/dieresisacutecomb.glif
index 44c38888d..18bb1e61e 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dieresisacutecomb.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dieresisacutecomb.glif
@@ -2,6 +2,9 @@
 <glyph name="dieresisacutecomb" format="1">
   <advance width="0"/>
   <outline>
+    <contour>
+      <point x="-809.0" y="1737.0" type="move" name="_top"/>
+    </contour>
     <contour>
       <point x="-913" y="1926" type="line"/>
       <point x="-738" y="1926" type="line"/>
@@ -9,9 +12,6 @@
       <point x="-738" y="2239" type="line"/>
     </contour>
     <component base="dieresis" xOffset="-1624" yOffset="-76"/>
-    <contour>
-      <point x="-809.0" y="1737.0" type="move" name="_top"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dieresisnosp.glif b/src/Inter-UI-Regular.ufo/glyphs/dieresisnosp.glif
index 8a3e56ebd..173691abc 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dieresisnosp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dieresisnosp.glif
@@ -3,7 +3,6 @@
   <advance width="0"/>
   <unicode hex="0308"/>
   <outline>
-    <component base="dieresis" xOffset="-1652"/>
     <contour>
       <point x="-836" y="1776" type="move" name="_marktop"/>
     </contour>
@@ -13,6 +12,7 @@
     <contour>
       <point x="-836" y="1880" type="move" name="parent_top"/>
     </contour>
+    <component base="dieresis" xOffset="-1652"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dotlessi.glif b/src/Inter-UI-Regular.ufo/glyphs/dotlessi.glif
index 4eaa52b22..5c0dac799 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dotlessi.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dotlessi.glif
@@ -3,12 +3,6 @@
   <advance width="652"/>
   <unicode hex="0131"/>
   <outline>
-    <contour>
-      <point x="444" y="1536" type="line"/>
-      <point x="208" y="1536" type="line"/>
-      <point x="208" y="0" type="line"/>
-      <point x="444" y="0" type="line"/>
-    </contour>
     <contour>
       <point x="336" y="1796" type="move" name="top"/>
     </contour>
@@ -21,6 +15,12 @@
     <contour>
       <point x="664" y="1776" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="444" y="1536" type="line"/>
+      <point x="208" y="1536" type="line"/>
+      <point x="208" y="0" type="line"/>
+      <point x="444" y="0" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dotlessj.glif b/src/Inter-UI-Regular.ufo/glyphs/dotlessj.glif
index 4ac97a5f4..95912d78a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dotlessj.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dotlessj.glif
@@ -3,6 +3,15 @@
   <advance width="652"/>
   <unicode hex="0237"/>
   <outline>
+    <contour>
+      <point x="328" y="1716" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="644" y="0" type="move" name="_right"/>
+    </contour>
+    <contour>
+      <point x="680" y="1716" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="208" y="1536" type="line"/>
       <point x="208" y="-112" type="line"/>
@@ -17,15 +26,6 @@
       <point x="444" y="-112" type="curve"/>
       <point x="444" y="1536" type="line"/>
     </contour>
-    <contour>
-      <point x="328" y="1716" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="644" y="0" type="move" name="_right"/>
-    </contour>
-    <contour>
-      <point x="680" y="1716" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/drthook.glif b/src/Inter-UI-Regular.ufo/glyphs/drthook.glif
index 07431c65b..fc4fa9173 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/drthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/drthook.glif
@@ -3,6 +3,15 @@
   <advance width="1708"/>
   <unicode hex="0256"/>
   <outline>
+    <contour>
+      <point x="772" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="852" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1664" y="2200" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1492" y="292" type="line"/>
       <point x="1256" y="292" type="line"/>
@@ -22,15 +31,6 @@
       <point x="1492" y="-164" type="curve" smooth="yes"/>
     </contour>
     <component base="d"/>
-    <contour>
-      <point x="772" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="852" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1664" y="2200" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dyogh.glif b/src/Inter-UI-Regular.ufo/glyphs/dyogh.glif
index 020ef6b83..a36da2948 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dyogh.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dyogh.glif
@@ -3,6 +3,15 @@
   <advance width="2676"/>
   <unicode hex="02A4"/>
   <outline>
+    <contour>
+      <point x="1772.0" y="2200.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1772.0" y="-616.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="2600.0" y="2200.0" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="2528" y="1536" type="line"/>
       <point x="1336" y="1536" type="line"/>
@@ -38,15 +47,6 @@
       <point x="1892" y="596" type="curve"/>
     </contour>
     <component base="d"/>
-    <contour>
-      <point x="1772.0" y="2200.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1772.0" y="-616.0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="2600.0" y="2200.0" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dz.glif b/src/Inter-UI-Regular.ufo/glyphs/dz.glif
index 7fe97b658..aa57767a5 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dz.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dz.glif
@@ -3,8 +3,6 @@
   <advance width="2974"/>
   <unicode hex="02A3"/>
   <outline>
-    <component base="d"/>
-    <component base="z" xOffset="1456"/>
     <contour>
       <point x="1932" y="2200" type="move" name="top"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="2676" y="2200" type="move" name="top0315"/>
     </contour>
+    <component base="d"/>
+    <component base="z" xOffset="1456"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dzcurl.glif b/src/Inter-UI-Regular.ufo/glyphs/dzcurl.glif
index 4aed2d44c..8e5bce119 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dzcurl.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dzcurl.glif
@@ -3,8 +3,6 @@
   <advance width="3144"/>
   <unicode hex="02A5"/>
   <outline>
-    <component base="d"/>
-    <component base="zcurl" xOffset="1456"/>
     <contour>
       <point x="1900" y="2200" type="move" name="top"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="2984" y="2200" type="move" name="top0315"/>
     </contour>
+    <component base="d"/>
+    <component base="zcurl" xOffset="1456"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ecyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/ecyrillic.glif
index 5f1e1b2d4..9233a5cc7 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ecyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ecyrillic.glif
@@ -3,6 +3,12 @@
   <advance width="1504"/>
   <unicode hex="0454"/>
   <outline>
+    <contour>
+      <point x="708" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1404" y="1776" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="832" y="852" type="line"/>
       <point x="76" y="852" type="line"/>
@@ -10,12 +16,6 @@
       <point x="832" y="632" type="line"/>
     </contour>
     <component base="c" xOffset="-100"/>
-    <contour>
-      <point x="708" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1404" y="1776" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/eng.glif b/src/Inter-UI-Regular.ufo/glyphs/eng.glif
index e6315600f..738f91169 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/eng.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/eng.glif
@@ -3,6 +3,21 @@
   <advance width="1620"/>
   <unicode hex="014B"/>
   <outline>
+    <contour>
+      <point x="744.0" y="1776.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="728.0" y="16.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1060.0" y="-420.0" type="move" name="parenthesses.w1"/>
+    </contour>
+    <contour>
+      <point x="728.0" y="16.0" type="move" name="markbottom"/>
+    </contour>
+    <contour>
+      <point x="1560.0" y="1776.0" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1176" y="36" type="line"/>
       <point x="1176" y="-164" type="line" smooth="yes"/>
@@ -22,21 +37,6 @@
       <point x="1412" y="36" type="line"/>
     </contour>
     <component base="n"/>
-    <contour>
-      <point x="744.0" y="1776.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="728.0" y="16.0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1060.0" y="-420.0" type="move" name="parenthesses.w1"/>
-    </contour>
-    <contour>
-      <point x="728.0" y="16.0" type="move" name="markbottom"/>
-    </contour>
-    <contour>
-      <point x="1560.0" y="1776.0" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/eshcurl.glif b/src/Inter-UI-Regular.ufo/glyphs/eshcurl.glif
index 429616aa6..6dd4f7462 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/eshcurl.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/eshcurl.glif
@@ -3,6 +3,15 @@
   <advance width="1504"/>
   <unicode hex="0286"/>
   <outline>
+    <contour>
+      <point x="1128" y="2340" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="548" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1404" y="2340" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="960" y="312" type="line"/>
       <point x="724" y="312" type="line"/>
@@ -55,15 +64,6 @@
       <point x="724" y="1640" type="curve" smooth="yes"/>
       <point x="724" y="0" type="line"/>
     </contour>
-    <contour>
-      <point x="1128" y="2340" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="548" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1404" y="2340" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/eta.glif b/src/Inter-UI-Regular.ufo/glyphs/eta.glif
index c050beafb..20bf78e95 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/eta.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/eta.glif
@@ -3,6 +3,15 @@
   <advance width="1604"/>
   <unicode hex="03B7"/>
   <outline>
+    <contour>
+      <point x="800" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="340" y="16" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1608" y="1776" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="436" y="908" type="line" smooth="yes"/>
       <point x="436" y="1196"/>
@@ -26,15 +35,6 @@
       <point x="200" y="0" type="line"/>
       <point x="436" y="0" type="line"/>
     </contour>
-    <contour>
-      <point x="800" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="340" y="16" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1608" y="1776" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ezhcurl.glif b/src/Inter-UI-Regular.ufo/glyphs/ezhcurl.glif
index f68cd2060..4d4367447 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ezhcurl.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ezhcurl.glif
@@ -3,6 +3,15 @@
   <advance width="1760"/>
   <unicode hex="0293"/>
   <outline>
+    <contour>
+      <point x="824" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="824" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1612" y="1776" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="796" y="-600" type="curve" smooth="yes"/>
       <point x="992" y="-600"/>
@@ -55,15 +64,6 @@
       <point x="1028" y="-348"/>
       <point x="928" y="-380"/>
     </contour>
-    <contour>
-      <point x="824" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="824" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1612" y="1776" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/feng.glif b/src/Inter-UI-Regular.ufo/glyphs/feng.glif
index 27949930c..4c3d01980 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/feng.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/feng.glif
@@ -3,8 +3,6 @@
   <advance width="2296"/>
   <unicode hex="02A9"/>
   <outline>
-    <component base="f"/>
-    <component base="eng" xOffset="676"/>
     <contour>
       <point x="1616" y="2340" type="move" name="top"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="2364" y="2340" type="move" name="top0315"/>
     </contour>
+    <component base="f"/>
+    <component base="eng" xOffset="676"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/finalkaf.glif b/src/Inter-UI-Regular.ufo/glyphs/finalkaf.glif
index 09f4bc2f8..36f948f2d 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/finalkaf.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/finalkaf.glif
@@ -3,6 +3,15 @@
   <advance width="1760"/>
   <unicode hex="02AA"/>
   <outline>
+    <contour>
+      <point x="1036" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1036" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1756" y="2200" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1348" y="396" type="curve" smooth="yes"/>
       <point x="1348" y="280"/>
@@ -44,15 +53,6 @@
       <point x="1348" y="524"/>
     </contour>
     <component base="l" xOffset="-116"/>
-    <contour>
-      <point x="1036" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1036" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1756" y="2200" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/fitacyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/fitacyrillic.glif
index fd4d56ebd..961f79769 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/fitacyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/fitacyrillic.glif
@@ -3,6 +3,12 @@
   <advance width="1664"/>
   <unicode hex="0473"/>
   <outline>
+    <contour>
+      <point x="768" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1604" y="1776" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1364" y="876" type="line"/>
       <point x="288" y="876" type="line"/>
@@ -10,12 +16,6 @@
       <point x="1364" y="656" type="line"/>
     </contour>
     <component base="o"/>
-    <contour>
-      <point x="768" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1604" y="1776" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/g.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/g.cn.glif
deleted file mode 100644
index 542712a65..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/g.cn.glif
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="g.cn" format="1">
-  <advance width="1504"/>
-  <outline>
-    <contour>
-      <point x="1140" y="1488" type="line"/>
-      <point x="1112" y="1160" type="line"/>
-      <point x="1112" y="-24" type="line" smooth="yes"/>
-      <point x="1112" y="-276"/>
-      <point x="964" y="-368"/>
-      <point x="736" y="-368" type="curve" smooth="yes"/>
-      <point x="604" y="-368"/>
-      <point x="460" y="-324"/>
-      <point x="332" y="-220" type="curve"/>
-      <point x="220" y="-400" type="line"/>
-      <point x="348" y="-528"/>
-      <point x="616" y="-588"/>
-      <point x="756" y="-588" type="curve" smooth="yes"/>
-      <point x="1128" y="-588"/>
-      <point x="1388" y="-404"/>
-      <point x="1388" y="-8" type="curve" smooth="yes"/>
-      <point x="1388" y="1488" type="line"/>
-    </contour>
-    <contour>
-      <point x="120" y="672" type="line"/>
-      <point x="120" y="204"/>
-      <point x="348" y="-28"/>
-      <point x="704" y="-28" type="curve" smooth="yes"/>
-      <point x="1072" y="-28"/>
-      <point x="1232" y="240"/>
-      <point x="1272" y="676" type="curve"/>
-      <point x="1272" y="816" type="line"/>
-      <point x="1232" y="1252"/>
-      <point x="1072" y="1516"/>
-      <point x="708" y="1516" type="curve" smooth="yes"/>
-      <point x="344" y="1516"/>
-      <point x="120" y="1300"/>
-      <point x="120" y="812" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="392" y="812" type="line"/>
-      <point x="392" y="1136"/>
-      <point x="508" y="1288"/>
-      <point x="780" y="1288" type="curve" smooth="yes"/>
-      <point x="1024" y="1288"/>
-      <point x="1136" y="1120"/>
-      <point x="1180" y="928" type="curve"/>
-      <point x="1180" y="560" type="line"/>
-      <point x="1124" y="368"/>
-      <point x="1024" y="200"/>
-      <point x="776" y="200" type="curve" smooth="yes"/>
-      <point x="508" y="200"/>
-      <point x="392" y="348"/>
-      <point x="392" y="672" 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': 129, 'rightMargin': 187}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/gamma1.glif b/src/Inter-UI-Regular.ufo/glyphs/gamma1.glif
index 3386d1ec3..7006fcf62 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/gamma1.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/gamma1.glif
@@ -3,6 +3,15 @@
   <advance width="1660"/>
   <unicode hex="0263"/>
   <outline>
+    <contour>
+      <point x="832" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="832" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1612" y="1776" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="828" y="-600" type="curve" smooth="yes"/>
       <point x="1060" y="-600"/>
@@ -35,15 +44,6 @@
       <point x="452" y="-480"/>
       <point x="596" y="-600"/>
     </contour>
-    <contour>
-      <point x="832" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="832" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1612" y="1776" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/gbar.glif b/src/Inter-UI-Regular.ufo/glyphs/gbar.glif
index b02fb0dae..f9cbafda1 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/gbar.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/gbar.glif
@@ -3,8 +3,6 @@
   <advance width="1732"/>
   <unicode hex="01E5"/>
   <outline>
-    <component base="g"/>
-    <component base="crossbar" xOffset="664" yOffset="-212"/>
     <contour>
       <point x="860.0" y="1776.0" type="move" name="top"/>
     </contour>
@@ -20,6 +18,8 @@
     <contour>
       <point x="1664.0" y="1776.0" type="move" name="top0315"/>
     </contour>
+    <component base="g"/>
+    <component base="crossbar" xOffset="664" yOffset="-212"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/gcursive.glif b/src/Inter-UI-Regular.ufo/glyphs/gcursive.glif
index 08597a3e0..515c35188 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/gcursive.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/gcursive.glif
@@ -3,7 +3,6 @@
   <advance width="1760"/>
   <unicode hex="0261"/>
   <outline>
-    <component base="g" xOffset="-16"/>
     <contour>
       <point x="748" y="1776" type="move" name="top"/>
     </contour>
@@ -13,6 +12,7 @@
     <contour>
       <point x="748" y="-616" type="move" name="bottom"/>
     </contour>
+    <component base="g" xOffset="-16"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/gecyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/gecyrillic.glif
index 945b2f8e8..2043ed792 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/gecyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/gecyrillic.glif
@@ -3,14 +3,6 @@
   <advance width="1252"/>
   <unicode hex="0433"/>
   <outline>
-    <contour>
-      <point x="1156" y="1488" type="line"/>
-      <point x="208" y="1488" type="line"/>
-      <point x="208" y="0" type="line"/>
-      <point x="444" y="0" type="line"/>
-      <point x="444" y="1268" type="line"/>
-      <point x="1156" y="1268" type="line"/>
-    </contour>
     <contour>
       <point x="592" y="1744" type="move" name="top"/>
     </contour>
@@ -23,6 +15,14 @@
     <contour>
       <point x="1176" y="1744" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="1156" y="1488" type="line"/>
+      <point x="208" y="1488" type="line"/>
+      <point x="208" y="0" type="line"/>
+      <point x="444" y="0" type="line"/>
+      <point x="444" y="1268" type="line"/>
+      <point x="1156" y="1268" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ghook.glif b/src/Inter-UI-Regular.ufo/glyphs/ghook.glif
index 6fa97f7ed..09281e4cf 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ghook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ghook.glif
@@ -3,6 +3,15 @@
   <advance width="1712"/>
   <unicode hex="0260"/>
   <outline>
+    <contour>
+      <point x="740" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="740" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1644" y="1776" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1492" y="1464" type="line"/>
       <point x="1492" y="1664" type="line" smooth="yes"/>
@@ -22,15 +31,6 @@
       <point x="1264" y="1464" type="line"/>
     </contour>
     <component base="g"/>
-    <contour>
-      <point x="740" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="740" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1644" y="1776" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/glottalstopbarrev.glif b/src/Inter-UI-Regular.ufo/glyphs/glottalstopbarrev.glif
index 96f7de4aa..fcca84fc2 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/glottalstopbarrev.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/glottalstopbarrev.glif
@@ -3,8 +3,6 @@
   <advance width="1504"/>
   <unicode hex="02A2"/>
   <outline>
-    <component base="glottalstoprevinv" xOffset="-16"/>
-    <component base="crossbar" xOffset="124" yOffset="-688"/>
     <contour>
       <point x="772" y="2244" type="move" name="top"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="772" y="0" type="move" name="bottom"/>
     </contour>
+    <component base="glottalstoprevinv" xOffset="-16"/>
+    <component base="crossbar" xOffset="124" yOffset="-688"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/hadescendercyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/hadescendercyrillic.glif
index 158d16671..9a67a611a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/hadescendercyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/hadescendercyrillic.glif
@@ -3,8 +3,6 @@
   <advance width="1504"/>
   <unicode hex="04B3"/>
   <outline>
-    <component base="x" xOffset="-28"/>
-    <component base="cyrillictic" xOffset="996"/>
     <contour>
       <point x="1376" y="2200" type="move" name="top_dd"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="1376" y="1760" type="move" name="top0315"/>
     </contour>
+    <component base="x" xOffset="-28"/>
+    <component base="cyrillictic" xOffset="996"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/henghook.glif b/src/Inter-UI-Regular.ufo/glyphs/henghook.glif
index 80b3e6bfb..3122879ca 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/henghook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/henghook.glif
@@ -3,6 +3,15 @@
   <advance width="1620"/>
   <unicode hex="0267"/>
   <outline>
+    <contour>
+      <point x="832" y="2340" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="756" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1524" y="2340" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="444" y="1464" type="line"/>
       <point x="444" y="1664" type="line" smooth="yes"/>
@@ -62,15 +71,6 @@
       <point x="1412" y="-164" type="curve" smooth="yes"/>
       <point x="1412" y="36" type="line"/>
     </contour>
-    <contour>
-      <point x="832" y="2340" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="756" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1524" y="2340" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/hhook.glif b/src/Inter-UI-Regular.ufo/glyphs/hhook.glif
index 5fa3d9c46..8716220fc 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/hhook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/hhook.glif
@@ -3,6 +3,15 @@
   <advance width="1620"/>
   <unicode hex="0266"/>
   <outline>
+    <contour>
+      <point x="832" y="2340" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="756" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1524" y="2340" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="444" y="1464" type="line"/>
       <point x="444" y="1664" type="line" smooth="yes"/>
@@ -44,15 +53,6 @@
       <point x="208" y="0" type="line"/>
       <point x="444" y="0" type="line"/>
     </contour>
-    <contour>
-      <point x="832" y="2340" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="756" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1524" y="2340" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/hturn.glif b/src/Inter-UI-Regular.ufo/glyphs/hturn.glif
index 25576812b..e201c1a95 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/hturn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/hturn.glif
@@ -3,7 +3,6 @@
   <advance width="1620"/>
   <unicode hex="0265"/>
   <outline>
-    <component base="h" xScale="-1" yScale="-1" xOffset="1620" yOffset="1536"/>
     <contour>
       <point x="756" y="1776" type="move" name="top"/>
     </contour>
@@ -13,6 +12,7 @@
     <contour>
       <point x="1532" y="1776" type="move" name="top0315"/>
     </contour>
+    <component base="h" xScale="-1" yScale="-1" xOffset="1620" yOffset="1536"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/hturnhook2.glif b/src/Inter-UI-Regular.ufo/glyphs/hturnhook2.glif
index 7832a006a..0bb95bc39 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/hturnhook2.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/hturnhook2.glif
@@ -3,6 +3,15 @@
   <advance width="1624"/>
   <unicode hex="02AF"/>
   <outline>
+    <contour>
+      <point x="876.0" y="1776.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="876.0" y="-616.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1740.0" y="1776.0" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1176" y="608" type="line" smooth="yes"/>
       <point x="1176" y="320"/>
@@ -62,15 +71,6 @@
       <point x="1412" y="-324"/>
       <point x="1412" y="-164" type="curve" smooth="yes"/>
     </contour>
-    <contour>
-      <point x="876.0" y="1776.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="876.0" y="-616.0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1740.0" y="1776.0" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/hturnlthook.glif b/src/Inter-UI-Regular.ufo/glyphs/hturnlthook.glif
index 822c7ea40..01f64107d 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/hturnlthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/hturnlthook.glif
@@ -3,6 +3,15 @@
   <advance width="1620"/>
   <unicode hex="02AE"/>
   <outline>
+    <contour>
+      <point x="996.0" y="1776.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="996.0" y="-616.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1852.0" y="1776.0" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1176" y="608" type="line" smooth="yes"/>
       <point x="1176" y="320"/>
@@ -44,15 +53,6 @@
       <point x="208" y="1304"/>
       <point x="208" y="1144" type="curve" smooth="yes"/>
     </contour>
-    <contour>
-      <point x="996.0" y="1776.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="996.0" y="-616.0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1852.0" y="1776.0" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/i.glif b/src/Inter-UI-Regular.ufo/glyphs/i.glif
index c10fd80e8..33afc2677 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/i.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/i.glif
@@ -3,21 +3,6 @@
   <advance width="652"/>
   <unicode hex="0069"/>
   <outline>
-    <contour>
-      <point x="324" y="1756" type="curve"/>
-      <point x="428" y="1756"/>
-      <point x="492" y="1828"/>
-      <point x="492" y="1916" type="curve"/>
-      <point x="492" y="1996"/>
-      <point x="428" y="2076"/>
-      <point x="324" y="2076" type="curve"/>
-      <point x="220" y="2076"/>
-      <point x="156" y="1996"/>
-      <point x="156" y="1916" type="curve" smooth="yes"/>
-      <point x="156" y="1828"/>
-      <point x="220" y="1756"/>
-    </contour>
-    <component base="dotlessi"/>
     <contour>
       <point x="324" y="0" type="move" name="bottom"/>
     </contour>
@@ -39,6 +24,21 @@
     <contour>
       <point x="664.0" y="2200.0" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="324" y="1756" type="curve"/>
+      <point x="428" y="1756"/>
+      <point x="492" y="1828"/>
+      <point x="492" y="1916" type="curve"/>
+      <point x="492" y="1996"/>
+      <point x="428" y="2076"/>
+      <point x="324" y="2076" type="curve"/>
+      <point x="220" y="2076"/>
+      <point x="156" y="1996"/>
+      <point x="156" y="1916" type="curve" smooth="yes"/>
+      <point x="156" y="1828"/>
+      <point x="220" y="1756"/>
+    </contour>
+    <component base="dotlessi"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ibar.glif b/src/Inter-UI-Regular.ufo/glyphs/ibar.glif
index 785071169..eb86c45af 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ibar.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ibar.glif
@@ -3,8 +3,6 @@
   <advance width="880"/>
   <unicode hex="0268"/>
   <outline>
-    <component base="i" xOffset="116"/>
-    <component base="crossbar" xOffset="-188" yOffset="-164"/>
     <contour>
       <point x="308" y="2200" type="move" name="top"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="308" y="0" type="move" name="bottom"/>
     </contour>
+    <component base="i" xOffset="116"/>
+    <component base="crossbar" xOffset="-188" yOffset="-164"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/idieresis.glif b/src/Inter-UI-Regular.ufo/glyphs/idieresis.glif
index f3fd8bc9f..2bac9872a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/idieresis.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/idieresis.glif
@@ -3,8 +3,6 @@
   <advance width="1272"/>
   <unicode hex="00EF"/>
   <outline>
-    <component base="dotlessi" xOffset="308"/>
-    <component base="dieresis" xOffset="-180"/>
     <contour>
       <point x="720" y="900" type="move" name="rhotichook"/>
     </contour>
@@ -20,6 +18,8 @@
     <contour>
       <point x="636" y="0" type="move" name="bottom"/>
     </contour>
+    <component base="dotlessi" xOffset="308"/>
+    <component base="dieresis" xOffset="-180"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/idieresisacute.glif b/src/Inter-UI-Regular.ufo/glyphs/idieresisacute.glif
index 6f8f01cab..a3cb9b5cd 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/idieresisacute.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/idieresisacute.glif
@@ -3,8 +3,6 @@
   <advance width="900"/>
   <unicode hex="1E2F"/>
   <outline>
-    <component base="dotlessi" xOffset="124"/>
-    <component base="dieresisacutecomb.lc" xOffset="1252"/>
     <contour>
       <point x="536" y="900" type="move" name="rhotichook"/>
     </contour>
@@ -20,6 +18,8 @@
     <contour>
       <point x="448" y="0" type="move" name="bottom"/>
     </contour>
+    <component base="dotlessi" xOffset="124"/>
+    <component base="dieresisacutecomb.lc" xOffset="1252"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/iota.glif b/src/Inter-UI-Regular.ufo/glyphs/iota.glif
index a7130e4c8..244f3619c 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/iota.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/iota.glif
@@ -3,6 +3,12 @@
   <advance width="732"/>
   <unicode hex="03B9"/>
   <outline>
+    <contour>
+      <point x="324" y="1744" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="836" y="1744" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="200" y="1488" type="line"/>
       <point x="200" y="380" type="line"/>
@@ -21,12 +27,6 @@
       <point x="436" y="380" type="curve"/>
       <point x="436" y="1488" type="line"/>
     </contour>
-    <contour>
-      <point x="324" y="1744" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="836" y="1744" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/itildebelow.glif b/src/Inter-UI-Regular.ufo/glyphs/itildebelow.glif
index 995dd9851..7a7f55dcd 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/itildebelow.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/itildebelow.glif
@@ -3,8 +3,6 @@
   <advance width="872"/>
   <unicode hex="1E2D"/>
   <outline>
-    <component base="i" xOffset="112"/>
-    <component base="tilde" xOffset="-188" yOffset="-2216"/>
     <contour>
       <point x="472" y="16" type="move" name="bottom"/>
     </contour>
@@ -29,6 +27,8 @@
     <contour>
       <point x="820" y="-560" type="move" name="bottom_dd"/>
     </contour>
+    <component base="i" xOffset="112"/>
+    <component base="tilde" xOffset="-188" yOffset="-2216"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/iucyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/iucyrillic.glif
index f22a849a2..f7d4a585d 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/iucyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/iucyrillic.glif
@@ -3,6 +3,12 @@
   <advance width="2272"/>
   <unicode hex="044E"/>
   <outline>
+    <contour>
+      <point x="1020" y="1744" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="2184" y="1744" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="944" y="864" type="line"/>
       <point x="132" y="864" type="line"/>
@@ -11,12 +17,6 @@
     </contour>
     <component base="dotlessi" xOffset="-112"/>
     <component base="o" xOffset="584"/>
-    <contour>
-      <point x="1020" y="1744" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="2184" y="1744" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/j.glif b/src/Inter-UI-Regular.ufo/glyphs/j.glif
index 162d69209..630ae8591 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/j.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/j.glif
@@ -3,21 +3,6 @@
   <advance width="652"/>
   <unicode hex="006A"/>
   <outline>
-    <contour>
-      <point x="324" y="1756" type="curve"/>
-      <point x="428" y="1756"/>
-      <point x="492" y="1828"/>
-      <point x="492" y="1916" type="curve"/>
-      <point x="492" y="1996"/>
-      <point x="428" y="2076"/>
-      <point x="324" y="2076" type="curve"/>
-      <point x="220" y="2076"/>
-      <point x="156" y="1996"/>
-      <point x="156" y="1916" type="curve" smooth="yes"/>
-      <point x="156" y="1828"/>
-      <point x="220" y="1756"/>
-    </contour>
-    <component base="dotlessj"/>
     <contour>
       <point x="372" y="2304" type="move" name="top"/>
     </contour>
@@ -33,6 +18,21 @@
     <contour>
       <point x="668" y="2200" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="324" y="1756" type="curve"/>
+      <point x="428" y="1756"/>
+      <point x="492" y="1828"/>
+      <point x="492" y="1916" type="curve"/>
+      <point x="492" y="1996"/>
+      <point x="428" y="2076"/>
+      <point x="324" y="2076" type="curve"/>
+      <point x="220" y="2076"/>
+      <point x="156" y="1996"/>
+      <point x="156" y="1916" type="curve" smooth="yes"/>
+      <point x="156" y="1828"/>
+      <point x="220" y="1756"/>
+    </contour>
+    <component base="dotlessj"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/jcrosstail.glif b/src/Inter-UI-Regular.ufo/glyphs/jcrosstail.glif
index 3d40d5af6..3a8ef5aa4 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/jcrosstail.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/jcrosstail.glif
@@ -3,6 +3,15 @@
   <advance width="960"/>
   <unicode hex="029D"/>
   <outline>
+    <contour>
+      <point x="656" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="632" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1076" y="2200" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1048" y="156" type="line"/>
       <point x="364" y="156" type="line" smooth="yes"/>
@@ -30,15 +39,6 @@
       <point x="1048" y="-64" type="line"/>
     </contour>
     <component base="i" xOffset="308"/>
-    <contour>
-      <point x="656" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="632" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1076" y="2200" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/jdotlessbar.glif b/src/Inter-UI-Regular.ufo/glyphs/jdotlessbar.glif
index 6a8be64d8..a12b5a272 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/jdotlessbar.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/jdotlessbar.glif
@@ -3,8 +3,6 @@
   <advance width="880"/>
   <unicode hex="025F"/>
   <outline>
-    <component base="dotlessj" xOffset="112"/>
-    <component base="crossbar" xOffset="-188" yOffset="-912"/>
     <contour>
       <point x="620" y="1776" type="move" name="top"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="1024" y="1776" type="move" name="top0315"/>
     </contour>
+    <component base="dotlessj" xOffset="112"/>
+    <component base="crossbar" xOffset="-188" yOffset="-912"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/jhookdblbar.glif b/src/Inter-UI-Regular.ufo/glyphs/jhookdblbar.glif
index f1d6fbebd..3c0acae26 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/jhookdblbar.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/jhookdblbar.glif
@@ -3,8 +3,6 @@
   <advance width="1248"/>
   <unicode hex="0284"/>
   <outline>
-    <component base="esh" xOffset="44"/>
-    <component base="crossbar" xOffset="-20" yOffset="-888"/>
     <contour>
       <point x="836" y="2340" type="move" name="top"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="344" y="-616" type="move" name="bottom"/>
     </contour>
+    <component base="esh" xOffset="44"/>
+    <component base="crossbar" xOffset="-20" yOffset="-888"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/k.glif b/src/Inter-UI-Regular.ufo/glyphs/k.glif
index 3ff49be26..e69f62a27 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/k.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/k.glif
@@ -3,27 +3,6 @@
   <advance width="1484"/>
   <unicode hex="006B"/>
   <outline>
-    <contour>
-      <point x="444" y="2048" type="line"/>
-      <point x="208" y="2048" type="line"/>
-      <point x="208" y="0" type="line"/>
-      <point x="444" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1388.0" y="1536.0" type="line"/>
-      <point x="1096.0" y="1536.0" type="line"/>
-      <point x="472.0" y="844.0" type="line"/>
-      <point x="424.0" y="844.0" type="line"/>
-      <point x="428" y="520" type="line"/>
-      <point x="700" y="812" type="line"/>
-      <point x="720" y="812" type="line"/>
-    </contour>
-    <contour>
-      <point x="1176" y="0" type="line"/>
-      <point x="1452" y="0" type="line"/>
-      <point x="752" y="924" type="line"/>
-      <point x="616" y="744" type="line"/>
-    </contour>
     <contour>
       <point x="736" y="0" type="move" name="bottom"/>
     </contour>
@@ -45,6 +24,27 @@
     <contour>
       <point x="1228" y="2216" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="444" y="2048" type="line"/>
+      <point x="208" y="2048" type="line"/>
+      <point x="208" y="0" type="line"/>
+      <point x="444" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="1388.0" y="1536.0" type="line"/>
+      <point x="1096.0" y="1536.0" type="line"/>
+      <point x="472.0" y="844.0" type="line"/>
+      <point x="424.0" y="844.0" type="line"/>
+      <point x="428" y="520" type="line"/>
+      <point x="700" y="812" type="line"/>
+      <point x="720" y="812" type="line"/>
+    </contour>
+    <contour>
+      <point x="1176" y="0" type="line"/>
+      <point x="1452" y="0" type="line"/>
+      <point x="752" y="924" type="line"/>
+      <point x="616" y="744" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ksicyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/ksicyrillic.glif
index 244f64f58..08f274c1b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ksicyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ksicyrillic.glif
@@ -3,6 +3,12 @@
   <advance width="1248"/>
   <unicode hex="046F"/>
   <outline>
+    <contour>
+      <point x="608" y="2392" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1320" y="2392" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="140" y="1488" type="line"/>
       <point x="140" y="1268" type="line"/>
@@ -56,12 +62,6 @@
       <point x="532" y="796" type="curve" smooth="yes"/>
     </contour>
     <component base="caron" xOffset="-24" yOffset="64"/>
-    <contour>
-      <point x="608" y="2392" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1320" y="2392" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/kturn.glif b/src/Inter-UI-Regular.ufo/glyphs/kturn.glif
index 7936e8e18..a7296e605 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/kturn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/kturn.glif
@@ -3,7 +3,6 @@
   <advance width="1484.0"/>
   <unicode hex="029E"/>
   <outline>
-    <component base="k" xScale="-1.0" yScale="-1.0" xOffset="1484" yOffset="1536"/>
     <contour>
       <point x="632" y="1776" type="move" name="top"/>
     </contour>
@@ -13,6 +12,7 @@
     <contour>
       <point x="1388" y="1776" type="move" name="top0315"/>
     </contour>
+    <component base="k" xScale="-1.0" yScale="-1.0" xOffset="1484" yOffset="1536"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/l.glif b/src/Inter-UI-Regular.ufo/glyphs/l.glif
index 14625c98d..d9bd1bed3 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/l.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/l.glif
@@ -3,12 +3,6 @@
   <advance width="652"/>
   <unicode hex="006C"/>
   <outline>
-    <contour>
-      <point x="444" y="2048" type="line"/>
-      <point x="208" y="2048" type="line"/>
-      <point x="208" y="0" type="line"/>
-      <point x="444" y="0" type="line"/>
-    </contour>
     <contour>
       <point x="324" y="2304" type="move" name="top"/>
     </contour>
@@ -33,6 +27,12 @@
     <contour>
       <point x="640" y="2336" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="444" y="2048" type="line"/>
+      <point x="208" y="2048" type="line"/>
+      <point x="208" y="0" type="line"/>
+      <point x="444" y="0" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/lbar.glif b/src/Inter-UI-Regular.ufo/glyphs/lbar.glif
index 93ba7ef45..68778560c 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/lbar.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/lbar.glif
@@ -3,8 +3,6 @@
   <advance width="880"/>
   <unicode hex="019A"/>
   <outline>
-    <component base="l" xOffset="108"/>
-    <component base="crossbar" xOffset="-188" yOffset="96"/>
     <contour>
       <point x="456" y="2336" type="move" name="top"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="456" y="16" type="move" name="bottom"/>
     </contour>
+    <component base="l" xOffset="108"/>
+    <component base="crossbar" xOffset="-188" yOffset="96"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/lbelt.glif b/src/Inter-UI-Regular.ufo/glyphs/lbelt.glif
index 7cace8c5b..28348fb0b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/lbelt.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/lbelt.glif
@@ -3,6 +3,15 @@
   <advance width="1164"/>
   <unicode hex="026C"/>
   <outline>
+    <contour>
+      <point x="760" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="760" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1236" y="2200" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1148" y="824" type="line"/>
       <point x="1148" y="1044" type="line"/>
@@ -30,15 +39,6 @@
       <point x="464" y="824" type="curve" smooth="yes"/>
     </contour>
     <component base="l" xOffset="408"/>
-    <contour>
-      <point x="760" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="760" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1236" y="2200" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/lmidtilde.glif b/src/Inter-UI-Regular.ufo/glyphs/lmidtilde.glif
index adfa1b560..115f18994 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/lmidtilde.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/lmidtilde.glif
@@ -3,8 +3,6 @@
   <advance width="936"/>
   <unicode hex="026B"/>
   <outline>
-    <component base="l" xOffset="144"/>
-    <component base="tilde" xOffset="-156" yOffset="-824"/>
     <contour>
       <point x="504" y="2200" type="move" name="top"/>
     </contour>
@@ -17,6 +15,8 @@
     <contour>
       <point x="504" y="0" type="move" name="bottom"/>
     </contour>
+    <component base="l" xOffset="144"/>
+    <component base="tilde" xOffset="-156" yOffset="-824"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/lrthook.glif b/src/Inter-UI-Regular.ufo/glyphs/lrthook.glif
index b9728cde6..9f1ccf9e1 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/lrthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/lrthook.glif
@@ -3,6 +3,15 @@
   <advance width="652"/>
   <unicode hex="026D"/>
   <outline>
+    <contour>
+      <point x="356.0" y="2200.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="356.0" y="-616.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="840.0" y="2200.0" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="444" y="36" type="line"/>
       <point x="208" y="36" type="line"/>
@@ -22,15 +31,6 @@
       <point x="444" y="-164" type="curve" smooth="yes"/>
     </contour>
     <component base="l"/>
-    <contour>
-      <point x="356.0" y="2200.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="356.0" y="-616.0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="840.0" y="2200.0" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/lslash.glif b/src/Inter-UI-Regular.ufo/glyphs/lslash.glif
index 0ffd35a03..743c910ce 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/lslash.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/lslash.glif
@@ -3,13 +3,6 @@
   <advance width="652"/>
   <unicode hex="0142"/>
   <outline>
-    <contour>
-      <point x="664" y="1280" type="line"/>
-      <point x="-12" y="1024" type="line"/>
-      <point x="-12" y="848" type="line"/>
-      <point x="664" y="1104" type="line"/>
-    </contour>
-    <component base="l"/>
     <contour>
       <point x="368" y="2304" type="move" name="top"/>
     </contour>
@@ -19,6 +12,13 @@
     <contour>
       <point x="760" y="2336" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="664" y="1280" type="line"/>
+      <point x="-12" y="1024" type="line"/>
+      <point x="-12" y="848" type="line"/>
+      <point x="664" y="1104" type="line"/>
+    </contour>
+    <component base="l"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/lyogh.glif b/src/Inter-UI-Regular.ufo/glyphs/lyogh.glif
index c7cba2185..a06e8262c 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/lyogh.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/lyogh.glif
@@ -3,6 +3,15 @@
   <advance width="1760"/>
   <unicode hex="026E"/>
   <outline>
+    <contour>
+      <point x="864" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="864" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1716" y="1776" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="276" y="1488" type="line"/>
       <point x="276" y="1268" type="line"/>
@@ -38,15 +47,6 @@
       <point x="836" y="596" type="curve"/>
     </contour>
     <component base="l" xOffset="4"/>
-    <contour>
-      <point x="864" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="864" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1716" y="1776" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/mhook.glif b/src/Inter-UI-Regular.ufo/glyphs/mhook.glif
index d850732b7..90c3c0244 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/mhook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/mhook.glif
@@ -3,6 +3,15 @@
   <advance width="2388"/>
   <unicode hex="0271"/>
   <outline>
+    <contour>
+      <point x="1248" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1248" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="2464" y="1776" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1944" y="36" type="line"/>
       <point x="1944" y="-164" type="line" smooth="yes"/>
@@ -22,15 +31,6 @@
       <point x="2180" y="36" type="line"/>
     </contour>
     <component base="m"/>
-    <contour>
-      <point x="1248" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1248" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="2464" y="1776" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/mturn.glif b/src/Inter-UI-Regular.ufo/glyphs/mturn.glif
index c48295fbf..b20f49ddb 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/mturn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/mturn.glif
@@ -3,7 +3,6 @@
   <advance width="2388.0"/>
   <unicode hex="026F"/>
   <outline>
-    <component base="m" xScale="-1.0" yScale="-1.0" xOffset="2388" yOffset="1536"/>
     <contour>
       <point x="1268" y="1776" type="move" name="top"/>
     </contour>
@@ -13,6 +12,7 @@
     <contour>
       <point x="2492" y="1776" type="move" name="top0315"/>
     </contour>
+    <component base="m" xScale="-1.0" yScale="-1.0" xOffset="2388" yOffset="1536"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/mturndescend.glif b/src/Inter-UI-Regular.ufo/glyphs/mturndescend.glif
index 7deb05f87..9a0bdcec5 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/mturndescend.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/mturndescend.glif
@@ -3,13 +3,6 @@
   <advance width="2388.0"/>
   <unicode hex="0270"/>
   <outline>
-    <contour>
-      <point x="1944" y="-576" type="line"/>
-      <point x="2180" y="-576" type="line"/>
-      <point x="2180" y="24" type="line"/>
-      <point x="1944" y="24" type="line"/>
-    </contour>
-    <component base="m" xScale="-1.0" yScale="-1.0" xOffset="2388" yOffset="1536"/>
     <contour>
       <point x="1272" y="1776" type="move" name="top"/>
     </contour>
@@ -19,6 +12,13 @@
     <contour>
       <point x="2496" y="1776" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="1944" y="-576" type="line"/>
+      <point x="2180" y="-576" type="line"/>
+      <point x="2180" y="24" type="line"/>
+      <point x="1944" y="24" type="line"/>
+    </contour>
+    <component base="m" xScale="-1.0" yScale="-1.0" xOffset="2388" yOffset="1536"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/nlfthook.glif b/src/Inter-UI-Regular.ufo/glyphs/nlfthook.glif
index 73ae3800d..d2a34e0d3 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/nlfthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/nlfthook.glif
@@ -3,6 +3,15 @@
   <advance width="1620"/>
   <unicode hex="0272"/>
   <outline>
+    <contour>
+      <point x="956.0" y="1776.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="956.0" y="-616.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1716.0" y="1776.0" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="208" y="36" type="line"/>
       <point x="208" y="-164" type="line" smooth="yes"/>
@@ -22,15 +31,6 @@
       <point x="444" y="36" type="line"/>
     </contour>
     <component base="n"/>
-    <contour>
-      <point x="956.0" y="1776.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="956.0" y="-616.0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1716.0" y="1776.0" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/nrthook.glif b/src/Inter-UI-Regular.ufo/glyphs/nrthook.glif
index 4d50d22df..8322a2647 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/nrthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/nrthook.glif
@@ -3,6 +3,15 @@
   <advance width="1620"/>
   <unicode hex="0273"/>
   <outline>
+    <contour>
+      <point x="788" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="788" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1636" y="1776" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1412" y="36" type="line"/>
       <point x="1176" y="36" type="line"/>
@@ -22,15 +31,6 @@
       <point x="1412" y="-164" type="curve" smooth="yes"/>
     </contour>
     <component base="n"/>
-    <contour>
-      <point x="788" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="788" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1636" y="1776" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/o.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/o.cn.glif
deleted file mode 100644
index 12cad0067..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/o.cn.glif
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="o.cn" format="1">
-  <advance width="1760"/>
-  <outline>
-    <contour>
-      <point x="200" y="676" type="line"/>
-      <point x="200" y="208"/>
-      <point x="500" y="-28"/>
-      <point x="880" y="-28" type="curve" smooth="yes"/>
-      <point x="1264" y="-28"/>
-      <point x="1560" y="208"/>
-      <point x="1560" y="676" type="curve"/>
-      <point x="1560" y="812" type="line"/>
-      <point x="1560" y="1280"/>
-      <point x="1264" y="1516"/>
-      <point x="880" y="1516" type="curve" smooth="yes"/>
-      <point x="500" y="1516"/>
-      <point x="200" y="1280"/>
-      <point x="200" y="812" type="curve"/>
-    </contour>
-    <contour>
-      <point x="476" y="812" type="line"/>
-      <point x="476" y="1136"/>
-      <point x="644" y="1296"/>
-      <point x="880" y="1296" type="curve" smooth="yes"/>
-      <point x="1116" y="1296"/>
-      <point x="1284" y="1136"/>
-      <point x="1284" y="812" type="curve"/>
-      <point x="1284" y="676" type="line"/>
-      <point x="1284" y="348"/>
-      <point x="1152" y="192"/>
-      <point x="880" y="192" type="curve" smooth="yes"/>
-      <point x="644" y="192"/>
-      <point x="476" y="348"/>
-      <point x="476" y="676" 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': 1613, 'leftMargin': 127, 'rightMargin': 127}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/o_uni02DE__.glif b/src/Inter-UI-Regular.ufo/glyphs/o_uni02DE__.glif
index f3889d7f3..8011bd563 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/o_uni02DE__.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/o_uni02DE__.glif
@@ -2,8 +2,6 @@
 <glyph name="o_uni02DE" format="1">
   <advance width="2304"/>
   <outline>
-    <component base="o" xOffset="-168"/>
-    <component base="rhotichookmod" xOffset="1448"/>
     <contour>
       <point x="2012" y="1776" type="move" name="top0315"/>
     </contour>
@@ -22,6 +20,8 @@
     <contour>
       <point x="1448" y="-560" type="move" name="bottom_dd"/>
     </contour>
+    <component base="o" xOffset="-168"/>
+    <component base="rhotichookmod" xOffset="1448"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/oe.glif b/src/Inter-UI-Regular.ufo/glyphs/oe.glif
index 0a6c3cac4..4f94874c6 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/oe.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/oe.glif
@@ -3,8 +3,6 @@
   <advance width="2772"/>
   <unicode hex="0153"/>
   <outline>
-    <component base="o"/>
-    <component base="e" xOffset="1156"/>
     <contour>
       <point x="1280" y="1776" type="move" name="top"/>
     </contour>
@@ -20,6 +18,8 @@
     <contour>
       <point x="2536" y="1776" type="move" name="top0315"/>
     </contour>
+    <component base="o"/>
+    <component base="e" xOffset="1156"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ohorn.glif b/src/Inter-UI-Regular.ufo/glyphs/ohorn.glif
index a9029764e..51580e100 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ohorn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ohorn.glif
@@ -3,6 +3,15 @@
   <advance width="1684"/>
   <unicode hex="01A1"/>
   <outline>
+    <contour>
+      <point x="904" y="1792" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="804" y="-16" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1620" y="1776" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1456" y="1652" type="line"/>
       <point x="1456" y="1456"/>
@@ -14,15 +23,6 @@
       <point x="1676" y="1652" type="curve"/>
     </contour>
     <component base="o"/>
-    <contour>
-      <point x="904" y="1792" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="804" y="-16" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1620" y="1776" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/omegaroundcyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/omegaroundcyrillic.glif
index 15503e1dc..4508383ad 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/omegaroundcyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/omegaroundcyrillic.glif
@@ -3,6 +3,12 @@
   <advance width="1760"/>
   <unicode hex="047B"/>
   <outline>
+    <contour>
+      <point x="796" y="1872" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1588" y="1872" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="924" y="1656" type="line"/>
       <point x="648" y="1656" type="line"/>
@@ -16,12 +22,6 @@
       <point x="924" y="-160" type="line"/>
     </contour>
     <component base="o" xOffset="-16"/>
-    <contour>
-      <point x="796" y="1872" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1588" y="1872" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/oopen.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/oopen.cn.glif
deleted file mode 100644
index ca974665c..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/oopen.cn.glif
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oopen.cn" format="1">
-  <advance width="1504"/>
-  <outline>
-    <contour>
-      <point x="120" y="472" type="line"/>
-      <point x="136" y="176"/>
-      <point x="400" y="-28"/>
-      <point x="716" y="-28" type="curve" smooth="yes"/>
-      <point x="1172" y="-28"/>
-      <point x="1384" y="232"/>
-      <point x="1384" y="660" type="curve" smooth="yes"/>
-      <point x="1384" y="828" type="line" smooth="yes"/>
-      <point x="1384" y="1256"/>
-      <point x="1172" y="1516"/>
-      <point x="716" y="1516" type="curve" smooth="yes"/>
-      <point x="364" y="1516"/>
-      <point x="136" y="1312"/>
-      <point x="120" y="976" type="curve"/>
-      <point x="380" y="976" type="line"/>
-      <point x="396" y="1184"/>
-      <point x="516" y="1296"/>
-      <point x="716" y="1296" type="curve" smooth="yes"/>
-      <point x="1024" y="1296"/>
-      <point x="1112" y="1108"/>
-      <point x="1112" y="828" type="curve" smooth="yes"/>
-      <point x="1112" y="660" type="line" smooth="yes"/>
-      <point x="1112" y="380"/>
-      <point x="1028" y="192"/>
-      <point x="716" y="192" type="curve" smooth="yes"/>
-      <point x="540" y="192"/>
-      <point x="396" y="276"/>
-      <point x="380" y="472" 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': 1480, 'leftMargin': 88, 'rightMargin': 127}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/oslash.glif b/src/Inter-UI-Regular.ufo/glyphs/oslash.glif
index 864e8e558..a566510a6 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/oslash.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/oslash.glif
@@ -3,13 +3,6 @@
   <advance width="1664"/>
   <unicode hex="00F8"/>
   <outline>
-    <contour>
-      <point x="372" y="-84" type="line"/>
-      <point x="1444" y="1504" type="line"/>
-      <point x="1292" y="1608" type="line"/>
-      <point x="220" y="20" type="line"/>
-    </contour>
-    <component base="o"/>
     <contour>
       <point x="844.0" y="1792.0" type="move" name="top"/>
     </contour>
@@ -19,6 +12,13 @@
     <contour>
       <point x="1588.0" y="1792.0" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="372" y="-84" type="line"/>
+      <point x="1444" y="1504" type="line"/>
+      <point x="1292" y="1608" type="line"/>
+      <point x="220" y="20" type="line"/>
+    </contour>
+    <component base="o"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/p.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/p.cn.glif
deleted file mode 100644
index d5c41f9e1..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/p.cn.glif
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="p.cn" format="1">
-  <advance width="1760"/>
-  <outline>
-    <contour>
-      <point x="520" y="1204" type="line"/>
-      <point x="496" y="1488" type="line"/>
-      <point x="244" y="1488" type="line"/>
-      <point x="244" y="-572" type="line"/>
-      <point x="520" y="-572" type="line"/>
-    </contour>
-    <contour>
-      <point x="1516" y="812" type="line"/>
-      <point x="1516" y="1300"/>
-      <point x="1312" y="1516"/>
-      <point x="932" y="1516" type="curve" smooth="yes"/>
-      <point x="568" y="1516"/>
-      <point x="400" y="1252"/>
-      <point x="360" y="816" type="curve"/>
-      <point x="360" y="644" type="line"/>
-      <point x="400" y="228"/>
-      <point x="568" y="-28"/>
-      <point x="936" y="-28" type="curve" smooth="yes"/>
-      <point x="1308" y="-28"/>
-      <point x="1516" y="204"/>
-      <point x="1516" y="672" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="1240" y="672" type="line"/>
-      <point x="1240" y="348"/>
-      <point x="1120" y="192"/>
-      <point x="852" y="192" type="curve" smooth="yes"/>
-      <point x="608" y="192"/>
-      <point x="504" y="356"/>
-      <point x="448" y="532" type="curve"/>
-      <point x="448" y="928" type="line"/>
-      <point x="492" y="1120"/>
-      <point x="608" y="1288"/>
-      <point x="848" y="1288" type="curve" smooth="yes"/>
-      <point x="1120" y="1288"/>
-      <point x="1240" y="1136"/>
-      <point x="1240" y="812" 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': 188, 'rightMargin': 126}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/p.glif b/src/Inter-UI-Regular.ufo/glyphs/p.glif
index 16ebe8dc1..b6b2ecf99 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/p.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/p.glif
@@ -3,17 +3,6 @@
   <advance width="1700"/>
   <unicode hex="0070"/>
   <outline>
-    <contour>
-      <point x="208" y="-576" type="line"/>
-      <point x="444" y="-576" type="line"/>
-      <point x="444" y="392" type="line"/>
-      <point x="376" y="728" type="line"/>
-      <point x="436" y="1148" type="line"/>
-      <point x="436" y="1244" type="line"/>
-      <point x="436" y="1536" type="line"/>
-      <point x="208" y="1536" type="line"/>
-    </contour>
-    <component base="rightloop.cn" xOffset="52"/>
     <contour>
       <point x="896" y="1792" type="move" name="top"/>
     </contour>
@@ -32,6 +21,17 @@
     <contour>
       <point x="1552" y="1760" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="208" y="-576" type="line"/>
+      <point x="444" y="-576" type="line"/>
+      <point x="444" y="392" type="line"/>
+      <point x="376" y="728" type="line"/>
+      <point x="436" y="1148" type="line"/>
+      <point x="436" y="1244" type="line"/>
+      <point x="436" y="1536" type="line"/>
+      <point x="208" y="1536" type="line"/>
+    </contour>
+    <component base="rightloop.cn" xOffset="52"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/perispomenigreekcmb.glif b/src/Inter-UI-Regular.ufo/glyphs/perispomenigreekcmb.glif
index e4680cd35..b98ee8369 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/perispomenigreekcmb.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/perispomenigreekcmb.glif
@@ -3,13 +3,13 @@
   <advance width="0"/>
   <unicode hex="0342"/>
   <outline>
-    <component base="tilde" xOffset="-1475"/>
     <contour>
       <point x="-788" y="1774" type="move" name="_marktop"/>
     </contour>
     <contour>
       <point x="-788" y="2173" type="move" name="mkmktop"/>
     </contour>
+    <component base="tilde" xOffset="-1475"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/q.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/q.cn.glif
deleted file mode 100644
index 5eec0c421..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/q.cn.glif
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="q.cn" format="1">
-  <advance width="1504"/>
-  <outline>
-    <contour>
-      <point x="1112" y="-572" type="line"/>
-      <point x="1388" y="-572" type="line"/>
-      <point x="1388" y="1488" type="line"/>
-      <point x="1136" y="1488" type="line"/>
-      <point x="1112" y="1204" type="line"/>
-    </contour>
-    <contour>
-      <point x="120" y="672" type="line"/>
-      <point x="120" y="204"/>
-      <point x="344" y="-28"/>
-      <point x="712" y="-28" type="curve" smooth="yes"/>
-      <point x="1080" y="-28"/>
-      <point x="1248" y="240"/>
-      <point x="1284" y="676" type="curve"/>
-      <point x="1284" y="816" type="line"/>
-      <point x="1248" y="1252"/>
-      <point x="1080" y="1516"/>
-      <point x="716" y="1516" type="curve" smooth="yes"/>
-      <point x="340" y="1516"/>
-      <point x="120" y="1300"/>
-      <point x="120" y="812" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="396" y="812" type="line"/>
-      <point x="396" y="1136"/>
-      <point x="512" y="1296"/>
-      <point x="784" y="1296" type="curve" smooth="yes"/>
-      <point x="1028" y="1296"/>
-      <point x="1152" y="1120"/>
-      <point x="1196" y="928" type="curve"/>
-      <point x="1196" y="560" type="line"/>
-      <point x="1140" y="364"/>
-      <point x="1028" y="192"/>
-      <point x="784" y="192" type="curve" smooth="yes"/>
-      <point x="512" y="192"/>
-      <point x="396" y="348"/>
-      <point x="396" y="672" 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': 1607, 'leftMargin': 127, 'rightMargin': 213}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/q.glif b/src/Inter-UI-Regular.ufo/glyphs/q.glif
index 35cad5b46..55fef41b8 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/q.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/q.glif
@@ -3,17 +3,6 @@
   <advance width="1700"/>
   <unicode hex="0071"/>
   <outline>
-    <contour>
-      <point x="1492" y="1536" type="line"/>
-      <point x="1264" y="1536" type="line"/>
-      <point x="1264" y="1244" type="line"/>
-      <point x="1264" y="1148" type="line"/>
-      <point x="1328" y="728" type="line"/>
-      <point x="1256" y="392" type="line"/>
-      <point x="1256" y="-576" type="line"/>
-      <point x="1492" y="-576" type="line"/>
-    </contour>
-    <component base="leftloop.cn" xOffset="8"/>
     <contour>
       <point x="812" y="1792" type="move" name="top"/>
     </contour>
@@ -32,6 +21,17 @@
     <contour>
       <point x="1420" y="1792" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="1492" y="1536" type="line"/>
+      <point x="1264" y="1536" type="line"/>
+      <point x="1264" y="1244" type="line"/>
+      <point x="1264" y="1148" type="line"/>
+      <point x="1328" y="728" type="line"/>
+      <point x="1256" y="392" type="line"/>
+      <point x="1256" y="-576" type="line"/>
+      <point x="1492" y="-576" type="line"/>
+    </contour>
+    <component base="leftloop.cn" xOffset="8"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/qhook.glif b/src/Inter-UI-Regular.ufo/glyphs/qhook.glif
index 32a998087..badccebc5 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/qhook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/qhook.glif
@@ -3,6 +3,15 @@
   <advance width="1760"/>
   <unicode hex="02A0"/>
   <outline>
+    <contour>
+      <point x="776.0" y="2200.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="776.0" y="-616.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1640.0" y="2200.0" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1492" y="1288" type="line"/>
       <point x="1492" y="1488" type="line" smooth="yes"/>
@@ -22,15 +31,6 @@
       <point x="1264" y="1288" type="line"/>
     </contour>
     <component base="q"/>
-    <contour>
-      <point x="776.0" y="2200.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="776.0" y="-616.0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1640.0" y="2200.0" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/r.glif b/src/Inter-UI-Regular.ufo/glyphs/r.glif
index 6429454d8..9c798582a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/r.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/r.glif
@@ -3,6 +3,21 @@
   <advance width="1060"/>
   <unicode hex="0072"/>
   <outline>
+    <contour>
+      <point x="544" y="1792" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="324" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="924.0" y="2200.0" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="924.0" y="-560.0" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="924.0" y="1792.0" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="980" y="1552" type="line"/>
       <point x="964" y="1556"/>
@@ -24,21 +39,6 @@
       <point x="956" y="1312"/>
       <point x="980" y="1308" type="curve"/>
     </contour>
-    <contour>
-      <point x="544" y="1792" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="324" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="924.0" y="2200.0" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="924.0" y="-560.0" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="924.0" y="1792.0" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rdescend.glif b/src/Inter-UI-Regular.ufo/glyphs/rdescend.glif
index 1b6b0bb3c..1418d96ca 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rdescend.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rdescend.glif
@@ -3,13 +3,6 @@
   <advance width="1060"/>
   <unicode hex="027C"/>
   <outline>
-    <contour>
-      <point x="208" y="-576" type="line"/>
-      <point x="444" y="-576" type="line"/>
-      <point x="444" y="100" type="line"/>
-      <point x="208" y="100" type="line"/>
-    </contour>
-    <component base="r"/>
     <contour>
       <point x="584" y="1792" type="move" name="top"/>
     </contour>
@@ -19,6 +12,13 @@
     <contour>
       <point x="892" y="1792" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="208" y="-576" type="line"/>
+      <point x="444" y="-576" type="line"/>
+      <point x="444" y="100" type="line"/>
+      <point x="208" y="100" type="line"/>
+    </contour>
+    <component base="r"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rfishhookrev.glif b/src/Inter-UI-Regular.ufo/glyphs/rfishhookrev.glif
index 7e4c654ba..21b056148 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rfishhookrev.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rfishhookrev.glif
@@ -3,6 +3,15 @@
   <advance width="828"/>
   <unicode hex="027F"/>
   <outline>
+    <contour>
+      <point x="504" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="504" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="824" y="1776" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="620" y="-576" type="line"/>
       <point x="620" y="1148" type="line" smooth="yes"/>
@@ -21,15 +30,6 @@
       <point x="384" y="1132" type="curve" smooth="yes"/>
       <point x="384" y="-576" type="line"/>
     </contour>
-    <contour>
-      <point x="504" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="504" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="824" y="1776" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rho.glif b/src/Inter-UI-Regular.ufo/glyphs/rho.glif
index 285edc803..7f7ca2001 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rho.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rho.glif
@@ -3,6 +3,12 @@
   <advance width="1592"/>
   <unicode hex="03C1"/>
   <outline>
+    <contour>
+      <point x="816.0" y="1760.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1600.0" y="1760.0" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="192" y="-572" type="line"/>
       <point x="428" y="-572" type="line"/>
@@ -35,12 +41,6 @@
       <point x="192" y="1264"/>
       <point x="192" y="788" type="curve" smooth="yes"/>
     </contour>
-    <contour>
-      <point x="816.0" y="1760.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1600.0" y="1760.0" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rhotichookmod.glif b/src/Inter-UI-Regular.ufo/glyphs/rhotichookmod.glif
index fdb71d80c..1fdb61bc8 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rhotichookmod.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rhotichookmod.glif
@@ -3,6 +3,9 @@
   <advance width="768"/>
   <unicode hex="02DE"/>
   <outline>
+    <contour>
+      <point x="-16" y="880" type="move" name="_markrhotichook"/>
+    </contour>
     <contour>
       <point x="-20" y="760" type="line"/>
       <point x="304" y="820" type="line"/>
@@ -21,9 +24,6 @@
       <point x="476" y="1060" type="curve"/>
       <point x="-24" y="964" type="line"/>
     </contour>
-    <contour>
-      <point x="-16" y="880" type="move" name="_markrhotichook"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ringhalfright.glif b/src/Inter-UI-Regular.ufo/glyphs/ringhalfright.glif
index e30818b4f..35792225b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ringhalfright.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ringhalfright.glif
@@ -3,6 +3,12 @@
   <advance width="480"/>
   <unicode hex="02BE"/>
   <outline>
+    <contour>
+      <point x="140" y="1584" type="move" name="_top"/>
+    </contour>
+    <contour>
+      <point x="212" y="1584" type="move" name="_rhalfring"/>
+    </contour>
     <contour>
       <point x="100" y="1528" type="line"/>
       <point x="256" y="1528"/>
@@ -19,12 +25,6 @@
       <point x="176" y="1652"/>
       <point x="100" y="1652" type="curve"/>
     </contour>
-    <contour>
-      <point x="140" y="1584" type="move" name="_top"/>
-    </contour>
-    <contour>
-      <point x="212" y="1584" type="move" name="_rhalfring"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ringrighthalfsubnosp.glif b/src/Inter-UI-Regular.ufo/glyphs/ringrighthalfsubnosp.glif
index f91381b91..52198fe28 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ringrighthalfsubnosp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ringrighthalfsubnosp.glif
@@ -3,13 +3,13 @@
   <advance width="0"/>
   <unicode hex="0339"/>
   <outline>
-    <component base="ringhalfright" xOffset="-1005" yOffset="-2186"/>
     <contour>
       <point x="-858" y="-659" type="move" name="mkmkbottom_acc"/>
     </contour>
     <contour>
       <point x="-858" y="0" type="move" name="_markbottom"/>
     </contour>
+    <component base="ringhalfright" xOffset="-1005" yOffset="-2186"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rrthook.glif b/src/Inter-UI-Regular.ufo/glyphs/rrthook.glif
index e3e290e39..4f9a8f896 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rrthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rrthook.glif
@@ -3,6 +3,18 @@
   <advance width="1060"/>
   <unicode hex="027D"/>
   <outline>
+    <contour>
+      <point x="360" y="-424" type="move" name="parenthesses.w1"/>
+    </contour>
+    <contour>
+      <point x="568" y="1792" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="480" y="-576" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="880" y="1792" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="444" y="36" type="line"/>
       <point x="208" y="36" type="line"/>
@@ -22,18 +34,6 @@
       <point x="444" y="-164" type="curve" smooth="yes"/>
     </contour>
     <component base="r"/>
-    <contour>
-      <point x="360" y="-424" type="move" name="parenthesses.w1"/>
-    </contour>
-    <contour>
-      <point x="568" y="1792" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="480" y="-576" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="880" y="1792" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rturn.glif b/src/Inter-UI-Regular.ufo/glyphs/rturn.glif
index d2e28718e..397999f1f 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rturn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rturn.glif
@@ -3,7 +3,6 @@
   <advance width="1060.0"/>
   <unicode hex="0279"/>
   <outline>
-    <component base="r" xScale="-1.0" yScale="-1.0" xOffset="1060" yOffset="1536"/>
     <contour>
       <point x="284" y="1776" type="move" name="top"/>
     </contour>
@@ -13,6 +12,7 @@
     <contour>
       <point x="916" y="1776" type="move" name="top0315"/>
     </contour>
+    <component base="r" xScale="-1.0" yScale="-1.0" xOffset="1060" yOffset="1536"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rturnrthook.glif b/src/Inter-UI-Regular.ufo/glyphs/rturnrthook.glif
index dfea5bba1..ba638dc2d 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rturnrthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rturnrthook.glif
@@ -3,6 +3,15 @@
   <advance width="1088"/>
   <unicode hex="027B"/>
   <outline>
+    <contour>
+      <point x="424" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="424" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1136" y="1776" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="616" y="336" type="line"/>
       <point x="616" y="-192" type="line" smooth="yes"/>
@@ -22,15 +31,6 @@
       <point x="852" y="336" type="line"/>
     </contour>
     <component base="r" xScale="-1" yScale="-1" xOffset="1060" yOffset="1488"/>
-    <contour>
-      <point x="424" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="424" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1136" y="1776" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/s.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/s.cn.glif
deleted file mode 100644
index 512f9f696..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/s.cn.glif
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="s.cn" format="1">
-  <advance width="1504"/>
-  <outline>
-    <contour>
-      <point x="1076" y="384" type="curve" smooth="yes"/>
-      <point x="1076" y="264"/>
-      <point x="968" y="192"/>
-      <point x="772" y="192" type="curve" smooth="yes"/>
-      <point x="616" y="192"/>
-      <point x="440" y="248"/>
-      <point x="432" y="452" type="curve"/>
-      <point x="156" y="452" type="line"/>
-      <point x="156" y="204"/>
-      <point x="372" y="-28"/>
-      <point x="772" y="-28" type="curve" smooth="yes"/>
-      <point x="1120" y="-28"/>
-      <point x="1352" y="140"/>
-      <point x="1352" y="404" type="curve"/>
-      <point x="1352" y="644"/>
-      <point x="1156" y="752"/>
-      <point x="800" y="868" type="curve" smooth="yes"/>
-      <point x="544" y="956"/>
-      <point x="480" y="992"/>
-      <point x="480" y="1096" type="curve"/>
-      <point x="480" y="1204"/>
-      <point x="560" y="1296"/>
-      <point x="764" y="1296" type="curve" smooth="yes"/>
-      <point x="952" y="1296"/>
-      <point x="1060" y="1180"/>
-      <point x="1060" y="1064" type="curve"/>
-      <point x="1332" y="1064" type="line"/>
-      <point x="1332" y="1316"/>
-      <point x="1124" y="1516"/>
-      <point x="764" y="1516" type="curve" smooth="yes"/>
-      <point x="428" y="1516"/>
-      <point x="208" y="1328"/>
-      <point x="208" y="1088" type="curve"/>
-      <point x="208" y="848"/>
-      <point x="400" y="756"/>
-      <point x="728" y="640" type="curve" smooth="yes"/>
-      <point x="984" y="552"/>
-      <point x="1076" y="496"/>
-    </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': 1459, 'leftMargin': 132, 'rightMargin': 132}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/s.glif b/src/Inter-UI-Regular.ufo/glyphs/s.glif
index 9fa75edcb..50f07cf7d 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/s.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/s.glif
@@ -3,6 +3,21 @@
   <advance width="1444"/>
   <unicode hex="0073"/>
   <outline>
+    <contour>
+      <point x="732" y="1792" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="732" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1428" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1428" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1428" y="1776" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="168" y="1112" type="curve" smooth="yes"/>
       <point x="168" y="928"/>
@@ -45,21 +60,6 @@
       <point x="408" y="1556"/>
       <point x="168" y="1364"/>
     </contour>
-    <contour>
-      <point x="732" y="1792" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="732" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1428" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1428" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1428" y="1776" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/srthook.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/srthook.cn.glif
deleted file mode 100644
index 54b9096eb..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/srthook.cn.glif
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="srthook.cn" format="1">
-  <advance width="1504"/>
-  <outline>
-    <contour>
-      <point x="156" y="452" type="line"/>
-      <point x="156" y="-84" type="line" smooth="yes"/>
-      <point x="156" y="-348"/>
-      <point x="264" y="-496"/>
-      <point x="488" y="-496" type="curve" smooth="yes"/>
-      <point x="528" y="-496"/>
-      <point x="588" y="-488"/>
-      <point x="624" y="-476" type="curve"/>
-      <point x="624" y="-292" type="line"/>
-      <point x="604" y="-296"/>
-      <point x="572" y="-300"/>
-      <point x="552" y="-300" type="curve" smooth="yes"/>
-      <point x="424" y="-300"/>
-      <point x="344" y="-244"/>
-      <point x="344" y="-84" type="curve" smooth="yes"/>
-      <point x="344" y="452" type="line"/>
-    </contour>
-    <component base="s.cn" xOffset="24"/>
-  </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': 1459, 'leftMargin': 132, 'rightMargin': 132}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/srthook.glif b/src/Inter-UI-Regular.ufo/glyphs/srthook.glif
index 336d6510b..8bbb73ac7 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/srthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/srthook.glif
@@ -3,6 +3,15 @@
   <advance width="1462"/>
   <unicode hex="0282"/>
   <outline>
+    <contour>
+      <point x="752" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="752" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1456" y="1776" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="156" y="232" type="line"/>
       <point x="156" y="-168" type="line" smooth="yes"/>
@@ -22,15 +31,6 @@
       <point x="392" y="232" type="line"/>
     </contour>
     <component base="s"/>
-    <contour>
-      <point x="752" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="752" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1456" y="1776" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/st.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/st.cn.glif
deleted file mode 100644
index dda91ce95..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/st.cn.glif
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="st.cn" format="1">
-  <advance width="2528"/>
-  <outline>
-    <contour>
-      <point x="1400" y="1064" type="line"/>
-      <point x="1400" y="1356"/>
-      <point x="1248" y="1496"/>
-      <point x="1248" y="1708" type="curve" smooth="yes"/>
-      <point x="1248" y="1832"/>
-      <point x="1332" y="1920"/>
-      <point x="1492" y="1920" type="curve" smooth="yes"/>
-      <point x="1684" y="1920"/>
-      <point x="1760" y="1792"/>
-      <point x="1760" y="1608" type="curve"/>
-      <point x="2036" y="1608" type="line"/>
-      <point x="2036" y="1836"/>
-      <point x="1940" y="2144"/>
-      <point x="1492" y="2144" type="curve" smooth="yes"/>
-      <point x="1188" y="2144"/>
-      <point x="984" y="1968"/>
-      <point x="984" y="1744" type="curve" smooth="yes"/>
-      <point x="984" y="1532"/>
-      <point x="1160" y="1328"/>
-      <point x="1248" y="1064" type="curve"/>
-    </contour>
-    <contour>
-      <point x="2304" y="1488" type="line"/>
-      <point x="1488" y="1488" type="line"/>
-      <point x="1488" y="1284" type="line"/>
-      <point x="2304" y="1284" type="line"/>
-    </contour>
-    <contour>
-      <point x="1760" y="1608" type="line"/>
-      <point x="1760" y="372" type="line" smooth="yes"/>
-      <point x="1760" y="72"/>
-      <point x="1920" y="-28"/>
-      <point x="2108" y="-28" type="curve" smooth="yes"/>
-      <point x="2204" y="-28"/>
-      <point x="2268" y="-12"/>
-      <point x="2308" y="0" type="curve"/>
-      <point x="2308" y="220" type="line"/>
-      <point x="2288" y="216"/>
-      <point x="2232" y="204"/>
-      <point x="2192" y="204" type="curve" smooth="yes"/>
-      <point x="2108" y="204"/>
-      <point x="2036" y="228"/>
-      <point x="2036" y="372" type="curve" smooth="yes"/>
-      <point x="2036" y="1608" type="line"/>
-    </contour>
-    <component base="s.cn" xOffset="88"/>
-  </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': 2311, 'leftMargin': 129, 'rightMargin': 96}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/tccurl.glif b/src/Inter-UI-Regular.ufo/glyphs/tccurl.glif
index c13cbd235..c61c2b81a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/tccurl.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/tccurl.glif
@@ -3,6 +3,15 @@
   <advance width="2192"/>
   <unicode hex="02A8"/>
   <outline>
+    <contour>
+      <point x="1504" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1504" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="2188" y="2200" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1504" y="188" type="curve" smooth="yes"/>
       <point x="1192" y="188"/>
@@ -63,15 +72,6 @@
       <point x="540" y="412" type="curve" smooth="yes"/>
       <point x="540" y="1864" type="line"/>
     </contour>
-    <contour>
-      <point x="1504" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1504" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="2188" y="2200" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/tilde.glif b/src/Inter-UI-Regular.ufo/glyphs/tilde.glif
index cdc1c979f..07c2ab52a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/tilde.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/tilde.glif
@@ -3,6 +3,12 @@
   <advance width="1248"/>
   <unicode hex="02DC"/>
   <outline>
+    <contour>
+      <point x="624" y="1792" type="move" name="_top"/>
+    </contour>
+    <contour>
+      <point x="624" y="2208" type="move" name="mkmktop_acc"/>
+    </contour>
     <contour>
       <point x="936" y="2100" type="line"/>
       <point x="936" y="2016"/>
@@ -25,12 +31,6 @@
       <point x="1116" y="1876"/>
       <point x="1116" y="2084" type="curve"/>
     </contour>
-    <contour>
-      <point x="624" y="1792" type="move" name="_top"/>
-    </contour>
-    <contour>
-      <point x="624" y="2208" type="move" name="mkmktop_acc"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/tildecomb.glif b/src/Inter-UI-Regular.ufo/glyphs/tildecomb.glif
index 3860d9fea..9d71fa26f 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/tildecomb.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/tildecomb.glif
@@ -3,7 +3,6 @@
   <advance width="0"/>
   <unicode hex="0303"/>
   <outline>
-    <component base="tilde" xOffset="-1403"/>
     <contour>
       <point x="-780" y="1728" type="move" name="_top"/>
     </contour>
@@ -16,6 +15,7 @@
     <contour>
       <point x="-780" y="2208" type="move" name="mkmktop"/>
     </contour>
+    <component base="tilde" xOffset="-1403"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/tildesubnosp.glif b/src/Inter-UI-Regular.ufo/glyphs/tildesubnosp.glif
index 16d95c716..86e8613f2 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/tildesubnosp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/tildesubnosp.glif
@@ -3,7 +3,6 @@
   <advance width="0"/>
   <unicode hex="0330"/>
   <outline>
-    <component base="tilde" xOffset="-1488" yOffset="-2228"/>
     <contour>
       <point x="-864" y="0" type="move" name="_bottom"/>
     </contour>
@@ -13,6 +12,7 @@
     <contour>
       <point x="-864" y="-596" type="move" name="mkmkbottom_acc"/>
     </contour>
+    <component base="tilde" xOffset="-1488" yOffset="-2228"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/trthook.glif b/src/Inter-UI-Regular.ufo/glyphs/trthook.glif
index 8d99b46c8..eba7930b0 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/trthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/trthook.glif
@@ -3,6 +3,15 @@
   <advance width="964"/>
   <unicode hex="0288"/>
   <outline>
+    <contour>
+      <point x="404" y="2048" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="604" y="-600" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="916" y="2048" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="288" y="1844" type="line"/>
       <point x="288" y="-192" type="line" smooth="yes"/>
@@ -27,15 +36,6 @@
       <point x="56" y="1316" type="line"/>
       <point x="852" y="1316" type="line"/>
     </contour>
-    <contour>
-      <point x="404" y="2048" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="604" y="-600" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="916" y="2048" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/tturn.glif b/src/Inter-UI-Regular.ufo/glyphs/tturn.glif
index 60d51dbf7..a1c109344 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/tturn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/tturn.glif
@@ -3,7 +3,6 @@
   <advance width="992.0"/>
   <unicode hex="0287"/>
   <outline>
-    <component base="t" xScale="-1.0" yScale="-1.0" xOffset="992" yOffset="1540"/>
     <contour>
       <point x="360" y="2200" type="move" name="top"/>
     </contour>
@@ -13,6 +12,7 @@
     <contour>
       <point x="964" y="2200" type="move" name="top0315"/>
     </contour>
+    <component base="t" xScale="-1.0" yScale="-1.0" xOffset="992" yOffset="1540"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/u.glif b/src/Inter-UI-Regular.ufo/glyphs/u.glif
index 246cf4f1a..f13775dbe 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/u.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/u.glif
@@ -3,29 +3,6 @@
   <advance width="1620"/>
   <unicode hex="0075"/>
   <outline>
-    <contour>
-      <point x="1176" y="608" type="line" smooth="yes"/>
-      <point x="1176" y="320"/>
-      <point x="956" y="208"/>
-      <point x="780" y="208" type="curve" smooth="yes"/>
-      <point x="584" y="208"/>
-      <point x="444" y="336"/>
-      <point x="444" y="560" type="curve" smooth="yes"/>
-      <point x="444" y="1536" type="line"/>
-      <point x="208" y="1536" type="line"/>
-      <point x="208" y="560" type="line" smooth="yes"/>
-      <point x="208" y="156"/>
-      <point x="480" y="-20"/>
-      <point x="704" y="-20" type="curve" smooth="yes"/>
-      <point x="936" y="-20"/>
-      <point x="1084" y="100"/>
-      <point x="1160" y="216" type="curve"/>
-      <point x="1176" y="216" type="line"/>
-      <point x="1176" y="0" type="line"/>
-      <point x="1412" y="0" type="line"/>
-      <point x="1412" y="1536" type="line"/>
-      <point x="1176" y="1536" type="line"/>
-    </contour>
     <contour>
       <point x="812" y="1792" type="move" name="top"/>
     </contour>
@@ -50,6 +27,29 @@
     <contour>
       <point x="780" y="0" type="move" name="bottom"/>
     </contour>
+    <contour>
+      <point x="1176" y="608" type="line" smooth="yes"/>
+      <point x="1176" y="320"/>
+      <point x="956" y="208"/>
+      <point x="780" y="208" type="curve" smooth="yes"/>
+      <point x="584" y="208"/>
+      <point x="444" y="336"/>
+      <point x="444" y="560" type="curve" smooth="yes"/>
+      <point x="444" y="1536" type="line"/>
+      <point x="208" y="1536" type="line"/>
+      <point x="208" y="560" type="line" smooth="yes"/>
+      <point x="208" y="156"/>
+      <point x="480" y="-20"/>
+      <point x="704" y="-20" type="curve" smooth="yes"/>
+      <point x="936" y="-20"/>
+      <point x="1084" y="100"/>
+      <point x="1160" y="216" type="curve"/>
+      <point x="1176" y="216" type="line"/>
+      <point x="1176" y="0" type="line"/>
+      <point x="1412" y="0" type="line"/>
+      <point x="1412" y="1536" type="line"/>
+      <point x="1176" y="1536" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ubar.glif b/src/Inter-UI-Regular.ufo/glyphs/ubar.glif
index c816cff1f..588345b87 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ubar.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ubar.glif
@@ -3,13 +3,6 @@
   <advance width="1732"/>
   <unicode hex="0289"/>
   <outline>
-    <contour>
-      <point x="1732" y="996" type="line"/>
-      <point x="0" y="996" type="line"/>
-      <point x="0" y="796" type="line"/>
-      <point x="1732" y="796" type="line"/>
-    </contour>
-    <component base="u" xOffset="56"/>
     <contour>
       <point x="756" y="1776" type="move" name="top"/>
     </contour>
@@ -19,6 +12,13 @@
     <contour>
       <point x="1656" y="1776" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="1732" y="996" type="line"/>
+      <point x="0" y="996" type="line"/>
+      <point x="0" y="796" type="line"/>
+      <point x="1732" y="796" type="line"/>
+    </contour>
+    <component base="u" xOffset="56"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uhorn.glif b/src/Inter-UI-Regular.ufo/glyphs/uhorn.glif
index cf7a9f3d0..e93b90eb7 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uhorn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uhorn.glif
@@ -3,17 +3,6 @@
   <advance width="1736"/>
   <unicode hex="01B0"/>
   <outline>
-    <contour>
-      <point x="1592" y="1604" type="line"/>
-      <point x="1592" y="1396"/>
-      <point x="1588" y="1308"/>
-      <point x="1340" y="1308" type="curve"/>
-      <point x="1340" y="1144" type="line"/>
-      <point x="1700" y="1144"/>
-      <point x="1800" y="1300"/>
-      <point x="1800" y="1604" type="curve"/>
-    </contour>
-    <component base="u"/>
     <contour>
       <point x="824" y="1792" type="move" name="top"/>
     </contour>
@@ -29,6 +18,17 @@
     <contour>
       <point x="776" y="0" type="move" name="bottom"/>
     </contour>
+    <contour>
+      <point x="1592" y="1604" type="line"/>
+      <point x="1592" y="1396"/>
+      <point x="1588" y="1308"/>
+      <point x="1340" y="1308" type="curve"/>
+      <point x="1340" y="1144" type="line"/>
+      <point x="1700" y="1144"/>
+      <point x="1800" y="1300"/>
+      <point x="1800" y="1604" type="curve"/>
+    </contour>
+    <component base="u"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni0069.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni0069.ccmp.glif
index bc272d173..a2f953167 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni0069.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni0069.ccmp.glif
@@ -2,7 +2,6 @@
 <glyph name="uni0069.ccmp" format="1">
   <advance width="736"/>
   <outline>
-    <component base="dotlessi" xOffset="-8"/>
     <contour>
       <point x="344" y="1776" type="move" name="top"/>
     </contour>
@@ -12,6 +11,7 @@
     <contour>
       <point x="340" y="16" type="move" name="bottom"/>
     </contour>
+    <component base="dotlessi" xOffset="-8"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni006A_.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni006A_.ccmp.glif
index 454eda6de..802081d7a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni006A_.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni006A_.ccmp.glif
@@ -2,7 +2,6 @@
 <glyph name="uni006A.ccmp" format="1">
   <advance width="696"/>
   <outline>
-    <component base="dotlessj" xOffset="44"/>
     <contour>
       <point x="416" y="1716" type="move" name="top"/>
     </contour>
@@ -12,6 +11,7 @@
     <contour>
       <point x="304" y="-632" type="move" name="bottom"/>
     </contour>
+    <component base="dotlessj" xOffset="44"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni012F_.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni012F_.ccmp.glif
index 13430da1a..57e8c8bb8 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni012F_.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni012F_.ccmp.glif
@@ -2,8 +2,6 @@
 <glyph name="uni012F.ccmp" format="1">
   <advance width="736"/>
   <outline>
-    <component base="dotlessi" xOffset="124"/>
-    <component base="ogonek" xOffset="48" yOffset="16"/>
     <contour>
       <point x="480" y="1776" type="move" name="top"/>
     </contour>
@@ -13,6 +11,8 @@
     <contour>
       <point x="472" y="-632" type="move" name="bottom"/>
     </contour>
+    <component base="dotlessi" xOffset="124"/>
+    <component base="ogonek" xOffset="48" yOffset="16"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni0243.glif b/src/Inter-UI-Regular.ufo/glyphs/uni0243.glif
index c2f80e83a..4ce5bd13a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni0243.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni0243.glif
@@ -3,8 +3,6 @@
   <advance width="1780"/>
   <unicode hex="0243"/>
   <outline>
-    <component base="B"/>
-    <component base="crossbar" xOffset="-188" yOffset="-432"/>
     <contour>
       <point x="776" y="2216" type="move" name="top"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="776" y="16" type="move" name="bottom"/>
     </contour>
+    <component base="B"/>
+    <component base="crossbar" xOffset="-188" yOffset="-432"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni0244.glif b/src/Inter-UI-Regular.ufo/glyphs/uni0244.glif
index 76e06ad79..7c1903767 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni0244.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni0244.glif
@@ -3,13 +3,6 @@
   <advance width="2068"/>
   <unicode hex="0244"/>
   <outline>
-    <contour>
-      <point x="2084" y="1188" type="line"/>
-      <point x="-16" y="1188" type="line"/>
-      <point x="-16" y="1024" type="line"/>
-      <point x="2084" y="1024" type="line"/>
-    </contour>
-    <component base="U"/>
     <contour>
       <point x="908" y="2200" type="move" name="top"/>
     </contour>
@@ -19,6 +12,13 @@
     <contour>
       <point x="2008" y="2200" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="2084" y="1188" type="line"/>
+      <point x="-16" y="1188" type="line"/>
+      <point x="-16" y="1024" type="line"/>
+      <point x="2084" y="1024" type="line"/>
+    </contour>
+    <component base="U"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni0248.glif b/src/Inter-UI-Regular.ufo/glyphs/uni0248.glif
index 59c35f64c..7a220a022 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni0248.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni0248.glif
@@ -3,8 +3,6 @@
   <advance width="1448"/>
   <unicode hex="0248"/>
   <outline>
-    <component base="J"/>
-    <component base="crossbar" xOffset="364" yOffset="96"/>
     <contour>
       <point x="1192" y="2200" type="move" name="top"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="704" y="-16" type="move" name="bottom"/>
     </contour>
+    <component base="J"/>
+    <component base="crossbar" xOffset="364" yOffset="96"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni0249.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni0249.ccmp.glif
index f80cb2e1a..541cabd3e 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni0249.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni0249.ccmp.glif
@@ -2,8 +2,6 @@
 <glyph name="uni0249.ccmp" format="1">
   <advance width="992"/>
   <outline>
-    <component base="dotlessj" xOffset="140"/>
-    <component base="crossbar" xOffset="-140" yOffset="-164"/>
     <contour>
       <point x="512" y="1716" type="move" name="top"/>
     </contour>
@@ -13,6 +11,8 @@
     <contour>
       <point x="512" y="-632" type="move" name="bottom"/>
     </contour>
+    <component base="dotlessj" xOffset="140"/>
+    <component base="crossbar" xOffset="-140" yOffset="-164"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni0249.glif b/src/Inter-UI-Regular.ufo/glyphs/uni0249.glif
index a18c0844e..b68ef7eb2 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni0249.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni0249.glif
@@ -3,8 +3,6 @@
   <advance width="880"/>
   <unicode hex="0249"/>
   <outline>
-    <component base="j" xOffset="112"/>
-    <component base="crossbar" xOffset="-188" yOffset="-164"/>
     <contour>
       <point x="616" y="2200" type="move" name="top"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="572" y="-632" type="move" name="bottom"/>
     </contour>
+    <component base="j" xOffset="112"/>
+    <component base="crossbar" xOffset="-188" yOffset="-164"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni024C_.glif b/src/Inter-UI-Regular.ufo/glyphs/uni024C_.glif
index e283d9457..dac70a602 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni024C_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni024C_.glif
@@ -3,6 +3,15 @@
   <advance width="1780"/>
   <unicode hex="024C"/>
   <outline>
+    <contour>
+      <point x="936" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="936" y="16" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1912" y="2200" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="248" y="2048" type="line"/>
       <point x="248" y="0" type="line"/>
@@ -33,15 +42,6 @@
       <point x="1212" y="900" type="line"/>
       <point x="932" y="900" type="line"/>
     </contour>
-    <contour>
-      <point x="936" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="936" y="16" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1912" y="2200" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni024D_.glif b/src/Inter-UI-Regular.ufo/glyphs/uni024D_.glif
index e453264f9..cef04a12b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni024D_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni024D_.glif
@@ -3,8 +3,6 @@
   <advance width="1116"/>
   <unicode hex="024D"/>
   <outline>
-    <component base="r" xOffset="56"/>
-    <component base="crossbar" xOffset="-252" yOffset="-268"/>
     <contour>
       <point x="488" y="1776" type="move" name="top"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="380" y="16" type="move" name="bottom"/>
     </contour>
+    <component base="r" xOffset="56"/>
+    <component base="crossbar" xOffset="-252" yOffset="-268"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni024F_.glif b/src/Inter-UI-Regular.ufo/glyphs/uni024F_.glif
index 188963708..2fa167442 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni024F_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni024F_.glif
@@ -3,13 +3,6 @@
   <advance width="1504"/>
   <unicode hex="024F"/>
   <outline>
-    <contour>
-      <point x="1428" y="1096" type="line"/>
-      <point x="84" y="1096" type="line"/>
-      <point x="84" y="912" type="line"/>
-      <point x="1428" y="912" type="line"/>
-    </contour>
-    <component base="y"/>
     <contour>
       <point x="648" y="1776" type="move" name="top"/>
     </contour>
@@ -19,6 +12,13 @@
     <contour>
       <point x="1392" y="1776" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="1428" y="1096" type="line"/>
+      <point x="84" y="1096" type="line"/>
+      <point x="84" y="912" type="line"/>
+      <point x="1428" y="912" type="line"/>
+    </contour>
+    <component base="y"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni0268.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni0268.ccmp.glif
index 8da8d505c..593a11233 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni0268.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni0268.ccmp.glif
@@ -2,8 +2,6 @@
 <glyph name="uni0268.ccmp" format="1">
   <advance width="992"/>
   <outline>
-    <component base="dotlessi" xOffset="156"/>
-    <component base="crossbar" xOffset="-148" yOffset="-164"/>
     <contour>
       <point x="512" y="1776" type="move" name="top"/>
     </contour>
@@ -13,6 +11,8 @@
     <contour>
       <point x="504" y="16" type="move" name="bottom"/>
     </contour>
+    <component base="dotlessi" xOffset="156"/>
+    <component base="crossbar" xOffset="-148" yOffset="-164"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni029D_.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni029D_.ccmp.glif
index c67d1303c..0418a2308 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni029D_.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni029D_.ccmp.glif
@@ -2,6 +2,15 @@
 <glyph name="uni029D.ccmp" format="1">
   <advance width="1248"/>
   <outline>
+    <contour>
+      <point x="788" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="784" y="-632" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1208" y="1776" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1180" y="132" type="line"/>
       <point x="464" y="132" type="line" smooth="yes"/>
@@ -29,15 +38,6 @@
       <point x="1180" y="-88" type="line"/>
     </contour>
     <component base="dotlessi" xOffset="436"/>
-    <contour>
-      <point x="788" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="784" y="-632" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1208" y="1776" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni02AB__.glif b/src/Inter-UI-Regular.ufo/glyphs/uni02AB__.glif
index 54d60c881..8a462645d 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni02AB__.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni02AB__.glif
@@ -3,6 +3,15 @@
   <advance width="1760"/>
   <unicode hex="02AB"/>
   <outline>
+    <contour>
+      <point x="980" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="980" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1684" y="2200" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1588" y="220" type="line"/>
       <point x="416" y="220" type="line"/>
@@ -24,15 +33,6 @@
       <point x="1432" y="1268" type="line"/>
     </contour>
     <component base="l" xOffset="-84"/>
-    <contour>
-      <point x="980" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="980" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1684" y="2200" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni034A_.glif b/src/Inter-UI-Regular.ufo/glyphs/uni034A_.glif
index a08f92564..a213e898e 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni034A_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni034A_.glif
@@ -3,6 +3,12 @@
   <advance width="0"/>
   <unicode hex="034A"/>
   <outline>
+    <contour>
+      <point x="-807" y="1727" type="move" name="_marktop"/>
+    </contour>
+    <contour>
+      <point x="-807" y="2263" type="move" name="mkmktop"/>
+    </contour>
     <contour>
       <point x="-741" y="2164" type="line"/>
       <point x="-1002" y="1715" type="line"/>
@@ -10,12 +16,6 @@
       <point x="-611" y="2080" type="line"/>
     </contour>
     <component base="tilde" xOffset="-1474"/>
-    <contour>
-      <point x="-807" y="1727" type="move" name="_marktop"/>
-    </contour>
-    <contour>
-      <point x="-807" y="2263" type="move" name="mkmktop"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni0357.glif b/src/Inter-UI-Regular.ufo/glyphs/uni0357.glif
index c6a1e93b8..95f5267e1 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni0357.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni0357.glif
@@ -3,13 +3,13 @@
   <advance width="0"/>
   <unicode hex="0357"/>
   <outline>
-    <component base="ringhalfright" xOffset="-1005"/>
     <contour>
       <point x="-880" y="1526" type="move" name="_marktop"/>
     </contour>
     <contour>
       <point x="-880" y="2129" type="move" name="mkmktop"/>
     </contour>
+    <component base="ringhalfright" xOffset="-1005"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni037B_.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/uni037B_.cn.glif
deleted file mode 100644
index e63dd9311..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/uni037B_.cn.glif
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni037B.cn" format="1">
-  <advance width="1504"/>
-  <outline>
-    <contour>
-      <point x="120" y="472" type="line"/>
-      <point x="136" y="176"/>
-      <point x="400" y="-28"/>
-      <point x="716" y="-28" type="curve" smooth="yes"/>
-      <point x="1172" y="-28"/>
-      <point x="1384" y="232"/>
-      <point x="1384" y="660" type="curve" smooth="yes"/>
-      <point x="1384" y="828" type="line" smooth="yes"/>
-      <point x="1384" y="1256"/>
-      <point x="1172" y="1516"/>
-      <point x="716" y="1516" type="curve" smooth="yes"/>
-      <point x="364" y="1516"/>
-      <point x="136" y="1312"/>
-      <point x="120" y="976" type="curve"/>
-      <point x="380" y="976" type="line"/>
-      <point x="396" y="1184"/>
-      <point x="516" y="1296"/>
-      <point x="716" y="1296" type="curve" smooth="yes"/>
-      <point x="1024" y="1296"/>
-      <point x="1112" y="1108"/>
-      <point x="1112" y="828" type="curve" smooth="yes"/>
-      <point x="1112" y="660" type="line" smooth="yes"/>
-      <point x="1112" y="380"/>
-      <point x="1028" y="192"/>
-      <point x="716" y="192" type="curve" smooth="yes"/>
-      <point x="540" y="192"/>
-      <point x="396" y="276"/>
-      <point x="380" y="472" 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': 1480, 'leftMargin': 88, 'rightMargin': 127}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni037D_.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/uni037D_.cn.glif
deleted file mode 100644
index 8258cc715..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/uni037D_.cn.glif
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni037D.cn" format="1">
-  <advance width="1504"/>
-  <outline>
-    <contour>
-      <point x="120" y="472" type="line"/>
-      <point x="136" y="176"/>
-      <point x="400" y="-28"/>
-      <point x="716" y="-28" type="curve" smooth="yes"/>
-      <point x="1172" y="-28"/>
-      <point x="1384" y="232"/>
-      <point x="1384" y="660" type="curve" smooth="yes"/>
-      <point x="1384" y="828" type="line" smooth="yes"/>
-      <point x="1384" y="1256"/>
-      <point x="1172" y="1516"/>
-      <point x="716" y="1516" type="curve" smooth="yes"/>
-      <point x="364" y="1516"/>
-      <point x="136" y="1312"/>
-      <point x="120" y="976" type="curve"/>
-      <point x="380" y="976" type="line"/>
-      <point x="396" y="1184"/>
-      <point x="516" y="1296"/>
-      <point x="716" y="1296" type="curve" smooth="yes"/>
-      <point x="1024" y="1296"/>
-      <point x="1112" y="1108"/>
-      <point x="1112" y="828" type="curve" smooth="yes"/>
-      <point x="1112" y="660" type="line" smooth="yes"/>
-      <point x="1112" y="380"/>
-      <point x="1028" y="192"/>
-      <point x="716" y="192" type="curve" smooth="yes"/>
-      <point x="540" y="192"/>
-      <point x="396" y="276"/>
-      <point x="380" y="472" type="curve"/>
-    </contour>
-    <contour>
-      <point x="712" y="588" type="curve" smooth="yes"/>
-      <point x="816" y="588"/>
-      <point x="868" y="656"/>
-      <point x="868" y="740" type="curve" smooth="yes"/>
-      <point x="868" y="824"/>
-      <point x="816" y="892"/>
-      <point x="712" y="892" type="curve" smooth="yes"/>
-      <point x="604" y="892"/>
-      <point x="552" y="824"/>
-      <point x="552" y="740" type="curve" smooth="yes"/>
-      <point x="552" y="656"/>
-      <point x="604" 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': 1480, 'leftMargin': 88, 'rightMargin': 127}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni03F3_.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni03F3_.ccmp.glif
index 825706886..07946944a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni03F3_.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni03F3_.ccmp.glif
@@ -2,7 +2,6 @@
 <glyph name="uni03F3.ccmp" format="1">
   <advance width="736"/>
   <outline>
-    <component base="dotlessj" xOffset="-16"/>
     <contour>
       <point x="360" y="1716" type="move" name="top"/>
     </contour>
@@ -12,6 +11,7 @@
     <contour>
       <point x="360" y="-632" type="move" name="bottom"/>
     </contour>
+    <component base="dotlessj" xOffset="-16"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni03FD__.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/uni03FD__.cn.glif
deleted file mode 100644
index 21b9f2c2c..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/uni03FD__.cn.glif
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni03FD.cn" format="1">
-  <advance width="1760"/>
-  <outline>
-    <contour>
-      <point x="112" y="640" type="line"/>
-      <point x="136" y="232"/>
-      <point x="388" y="-28"/>
-      <point x="876" y="-28" type="curve" smooth="yes"/>
-      <point x="1352" y="-28"/>
-      <point x="1652" y="304"/>
-      <point x="1652" y="820" type="curve" smooth="yes"/>
-      <point x="1652" y="1180" type="line" smooth="yes"/>
-      <point x="1652" y="1696"/>
-      <point x="1352" y="2032"/>
-      <point x="848" y="2032" type="curve" smooth="yes"/>
-      <point x="392" y="2032"/>
-      <point x="136" y="1784"/>
-      <point x="112" y="1356" type="curve"/>
-      <point x="396" y="1356" type="line"/>
-      <point x="424" y="1664"/>
-      <point x="548" y="1800"/>
-      <point x="848" y="1800" type="curve" smooth="yes"/>
-      <point x="1200" y="1800"/>
-      <point x="1364" y="1556"/>
-      <point x="1364" y="1184" type="curve" smooth="yes"/>
-      <point x="1364" y="820" type="line" smooth="yes"/>
-      <point x="1364" y="480"/>
-      <point x="1228" y="200"/>
-      <point x="876" y="200" type="curve" smooth="yes"/>
-      <point x="540" y="200"/>
-      <point x="428" y="332"/>
-      <point x="396" y="640" 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': 1836, 'leftMargin': 121, 'rightMargin': 176}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni03FF__.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/uni03FF__.cn.glif
deleted file mode 100644
index 92ccf79c4..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/uni03FF__.cn.glif
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni03FF.cn" format="1">
-  <advance width="1760"/>
-  <outline>
-    <contour>
-      <point x="112" y="640" type="line"/>
-      <point x="136" y="232"/>
-      <point x="388" y="-28"/>
-      <point x="876" y="-28" type="curve" smooth="yes"/>
-      <point x="1352" y="-28"/>
-      <point x="1652" y="304"/>
-      <point x="1652" y="820" type="curve" smooth="yes"/>
-      <point x="1652" y="1180" type="line" smooth="yes"/>
-      <point x="1652" y="1696"/>
-      <point x="1352" y="2032"/>
-      <point x="848" y="2032" type="curve" smooth="yes"/>
-      <point x="392" y="2032"/>
-      <point x="136" y="1784"/>
-      <point x="112" y="1356" type="curve"/>
-      <point x="396" y="1356" type="line"/>
-      <point x="424" y="1664"/>
-      <point x="548" y="1800"/>
-      <point x="848" y="1800" type="curve" smooth="yes"/>
-      <point x="1200" y="1800"/>
-      <point x="1364" y="1556"/>
-      <point x="1364" y="1184" type="curve" smooth="yes"/>
-      <point x="1364" y="820" type="line" smooth="yes"/>
-      <point x="1364" y="480"/>
-      <point x="1228" y="200"/>
-      <point x="876" y="200" type="curve" smooth="yes"/>
-      <point x="540" y="200"/>
-      <point x="428" y="332"/>
-      <point x="396" y="640" type="curve"/>
-    </contour>
-    <contour>
-      <point x="680" y="1000" type="curve" smooth="yes"/>
-      <point x="680" y="916"/>
-      <point x="732" y="852"/>
-      <point x="836" y="852" type="curve" smooth="yes"/>
-      <point x="944" y="852"/>
-      <point x="996" y="916"/>
-      <point x="996" y="1000" type="curve" smooth="yes"/>
-      <point x="996" y="1084"/>
-      <point x="944" y="1152"/>
-      <point x="836" y="1152" type="curve" smooth="yes"/>
-      <point x="732" y="1152"/>
-      <point x="680" y="1084"/>
-    </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': 1836, 'leftMargin': 121, 'rightMargin': 176}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni0456.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni0456.ccmp.glif
index e327506e4..e87f4d711 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni0456.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni0456.ccmp.glif
@@ -2,7 +2,6 @@
 <glyph name="uni0456.ccmp" format="1">
   <advance width="736"/>
   <outline>
-    <component base="dotlessi" xOffset="-8"/>
     <contour>
       <point x="344" y="1776" type="move" name="top"/>
     </contour>
@@ -12,6 +11,7 @@
     <contour>
       <point x="340" y="16" type="move" name="bottom"/>
     </contour>
+    <component base="dotlessi" xOffset="-8"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni0458.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni0458.ccmp.glif
index f2607eb7a..a3381beed 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni0458.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni0458.ccmp.glif
@@ -2,7 +2,6 @@
 <glyph name="uni0458.ccmp" format="1">
   <advance width="768"/>
   <outline>
-    <component base="dotlessj" xOffset="176"/>
     <contour>
       <point x="548" y="1716" type="move" name="top"/>
     </contour>
@@ -12,6 +11,7 @@
     <contour>
       <point x="548" y="-632" type="move" name="bottom"/>
     </contour>
+    <component base="dotlessj" xOffset="176"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni048A_.glif b/src/Inter-UI-Regular.ufo/glyphs/uni048A_.glif
index 365e7afc1..e044896e2 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni048A_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni048A_.glif
@@ -3,15 +3,15 @@
   <advance width="2272"/>
   <unicode hex="048A"/>
   <outline>
-    <component base="afii10026" xOffset="-48"/>
-    <component base="breve" xOffset="368" yOffset="444"/>
-    <component base="comma" xOffset="1520" yOffset="-100"/>
     <contour>
       <point x="996" y="2688" type="move" name="top"/>
     </contour>
     <contour>
       <point x="1960" y="2216" type="move" name="top0315"/>
     </contour>
+    <component base="afii10026" xOffset="-48"/>
+    <component base="breve" xOffset="368" yOffset="444"/>
+    <component base="comma" xOffset="1520" yOffset="-100"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni048B_.glif b/src/Inter-UI-Regular.ufo/glyphs/uni048B_.glif
index b6c8dbda6..7ddd825ff 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni048B_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni048B_.glif
@@ -3,15 +3,15 @@
   <advance width="1760"/>
   <unicode hex="048B"/>
   <outline>
-    <component base="iicyrillic" xOffset="-84"/>
-    <component base="breve" xOffset="144" yOffset="-28"/>
-    <component base="comma" xOffset="1168" yOffset="-100"/>
     <contour>
       <point x="732" y="2136" type="move" name="top"/>
     </contour>
     <contour>
       <point x="1552" y="1744" type="move" name="top0315"/>
     </contour>
+    <component base="iicyrillic" xOffset="-84"/>
+    <component base="breve" xOffset="144" yOffset="-28"/>
+    <component base="comma" xOffset="1168" yOffset="-100"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni04C6_.glif b/src/Inter-UI-Regular.ufo/glyphs/uni04C6_.glif
index a398e2846..3f232a38d 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni04C6_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni04C6_.glif
@@ -3,11 +3,11 @@
   <advance width="1760"/>
   <unicode hex="04C6"/>
   <outline>
-    <component base="elcyrillic" xOffset="-48"/>
-    <component base="comma" xOffset="1208" yOffset="-100"/>
     <contour>
       <point x="1592" y="1744" type="move" name="top0315"/>
     </contour>
+    <component base="elcyrillic" xOffset="-48"/>
+    <component base="comma" xOffset="1208" yOffset="-100"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni04C9_.glif b/src/Inter-UI-Regular.ufo/glyphs/uni04C9_.glif
index 978c4c681..a05bd6a79 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni04C9_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni04C9_.glif
@@ -3,8 +3,6 @@
   <advance width="2032"/>
   <unicode hex="04C9"/>
   <outline>
-    <component base="H" xOffset="-52"/>
-    <component base="comma" xOffset="1492" yOffset="-100"/>
     <contour>
       <point x="1960" y="2200" type="move" name="top_dd"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="1960" y="2216" type="move" name="top0315"/>
     </contour>
+    <component base="H" xOffset="-52"/>
+    <component base="comma" xOffset="1492" yOffset="-100"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni04CA__.glif b/src/Inter-UI-Regular.ufo/glyphs/uni04CA__.glif
index a91f74d36..e0432e29c 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni04CA__.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni04CA__.glif
@@ -3,11 +3,11 @@
   <advance width="1760"/>
   <unicode hex="04CA"/>
   <outline>
-    <component base="encyrillic" xOffset="-84"/>
-    <component base="comma" xOffset="1168" yOffset="-100"/>
     <contour>
       <point x="1552" y="1744" type="move" name="top0315"/>
     </contour>
+    <component base="encyrillic" xOffset="-84"/>
+    <component base="comma" xOffset="1168" yOffset="-100"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni04CD__.glif b/src/Inter-UI-Regular.ufo/glyphs/uni04CD__.glif
index a4392a6b0..dbc9f0985 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni04CD__.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni04CD__.glif
@@ -3,8 +3,6 @@
   <advance width="2404"/>
   <unicode hex="04CD"/>
   <outline>
-    <component base="M"/>
-    <component base="comma" xOffset="1800" yOffset="-100"/>
     <contour>
       <point x="2464" y="2200" type="move" name="top_dd"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="2464" y="2200" type="move" name="top0315"/>
     </contour>
+    <component base="M"/>
+    <component base="comma" xOffset="1800" yOffset="-100"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni04CE__.glif b/src/Inter-UI-Regular.ufo/glyphs/uni04CE__.glif
index 7a8cb9e61..5ad158c42 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni04CE__.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni04CE__.glif
@@ -3,11 +3,11 @@
   <advance width="2272"/>
   <unicode hex="04CE"/>
   <outline>
-    <component base="emcyrillic" xOffset="-72"/>
-    <component base="comma" xOffset="1644" yOffset="-100"/>
     <contour>
       <point x="2024" y="1744" type="move" name="top0315"/>
     </contour>
+    <component base="emcyrillic" xOffset="-72"/>
+    <component base="comma" xOffset="1644" yOffset="-100"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni04FC__.glif b/src/Inter-UI-Regular.ufo/glyphs/uni04FC__.glif
index b5cd6c1b4..7d10781f5 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni04FC__.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni04FC__.glif
@@ -3,8 +3,6 @@
   <advance width="1824"/>
   <unicode hex="04FC"/>
   <outline>
-    <component base="X"/>
-    <component base="cyrillichook" xOffset="1112" yOffset="24"/>
     <contour>
       <point x="1776" y="2200" type="move" name="top_dd"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="1776" y="2216" type="move" name="top0315"/>
     </contour>
+    <component base="X"/>
+    <component base="cyrillichook" xOffset="1112" yOffset="24"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni04FD__.glif b/src/Inter-UI-Regular.ufo/glyphs/uni04FD__.glif
index 011131469..1884167ef 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni04FD__.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni04FD__.glif
@@ -3,8 +3,6 @@
   <advance width="1536"/>
   <unicode hex="04FD"/>
   <outline>
-    <component base="x" xOffset="-116"/>
-    <component base="cyrillichook" xOffset="840"/>
     <contour>
       <point x="1288" y="2200" type="move" name="top_dd"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="1288" y="1760" type="move" name="top0315"/>
     </contour>
+    <component base="x" xOffset="-116"/>
+    <component base="cyrillichook" xOffset="840"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni1FC0__.glif b/src/Inter-UI-Regular.ufo/glyphs/uni1FC0__.glif
index 7f9bd1584..138c69821 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni1FC0__.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni1FC0__.glif
@@ -3,10 +3,10 @@
   <advance width="1248"/>
   <unicode hex="1FC0"/>
   <outline>
-    <component base="tilde" xOffset="-16"/>
     <contour>
       <point x="572" y="1624" type="move" name="_top"/>
     </contour>
+    <component base="tilde" xOffset="-16"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni20DB__.glif b/src/Inter-UI-Regular.ufo/glyphs/uni20DB__.glif
index 3c8e5cc93..86c5454ed 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni20DB__.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni20DB__.glif
@@ -3,12 +3,12 @@
   <advance width="0"/>
   <unicode hex="20DB"/>
   <outline>
-    <component base="period" xOffset="-1788" yOffset="1788"/>
-    <component base="period" xOffset="-1178" yOffset="1788"/>
-    <component base="period" xOffset="-601" yOffset="1788"/>
     <contour>
       <point x="-829" y="1609" type="move" name="_marktop"/>
     </contour>
+    <component base="period" xOffset="-1788" yOffset="1788"/>
+    <component base="period" xOffset="-1178" yOffset="1788"/>
+    <component base="period" xOffset="-601" yOffset="1788"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni20DC__.glif b/src/Inter-UI-Regular.ufo/glyphs/uni20DC__.glif
index c9ce3b5ae..a9336ba75 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni20DC__.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni20DC__.glif
@@ -3,13 +3,13 @@
   <advance width="0"/>
   <unicode hex="20DC"/>
   <outline>
+    <contour>
+      <point x="-822" y="1609" type="move" name="_marktop"/>
+    </contour>
     <component base="period" xOffset="-2063" yOffset="1788"/>
     <component base="period" xOffset="-1453" yOffset="1788"/>
     <component base="period" xOffset="-876" yOffset="1788"/>
     <component base="period" xOffset="-312" yOffset="1788"/>
-    <contour>
-      <point x="-822" y="1609" type="move" name="_marktop"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni2183.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/uni2183.cn.glif
deleted file mode 100644
index 55c01efe7..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/uni2183.cn.glif
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2183.cn" format="1">
-  <advance width="1760"/>
-  <outline>
-    <contour>
-      <point x="112" y="640" type="line"/>
-      <point x="136" y="232"/>
-      <point x="388" y="-28"/>
-      <point x="876" y="-28" type="curve" smooth="yes"/>
-      <point x="1352" y="-28"/>
-      <point x="1652" y="304"/>
-      <point x="1652" y="820" type="curve" smooth="yes"/>
-      <point x="1652" y="1180" type="line" smooth="yes"/>
-      <point x="1652" y="1696"/>
-      <point x="1352" y="2032"/>
-      <point x="848" y="2032" type="curve" smooth="yes"/>
-      <point x="392" y="2032"/>
-      <point x="136" y="1784"/>
-      <point x="112" y="1356" type="curve"/>
-      <point x="396" y="1356" type="line"/>
-      <point x="424" y="1664"/>
-      <point x="548" y="1800"/>
-      <point x="848" y="1800" type="curve" smooth="yes"/>
-      <point x="1200" y="1800"/>
-      <point x="1364" y="1556"/>
-      <point x="1364" y="1184" type="curve" smooth="yes"/>
-      <point x="1364" y="820" type="line" smooth="yes"/>
-      <point x="1364" y="480"/>
-      <point x="1228" y="200"/>
-      <point x="876" y="200" type="curve" smooth="yes"/>
-      <point x="540" y="200"/>
-      <point x="428" y="332"/>
-      <point x="396" y="640" 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': 1836, 'leftMargin': 121, 'rightMargin': 176}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni2184.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/uni2184.cn.glif
deleted file mode 100644
index 74a4809bc..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/uni2184.cn.glif
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2184.cn" format="1">
-  <advance width="1504"/>
-  <outline>
-    <contour>
-      <point x="120" y="472" type="line"/>
-      <point x="136" y="176"/>
-      <point x="400" y="-28"/>
-      <point x="716" y="-28" type="curve" smooth="yes"/>
-      <point x="1172" y="-28"/>
-      <point x="1384" y="232"/>
-      <point x="1384" y="660" type="curve" smooth="yes"/>
-      <point x="1384" y="828" type="line" smooth="yes"/>
-      <point x="1384" y="1256"/>
-      <point x="1172" y="1516"/>
-      <point x="716" y="1516" type="curve" smooth="yes"/>
-      <point x="364" y="1516"/>
-      <point x="136" y="1312"/>
-      <point x="120" y="976" type="curve"/>
-      <point x="380" y="976" type="line"/>
-      <point x="396" y="1184"/>
-      <point x="516" y="1296"/>
-      <point x="716" y="1296" type="curve" smooth="yes"/>
-      <point x="1024" y="1296"/>
-      <point x="1112" y="1108"/>
-      <point x="1112" y="828" type="curve" smooth="yes"/>
-      <point x="1112" y="660" type="line" smooth="yes"/>
-      <point x="1112" y="380"/>
-      <point x="1028" y="192"/>
-      <point x="716" y="192" type="curve" smooth="yes"/>
-      <point x="540" y="192"/>
-      <point x="396" y="276"/>
-      <point x="380" y="472" type="curve"/>
-    </contour>
-  </outline>
-  <lib>
-    <dict>
-      <key>com.typemytype.robofont.mark</key>
-      <array>
-        <real>0.8029983485</real>
-        <real>0.9647658846</real>
-        <real>0.7954395628</real>
-        <real>1.0</real>
-      </array>
-      <key>interface.gridadjust.original</key>
-      <string>{'width': 1480, 'leftMargin': 88, 'rightMargin': 127}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni2185.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/uni2185.cn.glif
deleted file mode 100644
index e420d1a84..000000000
--- a/src/Inter-UI-Regular.ufo/glyphs/uni2185.cn.glif
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2185.cn" format="1">
-  <advance width="1760"/>
-  <outline>
-    <contour>
-      <point x="1648" y="640" type="line"/>
-      <point x="1364" y="640" type="line"/>
-      <point x="1364" y="-496" type="line"/>
-      <point x="1648" y="-496" type="line"/>
-    </contour>
-    <component base="C.cn" xOffset="-64"/>
-  </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': 1755, 'leftMargin': 175, 'rightMargin': 42}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/upsilon.glif b/src/Inter-UI-Regular.ufo/glyphs/upsilon.glif
index cead695ea..68a139e1b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/upsilon.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/upsilon.glif
@@ -3,6 +3,12 @@
   <advance width="1576"/>
   <unicode hex="03C5"/>
   <outline>
+    <contour>
+      <point x="768" y="1744" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1560" y="1744" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="208" y="1488" type="line"/>
       <point x="208" y="596" type="line"/>
@@ -27,12 +33,6 @@
       <point x="444" y="592" type="curve"/>
       <point x="444" y="1488" type="line"/>
     </contour>
-    <contour>
-      <point x="768" y="1744" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1560" y="1744" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/v.glif b/src/Inter-UI-Regular.ufo/glyphs/v.glif
index d8b935499..12c6643f2 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/v.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/v.glif
@@ -3,16 +3,6 @@
   <advance width="1504"/>
   <unicode hex="0076"/>
   <outline>
-    <contour>
-      <point x="1416" y="1536" type="line"/>
-      <point x="1176" y="1536" type="line"/>
-      <point x="760" y="364" type="line"/>
-      <point x="744" y="364" type="line"/>
-      <point x="328" y="1536" type="line"/>
-      <point x="88" y="1536" type="line"/>
-      <point x="640" y="0" type="line"/>
-      <point x="864" y="0" type="line"/>
-    </contour>
     <contour>
       <point x="752" y="1792" type="move" name="top"/>
     </contour>
@@ -28,6 +18,16 @@
     <contour>
       <point x="1392" y="1792" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="1416" y="1536" type="line"/>
+      <point x="1176" y="1536" type="line"/>
+      <point x="760" y="364" type="line"/>
+      <point x="744" y="364" type="line"/>
+      <point x="328" y="1536" type="line"/>
+      <point x="88" y="1536" type="line"/>
+      <point x="640" y="0" type="line"/>
+      <point x="864" y="0" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/vturn.glif b/src/Inter-UI-Regular.ufo/glyphs/vturn.glif
index c8b631a46..41d941b7e 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/vturn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/vturn.glif
@@ -3,7 +3,6 @@
   <advance width="1504"/>
   <unicode hex="028C"/>
   <outline>
-    <component base="v" xScale="-1.0" yScale="-1.0" xOffset="1504" yOffset="1536"/>
     <contour>
       <point x="748" y="1776" type="move" name="top"/>
     </contour>
@@ -13,6 +12,7 @@
     <contour>
       <point x="1436" y="1776" type="move" name="top0315"/>
     </contour>
+    <component base="v" xScale="-1.0" yScale="-1.0" xOffset="1504" yOffset="1536"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/w.glif b/src/Inter-UI-Regular.ufo/glyphs/w.glif
index a8dfdcd39..de5c1db0f 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/w.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/w.glif
@@ -3,24 +3,6 @@
   <advance width="2272"/>
   <unicode hex="0077"/>
   <outline>
-    <contour>
-      <point x="2184" y="1536" type="line"/>
-      <point x="1936" y="1536" type="line" smooth="yes"/>
-      <point x="1604" y="364" type="line"/>
-      <point x="1588" y="364" type="line"/>
-      <point x="1264" y="1536" type="line"/>
-      <point x="1012" y="1536" type="line"/>
-      <point x="684" y="360" type="line"/>
-      <point x="668" y="360" type="line"/>
-      <point x="336" y="1536" type="line" smooth="yes"/>
-      <point x="88" y="1536" type="line"/>
-      <point x="556" y="0" type="line"/>
-      <point x="788" y="0" type="line"/>
-      <point x="1124" y="1180" type="line"/>
-      <point x="1148" y="1180" type="line"/>
-      <point x="1484" y="0" type="line"/>
-      <point x="1716" y="0" type="line"/>
-    </contour>
     <contour>
       <point x="1136" y="1792" type="move" name="top"/>
     </contour>
@@ -39,6 +21,24 @@
     <contour>
       <point x="2100" y="1776" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="2184" y="1536" type="line"/>
+      <point x="1936" y="1536" type="line" smooth="yes"/>
+      <point x="1604" y="364" type="line"/>
+      <point x="1588" y="364" type="line"/>
+      <point x="1264" y="1536" type="line"/>
+      <point x="1012" y="1536" type="line"/>
+      <point x="684" y="360" type="line"/>
+      <point x="668" y="360" type="line"/>
+      <point x="336" y="1536" type="line" smooth="yes"/>
+      <point x="88" y="1536" type="line"/>
+      <point x="556" y="0" type="line"/>
+      <point x="788" y="0" type="line"/>
+      <point x="1124" y="1180" type="line"/>
+      <point x="1148" y="1180" type="line"/>
+      <point x="1484" y="0" type="line"/>
+      <point x="1716" y="0" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/wturn.glif b/src/Inter-UI-Regular.ufo/glyphs/wturn.glif
index afbaa4b30..ed674abe4 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/wturn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/wturn.glif
@@ -3,7 +3,6 @@
   <advance width="2272"/>
   <unicode hex="028D"/>
   <outline>
-    <component base="w" xScale="-1.0" yScale="-1.0" xOffset="2272" yOffset="1536"/>
     <contour>
       <point x="1136" y="1792" type="move" name="top"/>
     </contour>
@@ -13,6 +12,7 @@
     <contour>
       <point x="2192" y="1776" type="move" name="top0315"/>
     </contour>
+    <component base="w" xScale="-1.0" yScale="-1.0" xOffset="2272" yOffset="1536"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/x.glif b/src/Inter-UI-Regular.ufo/glyphs/x.glif
index 819998fa2..416fdc130 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/x.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/x.glif
@@ -3,20 +3,6 @@
   <advance width="1504"/>
   <unicode hex="0078"/>
   <outline>
-    <contour>
-      <point x="384" y="1536" type="line"/>
-      <point x="112" y="1536" type="line"/>
-      <point x="600" y="768" type="line"/>
-      <point x="112" y="0" type="line"/>
-      <point x="384" y="0" type="line"/>
-      <point x="752" y="596" type="line"/>
-      <point x="1120" y="0" type="line"/>
-      <point x="1392" y="0" type="line"/>
-      <point x="896" y="768" type="line"/>
-      <point x="1392" y="1536" type="line"/>
-      <point x="1120" y="1536" type="line"/>
-      <point x="752" y="908" type="line"/>
-    </contour>
     <contour>
       <point x="752" y="0" type="move" name="bottom"/>
     </contour>
@@ -38,6 +24,20 @@
     <contour>
       <point x="1388" y="1760" type="move" name="top0315"/>
     </contour>
+    <contour>
+      <point x="384" y="1536" type="line"/>
+      <point x="112" y="1536" type="line"/>
+      <point x="600" y="768" type="line"/>
+      <point x="112" y="0" type="line"/>
+      <point x="384" y="0" type="line"/>
+      <point x="752" y="596" type="line"/>
+      <point x="1120" y="0" type="line"/>
+      <point x="1392" y="0" type="line"/>
+      <point x="896" y="768" type="line"/>
+      <point x="1392" y="1536" type="line"/>
+      <point x="1120" y="1536" type="line"/>
+      <point x="752" y="908" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/yericyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/yericyrillic.glif
index 1aca40a4b..33b7b5beb 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/yericyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/yericyrillic.glif
@@ -3,14 +3,14 @@
   <advance width="2272"/>
   <unicode hex="044B"/>
   <outline>
-    <component base="softsigncyrillic" xOffset="72"/>
-    <component base="dotlessi" xOffset="1536"/>
     <contour>
       <point x="1156" y="1744" type="move" name="top"/>
     </contour>
     <contour>
       <point x="2276" y="1744" type="move" name="top0315"/>
     </contour>
+    <component base="softsigncyrillic" xOffset="72"/>
+    <component base="dotlessi" xOffset="1536"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/yturn.glif b/src/Inter-UI-Regular.ufo/glyphs/yturn.glif
index 6d2c8bd20..8a87cc2d4 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/yturn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/yturn.glif
@@ -3,7 +3,6 @@
   <advance width="1504.0"/>
   <unicode hex="028E"/>
   <outline>
-    <component base="y" xScale="-1.0" yScale="-1.0" xOffset="1504" yOffset="1536"/>
     <contour>
       <point x="732" y="2200" type="move" name="top"/>
     </contour>
@@ -13,6 +12,7 @@
     <contour>
       <point x="1412" y="2200" type="move" name="top0315"/>
     </contour>
+    <component base="y" xScale="-1.0" yScale="-1.0" xOffset="1504" yOffset="1536"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/z.glif b/src/Inter-UI-Regular.ufo/glyphs/z.glif
index f8ce13df7..033e9721c 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/z.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/z.glif
@@ -3,6 +3,21 @@
   <advance width="1508"/>
   <unicode hex="007A"/>
   <outline>
+    <contour>
+      <point x="752" y="1792" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="752" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1388" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1388" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1388" y="1776" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1356" y="220" type="line"/>
       <point x="272" y="220" type="line"/>
@@ -23,21 +38,6 @@
       <point x="152" y="1316" type="line"/>
       <point x="1216" y="1316" type="line"/>
     </contour>
-    <contour>
-      <point x="752" y="1792" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="752" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1388" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1388" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1388" y="1776" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/zbar.glif b/src/Inter-UI-Regular.ufo/glyphs/zbar.glif
index 133d5b546..ea65d19d5 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/zbar.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/zbar.glif
@@ -3,8 +3,6 @@
   <advance width="1508"/>
   <unicode hex="01B6"/>
   <outline>
-    <component base="z"/>
-    <component base="crossbar" xOffset="128" yOffset="-236"/>
     <contour>
       <point x="696" y="1776" type="move" name="top"/>
     </contour>
@@ -14,6 +12,8 @@
     <contour>
       <point x="1416" y="1776" type="move" name="top0315"/>
     </contour>
+    <component base="z"/>
+    <component base="crossbar" xOffset="128" yOffset="-236"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/zcurl.glif b/src/Inter-UI-Regular.ufo/glyphs/zcurl.glif
index a7e9ac162..49099cd20 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/zcurl.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/zcurl.glif
@@ -3,6 +3,15 @@
   <advance width="1704"/>
   <unicode hex="0291"/>
   <outline>
+    <contour>
+      <point x="648" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="648" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1696" y="1776" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="912" y="0" type="line"/>
       <point x="1056" y="0" type="line" smooth="yes"/>
@@ -41,15 +50,6 @@
       <point x="168" y="0" type="line"/>
       <point x="1036" y="0" type="line"/>
     </contour>
-    <contour>
-      <point x="648" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="648" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1696" y="1776" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/zrthook.glif b/src/Inter-UI-Regular.ufo/glyphs/zrthook.glif
index 6a08fcf5a..8e14edb3a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/zrthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/zrthook.glif
@@ -3,6 +3,15 @@
   <advance width="1508"/>
   <unicode hex="0290"/>
   <outline>
+    <contour>
+      <point x="608.0" y="1776.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="608.0" y="-616.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1452.0" y="1776.0" type="move" name="top0315"/>
+    </contour>
     <contour>
       <point x="1120" y="168" type="line"/>
       <point x="1120" y="-192" type="line" smooth="yes"/>
@@ -22,15 +31,6 @@
       <point x="1356" y="168" type="line"/>
     </contour>
     <component base="z"/>
-    <contour>
-      <point x="608.0" y="1776.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="608.0" y="-616.0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1452.0" y="1776.0" type="move" name="top0315"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/groups.plist b/src/Inter-UI-Regular.ufo/groups.plist
index 1e5a2d6c8..5724066b3 100644
--- a/src/Inter-UI-Regular.ufo/groups.plist
+++ b/src/Inter-UI-Regular.ufo/groups.plist
@@ -299,7 +299,6 @@
 		<string>eng</string>
 		<string>feng</string>
 		<string>nlfthook</string>
-		<string>end</string>
 		<string>hbar</string>
 		<string>agrave</string>
 		<string>aacute</string>
diff --git a/src/Inter-UI-Regular.ufo/kerning.plist b/src/Inter-UI-Regular.ufo/kerning.plist
index 5435a9d74..9492ff677 100644
--- a/src/Inter-UI-Regular.ufo/kerning.plist
+++ b/src/Inter-UI-Regular.ufo/kerning.plist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>@KERN_LEFT_A</key>
@@ -733,8 +733,6 @@
 		<integer>28</integer>
 		<key>Hbar</key>
 		<integer>42</integer>
-		<key>Lslash</key>
-		<integer>40</integer>
 		<key>Tbar</key>
 		<integer>40</integer>
 		<key>asciitilde</key>
@@ -2813,8 +2811,6 @@
 		<integer>69</integer>
 		<key>Hbar</key>
 		<integer>125</integer>
-		<key>Lslash</key>
-		<integer>41</integer>
 		<key>backslash</key>
 		<integer>164</integer>
 		<key>infinity</key>
@@ -3374,8 +3370,6 @@
 		<integer>42</integer>
 		<key>Hbar</key>
 		<integer>40</integer>
-		<key>Lslash</key>
-		<integer>41</integer>
 		<key>anoteleia</key>
 		<integer>41</integer>
 		<key>asciitilde</key>
@@ -3753,39 +3747,6 @@
 		<key>asterisk.case</key>
 		<integer>-96</integer>
 	</dict>
-	<key>Lslash</key>
-	<dict>
-		<key>@KERN_RIGHT_C</key>
-		<integer>-84</integer>
-		<key>@KERN_RIGHT_T</key>
-		<integer>-261</integer>
-		<key>@KERN_RIGHT_V</key>
-		<integer>-166</integer>
-		<key>@KERN_RIGHT_W</key>
-		<integer>-192</integer>
-		<key>@KERN_RIGHT_Y</key>
-		<integer>-260</integer>
-		<key>@KERN_RIGHT_asciicircum</key>
-		<integer>-220</integer>
-		<key>@KERN_RIGHT_dagger</key>
-		<integer>-192</integer>
-		<key>@KERN_RIGHT_divide</key>
-		<integer>-180</integer>
-		<key>@KERN_RIGHT_eight.sups</key>
-		<integer>-247</integer>
-		<key>@KERN_RIGHT_quotedbl</key>
-		<integer>-274</integer>
-		<key>@KERN_RIGHT_quotedblleft</key>
-		<integer>-331</integer>
-		<key>@KERN_RIGHT_quotedblright</key>
-		<integer>-345</integer>
-		<key>Tbar</key>
-		<integer>-178</integer>
-		<key>periodcentered</key>
-		<integer>-164</integer>
-		<key>question</key>
-		<integer>-137</integer>
-	</dict>
 	<key>Ohorn</key>
 	<dict>
 		<key>dotlessi</key>
@@ -5034,8 +4995,6 @@
 		<integer>-41</integer>
 		<key>@KERN_RIGHT_z</key>
 		<integer>-41</integer>
-		<key>Lslash</key>
-		<integer>54</integer>
 		<key>Tbar</key>
 		<integer>-83</integer>
 		<key>ampersand</key>
diff --git a/src/Inter-UI-Regular.ufo/lib.plist b/src/Inter-UI-Regular.ufo/lib.plist
index b4f6b1532..31fc15fd7 100644
--- a/src/Inter-UI-Regular.ufo/lib.plist
+++ b/src/Inter-UI-Regular.ufo/lib.plist
@@ -950,7 +950,6 @@
 				<string>uni215A</string>
 				<string>uni02E5_uni02E7_uni02E8</string>
 				<string>uni215F</string>
-				<string>uni2184.cn</string>
 				<string>macronacutecomb</string>
 				<string>crossbar</string>
 				<string>uni006A.ccmp</string>
@@ -1042,12 +1041,10 @@
 				<string>uni03F5</string>
 				<string>uni03F6</string>
 				<string>longs</string>
-				<string>Ghook.cn</string>
 				<string>tonebarextrahighmod</string>
 				<string>one.sup</string>
 				<string>dieresismacroncomb</string>
 				<string>trianglebullet</string>
-				<string>uni03FF.cn</string>
 				<string>Ysmallcap</string>
 				<string>uni03FB</string>
 				<string>uni03FD</string>
@@ -1067,8 +1064,6 @@
 				<string>uni037C</string>
 				<string>uni037B</string>
 				<string>uni037D</string>
-				<string>uni03FD.cn</string>
-				<string>srthook.cn</string>
 				<string>interrobang</string>
 				<string>primemod</string>
 				<string>uni213B</string>
@@ -1117,7 +1112,6 @@
 				<string>uni02E9_uni02E6</string>
 				<string>uni02E9_uni02E5</string>
 				<string>exclam1</string>
-				<string>q.cn</string>
 				<string>Digamma</string>
 				<string>candrabindunosp</string>
 				<string>qofdagesh</string>
@@ -1210,7 +1204,6 @@
 				<string>asterism</string>
 				<string>philatin</string>
 				<string>sixroman</string>
-				<string>st.cn</string>
 				<string>uni02E6_uni02E7_uni02E5</string>
 				<string>cyrillichookleft</string>
 				<string>uni03D8</string>
@@ -1241,7 +1234,6 @@
 				<string>cadauna</string>
 				<string>uni02E5_uni02E6_uni02E9</string>
 				<string>uni02E5_uni02E6_uni02E8</string>
-				<string>U.cn</string>
 				<string>uni035E</string>
 				<string>uni0220</string>
 				<string>uni0223</string>
@@ -1275,7 +1267,6 @@
 				<string>mcapturn</string>
 				<string>st</string>
 				<string>uni205D</string>
-				<string>Q.cn</string>
 				<string>uni02E7_uni02E5_uni02E6</string>
 				<string>uni02E7_uni02E5_uni02E7</string>
 				<string>uni02E7_uni02E5_uni02E5</string>
@@ -1323,7 +1314,6 @@
 				<string>tonebarmidmod</string>
 				<string>tonebarlowmod</string>
 				<string>tonebarextralowmod</string>
-				<string>p.cn</string>
 				<string>afii61664</string>
 				<string>uni1DC6</string>
 				<string>uni1DC4</string>
@@ -1371,14 +1361,12 @@
 				<string>uni02F2</string>
 				<string>dotmacroncomb.lc</string>
 				<string>fiveeighths</string>
-				<string>oopen.cn</string>
 				<string>uni02FE</string>
 				<string>uni02FD</string>
 				<string>uni02FF</string>
 				<string>uni02FA</string>
 				<string>uni02FC</string>
 				<string>uni02FB</string>
-				<string>uni2185.cn</string>
 				<string>angstrom</string>
 				<string>macrongravecomb.lc</string>
 				<string>macronsubnosp</string>
@@ -1432,16 +1420,13 @@
 				<string>tildedieresiscomb</string>
 				<string>tel</string>
 				<string>commasuprevnosp</string>
-				<string>uni2183.cn</string>
 				<string>hyphennobreak</string>
 				<string>archdblsubnosp</string>
 				<string>hsuper</string>
 				<string>deltaturn</string>
 				<string>published</string>
 				<string>wsuper</string>
-				<string>uni037D.cn</string>
 				<string>macronacutecomb.lc</string>
-				<string>c.cn</string>
 				<string>oopen_uni02DE</string>
 				<string>four.frac</string>
 				<string>onedotleader</string>
@@ -1472,7 +1457,6 @@
 				<string>uni1DC2</string>
 				<string>uni1DC1</string>
 				<string>uni1DC0</string>
-				<string>g.cn</string>
 				<string>uni02E9_uni02E7_uni02E5</string>
 				<string>uniFE28</string>
 				<string>hooksubretronosp</string>
@@ -1535,7 +1519,6 @@
 				<string>uni02E5_uni02E8_uni02E5</string>
 				<string>uni02E5_uni02E8_uni02E7</string>
 				<string>uni02E5_uni02E8_uni02E6</string>
-				<string>d.cn</string>
 				<string>uni035A</string>
 				<string>uni02E5_uni02E8_uni02E9</string>
 				<string>uni02E5_uni02E8_uni02E8</string>
@@ -1559,11 +1542,9 @@
 				<string>sampi</string>
 				<string>uni02E9_uni02E7_uni02E6</string>
 				<string>epsilon1revclosed_uni02DE</string>
-				<string>o.cn</string>
 				<string>uni02E9_uni02E7_uni02E7</string>
 				<string>uni02E5_uni02E9_uni02E5</string>
 				<string>eshshortrev</string>
-				<string>b.cn</string>
 				<string>ounce</string>
 				<string>vscript</string>
 				<string>acuterightnosp</string>
@@ -1572,14 +1553,11 @@
 				<string>tildevertsupnosp</string>
 				<string>dotmacroncomb</string>
 				<string>linevertdblnosp</string>
-				<string>s.cn</string>
 				<string>uni03F3.ccmp</string>
 				<string>macrondieresiscomb</string>
 				<string>jhookdblbar</string>
 				<string>six.frac</string>
-				<string>G.cn</string>
 				<string>seven.frac</string>
-				<string>C.cn</string>
 				<string>overline</string>
 				<string>ascript</string>
 				<string>seven.sup</string>
@@ -1654,7 +1632,6 @@
 				<string>underscoredblnosp</string>
 				<string>ysuper</string>
 				<string>tackrightsubnosp</string>
-				<string>D.cn</string>
 				<string>rsuper</string>
 				<string>Sampi</string>
 				<string>schwa</string>
@@ -1765,7 +1742,6 @@
 				<string>uni1DE0</string>
 				<string>uni1DE3</string>
 				<string>controlSOT</string>
-				<string>uni037B.cn</string>
 				<string>uniA92E</string>
 				<string>commaabovecmb</string>
 				<string>commaaboverightcmb</string>
@@ -2427,7 +2403,6 @@
 		<string>uni215A</string>
 		<string>uni02E5_uni02E7_uni02E8</string>
 		<string>uni215F</string>
-		<string>uni2184.cn</string>
 		<string>macronacutecomb</string>
 		<string>crossbar</string>
 		<string>uni006A.ccmp</string>
@@ -2519,12 +2494,10 @@
 		<string>uni03F5</string>
 		<string>uni03F6</string>
 		<string>longs</string>
-		<string>Ghook.cn</string>
 		<string>tonebarextrahighmod</string>
 		<string>one.sup</string>
 		<string>dieresismacroncomb</string>
 		<string>trianglebullet</string>
-		<string>uni03FF.cn</string>
 		<string>Ysmallcap</string>
 		<string>uni03FB</string>
 		<string>uni03FD</string>
@@ -2544,8 +2517,6 @@
 		<string>uni037C</string>
 		<string>uni037B</string>
 		<string>uni037D</string>
-		<string>uni03FD.cn</string>
-		<string>srthook.cn</string>
 		<string>interrobang</string>
 		<string>primemod</string>
 		<string>uni213B</string>
@@ -2594,7 +2565,6 @@
 		<string>uni02E9_uni02E6</string>
 		<string>uni02E9_uni02E5</string>
 		<string>exclam1</string>
-		<string>q.cn</string>
 		<string>Digamma</string>
 		<string>candrabindunosp</string>
 		<string>qofdagesh</string>
@@ -2687,7 +2657,6 @@
 		<string>asterism</string>
 		<string>philatin</string>
 		<string>sixroman</string>
-		<string>st.cn</string>
 		<string>uni02E6_uni02E7_uni02E5</string>
 		<string>cyrillichookleft</string>
 		<string>uni03D8</string>
@@ -2718,7 +2687,6 @@
 		<string>cadauna</string>
 		<string>uni02E5_uni02E6_uni02E9</string>
 		<string>uni02E5_uni02E6_uni02E8</string>
-		<string>U.cn</string>
 		<string>uni035E</string>
 		<string>uni0220</string>
 		<string>uni0223</string>
@@ -2752,7 +2720,6 @@
 		<string>mcapturn</string>
 		<string>st</string>
 		<string>uni205D</string>
-		<string>Q.cn</string>
 		<string>uni02E7_uni02E5_uni02E6</string>
 		<string>uni02E7_uni02E5_uni02E7</string>
 		<string>uni02E7_uni02E5_uni02E5</string>
@@ -2800,7 +2767,6 @@
 		<string>tonebarmidmod</string>
 		<string>tonebarlowmod</string>
 		<string>tonebarextralowmod</string>
-		<string>p.cn</string>
 		<string>afii61664</string>
 		<string>uni1DC6</string>
 		<string>uni1DC4</string>
@@ -2848,14 +2814,12 @@
 		<string>uni02F2</string>
 		<string>dotmacroncomb.lc</string>
 		<string>fiveeighths</string>
-		<string>oopen.cn</string>
 		<string>uni02FE</string>
 		<string>uni02FD</string>
 		<string>uni02FF</string>
 		<string>uni02FA</string>
 		<string>uni02FC</string>
 		<string>uni02FB</string>
-		<string>uni2185.cn</string>
 		<string>angstrom</string>
 		<string>macrongravecomb.lc</string>
 		<string>macronsubnosp</string>
@@ -2909,16 +2873,13 @@
 		<string>tildedieresiscomb</string>
 		<string>tel</string>
 		<string>commasuprevnosp</string>
-		<string>uni2183.cn</string>
 		<string>hyphennobreak</string>
 		<string>archdblsubnosp</string>
 		<string>hsuper</string>
 		<string>deltaturn</string>
 		<string>published</string>
 		<string>wsuper</string>
-		<string>uni037D.cn</string>
 		<string>macronacutecomb.lc</string>
-		<string>c.cn</string>
 		<string>oopen_uni02DE</string>
 		<string>four.frac</string>
 		<string>onedotleader</string>
@@ -2949,7 +2910,6 @@
 		<string>uni1DC2</string>
 		<string>uni1DC1</string>
 		<string>uni1DC0</string>
-		<string>g.cn</string>
 		<string>uni02E9_uni02E7_uni02E5</string>
 		<string>uniFE28</string>
 		<string>hooksubretronosp</string>
@@ -3012,7 +2972,6 @@
 		<string>uni02E5_uni02E8_uni02E5</string>
 		<string>uni02E5_uni02E8_uni02E7</string>
 		<string>uni02E5_uni02E8_uni02E6</string>
-		<string>d.cn</string>
 		<string>uni035A</string>
 		<string>uni02E5_uni02E8_uni02E9</string>
 		<string>uni02E5_uni02E8_uni02E8</string>
@@ -3036,11 +2995,9 @@
 		<string>sampi</string>
 		<string>uni02E9_uni02E7_uni02E6</string>
 		<string>epsilon1revclosed_uni02DE</string>
-		<string>o.cn</string>
 		<string>uni02E9_uni02E7_uni02E7</string>
 		<string>uni02E5_uni02E9_uni02E5</string>
 		<string>eshshortrev</string>
-		<string>b.cn</string>
 		<string>ounce</string>
 		<string>vscript</string>
 		<string>acuterightnosp</string>
@@ -3049,14 +3006,11 @@
 		<string>tildevertsupnosp</string>
 		<string>dotmacroncomb</string>
 		<string>linevertdblnosp</string>
-		<string>s.cn</string>
 		<string>uni03F3.ccmp</string>
 		<string>macrondieresiscomb</string>
 		<string>jhookdblbar</string>
 		<string>six.frac</string>
-		<string>G.cn</string>
 		<string>seven.frac</string>
-		<string>C.cn</string>
 		<string>overline</string>
 		<string>ascript</string>
 		<string>seven.sup</string>
@@ -3131,7 +3085,6 @@
 		<string>underscoredblnosp</string>
 		<string>ysuper</string>
 		<string>tackrightsubnosp</string>
-		<string>D.cn</string>
 		<string>rsuper</string>
 		<string>Sampi</string>
 		<string>schwa</string>
@@ -3242,7 +3195,6 @@
 		<string>uni1DE0</string>
 		<string>uni1DE3</string>
 		<string>controlSOT</string>
-		<string>uni037B.cn</string>
 		<string>uniA92E</string>
 		<string>commaabovecmb</string>
 		<string>commaaboverightcmb</string>
-- 
cgit v1.2.3