From cecb82a46c6146a6188629449c9336d3f88bf744 Mon Sep 17 00:00:00 2001
From: Rasmus Andersson <rasmus@notion.se>
Date: Sun, 26 Nov 2017 22:46:38 -0800
Subject: Anchor adjustments

Affected glyphs:
  Atilde_ E_ Idieresis_ OE__ Odieresis_ Otilde_ a adieresis ae atilde
  bullseye c casedieresis.cn casetilde.cn circumflex circumflexnosp
  circumflexsubnosp dieresis dotlessi ecyrillic edieresis f g h i j m n
  ntilde odieresis otilde tildecomb tildesubnosp trthook udieresis
  utilde v w wdieresis x y ydieresis z Atilde_ Otilde_ Q_ a atilde b
  bbar bullseye c casedieresis.cn casetilde.cn circumflex circumflexnosp
  circumflexsubnosp d dieresis dieresisnosp dotlessi f g h
  hadescendercyrillic i idieresis idieresisacute itilde k m n ntilde
  otilde p q r rdescend rrthook s tildecomb tildesubnosp trthook u
  uni04FD__ utilde v w wdieresis wturn x y ydieresis z
---
 src/Inter-UI-Black.ufo/glyphs/Atilde_.glif         |  2 +-
 src/Inter-UI-Black.ufo/glyphs/E_.glif              |  4 +-
 src/Inter-UI-Black.ufo/glyphs/Idieresis_.glif      |  2 +-
 src/Inter-UI-Black.ufo/glyphs/OE__.glif            | 30 +++++------
 src/Inter-UI-Black.ufo/glyphs/Odieresis_.glif      |  2 +-
 src/Inter-UI-Black.ufo/glyphs/Otilde_.glif         |  2 +-
 src/Inter-UI-Black.ufo/glyphs/a.glif               |  6 +--
 src/Inter-UI-Black.ufo/glyphs/adieresis.glif       |  2 +-
 src/Inter-UI-Black.ufo/glyphs/ae.glif              | 62 +++++++++++-----------
 src/Inter-UI-Black.ufo/glyphs/atilde.glif          |  2 +-
 src/Inter-UI-Black.ufo/glyphs/bullseye.glif        | 24 ++++-----
 src/Inter-UI-Black.ufo/glyphs/c.glif               |  4 +-
 src/Inter-UI-Black.ufo/glyphs/casedieresis.cn.glif |  3 --
 src/Inter-UI-Black.ufo/glyphs/casetilde.cn.glif    | 14 +++++
 src/Inter-UI-Black.ufo/glyphs/circumflex.glif      |  2 +-
 src/Inter-UI-Black.ufo/glyphs/circumflexnosp.glif  | 23 ++++++--
 .../glyphs/circumflexsubnosp.glif                  | 21 +++++++-
 src/Inter-UI-Black.ufo/glyphs/dieresis.glif        |  2 +-
 src/Inter-UI-Black.ufo/glyphs/dotlessi.glif        | 21 +++++++-
 src/Inter-UI-Black.ufo/glyphs/ecyrillic.glif       | 12 ++---
 src/Inter-UI-Black.ufo/glyphs/edieresis.glif       |  2 +-
 src/Inter-UI-Black.ufo/glyphs/f.glif               |  2 +-
 src/Inter-UI-Black.ufo/glyphs/g.glif               | 19 +------
 src/Inter-UI-Black.ufo/glyphs/h.glif               |  2 +-
 src/Inter-UI-Black.ufo/glyphs/i.glif               |  6 +--
 src/Inter-UI-Black.ufo/glyphs/j.glif               |  2 +-
 src/Inter-UI-Black.ufo/glyphs/m.glif               | 21 +++++++-
 src/Inter-UI-Black.ufo/glyphs/n.glif               | 21 +++++++-
 src/Inter-UI-Black.ufo/glyphs/ntilde.glif          |  2 +-
 src/Inter-UI-Black.ufo/glyphs/odieresis.glif       |  2 +-
 src/Inter-UI-Black.ufo/glyphs/otilde.glif          |  2 +-
 src/Inter-UI-Black.ufo/glyphs/tildecomb.glif       | 27 ++++++++--
 src/Inter-UI-Black.ufo/glyphs/tildesubnosp.glif    | 25 +++++++--
 src/Inter-UI-Black.ufo/glyphs/trthook.glif         | 12 ++---
 src/Inter-UI-Black.ufo/glyphs/udieresis.glif       |  2 +-
 src/Inter-UI-Black.ufo/glyphs/utilde.glif          |  2 +-
 src/Inter-UI-Black.ufo/glyphs/v.glif               | 16 +++++-
 src/Inter-UI-Black.ufo/glyphs/w.glif               |  4 +-
 src/Inter-UI-Black.ufo/glyphs/wdieresis.glif       |  2 +-
 src/Inter-UI-Black.ufo/glyphs/x.glif               | 17 ++++++
 src/Inter-UI-Black.ufo/glyphs/y.glif               | 23 ++++++--
 src/Inter-UI-Black.ufo/glyphs/ydieresis.glif       |  2 +-
 src/Inter-UI-Black.ufo/glyphs/z.glif               | 27 ++++++++--
 src/Inter-UI-Regular.ufo/glyphs/Atilde_.glif       |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/Otilde_.glif       |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/Q_.glif            |  8 +--
 src/Inter-UI-Regular.ufo/glyphs/a.glif             | 20 +++++--
 src/Inter-UI-Regular.ufo/glyphs/atilde.glif        |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/b.glif             |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/bbar.glif          |  6 +--
 src/Inter-UI-Regular.ufo/glyphs/bullseye.glif      | 24 ++++-----
 src/Inter-UI-Regular.ufo/glyphs/c.glif             |  6 +--
 .../glyphs/casedieresis.cn.glif                    |  3 --
 src/Inter-UI-Regular.ufo/glyphs/casetilde.cn.glif  |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/circumflex.glif    |  2 +-
 .../glyphs/circumflexnosp.glif                     |  6 +--
 .../glyphs/circumflexsubnosp.glif                  |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/d.glif             |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/dieresis.glif      |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/dieresisnosp.glif  | 23 ++++++--
 src/Inter-UI-Regular.ufo/glyphs/dotlessi.glif      |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/f.glif             |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/g.glif             |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/h.glif             |  2 +-
 .../glyphs/hadescendercyrillic.glif                |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/i.glif             |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/idieresis.glif     |  2 +-
 .../glyphs/idieresisacute.glif                     |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/itilde.glif        |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/k.glif             |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/m.glif             |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/n.glif             | 16 +++---
 src/Inter-UI-Regular.ufo/glyphs/ntilde.glif        |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/otilde.glif        |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/p.glif             |  6 +--
 src/Inter-UI-Regular.ufo/glyphs/q.glif             |  6 +--
 src/Inter-UI-Regular.ufo/glyphs/r.glif             |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/rdescend.glif      |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/rrthook.glif       |  6 +--
 src/Inter-UI-Regular.ufo/glyphs/s.glif             | 18 ++++++-
 src/Inter-UI-Regular.ufo/glyphs/tildecomb.glif     | 25 +++++++--
 src/Inter-UI-Regular.ufo/glyphs/tildesubnosp.glif  | 23 ++++++--
 src/Inter-UI-Regular.ufo/glyphs/trthook.glif       |  6 +--
 src/Inter-UI-Regular.ufo/glyphs/u.glif             | 21 +++++++-
 src/Inter-UI-Regular.ufo/glyphs/uni04FD__.glif     |  4 +-
 src/Inter-UI-Regular.ufo/glyphs/utilde.glif        |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/v.glif             | 39 ++++++++++----
 src/Inter-UI-Regular.ufo/glyphs/w.glif             | 53 +++++++++++-------
 src/Inter-UI-Regular.ufo/glyphs/wdieresis.glif     |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/wturn.glif         | 21 +++++++-
 src/Inter-UI-Regular.ufo/glyphs/x.glif             | 49 +++++++++++------
 src/Inter-UI-Regular.ufo/glyphs/y.glif             | 23 ++++++--
 src/Inter-UI-Regular.ufo/glyphs/ydieresis.glif     |  2 +-
 src/Inter-UI-Regular.ufo/glyphs/z.glif             | 21 +++++++-
 src/diacritics.txt                                 | 52 +++++++++---------
 src/fontbuild.cfg                                  |  1 -
 96 files changed, 701 insertions(+), 329 deletions(-)

(limited to 'src')

diff --git a/src/Inter-UI-Black.ufo/glyphs/Atilde_.glif b/src/Inter-UI-Black.ufo/glyphs/Atilde_.glif
index 2947251fb..406ff6c58 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Atilde_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Atilde_.glif
@@ -3,7 +3,7 @@
   <advance width="2048"/>
   <unicode hex="00C3"/>
   <outline>
-    <component base="A"/>
     <component base="casetilde.cn" xOffset="384"/>
+    <component base="A"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/E_.glif b/src/Inter-UI-Black.ufo/glyphs/E_.glif
index 87faea0d3..50c40c123 100644
--- a/src/Inter-UI-Black.ufo/glyphs/E_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/E_.glif
@@ -31,13 +31,13 @@
       <point x="832" y="2200" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="940.0" y="16.0" type="move" name="bottom"/>
+      <point x="884" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="-88.0" y="2004.0" type="move" name="tonos"/>
     </contour>
     <contour>
-      <point x="1332.0" y="0.0" type="move" name="ogonek"/>
+      <point x="1276" y="0" type="move" name="ogonek"/>
     </contour>
     <contour>
       <point x="1568" y="2200" type="move" name="top_dd"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Idieresis_.glif b/src/Inter-UI-Black.ufo/glyphs/Idieresis_.glif
index 4900f7ce2..d311080ab 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Idieresis_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Idieresis_.glif
@@ -3,7 +3,7 @@
   <advance width="1088"/>
   <unicode hex="00CF"/>
   <outline>
-    <component base="I" xOffset="184"/>
     <component base="casedieresis.cn" xOffset="-96"/>
+    <component base="I" xOffset="184"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/OE__.glif b/src/Inter-UI-Black.ufo/glyphs/OE__.glif
index ffe2bcbe8..357d7add1 100644
--- a/src/Inter-UI-Black.ufo/glyphs/OE__.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/OE__.glif
@@ -3,21 +3,6 @@
   <advance width="2816"/>
   <unicode hex="0152"/>
   <outline>
-    <contour>
-      <point x="1384" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1384" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="2748" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="2748" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="2748" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="992" y="2048" type="line" smooth="yes"/>
       <point x="484" y="2048"/>
@@ -41,6 +26,21 @@
       <point x="1388" y="2048" type="line"/>
     </contour>
     <component base="E" xOffset="1100"/>
+    <contour>
+      <point x="1384" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1384" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="2748" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="2748" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="2748" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Odieresis_.glif b/src/Inter-UI-Black.ufo/glyphs/Odieresis_.glif
index a673e85f7..31105b48a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Odieresis_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Odieresis_.glif
@@ -3,7 +3,7 @@
   <advance width="1976"/>
   <unicode hex="00D6"/>
   <outline>
-    <component base="O"/>
     <component base="casedieresis.cn" xOffset="348"/>
+    <component base="O"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Otilde_.glif b/src/Inter-UI-Black.ufo/glyphs/Otilde_.glif
index cd3ba1016..1a3f1beb9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Otilde_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Otilde_.glif
@@ -3,7 +3,7 @@
   <advance width="1976"/>
   <unicode hex="00D5"/>
   <outline>
-    <component base="O"/>
     <component base="casetilde.cn" xOffset="348"/>
+    <component base="O"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/a.glif b/src/Inter-UI-Black.ufo/glyphs/a.glif
index bfedd7b06..de8e96d64 100644
--- a/src/Inter-UI-Black.ufo/glyphs/a.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/a.glif
@@ -51,16 +51,16 @@
       <point x="960" y="132" type="line"/>
     </contour>
     <contour>
-      <point x="764.0" y="1776.0" type="move" name="top"/>
+      <point x="772" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="676.0" y="4.0" type="move" name="bottom"/>
+      <point x="768" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="1388.0" y="0.0" type="move" name="ogonek"/>
     </contour>
     <contour>
-      <point x="768.0" y="1776.0" type="move" name="rhalfring"/>
+      <point x="772" y="1776" type="move" name="rhalfring"/>
     </contour>
     <contour>
       <point x="1536.0" y="2200.0" type="move" name="top_dd"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/adieresis.glif b/src/Inter-UI-Black.ufo/glyphs/adieresis.glif
index 400a80117..db1a27543 100644
--- a/src/Inter-UI-Black.ufo/glyphs/adieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/adieresis.glif
@@ -3,7 +3,7 @@
   <advance width="1528"/>
   <unicode hex="00E4"/>
   <outline>
-    <component base="a"/>
     <component base="dieresis" xOffset="132"/>
+    <component base="a"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ae.glif b/src/Inter-UI-Black.ufo/glyphs/ae.glif
index bcb0b17a8..6152d9ed1 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ae.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ae.glif
@@ -3,37 +3,6 @@
   <advance width="2448"/>
   <unicode hex="00E6"/>
   <outline>
-    <contour>
-      <point x="1680" y="-28" type="curve"/>
-      <point x="2084" y="-28"/>
-      <point x="2280" y="204"/>
-      <point x="2332" y="368" type="curve"/>
-      <point x="1964" y="492" type="line"/>
-      <point x="1920" y="404"/>
-      <point x="1828" y="340"/>
-      <point x="1684" y="340" type="curve" smooth="yes"/>
-      <point x="1456" y="340"/>
-      <point x="1356" y="504"/>
-      <point x="1356" y="744" type="curve"/>
-      <point x="1356" y="1020"/>
-      <point x="1460" y="1192"/>
-      <point x="1664" y="1192" type="curve" smooth="yes"/>
-      <point x="1844" y="1192"/>
-      <point x="1940" y="1056"/>
-      <point x="1940" y="912" type="curve"/>
-      <point x="1096" y="948" type="line"/>
-      <point x="1096" y="664" type="line"/>
-      <point x="2368" y="616" type="line"/>
-      <point x="2368" y="808" type="line" smooth="yes"/>
-      <point x="2368" y="1264"/>
-      <point x="2092" y="1556"/>
-      <point x="1668" y="1556" type="curve" smooth="yes"/>
-      <point x="1208" y="1556"/>
-      <point x="988" y="1212"/>
-      <point x="988" y="744" type="curve"/>
-      <point x="988" y="284"/>
-      <point x="1208" y="-28"/>
-    </contour>
     <contour>
       <point x="936" y="668" type="line"/>
       <point x="936" y="492" type="line" smooth="yes"/>
@@ -75,6 +44,37 @@
       <point x="408" y="1556"/>
       <point x="160" y="1368"/>
     </contour>
+    <contour>
+      <point x="1680" y="-28" type="curve"/>
+      <point x="2084" y="-28"/>
+      <point x="2280" y="204"/>
+      <point x="2332" y="368" type="curve"/>
+      <point x="1964" y="492" type="line"/>
+      <point x="1920" y="404"/>
+      <point x="1828" y="340"/>
+      <point x="1684" y="340" type="curve" smooth="yes"/>
+      <point x="1456" y="340"/>
+      <point x="1356" y="504"/>
+      <point x="1356" y="744" type="curve"/>
+      <point x="1356" y="1020"/>
+      <point x="1460" y="1192"/>
+      <point x="1664" y="1192" type="curve" smooth="yes"/>
+      <point x="1844" y="1192"/>
+      <point x="1940" y="1056"/>
+      <point x="1940" y="912" type="curve"/>
+      <point x="1096" y="948" type="line"/>
+      <point x="1096" y="664" type="line"/>
+      <point x="2368" y="616" type="line"/>
+      <point x="2368" y="808" type="line" smooth="yes"/>
+      <point x="2368" y="1264"/>
+      <point x="2092" y="1556"/>
+      <point x="1668" y="1556" type="curve" smooth="yes"/>
+      <point x="1208" y="1556"/>
+      <point x="988" y="1212"/>
+      <point x="988" y="744" type="curve"/>
+      <point x="988" y="284"/>
+      <point x="1208" y="-28"/>
+    </contour>
     <contour>
       <point x="1228.0" y="1776.0" type="move" name="top"/>
     </contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/atilde.glif b/src/Inter-UI-Black.ufo/glyphs/atilde.glif
index 6a340ad15..8723ca3de 100644
--- a/src/Inter-UI-Black.ufo/glyphs/atilde.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/atilde.glif
@@ -3,7 +3,7 @@
   <advance width="1528"/>
   <unicode hex="00E3"/>
   <outline>
-    <component base="a"/>
     <component base="tilde" xOffset="104"/>
+    <component base="a"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/bullseye.glif b/src/Inter-UI-Black.ufo/glyphs/bullseye.glif
index 93db1f887..dbd86b630 100644
--- a/src/Inter-UI-Black.ufo/glyphs/bullseye.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/bullseye.glif
@@ -4,18 +4,18 @@
   <unicode hex="0298"/>
   <outline>
     <contour>
-      <point x="720" y="1008" type="curve" smooth="yes"/>
-      <point x="720" y="876"/>
-      <point x="820" y="776"/>
-      <point x="968" y="776" type="curve" smooth="yes"/>
-      <point x="1116" y="776"/>
-      <point x="1212" y="876"/>
-      <point x="1212" y="1008" type="curve" smooth="yes"/>
-      <point x="1212" y="1140"/>
-      <point x="1116" y="1240"/>
-      <point x="968" y="1240" type="curve" smooth="yes"/>
-      <point x="820" y="1240"/>
-      <point x="720" y="1140"/>
+      <point x="744" y="1024" type="curve" smooth="yes"/>
+      <point x="744" y="892"/>
+      <point x="844" y="792"/>
+      <point x="992" y="792" type="curve" smooth="yes"/>
+      <point x="1140" y="792"/>
+      <point x="1236" y="892"/>
+      <point x="1236" y="1024" type="curve" smooth="yes"/>
+      <point x="1236" y="1156"/>
+      <point x="1140" y="1256"/>
+      <point x="992" y="1256" type="curve" smooth="yes"/>
+      <point x="844" y="1256"/>
+      <point x="744" y="1156"/>
     </contour>
     <component base="O"/>
     <contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/c.glif b/src/Inter-UI-Black.ufo/glyphs/c.glif
index 06d4b735d..633ddb17b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/c.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/c.glif
@@ -32,13 +32,13 @@
       <point x="1048" y="948" type="curve"/>
     </contour>
     <contour>
-      <point x="768.0" y="1776.0" type="move" name="top"/>
+      <point x="800" y="1776" type="move" name="top"/>
     </contour>
     <contour>
       <point x="804.0" y="0.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="768.0" y="1776.0" type="move" name="marktop"/>
+      <point x="800" y="1776" type="move" name="marktop"/>
     </contour>
     <contour>
       <point x="1496.0" y="2200.0" type="move" name="top_dd"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/casedieresis.cn.glif b/src/Inter-UI-Black.ufo/glyphs/casedieresis.cn.glif
index cce9310f9..5428f4705 100644
--- a/src/Inter-UI-Black.ufo/glyphs/casedieresis.cn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/casedieresis.cn.glif
@@ -3,9 +3,6 @@
   <advance width="1280"/>
   <outline>
     <component base="dieresis" yOffset="424"/>
-    <contour>
-      <point x="640" y="2200" type="move" name="_top"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/casetilde.cn.glif b/src/Inter-UI-Black.ufo/glyphs/casetilde.cn.glif
index 1387025b4..9eb375efa 100644
--- a/src/Inter-UI-Black.ufo/glyphs/casetilde.cn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/casetilde.cn.glif
@@ -25,6 +25,20 @@
           <key>y</key>
           <integer>2200</integer>
         </dict>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>640</integer>
+          <key>y</key>
+          <integer>2032</integer>
+        </dict>
       </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
diff --git a/src/Inter-UI-Black.ufo/glyphs/circumflex.glif b/src/Inter-UI-Black.ufo/glyphs/circumflex.glif
index 5e197e295..7d7ab4c9f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/circumflex.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/circumflex.glif
@@ -8,7 +8,7 @@
       <point x="768" y="1792" type="move" name="_top"/>
     </contour>
     <contour>
-      <point x="764" y="2256" type="move" name="mkmktop_acc"/>
+      <point x="768" y="2256" type="move" name="mkmktop_acc"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/circumflexnosp.glif b/src/Inter-UI-Black.ufo/glyphs/circumflexnosp.glif
index b92b8519e..ff35dddb8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/circumflexnosp.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/circumflexnosp.glif
@@ -3,19 +3,36 @@
   <advance width="0"/>
   <unicode hex="0302"/>
   <outline>
-    <component base="circumflex" xOffset="-1500"/>
+    <component base="circumflex" xOffset="-1560"/>
     <contour>
-      <point x="-796" y="1774" type="move" name="_marktop"/>
+      <point x="-792" y="1776" type="move" name="_marktop"/>
     </contour>
     <contour>
       <point x="-792" y="1910" type="move" name="parent_top"/>
     </contour>
     <contour>
-      <point x="-796" y="2255" type="move" name="mkmktop"/>
+      <point x="-792" y="2256" type="move" name="mkmktop"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>-792</integer>
+          <key>y</key>
+          <integer>1912</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.98</real>
diff --git a/src/Inter-UI-Black.ufo/glyphs/circumflexsubnosp.glif b/src/Inter-UI-Black.ufo/glyphs/circumflexsubnosp.glif
index 353dbc8d8..99d0e257f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/circumflexsubnosp.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/circumflexsubnosp.glif
@@ -3,7 +3,7 @@
   <advance width="0"/>
   <unicode hex="032D"/>
   <outline>
-    <component base="circumflex" xOffset="-1500" yOffset="-2225"/>
+    <component base="circumflex" xOffset="-1560" yOffset="-2304"/>
     <contour>
       <point x="-792" y="0" type="move" name="_bottom"/>
     </contour>
@@ -11,7 +11,7 @@
       <point x="-792" y="0" type="move" name="_markbottom"/>
     </contour>
     <contour>
-      <point x="-793" y="-518" type="move" name="mkmkbottom_acc"/>
+      <point x="-792" y="-520" type="move" name="mkmkbottom_acc"/>
     </contour>
     <contour>
       <point x="-792" y="0" type="move" name="_bottomu"/>
@@ -19,6 +19,23 @@
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>-792</integer>
+          <key>y</key>
+          <integer>-404</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.98</real>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dieresis.glif b/src/Inter-UI-Black.ufo/glyphs/dieresis.glif
index 4549d13eb..0214f7544 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dieresis.glif
@@ -32,7 +32,7 @@
       <point x="876" y="1712"/>
     </contour>
     <contour>
-      <point x="640" y="1776" type="move" name="_top"/>
+      <point x="640" y="1772" type="move" name="_top"/>
     </contour>
     <contour>
       <point x="644" y="2216" type="move" name="mkmktop_acc"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dotlessi.glif b/src/Inter-UI-Black.ufo/glyphs/dotlessi.glif
index a47760a93..9eba7f72b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dotlessi.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dotlessi.glif
@@ -10,10 +10,10 @@
       <point x="604" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="364.0" y="1744.0" type="move" name="top"/>
+      <point x="376" y="1744" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="348.0" y="16.0" type="move" name="bottom"/>
+      <point x="376" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="452.0" y="900.0" type="move" name="rhotichook"/>
@@ -24,6 +24,23 @@
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>376</integer>
+          <key>y</key>
+          <integer>1504</integer>
+        </dict>
+      </array>
       <key>interface.gridadjust.original</key>
       <string>{'width': 793, 'leftMargin': 175, 'rightMargin': 174}</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/ecyrillic.glif
index 98f795036..151302012 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ecyrillic.glif
@@ -3,12 +3,6 @@
   <advance width="1536"/>
   <unicode hex="0454"/>
   <outline>
-    <contour>
-      <point x="776" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1452" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="904" y="848" type="line"/>
       <point x="416" y="848" type="line"/>
@@ -16,6 +10,12 @@
       <point x="904" y="596" type="line"/>
     </contour>
     <component base="c"/>
+    <contour>
+      <point x="776" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1452" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/edieresis.glif b/src/Inter-UI-Black.ufo/glyphs/edieresis.glif
index b7a7d2b98..b40f20990 100644
--- a/src/Inter-UI-Black.ufo/glyphs/edieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/edieresis.glif
@@ -3,7 +3,7 @@
   <advance width="1604"/>
   <unicode hex="00EB"/>
   <outline>
-    <component base="e"/>
     <component base="dieresis" xOffset="164"/>
+    <component base="e"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/f.glif b/src/Inter-UI-Black.ufo/glyphs/f.glif
index 6504ab56c..2d1211bd1 100644
--- a/src/Inter-UI-Black.ufo/glyphs/f.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/f.glif
@@ -31,7 +31,7 @@
       <point x="628" y="2284" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="468" y="0" type="move" name="bottom"/>
+      <point x="476" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="1032" y="2200" type="move" name="top_dd"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/g.glif b/src/Inter-UI-Black.ufo/glyphs/g.glif
index 4730f828d..b875bf8ec 100644
--- a/src/Inter-UI-Black.ufo/glyphs/g.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/g.glif
@@ -30,7 +30,7 @@
       <point x="760.0" y="1776.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="780.0" y="-568.0" type="move" name="bottom"/>
+      <point x="748" y="-576" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="1612.0" y="2200.0" type="move" name="top_dd"/>
@@ -44,23 +44,6 @@
   </outline>
   <lib>
     <dict>
-      <key>com.typemytype.robofont.guides</key>
-      <array>
-        <dict>
-          <key>angle</key>
-          <real>90.0</real>
-          <key>isGlobal</key>
-          <false/>
-          <key>magnetic</key>
-          <integer>5</integer>
-          <key>name</key>
-          <string></string>
-          <key>x</key>
-          <integer>796</integer>
-          <key>y</key>
-          <integer>480</integer>
-        </dict>
-      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/Inter-UI-Black.ufo/glyphs/h.glif b/src/Inter-UI-Black.ufo/glyphs/h.glif
index fad01e492..411c0bc72 100644
--- a/src/Inter-UI-Black.ufo/glyphs/h.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/h.glif
@@ -27,7 +27,7 @@
       <point x="588" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="732" y="2328" type="move" name="top"/>
+      <point x="896" y="2328" type="move" name="top"/>
     </contour>
     <contour>
       <point x="404" y="1792" type="move" name="cross"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/i.glif b/src/Inter-UI-Black.ufo/glyphs/i.glif
index 03ddb94c1..8f1dd0031 100644
--- a/src/Inter-UI-Black.ufo/glyphs/i.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/i.glif
@@ -19,13 +19,13 @@
     </contour>
     <component base="dotlessi"/>
     <contour>
-      <point x="372.0" y="0.0" type="move" name="bottom"/>
+      <point x="372" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="524.0" y="0.0" type="move" name="ogonek"/>
+      <point x="524" y="0" type="move" name="ogonek"/>
     </contour>
     <contour>
-      <point x="372.0" y="2200.0" type="move" name="top"/>
+      <point x="376" y="2200" type="move" name="top"/>
     </contour>
     <contour>
       <point x="756.0" y="2200.0" type="move" name="top_dd"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/j.glif b/src/Inter-UI-Black.ufo/glyphs/j.glif
index 4815f70ff..5a738ccab 100644
--- a/src/Inter-UI-Black.ufo/glyphs/j.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/j.glif
@@ -19,7 +19,7 @@
     </contour>
     <component base="dotlessj"/>
     <contour>
-      <point x="452.0" y="2200.0" type="move" name="top"/>
+      <point x="548" y="2200" type="move" name="top"/>
     </contour>
     <contour>
       <point x="472.0" y="-572.0" type="move" name="bottom"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/m.glif b/src/Inter-UI-Black.ufo/glyphs/m.glif
index d33657abf..dc4ec3efb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/m.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/m.glif
@@ -43,13 +43,13 @@
       <point x="1428" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="1176" y="1776" type="move" name="top"/>
+      <point x="1204" y="1776" type="move" name="top"/>
     </contour>
     <contour>
       <point x="1204" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1176" y="1776" type="move" name="marktop"/>
+      <point x="1204" y="1776" type="move" name="marktop"/>
     </contour>
     <contour>
       <point x="2364" y="2200" type="move" name="top_dd"/>
@@ -63,6 +63,23 @@
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>1204</integer>
+          <key>y</key>
+          <integer>-220</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/Inter-UI-Black.ufo/glyphs/n.glif b/src/Inter-UI-Black.ufo/glyphs/n.glif
index 1e00769ce..2f32cf2f8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/n.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/n.glif
@@ -27,7 +27,7 @@
       <point x="588" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="768" y="1776" type="move" name="top"/>
+      <point x="816" y="1776" type="move" name="top"/>
     </contour>
     <contour>
       <point x="816" y="0" type="move" name="bottom"/>
@@ -39,7 +39,7 @@
       <point x="1432" y="0" type="move" name="right"/>
     </contour>
     <contour>
-      <point x="768" y="1776" type="move" name="marktop"/>
+      <point x="816" y="1776" type="move" name="marktop"/>
     </contour>
     <contour>
       <point x="1560" y="2200" type="move" name="top_dd"/>
@@ -53,6 +53,23 @@
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>816</integer>
+          <key>y</key>
+          <integer>-164</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ntilde.glif b/src/Inter-UI-Black.ufo/glyphs/ntilde.glif
index c503ceec5..7daae801e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ntilde.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ntilde.glif
@@ -3,7 +3,7 @@
   <advance width="1624"/>
   <unicode hex="00F1"/>
   <outline>
-    <component base="n"/>
     <component base="tilde" xOffset="152"/>
+    <component base="n"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/odieresis.glif b/src/Inter-UI-Black.ufo/glyphs/odieresis.glif
index c1c4bdb20..59a7ee83a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/odieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/odieresis.glif
@@ -3,7 +3,7 @@
   <advance width="1544"/>
   <unicode hex="00F6"/>
   <outline>
-    <component base="o"/>
     <component base="dieresis" xOffset="132"/>
+    <component base="o"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/otilde.glif b/src/Inter-UI-Black.ufo/glyphs/otilde.glif
index 9b8f28f81..e39862296 100644
--- a/src/Inter-UI-Black.ufo/glyphs/otilde.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/otilde.glif
@@ -3,7 +3,7 @@
   <advance width="1544"/>
   <unicode hex="00F5"/>
   <outline>
-    <component base="o"/>
     <component base="tilde" xOffset="132"/>
+    <component base="o"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tildecomb.glif b/src/Inter-UI-Black.ufo/glyphs/tildecomb.glif
index 536b053aa..37e07b060 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tildecomb.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tildecomb.glif
@@ -3,22 +3,39 @@
   <advance width="0"/>
   <unicode hex="0303"/>
   <outline>
+    <component base="tilde" xOffset="-1449"/>
     <contour>
-      <point x="-800" y="1727" type="move" name="_top"/>
+      <point x="-808" y="1728" type="move" name="_top"/>
     </contour>
     <contour>
-      <point x="-800" y="1727" type="move" name="_marktop"/>
+      <point x="-808" y="1728" type="move" name="_marktop"/>
     </contour>
     <contour>
-      <point x="-765" y="1922" type="move" name="parent_top"/>
+      <point x="-808" y="1924" type="move" name="parent_top"/>
     </contour>
     <contour>
-      <point x="-800" y="2305" type="move" name="mkmktop"/>
+      <point x="-808" y="2304" type="move" name="mkmktop"/>
     </contour>
-    <component base="tilde" xOffset="-1449"/>
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>-808</integer>
+          <key>y</key>
+          <integer>2432</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.98</real>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tildesubnosp.glif b/src/Inter-UI-Black.ufo/glyphs/tildesubnosp.glif
index 034711544..62d71cadb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tildesubnosp.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tildesubnosp.glif
@@ -3,19 +3,36 @@
   <advance width="0"/>
   <unicode hex="0330"/>
   <outline>
+    <component base="tilde" xOffset="-1477" yOffset="-2283"/>
     <contour>
-      <point x="-792" y="0" type="move" name="_bottom"/>
+      <point x="-836" y="0" type="move" name="_bottom"/>
     </contour>
     <contour>
-      <point x="-792" y="0" type="move" name="_markbottom"/>
+      <point x="-836" y="0" type="move" name="_markbottom"/>
     </contour>
     <contour>
-      <point x="-792" y="-560" type="move" name="mkmkbottom_acc"/>
+      <point x="-836" y="-560" type="move" name="mkmkbottom_acc"/>
     </contour>
-    <component base="tilde" xOffset="-1477" yOffset="-2283"/>
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>-836</integer>
+          <key>y</key>
+          <integer>-1088</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.98</real>
diff --git a/src/Inter-UI-Black.ufo/glyphs/trthook.glif b/src/Inter-UI-Black.ufo/glyphs/trthook.glif
index 5b8aee509..855b87361 100644
--- a/src/Inter-UI-Black.ufo/glyphs/trthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/trthook.glif
@@ -3,12 +3,6 @@
   <advance width="1280"/>
   <unicode hex="0288"/>
   <outline>
-    <contour>
-      <point x="1036" y="1536" type="line" name="hr00"/>
-      <point x="148" y="1536" type="line"/>
-      <point x="148" y="1216" type="line"/>
-      <point x="1036" y="1216" type="line"/>
-    </contour>
     <contour>
       <point x="348" y="1860" type="line"/>
       <point x="348" y="-108" type="line" smooth="yes"/>
@@ -27,6 +21,12 @@
       <point x="788" y="-108" type="curve" smooth="yes"/>
       <point x="788" y="1860" type="line"/>
     </contour>
+    <contour>
+      <point x="1036" y="1536" type="line" name="hr00"/>
+      <point x="148" y="1536" type="line"/>
+      <point x="148" y="1216" type="line"/>
+      <point x="1036" y="1216" type="line"/>
+    </contour>
     <contour>
       <point x="576" y="2200" type="move" name="top"/>
     </contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/udieresis.glif b/src/Inter-UI-Black.ufo/glyphs/udieresis.glif
index 6bdd23aee..19da79e18 100644
--- a/src/Inter-UI-Black.ufo/glyphs/udieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/udieresis.glif
@@ -3,7 +3,7 @@
   <advance width="1624"/>
   <unicode hex="00FC"/>
   <outline>
-    <component base="u"/>
     <component base="dieresis" xOffset="172"/>
+    <component base="u"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/utilde.glif b/src/Inter-UI-Black.ufo/glyphs/utilde.glif
index bcf77ec93..d03b3ce17 100644
--- a/src/Inter-UI-Black.ufo/glyphs/utilde.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/utilde.glif
@@ -3,7 +3,7 @@
   <advance width="1624"/>
   <unicode hex="0169"/>
   <outline>
-    <component base="u"/>
     <component base="tilde" xOffset="172"/>
+    <component base="u"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/v.glif b/src/Inter-UI-Black.ufo/glyphs/v.glif
index a87f5056e..ccacd4697 100644
--- a/src/Inter-UI-Black.ufo/glyphs/v.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/v.glif
@@ -14,7 +14,7 @@
       <point x="992" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="772" y="1760" type="move" name="top"/>
+      <point x="768" y="1760" type="move" name="top"/>
     </contour>
     <contour>
       <point x="768" y="0" type="move" name="bottom"/>
@@ -57,6 +57,20 @@
           <key>y</key>
           <real>763.125</real>
         </dict>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>768</integer>
+          <key>y</key>
+          <integer>448</integer>
+        </dict>
       </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
diff --git a/src/Inter-UI-Black.ufo/glyphs/w.glif b/src/Inter-UI-Black.ufo/glyphs/w.glif
index d61e0d761..ce6ac8c22 100644
--- a/src/Inter-UI-Black.ufo/glyphs/w.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/w.glif
@@ -22,13 +22,13 @@
       <point x="1716" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="1148" y="1776" type="move" name="top"/>
+      <point x="1084" y="1776" type="move" name="top"/>
     </contour>
     <contour>
       <point x="1084" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1148" y="1776" type="move" name="marktop"/>
+      <point x="1084" y="1776" type="move" name="marktop"/>
     </contour>
     <contour>
       <point x="2180" y="2200" type="move" name="top_dd"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/wdieresis.glif b/src/Inter-UI-Black.ufo/glyphs/wdieresis.glif
index c54f335de..b1cd1f80d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/wdieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/wdieresis.glif
@@ -3,7 +3,7 @@
   <advance width="2172"/>
   <unicode hex="1E85"/>
   <outline>
-    <component base="w"/>
     <component base="dieresis" xOffset="448"/>
+    <component base="w"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/x.glif b/src/Inter-UI-Black.ufo/glyphs/x.glif
index 33516f837..13f93d45a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/x.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/x.glif
@@ -41,6 +41,23 @@
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>768</integer>
+          <key>y</key>
+          <integer>960</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/Inter-UI-Black.ufo/glyphs/y.glif b/src/Inter-UI-Black.ufo/glyphs/y.glif
index 45586b9b5..fb88bab23 100644
--- a/src/Inter-UI-Black.ufo/glyphs/y.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/y.glif
@@ -29,13 +29,13 @@
       <point x="852" y="496" type="line"/>
     </contour>
     <contour>
-      <point x="768" y="1776" type="move" name="top"/>
+      <point x="780" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1180" y="-128" type="move" name="bottom"/>
+      <point x="732" y="-576" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="768" y="1776" type="move" name="marktop"/>
+      <point x="780" y="1776" type="move" name="marktop"/>
     </contour>
     <contour>
       <point x="1488" y="2200" type="move" name="top_dd"/>
@@ -52,6 +52,23 @@
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>780</integer>
+          <key>y</key>
+          <integer>556</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ydieresis.glif b/src/Inter-UI-Black.ufo/glyphs/ydieresis.glif
index f31f05888..f4a74b5f8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ydieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ydieresis.glif
@@ -3,7 +3,7 @@
   <advance width="1536"/>
   <unicode hex="00FF"/>
   <outline>
-    <component base="y"/>
     <component base="dieresis" xOffset="128"/>
+    <component base="y"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/z.glif b/src/Inter-UI-Black.ufo/glyphs/z.glif
index 4510c1838..057508339 100644
--- a/src/Inter-UI-Black.ufo/glyphs/z.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/z.glif
@@ -24,23 +24,40 @@
       <point x="1220" y="1176" type="line"/>
     </contour>
     <contour>
-      <point x="756" y="1776" type="move" name="top"/>
+      <point x="748" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="756" y="0" type="move" name="bottom"/>
+      <point x="748" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1480" y="2200" type="move" name="top_dd"/>
+      <point x="1480.0" y="2200.0" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1480" y="-560" type="move" name="bottom_dd"/>
+      <point x="1480.0" y="-560.0" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1480" y="1776" type="move" name="top0315"/>
+      <point x="1480.0" y="1776.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>748</integer>
+          <key>y</key>
+          <integer>656</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/Atilde_.glif b/src/Inter-UI-Regular.ufo/glyphs/Atilde_.glif
index 0848eebbb..9e89c11b1 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/Atilde_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/Atilde_.glif
@@ -3,7 +3,7 @@
   <advance width="1792"/>
   <unicode hex="00C3"/>
   <outline>
-    <component base="A"/>
     <component base="casetilde.cn" xOffset="272"/>
+    <component base="A"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/Otilde_.glif b/src/Inter-UI-Regular.ufo/glyphs/Otilde_.glif
index d4767dabf..cd402ebef 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/Otilde_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/Otilde_.glif
@@ -3,7 +3,7 @@
   <advance width="2032"/>
   <unicode hex="00D5"/>
   <outline>
-    <component base="O"/>
     <component base="casetilde.cn" xOffset="392"/>
+    <component base="O"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/Q_.glif b/src/Inter-UI-Regular.ufo/glyphs/Q_.glif
index 77f46e52e..9c3421d2e 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/Q_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/Q_.glif
@@ -8,10 +8,10 @@
       <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="1864.0" y="-192.0" type="line"/>
-      <point x="1523.0" y="260.0" type="line"/>
-      <point x="1463.0" y="339.0" type="line"/>
-      <point x="1236.0" y="640.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>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/a.glif b/src/Inter-UI-Regular.ufo/glyphs/a.glif
index 74ff0f778..6a8f25399 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/a.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/a.glif
@@ -51,16 +51,16 @@
       <point x="1128.0" y="208.0" type="line"/>
     </contour>
     <contour>
-      <point x="760.0" y="1792.0" type="move" name="top"/>
+      <point x="796" y="1792" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="756.0" y="0.0" type="move" name="bottom"/>
+      <point x="756" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="1364.0" y="0.0" type="move" name="ogonek"/>
     </contour>
     <contour>
-      <point x="760.0" y="1792.0" type="move" name="rhalfring"/>
+      <point x="796" y="1792" type="move" name="rhalfring"/>
     </contour>
     <contour>
       <point x="1504.0" y="2176.0" type="move" name="top_dd"/>
@@ -79,6 +79,20 @@
     <dict>
       <key>com.typemytype.robofont.guides</key>
       <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>796</integer>
+          <key>y</key>
+          <integer>1160</integer>
+        </dict>
       </array>
       <key>com.typemytype.robofont.layerData</key>
       <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/atilde.glif b/src/Inter-UI-Regular.ufo/glyphs/atilde.glif
index 29d7fa5d3..5195b3176 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/atilde.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/atilde.glif
@@ -3,7 +3,7 @@
   <advance width="1572.0"/>
   <unicode hex="00E3"/>
   <outline>
-    <component base="a"/>
     <component base="tilde" xOffset="128"/>
+    <component base="a"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/b.glif b/src/Inter-UI-Regular.ufo/glyphs/b.glif
index 1ba67eead..da6989487 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/b.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/b.glif
@@ -17,7 +17,7 @@
       <point x="892" y="2304" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="888" y="-28" type="move" name="bottom"/>
+      <point x="896" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="1692" y="2200" type="move" name="top_dd"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/bbar.glif b/src/Inter-UI-Regular.ufo/glyphs/bbar.glif
index 0dbf0167f..2c028fb9a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/bbar.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/bbar.glif
@@ -6,10 +6,10 @@
     <component base="b" xOffset="16"/>
     <component base="crossbar" xOffset="-188" yOffset="824"/>
     <contour>
-      <point x="728" y="-16" type="move" name="markbottom"/>
+      <point x="924" y="0" type="move" name="markbottom"/>
     </contour>
     <contour>
-      <point x="780" y="2216" type="move" name="top"/>
+      <point x="896" y="2216" type="move" name="top"/>
     </contour>
     <contour>
       <point x="384" y="1792" type="move" name="parenthesses.w2"/>
@@ -18,7 +18,7 @@
       <point x="1612" y="2216" type="move" name="top0315"/>
     </contour>
     <contour>
-      <point x="728" y="-16" type="move" name="bottom"/>
+      <point x="924" y="0" type="move" name="bottom"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/bullseye.glif b/src/Inter-UI-Regular.ufo/glyphs/bullseye.glif
index b3ab1adf3..598ffcb5b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/bullseye.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/bullseye.glif
@@ -4,18 +4,18 @@
   <unicode hex="0298"/>
   <outline>
     <contour>
-      <point x="792" y="1008" type="curve" smooth="yes"/>
-      <point x="792" y="920"/>
-      <point x="848" y="852"/>
-      <point x="960" y="852" type="curve" smooth="yes"/>
-      <point x="1068" y="852"/>
-      <point x="1124" y="920"/>
-      <point x="1124" y="1008" type="curve" smooth="yes"/>
-      <point x="1124" y="1096"/>
-      <point x="1068" y="1168"/>
-      <point x="960" y="1168" type="curve" smooth="yes"/>
-      <point x="848" y="1168"/>
-      <point x="792" y="1096"/>
+      <point x="836" y="1024" type="curve" smooth="yes"/>
+      <point x="836" y="936"/>
+      <point x="892" y="868"/>
+      <point x="1004" y="868" type="curve" smooth="yes"/>
+      <point x="1112" y="868"/>
+      <point x="1168" y="936"/>
+      <point x="1168" y="1024" type="curve" smooth="yes"/>
+      <point x="1168" y="1112"/>
+      <point x="1112" y="1184"/>
+      <point x="1004" y="1184" type="curve" smooth="yes"/>
+      <point x="892" y="1184"/>
+      <point x="836" y="1112"/>
     </contour>
     <component base="O" xOffset="-16"/>
     <contour>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/c.glif b/src/Inter-UI-Regular.ufo/glyphs/c.glif
index c58626905..5f4c9bbcf 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/c.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/c.glif
@@ -32,13 +32,13 @@
       <point x="1200" y="1076" type="curve"/>
     </contour>
     <contour>
-      <point x="824.0" y="1792.0" type="move" name="top"/>
+      <point x="816" y="1792" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="820.0" y="-32.0" type="move" name="bottom"/>
+      <point x="816" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="824.0" y="1792.0" type="move" name="marktop"/>
+      <point x="816" y="1792" type="move" name="marktop"/>
     </contour>
     <contour>
       <point x="1456.0" y="2200.0" type="move" name="top_dd"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/casedieresis.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/casedieresis.cn.glif
index 84143404b..70f14b221 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/casedieresis.cn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/casedieresis.cn.glif
@@ -3,9 +3,6 @@
   <advance width="1632"/>
   <outline>
     <component base="dieresis" yOffset="512"/>
-    <contour>
-      <point x="880.0" y="2304.0" type="move" name="_top"/>
-    </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 d420a707f..03d61dcc1 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/casetilde.cn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/casetilde.cn.glif
@@ -4,7 +4,7 @@
   <outline>
     <component base="tilde" yOffset="532"/>
     <contour>
-      <point x="624" y="2304" type="move" name="_top"/>
+      <point x="624.0" y="2304.0" type="move" name="_top"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/circumflex.glif b/src/Inter-UI-Regular.ufo/glyphs/circumflex.glif
index e884fd7b0..84c468fb5 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/circumflex.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/circumflex.glif
@@ -8,7 +8,7 @@
       <point x="640" y="1792" type="move" name="_top"/>
     </contour>
     <contour>
-      <point x="624" y="2256" type="move" name="mkmktop_acc"/>
+      <point x="640" y="2256" type="move" name="mkmktop_acc"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/circumflexnosp.glif b/src/Inter-UI-Regular.ufo/glyphs/circumflexnosp.glif
index fa5529ff0..b1f557a98 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/circumflexnosp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/circumflexnosp.glif
@@ -5,13 +5,13 @@
   <outline>
     <component base="circumflex" xOffset="-1471"/>
     <contour>
-      <point x="-813" y="1774" type="move" name="_marktop"/>
+      <point x="-832" y="1776" type="move" name="_marktop"/>
     </contour>
     <contour>
-      <point x="-811" y="1918" type="move" name="parent_top"/>
+      <point x="-832" y="1920" type="move" name="parent_top"/>
     </contour>
     <contour>
-      <point x="-813" y="2255" type="move" name="mkmktop"/>
+      <point x="-832" y="2256" type="move" name="mkmktop"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/circumflexsubnosp.glif b/src/Inter-UI-Regular.ufo/glyphs/circumflexsubnosp.glif
index e8bfdc208..a979506e8 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/circumflexsubnosp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/circumflexsubnosp.glif
@@ -3,9 +3,9 @@
   <advance width="0"/>
   <unicode hex="032D"/>
   <outline>
-    <component base="circumflex" xOffset="-1469" yOffset="-2278"/>
+    <component base="circumflex" xOffset="-1448" yOffset="-2304"/>
     <contour>
-      <point x="-809" y="0" type="move" name="_bottom"/>
+      <point x="-808" y="0" type="move" name="_bottom"/>
     </contour>
     <contour>
       <point x="-809" y="0" type="move" name="_markbottom"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/d.glif b/src/Inter-UI-Regular.ufo/glyphs/d.glif
index f32e9e4f2..1b392d384 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/d.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/d.glif
@@ -20,10 +20,10 @@
       <point x="1244.0" y="1796.0" type="move" name="cross"/>
     </contour>
     <contour>
-      <point x="756.0" y="-28.0" type="move" name="bottom"/>
+      <point x="828" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="776.0" y="2304.0" type="move" name="top"/>
+      <point x="828" y="2304" type="move" name="top"/>
     </contour>
     <contour>
       <point x="1628.0" y="2200.0" type="move" name="top_dd"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dieresis.glif b/src/Inter-UI-Regular.ufo/glyphs/dieresis.glif
index 7ec941669..4a101e74e 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dieresis.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dieresis.glif
@@ -35,7 +35,7 @@
       <point x="816.0" y="1792.0" type="move" name="_top"/>
     </contour>
     <contour>
-      <point x="628.0" y="2172.0" type="move" name="mkmktop_acc"/>
+      <point x="816" y="2172" type="move" name="mkmktop_acc"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dieresisnosp.glif b/src/Inter-UI-Regular.ufo/glyphs/dieresisnosp.glif
index 3e70faa69..8a3e56ebd 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dieresisnosp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dieresisnosp.glif
@@ -5,17 +5,34 @@
   <outline>
     <component base="dieresis" xOffset="-1652"/>
     <contour>
-      <point x="-939" y="1774" type="move" name="_marktop"/>
+      <point x="-836" y="1776" type="move" name="_marktop"/>
     </contour>
     <contour>
-      <point x="-939" y="2173" type="move" name="mkmktop"/>
+      <point x="-836" y="2176" type="move" name="mkmktop"/>
     </contour>
     <contour>
-      <point x="-939" y="1880" type="move" name="parent_top"/>
+      <point x="-836" y="1880" type="move" name="parent_top"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>-836</integer>
+          <key>y</key>
+          <integer>1740</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.98</real>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dotlessi.glif b/src/Inter-UI-Regular.ufo/glyphs/dotlessi.glif
index 30f0b10cf..4eaa52b22 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dotlessi.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dotlessi.glif
@@ -13,7 +13,7 @@
       <point x="336" y="1796" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="300" y="16" type="move" name="bottom"/>
+      <point x="324" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="344" y="900" type="move" name="rhotichook"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/f.glif b/src/Inter-UI-Regular.ufo/glyphs/f.glif
index f5dc6d109..d0e999b52 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/f.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/f.glif
@@ -31,7 +31,7 @@
       <point x="536.0" y="2304.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="440.0" y="16.0" type="move" name="bottom"/>
+      <point x="432" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="756.0" y="1484.0" type="move" name="top_dd"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/g.glif b/src/Inter-UI-Regular.ufo/glyphs/g.glif
index 860531c96..73293b914 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/g.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/g.glif
@@ -30,7 +30,7 @@
       <point x="896.0" y="1792.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="832.0" y="-616.0" type="move" name="bottom"/>
+      <point x="836" y="-588" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="1652.0" y="2200.0" type="move" name="top_dd"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/h.glif b/src/Inter-UI-Regular.ufo/glyphs/h.glif
index 2a0deca91..7316c59fe 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/h.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/h.glif
@@ -33,7 +33,7 @@
       <point x="356" y="1796" type="move" name="cross"/>
     </contour>
     <contour>
-      <point x="780" y="16" type="move" name="bottom"/>
+      <point x="812" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="1340" y="0" type="move" name="right"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/hadescendercyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/hadescendercyrillic.glif
index 9a67a611a..158d16671 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/hadescendercyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/hadescendercyrillic.glif
@@ -3,6 +3,8 @@
   <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>
@@ -12,8 +14,6 @@
     <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/i.glif b/src/Inter-UI-Regular.ufo/glyphs/i.glif
index 0b4b346e9..c10fd80e8 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/i.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/i.glif
@@ -19,7 +19,7 @@
     </contour>
     <component base="dotlessi"/>
     <contour>
-      <point x="316.0" y="16.0" type="move" name="bottom"/>
+      <point x="324" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="432.0" y="0.0" type="move" name="ogonek"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/idieresis.glif b/src/Inter-UI-Regular.ufo/glyphs/idieresis.glif
index eb0ce55be..f3fd8bc9f 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/idieresis.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/idieresis.glif
@@ -18,7 +18,7 @@
       <point x="680" y="2668" type="move" name="mkmktop_acc"/>
     </contour>
     <contour>
-      <point x="676" y="16" type="move" name="bottom"/>
+      <point x="636" y="0" type="move" name="bottom"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/idieresisacute.glif b/src/Inter-UI-Regular.ufo/glyphs/idieresisacute.glif
index b0896a487..6f8f01cab 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/idieresisacute.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/idieresisacute.glif
@@ -18,7 +18,7 @@
       <point x="496" y="2668" type="move" name="mkmktop_acc"/>
     </contour>
     <contour>
-      <point x="492" y="16" type="move" name="bottom"/>
+      <point x="448" y="0" type="move" name="bottom"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/itilde.glif b/src/Inter-UI-Regular.ufo/glyphs/itilde.glif
index 4da60664b..35a58a788 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/itilde.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/itilde.glif
@@ -3,7 +3,7 @@
   <advance width="1240"/>
   <unicode hex="0129"/>
   <outline>
-    <component base="dotlessi" xOffset="296"/>
     <component base="tilde" xOffset="-4"/>
+    <component base="dotlessi" xOffset="296"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/k.glif b/src/Inter-UI-Regular.ufo/glyphs/k.glif
index 98bda71d8..3ff49be26 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/k.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/k.glif
@@ -25,7 +25,7 @@
       <point x="616" y="744" type="line"/>
     </contour>
     <contour>
-      <point x="696" y="92" type="move" name="bottom"/>
+      <point x="736" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="300" y="1772" type="move" name="cross"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/m.glif b/src/Inter-UI-Regular.ufo/glyphs/m.glif
index 4361b85a4..d6dd61d98 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/m.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/m.glif
@@ -46,7 +46,7 @@
       <point x="1264" y="1792" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1200" y="16" type="move" name="bottom"/>
+      <point x="1196" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="1264" y="1792" type="move" name="marktop"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/n.glif b/src/Inter-UI-Regular.ufo/glyphs/n.glif
index 9776837e3..4373521b5 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/n.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/n.glif
@@ -27,28 +27,28 @@
       <point x="444" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="816" y="1792" type="move" name="top"/>
+      <point x="816.0" y="1792.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="608" y="16" type="move" name="bottom"/>
+      <point x="812" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="-200" y="2120" type="move" name="caron"/>
+      <point x="-200.0" y="2120.0" type="move" name="caron"/>
     </contour>
     <contour>
-      <point x="1208" y="0" type="move" name="right"/>
+      <point x="1208.0" y="0.0" type="move" name="right"/>
     </contour>
     <contour>
-      <point x="816" y="1792" type="move" name="marktop"/>
+      <point x="816.0" y="1792.0" type="move" name="marktop"/>
     </contour>
     <contour>
-      <point x="1400" y="2200" type="move" name="top_dd"/>
+      <point x="1400.0" y="2200.0" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1400" y="-560" type="move" name="bottom_dd"/>
+      <point x="1400.0" y="-560.0" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1400" y="1776" type="move" name="top0315"/>
+      <point x="1400.0" y="1776.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ntilde.glif b/src/Inter-UI-Regular.ufo/glyphs/ntilde.glif
index 8f93d6e51..d5bfa62ca 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ntilde.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ntilde.glif
@@ -3,7 +3,7 @@
   <advance width="1620"/>
   <unicode hex="00F1"/>
   <outline>
-    <component base="n"/>
     <component base="tilde" xOffset="132"/>
+    <component base="n"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/otilde.glif b/src/Inter-UI-Regular.ufo/glyphs/otilde.glif
index 92cc0804e..adafdab6e 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/otilde.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/otilde.glif
@@ -3,7 +3,7 @@
   <advance width="1664"/>
   <unicode hex="00F5"/>
   <outline>
-    <component base="o"/>
     <component base="tilde" xOffset="208"/>
+    <component base="o"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/p.glif b/src/Inter-UI-Regular.ufo/glyphs/p.glif
index 65cf32c75..e1ee72a84 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/p.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/p.glif
@@ -15,13 +15,13 @@
     </contour>
     <component base="rightloop.cn" xOffset="52"/>
     <contour>
-      <point x="864" y="1792" type="move" name="top"/>
+      <point x="896" y="1792" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="292" y="-560" type="move" name="bottom"/>
+      <point x="324" y="-576" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="864" y="1792" type="move" name="marktop"/>
+      <point x="896" y="1792" type="move" name="marktop"/>
     </contour>
     <contour>
       <point x="1552" y="2200" type="move" name="top_dd"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/q.glif b/src/Inter-UI-Regular.ufo/glyphs/q.glif
index a96f53224..9cae520ed 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/q.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/q.glif
@@ -15,13 +15,13 @@
     </contour>
     <component base="leftloop.cn" xOffset="24"/>
     <contour>
-      <point x="792" y="1792" type="move" name="top"/>
+      <point x="828" y="1792" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1284" y="-560" type="move" name="bottom"/>
+      <point x="1388" y="-576" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="792" y="1792" type="move" name="marktop"/>
+      <point x="828" y="1792" type="move" name="marktop"/>
     </contour>
     <contour>
       <point x="1632" y="2200" type="move" name="top_dd"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/r.glif b/src/Inter-UI-Regular.ufo/glyphs/r.glif
index 1eaa2bfb9..6429454d8 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/r.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/r.glif
@@ -25,10 +25,10 @@
       <point x="980" y="1308" type="curve"/>
     </contour>
     <contour>
-      <point x="528.0" y="1792.0" type="move" name="top"/>
+      <point x="544" y="1792" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="312.0" y="16.0" type="move" name="bottom"/>
+      <point x="324" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="924.0" y="2200.0" type="move" name="top_dd"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rdescend.glif b/src/Inter-UI-Regular.ufo/glyphs/rdescend.glif
index e566f13df..1b6b0bb3c 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rdescend.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rdescend.glif
@@ -11,13 +11,13 @@
     </contour>
     <component base="r"/>
     <contour>
-      <point x="592" y="1776" type="move" name="top"/>
+      <point x="584" y="1792" type="move" name="top"/>
     </contour>
     <contour>
       <point x="592" y="-616" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="900" y="1776" type="move" name="top0315"/>
+      <point x="892" y="1792" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rrthook.glif b/src/Inter-UI-Regular.ufo/glyphs/rrthook.glif
index bd3ad2845..e3e290e39 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rrthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rrthook.glif
@@ -26,13 +26,13 @@
       <point x="360" y="-424" type="move" name="parenthesses.w1"/>
     </contour>
     <contour>
-      <point x="536" y="1776" type="move" name="top"/>
+      <point x="568" y="1792" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="536" y="-616" type="move" name="bottom"/>
+      <point x="480" y="-576" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="848" y="1776" type="move" name="top0315"/>
+      <point x="880" y="1792" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/s.glif b/src/Inter-UI-Regular.ufo/glyphs/s.glif
index 21551b0a0..f8e238c45 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/s.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/s.glif
@@ -46,10 +46,10 @@
       <point x="168" y="1364"/>
     </contour>
     <contour>
-      <point x="740.0" y="1792.0" type="move" name="top"/>
+      <point x="732" y="1792" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="736.0" y="0.0" type="move" name="bottom"/>
+      <point x="732" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="1428.0" y="2200.0" type="move" name="top_dd"/>
@@ -93,6 +93,20 @@
           <key>y</key>
           <integer>784</integer>
         </dict>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>732</integer>
+          <key>y</key>
+          <integer>328</integer>
+        </dict>
       </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/tildecomb.glif b/src/Inter-UI-Regular.ufo/glyphs/tildecomb.glif
index c027cee73..3860d9fea 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/tildecomb.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/tildecomb.glif
@@ -5,20 +5,37 @@
   <outline>
     <component base="tilde" xOffset="-1403"/>
     <contour>
-      <point x="-745" y="1727" type="move" name="_top"/>
+      <point x="-780" y="1728" type="move" name="_top"/>
     </contour>
     <contour>
-      <point x="-745" y="1727" type="move" name="_marktop"/>
+      <point x="-780" y="1728" type="move" name="_marktop"/>
     </contour>
     <contour>
-      <point x="-736" y="1893" type="move" name="parent_top"/>
+      <point x="-780" y="1892" type="move" name="parent_top"/>
     </contour>
     <contour>
-      <point x="-745" y="2208" type="move" name="mkmktop"/>
+      <point x="-780" y="2208" type="move" name="mkmktop"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>-780</integer>
+          <key>y</key>
+          <integer>2192</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.98</real>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/tildesubnosp.glif b/src/Inter-UI-Regular.ufo/glyphs/tildesubnosp.glif
index 7051286c8..16d95c716 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/tildesubnosp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/tildesubnosp.glif
@@ -5,17 +5,34 @@
   <outline>
     <component base="tilde" xOffset="-1488" yOffset="-2228"/>
     <contour>
-      <point x="-809" y="0" type="move" name="_bottom"/>
+      <point x="-864" y="0" type="move" name="_bottom"/>
     </contour>
     <contour>
-      <point x="-809" y="0" type="move" name="_markbottom"/>
+      <point x="-864" y="0" type="move" name="_markbottom"/>
     </contour>
     <contour>
-      <point x="-809" y="-594" type="move" name="mkmkbottom_acc"/>
+      <point x="-864" y="-596" type="move" name="mkmkbottom_acc"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>-864</integer>
+          <key>y</key>
+          <integer>-996</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.98</real>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/trthook.glif b/src/Inter-UI-Regular.ufo/glyphs/trthook.glif
index d6e52063e..8d99b46c8 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/trthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/trthook.glif
@@ -28,13 +28,13 @@
       <point x="852" y="1316" type="line"/>
     </contour>
     <contour>
-      <point x="496" y="2200" type="move" name="top"/>
+      <point x="404" y="2048" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="624" y="-616" type="move" name="bottom"/>
+      <point x="604" y="-600" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1008" y="2200" type="move" name="top0315"/>
+      <point x="916" y="2048" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/u.glif b/src/Inter-UI-Regular.ufo/glyphs/u.glif
index c9b85d07b..246cf4f1a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/u.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/u.glif
@@ -33,7 +33,7 @@
       <point x="1264" y="0" type="move" name="ogonek"/>
     </contour>
     <contour>
-      <point x="612" y="0" type="move" name="bottomu"/>
+      <point x="780" y="0" type="move" name="bottomu"/>
     </contour>
     <contour>
       <point x="1468" y="2200" type="move" name="top_dd"/>
@@ -48,11 +48,28 @@
       <point x="1432" y="1776" type="move" name="top0315"/>
     </contour>
     <contour>
-      <point x="688" y="0" type="move" name="bottom"/>
+      <point x="780" y="0" type="move" name="bottom"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>812</integer>
+          <key>y</key>
+          <integer>1476</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni04FD__.glif b/src/Inter-UI-Regular.ufo/glyphs/uni04FD__.glif
index 1884167ef..011131469 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni04FD__.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni04FD__.glif
@@ -3,6 +3,8 @@
   <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>
@@ -12,8 +14,6 @@
     <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/utilde.glif b/src/Inter-UI-Regular.ufo/glyphs/utilde.glif
index a2c0ce4b4..be78c91a3 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/utilde.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/utilde.glif
@@ -3,7 +3,7 @@
   <advance width="1620"/>
   <unicode hex="0169"/>
   <outline>
-    <component base="u"/>
     <component base="tilde" xOffset="132"/>
+    <component base="u"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/v.glif b/src/Inter-UI-Regular.ufo/glyphs/v.glif
index f3e33cb20..d8b935499 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/v.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/v.glif
@@ -3,11 +3,21 @@
   <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>
     <contour>
-      <point x="680" y="16" type="move" name="bottom"/>
+      <point x="752" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="1352" y="2200" type="move" name="top_dd"/>
@@ -18,19 +28,26 @@
     <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>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>752</integer>
+          <key>y</key>
+          <integer>288</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/w.glif b/src/Inter-UI-Regular.ufo/glyphs/w.glif
index 67f46e9b6..a8dfdcd39 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="1132" y="1792" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1036" y="16" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1132" y="1792" type="move" name="marktop"/>
-    </contour>
-    <contour>
-      <point x="2100" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="2100" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <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"/>
@@ -39,9 +21,44 @@
       <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>
+    <contour>
+      <point x="1136" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1136" y="1792" type="move" name="marktop"/>
+    </contour>
+    <contour>
+      <point x="2100" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="2100" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="2100" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>1136</integer>
+          <key>y</key>
+          <integer>1108</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/wdieresis.glif b/src/Inter-UI-Regular.ufo/glyphs/wdieresis.glif
index fd831026c..1dcd4227e 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/wdieresis.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/wdieresis.glif
@@ -3,8 +3,8 @@
   <advance width="2272"/>
   <unicode hex="1E85"/>
   <outline>
-    <component base="w"/>
     <component base="dieresis" xOffset="320"/>
+    <component base="w"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/wturn.glif b/src/Inter-UI-Regular.ufo/glyphs/wturn.glif
index c44a5f974..afbaa4b30 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/wturn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/wturn.glif
@@ -5,10 +5,10 @@
   <outline>
     <component base="w" xScale="-1.0" yScale="-1.0" xOffset="2272" yOffset="1536"/>
     <contour>
-      <point x="1132" y="1776" type="move" name="top"/>
+      <point x="1136" y="1792" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1132" y="0" type="move" name="bottom"/>
+      <point x="1136" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="2192" y="1776" type="move" name="top0315"/>
@@ -16,6 +16,23 @@
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>1136</integer>
+          <key>y</key>
+          <integer>176</integer>
+        </dict>
+      </array>
       <key>interface.gridadjust.original</key>
       <string>{'width': 2109, 'leftMargin': 54, 'rightMargin': 53}</string>
       <key>interface.width-adjustments</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/x.glif b/src/Inter-UI-Regular.ufo/glyphs/x.glif
index f1ba348f3..819998fa2 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/x.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/x.glif
@@ -4,7 +4,21 @@
   <unicode hex="0078"/>
   <outline>
     <contour>
-      <point x="688" y="16" type="move" name="bottom"/>
+      <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>
     <contour>
       <point x="1176" y="0" type="move" name="right"/>
@@ -13,7 +27,7 @@
       <point x="684" y="760" type="move" name="cross"/>
     </contour>
     <contour>
-      <point x="756" y="1792" type="move" name="top"/>
+      <point x="752" y="1792" type="move" name="top"/>
     </contour>
     <contour>
       <point x="1388" y="2200" type="move" name="top_dd"/>
@@ -24,23 +38,26 @@
     <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>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>752</integer>
+          <key>y</key>
+          <integer>868</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/y.glif b/src/Inter-UI-Regular.ufo/glyphs/y.glif
index 862bbee26..ddf4bccc6 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/y.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/y.glif
@@ -32,7 +32,7 @@
       <point x="752.0" y="1792.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="708.0" y="-216.0" type="move" name="bottom"/>
+      <point x="536" y="-576" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="752.0" y="1792.0" type="move" name="marktop"/>
@@ -41,10 +41,10 @@
       <point x="1136.0" y="2176.0" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1060.0" y="-560.0" type="move" name="bottom_dd"/>
+      <point x="1060" y="-576" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="740.0" y="900.0" type="move" name="rhotichook"/>
+      <point x="752" y="896" type="move" name="rhotichook"/>
     </contour>
     <contour>
       <point x="1328.0" y="1792.0" type="move" name="top0315"/>
@@ -52,6 +52,23 @@
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>752</integer>
+          <key>y</key>
+          <integer>392</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.layerData</key>
       <dict>
         <key>reference</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ydieresis.glif b/src/Inter-UI-Regular.ufo/glyphs/ydieresis.glif
index db64e07f3..03b3a930d 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ydieresis.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ydieresis.glif
@@ -3,8 +3,8 @@
   <advance width="1504"/>
   <unicode hex="00FF"/>
   <outline>
-    <component base="y"/>
     <component base="dieresis" xOffset="-64"/>
+    <component base="y"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/z.glif b/src/Inter-UI-Regular.ufo/glyphs/z.glif
index 47dfdd3c8..f8ce13df7 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/z.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/z.glif
@@ -24,10 +24,10 @@
       <point x="1216" y="1316" type="line"/>
     </contour>
     <contour>
-      <point x="768" y="1792" type="move" name="top"/>
+      <point x="752" y="1792" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="704" y="16" type="move" name="bottom"/>
+      <point x="752" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="1388" y="2200" type="move" name="top_dd"/>
@@ -41,6 +41,23 @@
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>752</integer>
+          <key>y</key>
+          <integer>500</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/diacritics.txt b/src/diacritics.txt
index b8782d9f2..07405c935 100644
--- a/src/diacritics.txt
+++ b/src/diacritics.txt
@@ -8,8 +8,8 @@ t+crossbar:cross=tbar
 A+grave:top=Agrave
 A+acute:top=Aacute
 A+circumflex:top=Acircumflex
-A+tilde:top=Atilde
-A+dieresis:top=Adieresis
+# A+tilde:top=Atilde
+# A+dieresis:top=Adieresis
 A+ring:top=Aring
 A+ringacute:top=Aringacute
 C+cedilla:bottom=Ccedilla
@@ -20,13 +20,13 @@ E+dieresis:top=Edieresis
 I+grave:top=Igrave
 I+acute:top=Iacute
 I+circumflex:top=Icircumflex
-I+dieresis:top=Idieresis
+# I+dieresis:top=Idieresis
 N+tilde:top=Ntilde
 O+grave:top=Ograve
 O+acute:top=Oacute
 O+circumflex:top=Ocircumflex
-O+tilde:top=Otilde
-O+dieresis:top=Odieresis
+# O+tilde:top=Otilde
+# O+dieresis:top=Odieresis
 U+grave:top=Ugrave
 U+acute:top=Uacute
 U+circumflex:top=Ucircumflex
@@ -35,31 +35,31 @@ Y+acute:top=Yacute
 a+grave:top=agrave
 a+acute:top=aacute
 a+circumflex:top=acircumflex
-a+tilde:top=atilde
-a+dieresis:top=adieresis
+# a+tilde:top=atilde
+# a+dieresis:top=adieresis
 a+ring:top=aring
 a+ringacute:top=aringacute
 c+cedilla:bottom=ccedilla
 e+grave:top=egrave
 e+acute:top=eacute
 e+circumflex:top=ecircumflex
-e+dieresis:top=edieresis
+# e+dieresis:top=edieresis
 dotlessi+grave:top=igrave
 dotlessi+acute:top=iacute
 dotlessi+circumflex:top=icircumflex
-dotlessi+dieresis:top=idieresis
-n+tilde:top=ntilde
+# dotlessi+dieresis:top=idieresis
+# n+tilde:top=ntilde
 o+grave:top=ograve
 o+acute:top=oacute
 o+circumflex:top=ocircumflex
-o+tilde:top=otilde
-o+dieresis:top=odieresis
+# o+tilde:top=otilde
+# o+dieresis:top=odieresis
 u+grave:top=ugrave
 u+acute:top=uacute
 u+circumflex:top=ucircumflex
-u+dieresis:top=udieresis
+# u+dieresis:top=udieresis
 y+acute:top=yacute
-y+dieresis:top=ydieresis
+# y+dieresis:top=ydieresis
 A+macron:top=Amacron
 a+macron:top=amacron
 A+breve:top=Abreve
@@ -93,7 +93,7 @@ g+commaaccentrotate:top=gcommaaccent
 H+circumflex:top=Hcircumflex
 h+circumflex:top=hcircumflex
 I+tilde:top=Itilde
-dotlessi+tilde:top=itilde
+# dotlessi+tilde:top=itilde
 I+macron:top=Imacron
 dotlessi+macron:top=imacron
 I+breve:top=Ibreve
@@ -147,7 +147,7 @@ t+commaaccent:bottom=uni021B
 T+caron:top=Tcaron
 t+commaaccent:caron=tcaron/0,40
 U+tilde:top=Utilde
-u+tilde:top=utilde
+# u+tilde:top=utilde
 U+macron:top=Umacron
 u+macron:top=umacron
 U+breve:top=Ubreve
@@ -210,13 +210,13 @@ upsilon+dieresis:top=upsilondieresis
 o+tonos:top=omicrontonos
 upsilon+tonos:top=upsilontonos
 omega+tonos:top=omegatonos
-Phi=afii10038
+# Phi=afii10038
 W+grave:top=Wgrave
 w+grave:top=wgrave
 W+acute:top=Wacute
 w+acute:top=wacute
 W+dieresis:top=Wdieresis
-w+dieresis:top=wdieresis
+# w+dieresis:top=wdieresis
 Y+grave:top=Ygrave
 y+grave:top=ygrave
 quotesingle=minute
@@ -232,9 +232,9 @@ afii10047+dieresis:top=uni04EC
 ereversedcyrillic+dieresis:top=uni04ED
 Gamma+cyrillictic:right=uni04F6
 gecyrillic+cyrillictic:right=uni04F7
-softsigncyrillic+crossbar:cross=uni048D
+# softsigncyrillic+crossbar:cross=uni048D
 afii10046+crossbar:cross=uni048C
-softsigncyrillic+crossbar:cross=yatcyrillic
+# softsigncyrillic+crossbar:cross=yatcyrillic
 X+crossbar:cross=uni04FE
 x+crossbar:cross=uni04FF
 F+crossbar:cross=franc
@@ -290,11 +290,11 @@ Thorn=uni03F7
 thorn=uni03F8
 C=uni03F9
 M=uni03FA
-I+tildesubnosp:bottom=Itildebelow
-i+tildesubnosp:bottom=itildebelow
-I+dieresisacutecomb:top=Idieresisacute
-dotlessi+dieresisacutecomb.lc:top=idieresisacute
-longs+dotaccent:top=slongdotaccent
+# I+tildesubnosp:bottom=Itildebelow
+# i+tildesubnosp:bottom=itildebelow
+# I+dieresisacutecomb:top=Idieresisacute
+# dotlessi+dieresisacutecomb.lc:top=idieresisacute
+# longs+dotaccent:top=slongdotaccent
 alpha+uni1FBD:top=uni1F00
 alpha+uni1FFE:top=uni1F01
 alpha+uni1FCD:top=uni1F02
@@ -748,7 +748,7 @@ O+ogonek:bottom+macron:top=Oogonekmacron
 o+ogonek:bottom+macron:top=oogonekmacron
 D_Z=DZ
 D_z=Dz
-d_z=dz
+# d_z=dz
 A+dblgravecmb:top=Adblgrave
 a+dblgravecmb:top=adblgrave
 A+breveinvnosp:top=Ainvertedbreve
diff --git a/src/fontbuild.cfg b/src/fontbuild.cfg
index d095b72a3..98ef46b07 100644
--- a/src/fontbuild.cfg
+++ b/src/fontbuild.cfg
@@ -50,7 +50,6 @@ predecompose: uni04B4 uni04B5 dcroat uni040F uni045F uni0490 uni0491 OE oe Oslas
 	arrowNE arrowSW arrowSE
 	Adieresis adieresis edieresis Idieresis idieresis Odieresis odieresis udieresis wdieresis ydieresis
 	Atilde atilde itilde ntilde Otilde otilde utilde
-	casedieresis.cn casetilde.cn
 
 delete: s.cn G.cn C.cn U.cn b.cn c.cn d.cn g.cn o.cn p.cn q.cn
 	Ghook.cn srthook.cn uni2185.cn
-- 
cgit v1.2.3