diff --git a/src/Inter-UI-Black.ufo/glyphs/Germandbls_.glif b/src/Inter-UI-Black.ufo/glyphs/Germandbls_.glif
index bc52bc4bd..5059297ef 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Germandbls_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Germandbls_.glif
@@ -1,56 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Germandbls" format="1">
-  <advance width="2048"/>
+  <advance width="1976"/>
   <unicode hex="1E9E"/>
   <outline>
     <contour>
-      <point x="608" y="1344" type="line"/>
-      <point x="164" y="1344" type="line"/>
-      <point x="164" y="0" type="line"/>
-      <point x="608" y="0" type="line"/>
+      <point x="592" y="1344" type="line"/>
+      <point x="128" y="1344" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="592" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="608" y="1344" type="line"/>
-      <point x="608" y="1624"/>
-      <point x="728" y="1708"/>
-      <point x="888" y="1708" type="curve" smooth="yes"/>
-      <point x="1040" y="1708"/>
-      <point x="1152" y="1656"/>
-      <point x="1248" y="1584" type="curve"/>
-      <point x="896" y="1184" type="line"/>
-      <point x="896" y="1008" type="line"/>
-      <point x="1200" y="1008" type="line"/>
-      <point x="1800" y="1712" type="line"/>
-      <point x="1508" y="1940"/>
-      <point x="1236" y="2076"/>
-      <point x="888" y="2076" type="curve" smooth="yes"/>
-      <point x="404" y="2076"/>
-      <point x="164" y="1828"/>
-      <point x="164" y="1344" type="curve"/>
+      <point x="592" y="1344" type="line"/>
+      <point x="592" y="1624"/>
+      <point x="684" y="1708"/>
+      <point x="852" y="1708" type="curve" smooth="yes"/>
+      <point x="984" y="1708"/>
+      <point x="1116" y="1660"/>
+      <point x="1212" y="1584" type="curve"/>
+      <point x="860" y="1184" type="line"/>
+      <point x="860" y="1008" type="line"/>
+      <point x="1164" y="1008" type="line"/>
+      <point x="1764" y="1712" type="line"/>
+      <point x="1472" y="1940"/>
+      <point x="1200" y="2076"/>
+      <point x="852" y="2076" type="curve" smooth="yes"/>
+      <point x="368" y="2076"/>
+      <point x="128" y="1828"/>
+      <point x="128" y="1344" type="curve"/>
     </contour>
     <contour>
-      <point x="720" y="56" type="line"/>
-      <point x="828" y="12"/>
-      <point x="980" y="-28"/>
-      <point x="1196" y="-28" type="curve" smooth="yes"/>
-      <point x="1572" y="-28"/>
-      <point x="1884" y="176"/>
-      <point x="1884" y="596" type="curve" smooth="yes"/>
-      <point x="1884" y="996"/>
-      <point x="1612" y="1208"/>
-      <point x="1148" y="1208" type="curve"/>
-      <point x="896" y="1180" type="line"/>
-      <point x="896" y="916" type="line"/>
-      <point x="1076" y="916" type="line" smooth="yes"/>
-      <point x="1312" y="916"/>
-      <point x="1440" y="836"/>
-      <point x="1440" y="596" type="curve" smooth="yes"/>
-      <point x="1440" y="432"/>
-      <point x="1328" y="336"/>
-      <point x="1136" y="336" type="curve" smooth="yes"/>
-      <point x="1012" y="336"/>
-      <point x="900" y="376"/>
-      <point x="844" y="400" type="curve"/>
+      <point x="684" y="56" type="line"/>
+      <point x="792" y="12"/>
+      <point x="944" y="-28"/>
+      <point x="1160" y="-28" type="curve" smooth="yes"/>
+      <point x="1536" y="-28"/>
+      <point x="1848" y="176"/>
+      <point x="1848" y="596" type="curve" smooth="yes"/>
+      <point x="1848" y="996"/>
+      <point x="1576" y="1208"/>
+      <point x="1112" y="1208" type="curve"/>
+      <point x="860" y="1180" type="line"/>
+      <point x="860" y="916" type="line"/>
+      <point x="1040" y="916" type="line" smooth="yes"/>
+      <point x="1276" y="916"/>
+      <point x="1404" y="796"/>
+      <point x="1404" y="596" type="curve" smooth="yes"/>
+      <point x="1404" y="420"/>
+      <point x="1304" y="336"/>
+      <point x="1100" y="336" type="curve" smooth="yes"/>
+      <point x="964" y="336"/>
+      <point x="860" y="376"/>
+      <point x="808" y="400" type="curve"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/a.glif b/src/Inter-UI-Black.ufo/glyphs/a.glif
index 450690313..c8799673f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/a.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/a.glif
@@ -1,32 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="a" format="1">
-  <advance width="1560"/>
+  <advance width="1536"/>
   <unicode hex="0061"/>
   <outline>
-    <contour>
-      <point x="792" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="684" y="32" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1396" y="0" type="move" name="ogonek"/>
-    </contour>
-    <contour>
-      <point x="1000" y="1776" type="move" name="rhalfring"/>
-    </contour>
-    <contour>
-      <point x="1544" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1544" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1220" y="900" type="move" name="rhotichook"/>
-    </contour>
-    <contour>
-      <point x="1552" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="944" y="660" type="line"/>
       <point x="944" y="492" type="line" smooth="yes"/>
@@ -70,6 +46,30 @@
       <point x="956" y="132" type="curve"/>
       <point x="968" y="132" type="line"/>
     </contour>
+    <contour>
+      <point x="792" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="684" y="32" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1396" y="0" type="move" name="ogonek"/>
+    </contour>
+    <contour>
+      <point x="1000" y="1776" type="move" name="rhalfring"/>
+    </contour>
+    <contour>
+      <point x="1544" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1544" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1220" y="900" type="move" name="rhotichook"/>
+    </contour>
+    <contour>
+      <point x="1552" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/a_uni02DE__.glif b/src/Inter-UI-Black.ufo/glyphs/a_uni02DE__.glif
index 4b95ca4b3..60ffabb8c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/a_uni02DE__.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/a_uni02DE__.glif
@@ -2,6 +2,8 @@
 <glyph name="a_uni02DE" format="1">
   <advance width="2304"/>
   <outline>
+    <component base="a" xOffset="-24"/>
+    <component base="rhotichookmod" xOffset="1400"/>
     <contour>
       <point x="620" y="32" type="move" name="bottom"/>
     </contour>
@@ -26,8 +28,6 @@
     <contour>
       <point x="928" y="1776" type="move" name="rhalfring"/>
     </contour>
-    <component base="a" xOffset="-24"/>
-    <component base="rhotichookmod" xOffset="1400"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/alpha.glif b/src/Inter-UI-Black.ufo/glyphs/alpha.glif
index 340138b02..3770760ef 100644
--- a/src/Inter-UI-Black.ufo/glyphs/alpha.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/alpha.glif
@@ -1,67 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="alpha" format="1">
-  <advance width="1792"/>
+  <advance width="1618"/>
   <unicode hex="03B1"/>
   <outline>
     <contour>
-      <point x="912" y="1776" type="move" name="top"/>
+      <point x="80" y="732" type="line"/>
+      <point x="80" y="288"/>
+      <point x="284" y="-28"/>
+      <point x="660" y="-28" type="curve" smooth="yes"/>
+      <point x="984" y="-28"/>
+      <point x="1116" y="308"/>
+      <point x="1172" y="720" type="curve"/>
+      <point x="1172" y="756" type="line"/>
+      <point x="1116" y="1200"/>
+      <point x="984" y="1556"/>
+      <point x="664" y="1556" type="curve" smooth="yes"/>
+      <point x="284" y="1556"/>
+      <point x="80" y="1228"/>
+      <point x="80" y="760" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="736" y="-16" type="move" name="bottom"/>
+      <point x="528" y="760" type="line"/>
+      <point x="528" y="996"/>
+      <point x="592" y="1192"/>
+      <point x="776" y="1192" type="curve" smooth="yes"/>
+      <point x="956" y="1192"/>
+      <point x="1028" y="1044"/>
+      <point x="1044" y="792" type="curve"/>
+      <point x="1044" y="680" type="line"/>
+      <point x="1028" y="464"/>
+      <point x="956" y="340"/>
+      <point x="772" y="340" type="curve" smooth="yes"/>
+      <point x="584" y="340"/>
+      <point x="528" y="504"/>
+      <point x="528" y="732" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="1644" y="1776" type="move" name="top0315"/>
+      <point x="1032" y="1536" type="line"/>
+      <point x="976" y="1204" type="line"/>
+      <point x="976" y="396" type="line"/>
+      <point x="1024" y="108"/>
+      <point x="1172" y="-28"/>
+      <point x="1404" y="-28" type="curve" smooth="yes"/>
+      <point x="1468" y="-28"/>
+      <point x="1516" y="-24"/>
+      <point x="1576" y="0" type="curve"/>
+      <point x="1540" y="344" type="line"/>
+      <point x="1536" y="340"/>
+      <point x="1528" y="340"/>
+      <point x="1516" y="340" type="curve" smooth="yes"/>
+      <point x="1452" y="340"/>
+      <point x="1420" y="388"/>
+      <point x="1420" y="520" type="curve" smooth="yes"/>
+      <point x="1420" y="1536" type="line"/>
     </contour>
     <contour>
-      <point x="148" y="732" type="line"/>
-      <point x="148" y="288"/>
-      <point x="352" y="-28"/>
-      <point x="728" y="-28" type="curve" smooth="yes"/>
-      <point x="1052" y="-28"/>
-      <point x="1184" y="308"/>
-      <point x="1240" y="720" type="curve"/>
-      <point x="1240" y="756" type="line"/>
-      <point x="1184" y="1200"/>
-      <point x="1052" y="1556"/>
-      <point x="732" y="1556" type="curve" smooth="yes"/>
-      <point x="352" y="1556"/>
-      <point x="148" y="1228"/>
-      <point x="148" y="760" type="curve" smooth="yes"/>
+      <point x="844" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="596" y="760" type="line"/>
-      <point x="596" y="996"/>
-      <point x="660" y="1192"/>
-      <point x="844" y="1192" type="curve" smooth="yes"/>
-      <point x="1024" y="1192"/>
-      <point x="1096" y="1044"/>
-      <point x="1112" y="792" type="curve"/>
-      <point x="1112" y="680" type="line"/>
-      <point x="1096" y="464"/>
-      <point x="1024" y="340"/>
-      <point x="840" y="340" type="curve" smooth="yes"/>
-      <point x="652" y="340"/>
-      <point x="596" y="504"/>
-      <point x="596" y="732" type="curve" smooth="yes"/>
+      <point x="668" y="-16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1100" y="1536" type="line"/>
-      <point x="1044" y="1204" type="line"/>
-      <point x="1044" y="396" type="line"/>
-      <point x="1092" y="108"/>
-      <point x="1240" y="-28"/>
-      <point x="1472" y="-28" type="curve" smooth="yes"/>
-      <point x="1536" y="-28"/>
-      <point x="1584" y="-24"/>
-      <point x="1644" y="0" type="curve"/>
-      <point x="1608" y="344" type="line"/>
-      <point x="1604" y="340"/>
-      <point x="1596" y="340"/>
-      <point x="1584" y="340" type="curve" smooth="yes"/>
-      <point x="1520" y="340"/>
-      <point x="1488" y="388"/>
-      <point x="1488" y="520" type="curve" smooth="yes"/>
-      <point x="1488" y="1536" type="line"/>
+      <point x="1576" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/b.glif b/src/Inter-UI-Black.ufo/glyphs/b.glif
index 1a0598c45..c83e2072b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/b.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/b.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="b" format="1">
-  <advance width="1524"/>
+  <advance width="1572"/>
   <unicode hex="0062"/>
   <outline>
     <contour>
-      <point x="1004" y="2200" type="move" name="top"/>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="544" y="0" type="line"/>
+      <point x="568" y="304" type="line"/>
+      <point x="420" y="744" type="line"/>
+      <point x="588" y="1272" type="line"/>
+      <point x="588" y="2048" type="line"/>
+    </contour>
+    <component base="rightloop.cn" xOffset="-84"/>
+    <contour>
+      <point x="1048" y="2200" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1008" y="-16" type="move" name="bottom"/>
+      <point x="1052" y="-16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1660" y="2200" type="move" name="top_dd"/>
+      <point x="1704" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1660" y="-560" type="move" name="bottom_dd"/>
+      <point x="1704" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1660" y="2200" type="move" name="top0315"/>
+      <point x="1704" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="84" y="2048" type="line"/>
-      <point x="84" y="0" type="line"/>
-      <point x="500" y="0" type="line"/>
-      <point x="524" y="304" type="line"/>
-      <point x="376" y="744" type="line"/>
-      <point x="544" y="1272" type="line"/>
-      <point x="544" y="2048" type="line"/>
-    </contour>
-    <component base="rightloop.cn" xOffset="-128"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/bbar.glif b/src/Inter-UI-Black.ufo/glyphs/bbar.glif
index 0af66c8e2..da84348cd 100644
--- a/src/Inter-UI-Black.ufo/glyphs/bbar.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/bbar.glif
@@ -3,6 +3,8 @@
   <advance width="1792"/>
   <unicode hex="0180"/>
   <outline>
+    <component base="b" xOffset="176"/>
+    <component base="crossbar" xOffset="-108" yOffset="764"/>
     <contour>
       <point x="996" y="-16" type="move" name="markbottom"/>
     </contour>
@@ -18,8 +20,6 @@
     <contour>
       <point x="996" y="-16" type="move" name="bottom"/>
     </contour>
-    <component base="b" xOffset="176"/>
-    <component base="crossbar" xOffset="-108" yOffset="764"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/beta.glif b/src/Inter-UI-Black.ufo/glyphs/beta.glif
index d899d92dc..5fcc693c9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/beta.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/beta.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="beta" format="1">
-  <advance width="1692"/>
+  <advance width="1640"/>
   <unicode hex="03B2"/>
   <outline>
     <contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/d.glif b/src/Inter-UI-Black.ufo/glyphs/d.glif
index 00bd78403..9d745eebc 100644
--- a/src/Inter-UI-Black.ufo/glyphs/d.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/d.glif
@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="d" format="1">
-  <advance width="1532"/>
+  <advance width="1576"/>
   <unicode hex="0064"/>
   <outline>
+    <contour>
+      <point x="992" y="308" type="line"/>
+      <point x="1032" y="0" type="line"/>
+      <point x="1448" y="0" type="line"/>
+      <point x="1448" y="2048" type="line"/>
+      <point x="988" y="2048" type="line"/>
+      <point x="988" y="1256" type="line"/>
+      <point x="1144" y="732" type="line"/>
+    </contour>
+    <component base="leftloop.cn" xOffset="-4"/>
     <contour>
       <point x="1612" y="2112" type="move" name="caron"/>
     </contour>
@@ -24,16 +34,6 @@
     <contour>
       <point x="1588" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="992" y="308" type="line"/>
-      <point x="1032" y="0" type="line"/>
-      <point x="1448" y="0" type="line"/>
-      <point x="1448" y="2048" type="line"/>
-      <point x="988" y="2048" type="line"/>
-      <point x="988" y="1256" type="line"/>
-      <point x="1144" y="732" type="line"/>
-    </contour>
-    <component base="leftloop.cn" xOffset="-4"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dcroat.glif b/src/Inter-UI-Black.ufo/glyphs/dcroat.glif
index 5daceed9c..a23865acd 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dcroat.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dcroat.glif
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="dcroat" format="1">
-  <advance width="1788"/>
+  <advance width="1680"/>
   <unicode hex="0111"/>
   <outline>
+    <contour>
+      <point x="1680" y="1868" type="line"/>
+      <point x="688" y="1868" type="line"/>
+      <point x="688" y="1608" type="line"/>
+      <point x="1680" y="1608" type="line"/>
+    </contour>
+    <component base="d"/>
     <contour>
       <point x="1640" y="2112" type="move" name="caron"/>
     </contour>
@@ -27,20 +34,6 @@
     <contour>
       <point x="1184" y="1804" type="move" name="parenthesses.w2"/>
     </contour>
-    <contour>
-      <point x="1016" y="340" type="line"/>
-      <point x="1060" y="0" type="line"/>
-      <point x="1476" y="0" type="line"/>
-      <point x="1476" y="2048" type="line"/>
-      <point x="1016" y="2048" type="line"/>
-    </contour>
-    <contour>
-      <point x="1680" y="1868" type="line"/>
-      <point x="688" y="1868" type="line"/>
-      <point x="688" y="1608" type="line"/>
-      <point x="1680" y="1608" type="line"/>
-    </contour>
-    <component base="leftloop.cn" xOffset="-4"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dotlessj.glif b/src/Inter-UI-Black.ufo/glyphs/dotlessj.glif
index 9d05a66a5..4f4c4b415 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dotlessj.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dotlessj.glif
@@ -1,40 +1,76 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="dotlessj" format="1">
-  <advance width="768"/>
+  <advance width="916"/>
   <unicode hex="0237"/>
   <outline>
     <contour>
-      <point x="504" y="1744" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="768" y="0" type="move" name="_right"/>
-    </contour>
-    <contour>
-      <point x="948" y="1744" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="324" y="1488" type="line"/>
-      <point x="324" y="-20" type="line"/>
-      <point x="324" y="-168"/>
-      <point x="264" y="-244"/>
-      <point x="160" y="-244" type="curve" smooth="yes"/>
-      <point x="104" y="-244"/>
-      <point x="68" y="-240"/>
-      <point x="24" y="-228" type="curve"/>
+      <point x="316" y="1536" type="line"/>
+      <point x="316" y="-40" type="line"/>
+      <point x="316" y="-140"/>
+      <point x="280" y="-220"/>
+      <point x="100" y="-220" type="curve"/>
+      <point x="4" y="-220" type="line"/>
       <point x="4" y="-580" type="line"/>
-      <point x="80" y="-596"/>
-      <point x="140" y="-600"/>
-      <point x="216" y="-600" type="curve" smooth="yes"/>
-      <point x="560" y="-600"/>
-      <point x="768" y="-396"/>
-      <point x="768" y="-20" type="curve"/>
-      <point x="768" y="1488" type="line"/>
+      <point x="172" y="-580" type="line"/>
+      <point x="516" y="-580"/>
+      <point x="776" y="-420"/>
+      <point x="776" y="-48" type="curve"/>
+      <point x="776" y="1536" type="line"/>
+    </contour>
+    <contour>
+      <point x="452.0" y="2200.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="408.0" y="-632.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="900.0" y="2200.0" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="900.0" y="-560.0" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="900.0" y="2200.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>0.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>x</key>
+          <real>0.0</real>
+          <key>y</key>
+          <real>906.125</real>
+        </dict>
+        <dict>
+          <key>angle</key>
+          <real>0.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>x</key>
+          <real>0.0</real>
+          <key>y</key>
+          <real>1381.875</real>
+        </dict>
+      </array>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.86</real>
+        <real>0.92</real>
+        <real>0.97</real>
+        <real>1.0</real>
+      </array>
       <key>interface.gridadjust.original</key>
-      <string>{'width': 820, 'leftMargin': -124, 'rightMargin': 181}</string>
+      <string>{'width': 752, 'leftMargin': -151, 'rightMargin': 125}</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/drthook.glif b/src/Inter-UI-Black.ufo/glyphs/drthook.glif
index 5714fb345..b5647a056 100644
--- a/src/Inter-UI-Black.ufo/glyphs/drthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/drthook.glif
@@ -3,15 +3,6 @@
   <advance width="1792"/>
   <unicode hex="0256"/>
   <outline>
-    <contour>
-      <point x="624" y="2340" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="760" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1752" y="2340" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="964" y="392" type="line"/>
       <point x="964" y="-108" type="line" smooth="yes"/>
@@ -31,6 +22,15 @@
       <point x="1408" y="392" type="line"/>
     </contour>
     <component base="d" xOffset="-36"/>
+    <contour>
+      <point x="624" y="2340" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="760" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1752" y="2340" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dyogh.glif b/src/Inter-UI-Black.ufo/glyphs/dyogh.glif
index 1626536aa..177153c99 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dyogh.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dyogh.glif
@@ -3,15 +3,6 @@
   <advance width="2816"/>
   <unicode hex="02A4"/>
   <outline>
-    <contour>
-      <point x="1884" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1884" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="2708" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1276" y="1488" type="line"/>
       <point x="1276" y="1132" type="line"/>
@@ -47,6 +38,15 @@
       <point x="1908" y="652" type="curve"/>
     </contour>
     <component base="d" xOffset="88"/>
+    <contour>
+      <point x="1884" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1884" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="2708" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dz.glif b/src/Inter-UI-Black.ufo/glyphs/dz.glif
index b7b267c45..4f7ff6a55 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dz.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dz.glif
@@ -3,15 +3,6 @@
   <advance width="2840"/>
   <unicode hex="02A3"/>
   <outline>
-    <contour>
-      <point x="2084" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="2084" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="2796" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="2700" y="360" type="line"/>
       <point x="1556" y="360" type="line"/>
@@ -33,6 +24,15 @@
       <point x="2536" y="1132" type="line"/>
     </contour>
     <component base="d"/>
+    <contour>
+      <point x="2084" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="2084" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="2796" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dzcurl.glif b/src/Inter-UI-Black.ufo/glyphs/dzcurl.glif
index 5029aabe6..cf9c3aa24 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dzcurl.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dzcurl.glif
@@ -3,15 +3,6 @@
   <advance width="3252"/>
   <unicode hex="02A5"/>
   <outline>
-    <contour>
-      <point x="2024" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="2024" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="3200" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1784" y="-196" type="line"/>
       <point x="2036" y="-376" type="line"/>
@@ -59,6 +50,15 @@
       <point x="2532" y="1132" type="line"/>
     </contour>
     <component base="d"/>
+    <contour>
+      <point x="2024" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="2024" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="3200" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/eta.glif b/src/Inter-UI-Black.ufo/glyphs/eta.glif
index e69f418aa..6215574f1 100644
--- a/src/Inter-UI-Black.ufo/glyphs/eta.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/eta.glif
@@ -1,74 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="eta" format="1">
-  <advance width="1536"/>
+  <advance width="1624"/>
   <unicode hex="03B7"/>
   <outline>
     <contour>
-      <point x="768" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="328" y="16" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1560" y="1776" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="548" y="1212" type="line"/>
-      <point x="520" y="1536" type="line"/>
-      <point x="108" y="1536" type="line"/>
-      <point x="108" y="0" type="line"/>
-      <point x="548" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="464" y="836" type="line"/>
-      <point x="464" y="1044"/>
-      <point x="580" y="1200"/>
-      <point x="796" y="1200" type="curve" smooth="yes"/>
-      <point x="916" y="1200"/>
-      <point x="988" y="1128"/>
-      <point x="988" y="992" type="curve"/>
-      <point x="988" y="-572" type="line"/>
-      <point x="1432" y="-572" type="line"/>
-      <point x="1432" y="992" type="line"/>
-      <point x="1432" y="1400"/>
+      <point x="588" y="816" type="line" smooth="yes"/>
+      <point x="588" y="1032"/>
+      <point x="644" y="1192"/>
+      <point x="816" y="1192" type="curve" smooth="yes"/>
+      <point x="940" y="1192"/>
+      <point x="1036" y="1108"/>
+      <point x="1036" y="944" type="curve" smooth="yes"/>
+      <point x="1036" y="-576" type="line"/>
+      <point x="1496" y="-576" type="line"/>
+      <point x="1496" y="960" type="line" smooth="yes"/>
+      <point x="1496" y="1404"/>
       <point x="1240" y="1556"/>
-      <point x="960" y="1556" type="curve" smooth="yes"/>
-      <point x="616" y="1556"/>
-      <point x="384" y="1252"/>
-      <point x="384" y="832" type="curve"/>
+      <point x="980" y="1556" type="curve" smooth="yes"/>
+      <point x="804" y="1556"/>
+      <point x="656" y="1484"/>
+      <point x="568" y="1372" type="curve"/>
+      <point x="552" y="1372" type="line"/>
+      <point x="552" y="1536" type="line"/>
+      <point x="128" y="1536" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="588" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="768.0" y="1776.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="768.0" y="16.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="-152.0" y="2108.0" type="move" name="caron"/>
+    </contour>
+    <contour>
+      <point x="1432.0" y="0.0" type="move" name="right"/>
+    </contour>
+    <contour>
+      <point x="768.0" y="1776.0" type="move" name="marktop"/>
+    </contour>
+    <contour>
+      <point x="1560.0" y="2200.0" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1560.0" y="-560.0" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1560.0" y="1776.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.typemytype.robofont.guides</key>
+      <key>com.typemytype.robofont.mark</key>
       <array>
-        <dict>
-          <key>angle</key>
-          <real>0.0</real>
-          <key>isGlobal</key>
-          <false/>
-          <key>magnetic</key>
-          <integer>5</integer>
-          <key>x</key>
-          <real>0.0</real>
-          <key>y</key>
-          <real>1238.875</real>
-        </dict>
-        <dict>
-          <key>angle</key>
-          <real>0.0</real>
-          <key>isGlobal</key>
-          <false/>
-          <key>magnetic</key>
-          <integer>5</integer>
-          <key>x</key>
-          <real>0.0</real>
-          <key>y</key>
-          <real>763.125</real>
-        </dict>
+        <real>0.86</real>
+        <real>0.92</real>
+        <real>0.97</real>
+        <real>1.0</real>
       </array>
       <key>interface.gridadjust.original</key>
-      <string>{'width': 1585, 'leftMargin': 132, 'rightMargin': 129}</string>
+      <string>{'width': 1585, 'leftMargin': 129, 'rightMargin': 133}</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/finalkaf.glif b/src/Inter-UI-Black.ufo/glyphs/finalkaf.glif
index 3aa8a9b0e..b2eb92181 100644
--- a/src/Inter-UI-Black.ufo/glyphs/finalkaf.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/finalkaf.glif
@@ -3,15 +3,6 @@
   <advance width="2048"/>
   <unicode hex="02AA"/>
   <outline>
-    <contour>
-      <point x="1260" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1260" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1992" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1472" y="420" type="curve" smooth="yes"/>
       <point x="1472" y="332"/>
@@ -53,6 +44,15 @@
       <point x="1472" y="500"/>
     </contour>
     <component base="l" xOffset="-16"/>
+    <contour>
+      <point x="1260" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1260" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1992" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/fitacyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/fitacyrillic.glif
index 5bc021b3e..65e73c88f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/fitacyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/fitacyrillic.glif
@@ -3,12 +3,6 @@
   <advance width="1792"/>
   <unicode hex="0473"/>
   <outline>
-    <contour>
-      <point x="784" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1588" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1248" y="868" type="line"/>
       <point x="312" y="868" type="line"/>
@@ -16,6 +10,12 @@
       <point x="1248" y="604" type="line"/>
     </contour>
     <component base="o" xOffset="-4"/>
+    <contour>
+      <point x="784" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1588" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/g.glif b/src/Inter-UI-Black.ufo/glyphs/g.glif
index e65c14dfe..90e9ba5dd 100644
--- a/src/Inter-UI-Black.ufo/glyphs/g.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/g.glif
@@ -1,23 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="g" format="1">
-  <advance width="1544"/>
+  <advance width="1600"/>
   <unicode hex="0067"/>
   <outline>
-    <contour>
-      <point x="760" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="760" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1612" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1612" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1612" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1056" y="1528" type="line"/>
       <point x="1020" y="1240" type="line"/>
@@ -74,6 +59,21 @@
       <point x="520" y="524"/>
       <point x="520" y="752" type="curve" smooth="yes"/>
     </contour>
+    <contour>
+      <point x="760" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="760" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1612" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1612" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1612" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/gcursive.glif b/src/Inter-UI-Black.ufo/glyphs/gcursive.glif
index 32d2924b2..4db2e7b2a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/gcursive.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/gcursive.glif
@@ -3,6 +3,7 @@
   <advance width="1536"/>
   <unicode hex="0261"/>
   <outline>
+    <component base="g" xOffset="-12"/>
     <contour>
       <point x="752" y="1776" type="move" name="top"/>
     </contour>
@@ -12,7 +13,6 @@
     <contour>
       <point x="752" y="-616" type="move" name="bottom"/>
     </contour>
-    <component base="g" xOffset="-12"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/germandbls.glif b/src/Inter-UI-Black.ufo/glyphs/germandbls.glif
index 031ba1128..596a484f1 100644
--- a/src/Inter-UI-Black.ufo/glyphs/germandbls.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/germandbls.glif
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="germandbls" format="1">
-  <advance width="2048"/>
+  <advance width="1768"/>
   <unicode hex="00DF"/>
   <outline>
     <contour>
-      <point x="696" y="1504" type="line"/>
-      <point x="696" y="1724"/>
-      <point x="776" y="1792"/>
-      <point x="900" y="1792" type="curve" smooth="yes"/>
-      <point x="1016" y="1792"/>
-      <point x="1100" y="1712"/>
-      <point x="1100" y="1604" type="curve" smooth="yes"/>
-      <point x="1100" y="1392"/>
-      <point x="964" y="1380"/>
-      <point x="964" y="1124" type="curve" smooth="yes" name="hr01"/>
-      <point x="964" y="776"/>
-      <point x="1356" y="716"/>
-      <point x="1356" y="504" type="curve" smooth="yes" name="hr02"/>
-      <point x="1356" y="392"/>
-      <point x="1272" y="332"/>
-      <point x="1152" y="332" type="curve" smooth="yes"/>
-      <point x="1020" y="332"/>
-      <point x="916" y="364"/>
-      <point x="860" y="392" type="curve"/>
-      <point x="780" y="44" type="line"/>
-      <point x="856" y="0"/>
-      <point x="1016" y="-28"/>
-      <point x="1152" y="-28" type="curve" smooth="yes"/>
-      <point x="1576" y="-28"/>
-      <point x="1796" y="176"/>
-      <point x="1796" y="508" type="curve" smooth="yes"/>
-      <point x="1796" y="848"/>
-      <point x="1404" y="988"/>
-      <point x="1404" y="1148" type="curve" smooth="yes" name="hr03"/>
-      <point x="1404" y="1376"/>
-      <point x="1540" y="1360"/>
-      <point x="1540" y="1624" type="curve" smooth="yes" name="hr04"/>
-      <point x="1540" y="1968"/>
-      <point x="1268" y="2148"/>
-      <point x="944" y="2148" type="curve" smooth="yes"/>
-      <point x="516" y="2148"/>
-      <point x="252" y="1932"/>
-      <point x="252" y="1512" type="curve" smooth="yes"/>
-      <point x="252" y="0" type="line"/>
-      <point x="696" y="0" type="line"/>
+      <point x="572" y="1504" type="line"/>
+      <point x="572" y="1724"/>
+      <point x="652" y="1792"/>
+      <point x="776" y="1792" type="curve" smooth="yes"/>
+      <point x="892" y="1792"/>
+      <point x="976" y="1712"/>
+      <point x="976" y="1604" type="curve" smooth="yes"/>
+      <point x="976" y="1392"/>
+      <point x="840" y="1380"/>
+      <point x="840" y="1124" type="curve" smooth="yes" name="hr01"/>
+      <point x="840" y="776"/>
+      <point x="1232" y="716"/>
+      <point x="1232" y="504" type="curve" smooth="yes" name="hr02"/>
+      <point x="1232" y="392"/>
+      <point x="1148" y="332"/>
+      <point x="1028" y="332" type="curve" smooth="yes"/>
+      <point x="896" y="332"/>
+      <point x="792" y="364"/>
+      <point x="736" y="392" type="curve"/>
+      <point x="656" y="44" type="line"/>
+      <point x="732" y="0"/>
+      <point x="892" y="-28"/>
+      <point x="1028" y="-28" type="curve" smooth="yes"/>
+      <point x="1452" y="-28"/>
+      <point x="1672" y="176"/>
+      <point x="1672" y="508" type="curve" smooth="yes"/>
+      <point x="1672" y="848"/>
+      <point x="1280" y="988"/>
+      <point x="1280" y="1148" type="curve" smooth="yes" name="hr03"/>
+      <point x="1280" y="1376"/>
+      <point x="1416" y="1360"/>
+      <point x="1416" y="1624" type="curve" smooth="yes" name="hr04"/>
+      <point x="1416" y="1968"/>
+      <point x="1144" y="2148"/>
+      <point x="820" y="2148" type="curve" smooth="yes"/>
+      <point x="392" y="2148"/>
+      <point x="128" y="1932"/>
+      <point x="128" y="1512" type="curve" smooth="yes"/>
+      <point x="128" y="0" type="line"/>
+      <point x="572" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/h.glif b/src/Inter-UI-Black.ufo/glyphs/h.glif
index c53179fc1..d82c7c106 100644
--- a/src/Inter-UI-Black.ufo/glyphs/h.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/h.glif
@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="h" format="1">
-  <advance width="1536"/>
+  <advance width="1580"/>
   <unicode hex="0068"/>
   <outline>
     <contour>
-      <point x="712" y="2328" type="move" name="top"/>
+      <point x="588" y="816" type="line" smooth="yes"/>
+      <point x="588" y="1028"/>
+      <point x="648" y="1192"/>
+      <point x="820" y="1192" type="curve" smooth="yes"/>
+      <point x="948" y="1192"/>
+      <point x="992" y="1100"/>
+      <point x="992" y="964" type="curve" smooth="yes"/>
+      <point x="992" y="0" type="line"/>
+      <point x="1452" y="0" type="line"/>
+      <point x="1452" y="960" type="line" smooth="yes"/>
+      <point x="1452" y="1368"/>
+      <point x="1260" y="1556"/>
+      <point x="984" y="1556" type="curve" smooth="yes"/>
+      <point x="816" y="1556"/>
+      <point x="676" y="1488"/>
+      <point x="588" y="1372" type="curve"/>
+      <point x="572" y="1372" type="line"/>
+      <point x="572" y="2048" type="line"/>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="588" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="384" y="1792" type="move" name="cross"/>
+      <point x="732" y="2328" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="776" y="16" type="move" name="bottom"/>
+      <point x="404" y="1792" type="move" name="cross"/>
     </contour>
     <contour>
-      <point x="1432" y="0" type="move" name="right"/>
+      <point x="796" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1564" y="2200" type="move" name="top_dd"/>
+      <point x="1452" y="0" type="move" name="right"/>
     </contour>
     <contour>
-      <point x="1564" y="-560" type="move" name="bottom_dd"/>
+      <point x="1584" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1564" y="2328" type="move" name="top0315"/>
+      <point x="1584" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="568" y="816" type="line" smooth="yes"/>
-      <point x="568" y="1028"/>
-      <point x="628" y="1192"/>
-      <point x="800" y="1192" type="curve" smooth="yes"/>
-      <point x="928" y="1192"/>
-      <point x="972" y="1100"/>
-      <point x="972" y="964" type="curve" smooth="yes"/>
-      <point x="972" y="0" type="line"/>
-      <point x="1432" y="0" type="line"/>
-      <point x="1432" y="960" type="line" smooth="yes"/>
-      <point x="1432" y="1368"/>
-      <point x="1240" y="1556"/>
-      <point x="964" y="1556" type="curve" smooth="yes"/>
-      <point x="796" y="1556"/>
-      <point x="656" y="1488"/>
-      <point x="568" y="1372" type="curve"/>
-      <point x="552" y="1372" type="line"/>
-      <point x="552" y="2048" type="line"/>
-      <point x="108" y="2048" type="line"/>
-      <point x="108" y="0" type="line"/>
-      <point x="568" y="0" type="line"/>
+      <point x="1584" y="2328" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/hcedilla.glif b/src/Inter-UI-Black.ufo/glyphs/hcedilla.glif
index 4933b9eb4..df266aeac 100644
--- a/src/Inter-UI-Black.ufo/glyphs/hcedilla.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/hcedilla.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="hcedilla" format="1">
-  <advance width="1536"/>
+  <advance width="1580"/>
   <unicode hex="1E29"/>
   <outline>
-    <component base="h" xOffset="-4"/>
-    <component base="cedilla" xOffset="-164"/>
+    <component base="h"/>
+    <component base="cedilla" xOffset="-140"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/i.glif b/src/Inter-UI-Black.ufo/glyphs/i.glif
index c90679bc9..81cde1592 100644
--- a/src/Inter-UI-Black.ufo/glyphs/i.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/i.glif
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="i" format="1">
-  <advance width="772"/>
+  <advance width="748"/>
   <unicode hex="0069"/>
   <outline>
     <contour>
-      <point x="384.0" y="16.0" type="move" name="bottom"/>
+      <point x="604" y="1536" type="line"/>
+      <point x="144" y="1536" type="line"/>
+      <point x="144" y="0" type="line"/>
+      <point x="604" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="536.0" y="0.0" type="move" name="ogonek"/>
+      <point x="128" y="1860" type="curve" smooth="yes"/>
+      <point x="128" y="1728"/>
+      <point x="224" y="1636"/>
+      <point x="372" y="1636" type="curve" smooth="yes"/>
+      <point x="520" y="1636"/>
+      <point x="620" y="1728"/>
+      <point x="620" y="1860" type="curve" smooth="yes"/>
+      <point x="620" y="1992"/>
+      <point x="520" y="2084"/>
+      <point x="372" y="2084" type="curve" smooth="yes"/>
+      <point x="224" y="2084"/>
+      <point x="128" y="1992"/>
     </contour>
     <contour>
-      <point x="384.0" y="2200.0" type="move" name="top"/>
+      <point x="372" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="768.0" y="2200.0" type="move" name="top_dd"/>
+      <point x="524" y="0" type="move" name="ogonek"/>
     </contour>
     <contour>
-      <point x="768.0" y="-560.0" type="move" name="bottom_dd"/>
+      <point x="372" y="2200" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="488.0" y="900.0" type="move" name="rhotichook"/>
+      <point x="756" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="768.0" y="2200.0" type="move" name="top0315"/>
+      <point x="756" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="616" y="1536" type="line"/>
-      <point x="156" y="1536" type="line"/>
-      <point x="156" y="0" type="line"/>
-      <point x="616" y="0" type="line"/>
+      <point x="476" y="900" type="move" name="rhotichook"/>
     </contour>
     <contour>
-      <point x="140" y="1860" type="curve" smooth="yes"/>
-      <point x="140" y="1728"/>
-      <point x="236" y="1636"/>
-      <point x="384" y="1636" type="curve" smooth="yes"/>
-      <point x="532" y="1636"/>
-      <point x="632" y="1728"/>
-      <point x="632" y="1860" type="curve" smooth="yes"/>
-      <point x="632" y="1992"/>
-      <point x="532" y="2084"/>
-      <point x="384" y="2084" type="curve" smooth="yes"/>
-      <point x="236" y="2084"/>
-      <point x="140" y="1992"/>
+      <point x="756" y="2200" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ibar.glif b/src/Inter-UI-Black.ufo/glyphs/ibar.glif
index b44e31356..a30286603 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ibar.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ibar.glif
@@ -3,6 +3,8 @@
   <advance width="1280"/>
   <unicode hex="0268"/>
   <outline>
+    <component base="i" xOffset="308"/>
+    <component base="crossbar" yOffset="-244"/>
     <contour>
       <point x="688" y="2200" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="688" y="0" type="move" name="bottom"/>
     </contour>
-    <component base="i" xOffset="308"/>
-    <component base="crossbar" yOffset="-244"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/idieresisacute.glif b/src/Inter-UI-Black.ufo/glyphs/idieresisacute.glif
index 5ad2cb8e4..ec8df8afe 100644
--- a/src/Inter-UI-Black.ufo/glyphs/idieresisacute.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/idieresisacute.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="idieresisacute" format="1">
-  <advance width="1280"/>
+  <advance width="976"/>
   <unicode hex="1E2F"/>
   <outline>
+    <component base="dotlessi" xOffset="92"/>
+    <component base="dieresisacutecomb.lc" xOffset="1284" yOffset="-28"/>
     <contour>
-      <point x="728" y="900" type="move" name="rhotichook"/>
+      <point x="576" y="900" type="move" name="rhotichook"/>
     </contour>
     <contour>
-      <point x="644" y="1744" type="move" name="top"/>
+      <point x="492" y="1744" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1040" y="1744" type="move" name="top0315"/>
+      <point x="888" y="1744" type="move" name="top0315"/>
     </contour>
     <contour>
-      <point x="644" y="2708" type="move" name="mkmktop_acc"/>
+      <point x="492" y="2708" type="move" name="mkmktop_acc"/>
     </contour>
     <contour>
-      <point x="628" y="16" type="move" name="bottom"/>
+      <point x="476" y="16" type="move" name="bottom"/>
     </contour>
-    <component base="dotlessi" xOffset="244"/>
-    <component base="dieresisacutecomb.lc" xOffset="1436" yOffset="-28"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/itildebelow.glif b/src/Inter-UI-Black.ufo/glyphs/itildebelow.glif
index f69f3912c..f4aae85a6 100644
--- a/src/Inter-UI-Black.ufo/glyphs/itildebelow.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/itildebelow.glif
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="itildebelow" format="1">
-  <advance width="1280"/>
+  <advance width="800"/>
   <unicode hex="1E2D"/>
   <outline>
+    <component base="i" xOffset="20"/>
+    <component base="tilde" xOffset="-240" yOffset="-2268"/>
     <contour>
-      <point x="684.0" y="16.0" type="move" name="bottom"/>
+      <point x="448" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="788.0" y="900.0" type="move" name="rhotichook"/>
+      <point x="552" y="900" type="move" name="rhotichook"/>
     </contour>
     <contour>
-      <point x="684.0" y="-548.0" type="move" name="mkmkbottom_acc"/>
+      <point x="448" y="-548" type="move" name="mkmkbottom_acc"/>
     </contour>
     <contour>
-      <point x="684.0" y="2200.0" type="move" name="top"/>
+      <point x="448" y="2200" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1068.0" y="2200.0" type="move" name="top0315"/>
+      <point x="832" y="2200" type="move" name="top0315"/>
     </contour>
     <contour>
-      <point x="1068.0" y="2200.0" type="move" name="top_dd"/>
+      <point x="832" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="836.0" y="0.0" type="move" name="ogonek"/>
+      <point x="600" y="0" type="move" name="ogonek"/>
     </contour>
     <contour>
-      <point x="1068.0" y="-560.0" type="move" name="bottom_dd"/>
+      <point x="832" y="-560" type="move" name="bottom_dd"/>
     </contour>
-    <component base="i" xOffset="256"/>
-    <component base="tilde" yOffset="-2268"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/iucyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/iucyrillic.glif
index 25b363b40..a3898623d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/iucyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/iucyrillic.glif
@@ -3,12 +3,6 @@
   <advance width="2304"/>
   <unicode hex="044E"/>
   <outline>
-    <contour>
-      <point x="1056" y="1744" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="2200" y="1744" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="976" y="940" type="line"/>
       <point x="168" y="940" type="line"/>
@@ -17,6 +11,12 @@
     </contour>
     <component base="dotlessi" xOffset="-84"/>
     <component base="o" xOffset="612"/>
+    <contour>
+      <point x="1056" y="1744" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="2200" y="1744" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/j.glif b/src/Inter-UI-Black.ufo/glyphs/j.glif
index bc3647a33..31265a30b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/j.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/j.glif
@@ -1,8 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="j" format="1">
-  <advance width="896"/>
+  <advance width="916"/>
   <unicode hex="006A"/>
   <outline>
+    <contour>
+      <point x="296" y="1860" type="curve" smooth="yes"/>
+      <point x="296" y="1728"/>
+      <point x="396" y="1636"/>
+      <point x="544" y="1636" type="curve" smooth="yes"/>
+      <point x="692" y="1636"/>
+      <point x="788" y="1728"/>
+      <point x="788" y="1860" type="curve" smooth="yes"/>
+      <point x="788" y="1992"/>
+      <point x="692" y="2084"/>
+      <point x="544" y="2084" type="curve" smooth="yes"/>
+      <point x="396" y="2084"/>
+      <point x="296" y="1992"/>
+    </contour>
+    <component base="dotlessj"/>
     <contour>
       <point x="452" y="2200" type="move" name="top"/>
     </contour>
@@ -18,34 +33,6 @@
     <contour>
       <point x="900" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="316" y="1536" type="line"/>
-      <point x="316" y="-40" type="line"/>
-      <point x="316" y="-140"/>
-      <point x="280" y="-220"/>
-      <point x="100" y="-220" type="curve"/>
-      <point x="4" y="-220" type="line"/>
-      <point x="4" y="-580" type="line"/>
-      <point x="172" y="-580" type="line"/>
-      <point x="516" y="-580"/>
-      <point x="776" y="-420"/>
-      <point x="776" y="-48" type="curve"/>
-      <point x="776" y="1536" type="line"/>
-    </contour>
-    <contour>
-      <point x="296" y="1860" type="curve" smooth="yes"/>
-      <point x="296" y="1728"/>
-      <point x="396" y="1636"/>
-      <point x="544" y="1636" type="curve" smooth="yes"/>
-      <point x="692" y="1636"/>
-      <point x="788" y="1728"/>
-      <point x="788" y="1860" type="curve" smooth="yes"/>
-      <point x="788" y="1992"/>
-      <point x="692" y="2084"/>
-      <point x="544" y="2084" type="curve" smooth="yes"/>
-      <point x="396" y="2084"/>
-      <point x="296" y="1992"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/jcrosstail.glif b/src/Inter-UI-Black.ufo/glyphs/jcrosstail.glif
index 1ab14eb1b..5d61ee3b1 100644
--- a/src/Inter-UI-Black.ufo/glyphs/jcrosstail.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/jcrosstail.glif
@@ -3,15 +3,6 @@
   <advance width="1536"/>
   <unicode hex="029D"/>
   <outline>
-    <contour>
-      <point x="892" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="892" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1520" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1492" y="172" type="line"/>
       <point x="520" y="172" type="line" smooth="yes"/>
@@ -39,6 +30,15 @@
       <point x="1492" y="-124" type="line"/>
     </contour>
     <component base="i" xOffset="512"/>
+    <contour>
+      <point x="892" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="892" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1520" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/k.glif b/src/Inter-UI-Black.ufo/glyphs/k.glif
index ed227268a..f0094b840 100644
--- a/src/Inter-UI-Black.ufo/glyphs/k.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/k.glif
@@ -1,8 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="k" format="1">
-  <advance width="1552"/>
+  <advance width="1556"/>
   <unicode hex="006B"/>
   <outline>
+    <contour>
+      <point x="588" y="2048" type="line"/>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="588" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="1548" y="1536" type="line"/>
+      <point x="1016" y="1536" type="line"/>
+      <point x="608" y="1028" type="line"/>
+      <point x="544" y="1028" type="line"/>
+      <point x="544" y="344" type="line"/>
+    </contour>
+    <contour>
+      <point x="1076" y="0" type="line"/>
+      <point x="1572" y="0" type="line"/>
+      <point x="972" y="920" type="line"/>
+      <point x="660" y="648" type="line"/>
+    </contour>
     <contour>
       <point x="708" y="44" type="move" name="bottom"/>
     </contour>
@@ -24,25 +43,6 @@
     <contour>
       <point x="1264" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="588" y="2048" type="line"/>
-      <point x="128" y="2048" type="line"/>
-      <point x="128" y="0" type="line"/>
-      <point x="588" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1548" y="1536" type="line"/>
-      <point x="1016" y="1536" type="line"/>
-      <point x="608" y="1028" type="line"/>
-      <point x="544" y="1028" type="line"/>
-      <point x="544" y="344" type="line"/>
-    </contour>
-    <contour>
-      <point x="1076" y="0" type="line"/>
-      <point x="1572" y="0" type="line"/>
-      <point x="972" y="920" type="line"/>
-      <point x="660" y="648" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/l.glif b/src/Inter-UI-Black.ufo/glyphs/l.glif
index 8f5af62bf..f9b485175 100644
--- a/src/Inter-UI-Black.ufo/glyphs/l.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/l.glif
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="l" format="1">
-  <advance width="764"/>
+  <advance width="716"/>
   <unicode hex="006C"/>
   <outline>
     <contour>
-      <point x="384.0" y="2308.0" type="move" name="top"/>
+      <point x="588" y="2048" type="line"/>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="588" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="384.0" y="16.0" type="move" name="bottom"/>
+      <point x="360" y="2308" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="756.0" y="2112.0" type="move" name="caron"/>
+      <point x="360" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="740.0" y="1072.0" type="move" name="dot"/>
+      <point x="732" y="2112" type="move" name="caron"/>
     </contour>
     <contour>
-      <point x="948.0" y="2044.0" type="move" name="marktop"/>
+      <point x="716" y="1072" type="move" name="dot"/>
     </contour>
     <contour>
-      <point x="768.0" y="2200.0" type="move" name="top_dd"/>
+      <point x="924" y="2044" type="move" name="marktop"/>
     </contour>
     <contour>
-      <point x="768.0" y="-560.0" type="move" name="bottom_dd"/>
+      <point x="744" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="768.0" y="2308.0" type="move" name="top0315"/>
+      <point x="744" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="612" y="2048" type="line"/>
-      <point x="152" y="2048" type="line"/>
-      <point x="152" y="0" type="line"/>
-      <point x="612" y="0" type="line"/>
+      <point x="744" y="2308" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/lbar.glif b/src/Inter-UI-Black.ufo/glyphs/lbar.glif
index 051ba672f..f23899ab7 100644
--- a/src/Inter-UI-Black.ufo/glyphs/lbar.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/lbar.glif
@@ -3,6 +3,8 @@
   <advance width="1280"/>
   <unicode hex="019A"/>
   <outline>
+    <component base="l" xOffset="304"/>
+    <component base="crossbar" yOffset="112"/>
     <contour>
       <point x="688" y="2308" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="688" y="16" type="move" name="bottom"/>
     </contour>
-    <component base="l" xOffset="304"/>
-    <component base="crossbar" yOffset="112"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/lbelt.glif b/src/Inter-UI-Black.ufo/glyphs/lbelt.glif
index 995a90406..7cb7d18fb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/lbelt.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/lbelt.glif
@@ -3,15 +3,6 @@
   <advance width="1792"/>
   <unicode hex="026C"/>
   <outline>
-    <contour>
-      <point x="1028" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1028" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1672" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1244" y="968" type="line"/>
       <point x="1244" y="1272"/>
@@ -39,6 +30,15 @@
       <point x="1244" y="576" type="line"/>
     </contour>
     <component base="l" xOffset="640"/>
+    <contour>
+      <point x="1028" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1028" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1672" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/lmidtilde.glif b/src/Inter-UI-Black.ufo/glyphs/lmidtilde.glif
index 2542d68e3..2728bacad 100644
--- a/src/Inter-UI-Black.ufo/glyphs/lmidtilde.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/lmidtilde.glif
@@ -3,6 +3,8 @@
   <advance width="1280"/>
   <unicode hex="026B"/>
   <outline>
+    <component base="l" xOffset="256"/>
+    <component base="tilde" xOffset="-44" yOffset="-756"/>
     <contour>
       <point x="636" y="2200" type="move" name="top"/>
     </contour>
@@ -15,8 +17,6 @@
     <contour>
       <point x="636" y="0" type="move" name="bottom"/>
     </contour>
-    <component base="l" xOffset="256"/>
-    <component base="tilde" xOffset="-44" yOffset="-756"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/lslash.glif b/src/Inter-UI-Black.ufo/glyphs/lslash.glif
index 6f16e401c..0a6b071db 100644
--- a/src/Inter-UI-Black.ufo/glyphs/lslash.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/lslash.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="lslash" format="1">
-  <advance width="1020"/>
+  <advance width="716"/>
   <unicode hex="0142"/>
   <outline>
     <contour>
-      <point x="512" y="2308" type="move" name="top"/>
+      <point x="760" y="1344" type="line"/>
+      <point x="-52" y="1084" type="line"/>
+      <point x="-52" y="836" type="line"/>
+      <point x="760" y="1096" type="line"/>
+    </contour>
+    <component base="l"/>
+    <contour>
+      <point x="384.0" y="2308.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="512" y="16" type="move" name="bottom"/>
+      <point x="384.0" y="16.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="964" y="2308" type="move" name="top0315"/>
+      <point x="836.0" y="2308.0" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="916" y="1332" type="line"/>
-      <point x="104" y="1072" type="line"/>
-      <point x="104" y="824" type="line"/>
-      <point x="916" y="1084" type="line"/>
-    </contour>
-    <component base="l" xOffset="128"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/lyogh.glif b/src/Inter-UI-Black.ufo/glyphs/lyogh.glif
index d9e476700..6d9ee27d5 100644
--- a/src/Inter-UI-Black.ufo/glyphs/lyogh.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/lyogh.glif
@@ -3,15 +3,6 @@
   <advance width="1792"/>
   <unicode hex="026E"/>
   <outline>
-    <contour>
-      <point x="884" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="884" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1688" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="260" y="1488" type="line"/>
       <point x="260" y="1132" type="line"/>
@@ -47,6 +38,15 @@
       <point x="892" y="652" type="curve"/>
     </contour>
     <component base="l" xOffset="4"/>
+    <contour>
+      <point x="884" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="884" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1688" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/m.glif b/src/Inter-UI-Black.ufo/glyphs/m.glif
index 1257c8284..14337d616 100644
--- a/src/Inter-UI-Black.ufo/glyphs/m.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/m.glif
@@ -1,64 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="m" format="1">
-  <advance width="2432"/>
+  <advance width="2408"/>
   <unicode hex="006D"/>
   <outline>
     <contour>
-      <point x="1180.0" y="1776.0" type="move" name="top"/>
+      <point x="1428" y="952" type="line" smooth="yes"/>
+      <point x="1428" y="1120"/>
+      <point x="1504" y="1192"/>
+      <point x="1628" y="1192" type="curve" smooth="yes"/>
+      <point x="1736" y="1192"/>
+      <point x="1820" y="1136"/>
+      <point x="1820" y="960" type="curve" smooth="yes"/>
+      <point x="1820" y="0" type="line"/>
+      <point x="2280" y="0" type="line"/>
+      <point x="2280" y="960" type="line" smooth="yes"/>
+      <point x="2280" y="1404"/>
+      <point x="2072" y="1556"/>
+      <point x="1812" y="1556" type="curve" smooth="yes"/>
+      <point x="1616" y="1556"/>
+      <point x="1464" y="1468"/>
+      <point x="1380" y="1344" type="curve"/>
+      <point x="1364" y="1344" type="line"/>
+      <point x="1300" y="1480"/>
+      <point x="1172" y="1556"/>
+      <point x="988" y="1556" type="curve" smooth="yes"/>
+      <point x="800" y="1556"/>
+      <point x="676" y="1480"/>
+      <point x="588" y="1372" type="curve"/>
+      <point x="576" y="1372" type="line"/>
+      <point x="576" y="1536" type="line"/>
+      <point x="128" y="1536" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="588" y="0" type="line"/>
+      <point x="588" y="968" type="line"/>
+      <point x="588" y="1132"/>
+      <point x="672" y="1192"/>
+      <point x="776" y="1192" type="curve" smooth="yes"/>
+      <point x="892" y="1192"/>
+      <point x="984" y="1124"/>
+      <point x="984" y="960" type="curve" smooth="yes"/>
+      <point x="984" y="0" type="line"/>
+      <point x="1428" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="1184.0" y="16.0" type="move" name="bottom"/>
+      <point x="1176" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1180.0" y="1776.0" type="move" name="marktop"/>
+      <point x="1180" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="2368.0" y="2200.0" type="move" name="top_dd"/>
+      <point x="1176" y="1776" type="move" name="marktop"/>
     </contour>
     <contour>
-      <point x="2368.0" y="-560.0" type="move" name="bottom_dd"/>
+      <point x="2364" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="2368.0" y="1776.0" type="move" name="top0315"/>
+      <point x="2364" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1432" y="952" type="line" smooth="yes"/>
-      <point x="1432" y="1120"/>
-      <point x="1508" y="1192"/>
-      <point x="1632" y="1192" type="curve" smooth="yes"/>
-      <point x="1740" y="1192"/>
-      <point x="1824" y="1136"/>
-      <point x="1824" y="960" type="curve" smooth="yes"/>
-      <point x="1824" y="0" type="line"/>
-      <point x="2284" y="0" type="line"/>
-      <point x="2284" y="960" type="line" smooth="yes"/>
-      <point x="2284" y="1404"/>
-      <point x="2076" y="1556"/>
-      <point x="1816" y="1556" type="curve" smooth="yes"/>
-      <point x="1620" y="1556"/>
-      <point x="1468" y="1468"/>
-      <point x="1384" y="1344" type="curve"/>
-      <point x="1368" y="1344" type="line"/>
-      <point x="1304" y="1480"/>
-      <point x="1176" y="1556"/>
-      <point x="992" y="1556" type="curve" smooth="yes"/>
-      <point x="804" y="1556"/>
-      <point x="680" y="1480"/>
-      <point x="592" y="1372" type="curve"/>
-      <point x="580" y="1372" type="line"/>
-      <point x="580" y="1536" type="line"/>
-      <point x="132" y="1536" type="line"/>
-      <point x="132" y="0" type="line"/>
-      <point x="592" y="0" type="line"/>
-      <point x="592" y="968" type="line"/>
-      <point x="592" y="1132"/>
-      <point x="676" y="1192"/>
-      <point x="780" y="1192" type="curve" smooth="yes"/>
-      <point x="896" y="1192"/>
-      <point x="988" y="1124"/>
-      <point x="988" y="960" type="curve" smooth="yes"/>
-      <point x="988" y="0" type="line"/>
-      <point x="1432" y="0" type="line"/>
+      <point x="2364" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/mhook.glif b/src/Inter-UI-Black.ufo/glyphs/mhook.glif
index 433f77b78..eebc56bb5 100644
--- a/src/Inter-UI-Black.ufo/glyphs/mhook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/mhook.glif
@@ -3,15 +3,6 @@
   <advance width="2304"/>
   <unicode hex="0271"/>
   <outline>
-    <contour>
-      <point x="1188" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1188" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="2400" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1812" y="296" type="line"/>
       <point x="1812" y="-108" type="line" smooth="yes"/>
@@ -31,6 +22,15 @@
       <point x="2256" y="296" type="line"/>
     </contour>
     <component base="m" xOffset="-32"/>
+    <contour>
+      <point x="1188" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1188" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="2400" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/n.glif b/src/Inter-UI-Black.ufo/glyphs/n.glif
index e913ee5c0..6b109ce6c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/n.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/n.glif
@@ -1,54 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="n" format="1">
-  <advance width="1648"/>
+  <advance width="1624"/>
   <unicode hex="006E"/>
   <outline>
     <contour>
-      <point x="772" y="1776" type="move" name="top"/>
+      <point x="588" y="816" type="line" smooth="yes"/>
+      <point x="588" y="1032"/>
+      <point x="644" y="1192"/>
+      <point x="816" y="1192" type="curve" smooth="yes"/>
+      <point x="940" y="1192"/>
+      <point x="1036" y="1108"/>
+      <point x="1036" y="944" type="curve" smooth="yes"/>
+      <point x="1036" y="0" type="line"/>
+      <point x="1496" y="0" type="line"/>
+      <point x="1496" y="960" type="line" smooth="yes"/>
+      <point x="1496" y="1404"/>
+      <point x="1240" y="1556"/>
+      <point x="980" y="1556" type="curve" smooth="yes"/>
+      <point x="804" y="1556"/>
+      <point x="656" y="1484"/>
+      <point x="568" y="1372" type="curve"/>
+      <point x="552" y="1372" type="line"/>
+      <point x="552" y="1536" type="line"/>
+      <point x="128" y="1536" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="588" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="772" y="16" type="move" name="bottom"/>
+      <point x="768" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="-148" y="2108" type="move" name="caron"/>
+      <point x="768" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1436" y="0" type="move" name="right"/>
+      <point x="-152" y="2108" type="move" name="caron"/>
     </contour>
     <contour>
-      <point x="772" y="1776" type="move" name="marktop"/>
+      <point x="1432" y="0" type="move" name="right"/>
     </contour>
     <contour>
-      <point x="1564" y="2200" type="move" name="top_dd"/>
+      <point x="768" y="1776" type="move" name="marktop"/>
     </contour>
     <contour>
-      <point x="1564" y="-560" type="move" name="bottom_dd"/>
+      <point x="1560" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1564" y="1776" type="move" name="top0315"/>
+      <point x="1560" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="592" y="816" type="line" smooth="yes"/>
-      <point x="592" y="1032"/>
-      <point x="648" y="1192"/>
-      <point x="820" y="1192" type="curve" smooth="yes"/>
-      <point x="944" y="1192"/>
-      <point x="1040" y="1108"/>
-      <point x="1040" y="944" type="curve" smooth="yes"/>
-      <point x="1040" y="0" type="line"/>
-      <point x="1500" y="0" type="line"/>
-      <point x="1500" y="960" type="line" smooth="yes"/>
-      <point x="1500" y="1404"/>
-      <point x="1244" y="1556"/>
-      <point x="984" y="1556" type="curve" smooth="yes"/>
-      <point x="808" y="1556"/>
-      <point x="660" y="1484"/>
-      <point x="572" y="1372" type="curve"/>
-      <point x="556" y="1372" type="line"/>
-      <point x="556" y="1536" type="line"/>
-      <point x="132" y="1536" type="line"/>
-      <point x="132" y="0" type="line"/>
-      <point x="592" y="0" type="line"/>
+      <point x="1560" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/nlfthook.glif b/src/Inter-UI-Black.ufo/glyphs/nlfthook.glif
index abf310812..439523a7a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/nlfthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/nlfthook.glif
@@ -3,15 +3,6 @@
   <advance width="1792"/>
   <unicode hex="0272"/>
   <outline>
-    <contour>
-      <point x="1096" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1096" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1872" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="416" y="296" type="line"/>
       <point x="416" y="-108" type="line" smooth="yes"/>
@@ -31,6 +22,15 @@
       <point x="860" y="296" type="line"/>
     </contour>
     <component base="n" xOffset="288"/>
+    <contour>
+      <point x="1096" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1096" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1872" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/nrthook.glif b/src/Inter-UI-Black.ufo/glyphs/nrthook.glif
index 58e014f52..4b448ff48 100644
--- a/src/Inter-UI-Black.ufo/glyphs/nrthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/nrthook.glif
@@ -3,15 +3,6 @@
   <advance width="2048"/>
   <unicode hex="0273"/>
   <outline>
-    <contour>
-      <point x="856" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="856" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1860" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1072" y="296" type="line"/>
       <point x="1072" y="-108" type="line" smooth="yes"/>
@@ -31,6 +22,15 @@
       <point x="1516" y="296" type="line"/>
     </contour>
     <component base="n" xOffset="64"/>
+    <contour>
+      <point x="856" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="856" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1860" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/o.glif b/src/Inter-UI-Black.ufo/glyphs/o.glif
index fd8e9b725..62553ce14 100644
--- a/src/Inter-UI-Black.ufo/glyphs/o.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/o.glif
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="o" format="1">
-  <advance width="1536"/>
+  <advance width="1544"/>
   <unicode hex="006F"/>
   <outline>
     <contour>
-      <point x="768" y="340" type="curve" smooth="yes"/>
-      <point x="612" y="340"/>
-      <point x="516" y="460"/>
-      <point x="516" y="768" type="curve" smooth="yes"/>
-      <point x="516" y="1072"/>
-      <point x="616" y="1192"/>
-      <point x="768" y="1192" type="curve" smooth="yes"/>
-      <point x="920" y="1192"/>
-      <point x="1028" y="1072"/>
-      <point x="1028" y="768" type="curve" smooth="yes"/>
-      <point x="1028" y="464"/>
-      <point x="924" y="340"/>
+      <point x="772" y="340" type="curve" smooth="yes"/>
+      <point x="616" y="340"/>
+      <point x="520" y="460"/>
+      <point x="520" y="768" type="curve" smooth="yes"/>
+      <point x="520" y="1072"/>
+      <point x="620" y="1192"/>
+      <point x="772" y="1192" type="curve" smooth="yes"/>
+      <point x="924" y="1192"/>
+      <point x="1032" y="1072"/>
+      <point x="1032" y="768" type="curve" smooth="yes"/>
+      <point x="1032" y="464"/>
+      <point x="928" y="340"/>
     </contour>
     <contour>
-      <point x="772" y="-24" type="curve" smooth="yes"/>
-      <point x="1148" y="-24"/>
-      <point x="1460" y="224"/>
-      <point x="1460" y="768" type="curve" smooth="yes"/>
-      <point x="1460" y="1288"/>
-      <point x="1128" y="1556"/>
-      <point x="768" y="1556" type="curve" smooth="yes"/>
-      <point x="408" y="1556"/>
-      <point x="76" y="1288"/>
-      <point x="76" y="768" type="curve" smooth="yes"/>
-      <point x="76" y="224"/>
-      <point x="392" y="-24"/>
+      <point x="776" y="-24" type="curve" smooth="yes"/>
+      <point x="1152" y="-24"/>
+      <point x="1464" y="224"/>
+      <point x="1464" y="768" type="curve" smooth="yes"/>
+      <point x="1464" y="1288"/>
+      <point x="1132" y="1556"/>
+      <point x="772" y="1556" type="curve" smooth="yes"/>
+      <point x="412" y="1556"/>
+      <point x="80" y="1288"/>
+      <point x="80" y="768" type="curve" smooth="yes"/>
+      <point x="80" y="224"/>
+      <point x="396" y="-24"/>
     </contour>
     <contour>
-      <point x="768.0" y="1776.0" type="move" name="top"/>
+      <point x="772" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="896.0" y="-16.0" type="move" name="bottom"/>
+      <point x="900" y="-16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1560.0" y="2200.0" type="move" name="top_dd"/>
+      <point x="1564" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1688.0" y="-560.0" type="move" name="bottom_dd"/>
+      <point x="1692" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1428.0" y="900.0" type="move" name="rhotichook"/>
+      <point x="1432" y="900" type="move" name="rhotichook"/>
     </contour>
     <contour>
-      <point x="1560.0" y="1776.0" type="move" name="top0315"/>
+      <point x="1564" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
@@ -113,7 +113,7 @@
                 <integer>0</integer>
                 <integer>0</integer>
                 <integer>1</integer>
-                <integer>0</integer>
+                <integer>4</integer>
                 <integer>0</integer>
               </array>
             </dict>
@@ -130,7 +130,7 @@
           <array>
           </array>
           <key>width</key>
-          <integer>1536</integer>
+          <integer>1544</integer>
         </dict>
       </dict>
       <key>com.typemytype.robofont.mark</key>
diff --git a/src/Inter-UI-Black.ufo/glyphs/o_uni02DE__.glif b/src/Inter-UI-Black.ufo/glyphs/o_uni02DE__.glif
index e25362396..be9dfa7f5 100644
--- a/src/Inter-UI-Black.ufo/glyphs/o_uni02DE__.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/o_uni02DE__.glif
@@ -2,6 +2,8 @@
 <glyph name="o_uni02DE" format="1">
   <advance width="2304"/>
   <outline>
+    <component base="o" xOffset="-120"/>
+    <component base="rhotichookmod" xOffset="1404"/>
     <contour>
       <point x="2088" y="1776" type="move" name="top0315"/>
     </contour>
@@ -20,8 +22,6 @@
     <contour>
       <point x="1468" y="-560" type="move" name="bottom_dd"/>
     </contour>
-    <component base="o" xOffset="-120"/>
-    <component base="rhotichookmod" xOffset="1404"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/oe.glif b/src/Inter-UI-Black.ufo/glyphs/oe.glif
index 4a4f4822c..fff1ebeaa 100644
--- a/src/Inter-UI-Black.ufo/glyphs/oe.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/oe.glif
@@ -3,6 +3,8 @@
   <advance width="2484"/>
   <unicode hex="0153"/>
   <outline>
+    <component base="o"/>
+    <component base="e" xOffset="948"/>
     <contour>
       <point x="1280" y="1776" type="move" name="top"/>
     </contour>
@@ -18,8 +20,6 @@
     <contour>
       <point x="2552" y="1776" type="move" name="top0315"/>
     </contour>
-    <component base="o"/>
-    <component base="e" xOffset="948"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ohorn.glif b/src/Inter-UI-Black.ufo/glyphs/ohorn.glif
index a52013558..eb50d0975 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ohorn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ohorn.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="ohorn" format="1">
-  <advance width="1716"/>
+  <advance width="1660"/>
   <unicode hex="01A1"/>
   <outline>
     <contour>
-      <point x="772" y="1776" type="move" name="top"/>
+      <point x="1408" y="1620" type="line"/>
+      <point x="1408" y="1388"/>
+      <point x="1360" y="1248"/>
+      <point x="1152" y="1248" type="curve"/>
+      <point x="1152" y="1076" type="line"/>
+      <point x="1504" y="1076"/>
+      <point x="1660" y="1276"/>
+      <point x="1660" y="1620" type="curve"/>
+    </contour>
+    <component base="o"/>
+    <contour>
+      <point x="796" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="772" y="-16" type="move" name="bottom"/>
+      <point x="796" y="-16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1624" y="1776" type="move" name="top0315"/>
+      <point x="1648" y="1776" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1384" y="1620" type="line"/>
-      <point x="1384" y="1388"/>
-      <point x="1336" y="1248"/>
-      <point x="1128" y="1248" type="curve"/>
-      <point x="1128" y="1076" type="line"/>
-      <point x="1480" y="1076"/>
-      <point x="1636" y="1276"/>
-      <point x="1636" y="1620" type="curve"/>
-    </contour>
-    <component base="o" xOffset="-24"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/omegaroundcyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/omegaroundcyrillic.glif
index e4787b0b5..39c307065 100644
--- a/src/Inter-UI-Black.ufo/glyphs/omegaroundcyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/omegaroundcyrillic.glif
@@ -3,12 +3,6 @@
   <advance width="1792"/>
   <unicode hex="047B"/>
   <outline>
-    <contour>
-      <point x="788" y="1872" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1584" y="1872" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="900" y="1656" type="line"/>
       <point x="692" y="1656" type="line"/>
@@ -22,6 +16,12 @@
       <point x="892" y="-172" type="line"/>
     </contour>
     <component base="o" xOffset="-4"/>
+    <contour>
+      <point x="788" y="1872" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1584" y="1872" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/oslash.glif b/src/Inter-UI-Black.ufo/glyphs/oslash.glif
index 1e41ac59d..4bec5f638 100644
--- a/src/Inter-UI-Black.ufo/glyphs/oslash.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/oslash.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="oslash" format="1">
-  <advance width="1536"/>
+  <advance width="1544"/>
   <unicode hex="00F8"/>
   <outline>
     <contour>
-      <point x="612" y="1768" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1456" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1456" y="1768" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="1344" y="1676" type="line"/>
-      <point x="1108" y="1676" type="line"/>
-      <point x="196" y="-200" type="line"/>
-      <point x="432" y="-200" type="line"/>
+      <point x="1348" y="1708" type="line"/>
+      <point x="1112" y="1708" type="line"/>
+      <point x="200" y="-168" type="line"/>
+      <point x="436" y="-168" type="line"/>
     </contour>
     <component base="o"/>
+    <contour>
+      <point x="612.0" y="1768.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1456.0" y="2200.0" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1456.0" y="1768.0" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/p.glif b/src/Inter-UI-Black.ufo/glyphs/p.glif
index d82ba1e67..827422b86 100644
--- a/src/Inter-UI-Black.ufo/glyphs/p.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/p.glif
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="p" format="1">
-  <advance width="1568"/>
+  <advance width="1572"/>
   <unicode hex="0070"/>
   <outline>
+    <contour>
+      <point x="128" y="-576" type="line"/>
+      <point x="588" y="-576" type="line"/>
+      <point x="588" y="292" type="line"/>
+      <point x="420" y="736" type="line"/>
+      <point x="572" y="1192" type="line"/>
+      <point x="572" y="1244" type="line"/>
+      <point x="544" y="1536" type="line"/>
+      <point x="128" y="1536" type="line"/>
+    </contour>
+    <component base="rightloop.cn" xOffset="-84"/>
     <contour>
       <point x="1044" y="1760" type="move" name="top"/>
     </contour>
@@ -21,17 +32,6 @@
     <contour>
       <point x="1700" y="1760" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="128" y="-576" type="line"/>
-      <point x="588" y="-576" type="line"/>
-      <point x="588" y="292" type="line"/>
-      <point x="420" y="736" type="line"/>
-      <point x="572" y="1192" type="line"/>
-      <point x="572" y="1244" type="line"/>
-      <point x="544" y="1536" type="line"/>
-      <point x="128" y="1536" type="line"/>
-    </contour>
-    <component base="rightloop.cn" xOffset="-84"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/q.glif b/src/Inter-UI-Black.ufo/glyphs/q.glif
index 73a1016b6..2ee9bf206 100644
--- a/src/Inter-UI-Black.ufo/glyphs/q.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/q.glif
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="q" format="1">
-  <advance width="1532"/>
+  <advance width="1576"/>
   <unicode hex="0071"/>
   <outline>
+    <contour>
+      <point x="1448" y="1536" type="line"/>
+      <point x="1032" y="1536" type="line"/>
+      <point x="1012" y="1264" type="line"/>
+      <point x="1008" y="1196" type="line"/>
+      <point x="1140" y="748" type="line"/>
+      <point x="988" y="276" type="line"/>
+      <point x="988" y="-576" type="line"/>
+      <point x="1448" y="-576" type="line"/>
+    </contour>
+    <component base="leftloop.cn" xOffset="-4"/>
     <contour>
       <point x="740" y="1776" type="move" name="top"/>
     </contour>
@@ -21,17 +32,6 @@
     <contour>
       <point x="1588" y="1776" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1448" y="1536" type="line"/>
-      <point x="1032" y="1536" type="line"/>
-      <point x="1012" y="1264" type="line"/>
-      <point x="1008" y="1196" type="line"/>
-      <point x="1140" y="748" type="line"/>
-      <point x="988" y="276" type="line"/>
-      <point x="988" y="-576" type="line"/>
-      <point x="1448" y="-576" type="line"/>
-    </contour>
-    <component base="leftloop.cn" xOffset="-4"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/r.glif b/src/Inter-UI-Black.ufo/glyphs/r.glif
index 31bee2320..f6dbaa905 100644
--- a/src/Inter-UI-Black.ufo/glyphs/r.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/r.glif
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="r" format="1">
-  <advance width="1040"/>
+  <advance width="1020"/>
   <unicode hex="0072"/>
   <outline>
     <contour>
-      <point x="624.0" y="1776.0" type="move" name="top"/>
+      <point x="972" y="1548" type="line"/>
+      <point x="944" y="1556"/>
+      <point x="912" y="1556"/>
+      <point x="900" y="1556" type="curve"/>
+      <point x="772" y="1556"/>
+      <point x="644" y="1444"/>
+      <point x="600" y="1340" type="curve"/>
+      <point x="588" y="1340" type="line"/>
+      <point x="588" y="1536" type="line"/>
+      <point x="128" y="1536" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="588" y="0" type="line"/>
+      <point x="588" y="888" type="line"/>
+      <point x="588" y="1028"/>
+      <point x="708" y="1124"/>
+      <point x="880" y="1124" type="curve"/>
+      <point x="904" y="1124"/>
+      <point x="948" y="1124"/>
+      <point x="972" y="1120" type="curve"/>
     </contour>
     <contour>
-      <point x="420.0" y="16.0" type="move" name="bottom"/>
+      <point x="604" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1112.0" y="2200.0" type="move" name="top_dd"/>
+      <point x="400" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1112.0" y="-560.0" type="move" name="bottom_dd"/>
+      <point x="1092" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1112.0" y="1776.0" type="move" name="top0315"/>
+      <point x="1092" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="992" y="1548" type="line"/>
-      <point x="964" y="1556"/>
-      <point x="932" y="1556"/>
-      <point x="920" y="1556" type="curve"/>
-      <point x="792" y="1556"/>
-      <point x="664" y="1444"/>
-      <point x="620" y="1340" type="curve"/>
-      <point x="608" y="1340" type="line"/>
-      <point x="608" y="1536" type="line"/>
-      <point x="148" y="1536" type="line"/>
-      <point x="148" y="0" type="line"/>
-      <point x="608" y="0" type="line"/>
-      <point x="608" y="888" type="line"/>
-      <point x="608" y="1028"/>
-      <point x="728" y="1124"/>
-      <point x="900" y="1124" type="curve"/>
-      <point x="924" y="1124"/>
-      <point x="968" y="1124"/>
-      <point x="992" y="1120" type="curve"/>
+      <point x="1092" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/rrthook.glif b/src/Inter-UI-Black.ufo/glyphs/rrthook.glif
index 1648c9f29..f14a44a71 100644
--- a/src/Inter-UI-Black.ufo/glyphs/rrthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/rrthook.glif
@@ -3,18 +3,6 @@
   <advance width="1280"/>
   <unicode hex="027D"/>
   <outline>
-    <contour>
-      <point x="592" y="-424" type="move" name="parenthesses.w1"/>
-    </contour>
-    <contour>
-      <point x="796" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="796" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1112" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="200" y="296" type="line" name="hr00"/>
       <point x="200" y="-108" type="line" smooth="yes"/>
@@ -34,6 +22,18 @@
       <point x="640" y="296" type="line"/>
     </contour>
     <component base="r" xOffset="60"/>
+    <contour>
+      <point x="592" y="-424" type="move" name="parenthesses.w1"/>
+    </contour>
+    <contour>
+      <point x="796" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="796" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1112" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/rturnrthook.glif b/src/Inter-UI-Black.ufo/glyphs/rturnrthook.glif
index bc763e8ac..60319d63f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/rturnrthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/rturnrthook.glif
@@ -3,15 +3,6 @@
   <advance width="1280"/>
   <unicode hex="027B"/>
   <outline>
-    <contour>
-      <point x="340" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="340" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1284" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="496" y="296" type="line"/>
       <point x="496" y="-108" type="line" smooth="yes"/>
@@ -31,6 +22,15 @@
       <point x="940" y="296" type="line"/>
     </contour>
     <component base="r" xScale="-1" yScale="-1" xOffset="1080" yOffset="1488"/>
+    <contour>
+      <point x="340" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="340" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1284" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/thorn.glif b/src/Inter-UI-Black.ufo/glyphs/thorn.glif
index 1ac855a01..fa044ad34 100644
--- a/src/Inter-UI-Black.ufo/glyphs/thorn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/thorn.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="thorn" format="1">
-  <advance width="1524"/>
+  <advance width="1572"/>
   <unicode hex="00FE"/>
   <outline>
     <contour>
-      <point x="84" y="2048" type="line"/>
-      <point x="84" y="-576" type="line"/>
-      <point x="544" y="-576" type="line"/>
-      <point x="544" y="304" type="line"/>
-      <point x="376" y="744" type="line"/>
-      <point x="544" y="1272" type="line"/>
-      <point x="544" y="2048" type="line"/>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="-576" type="line"/>
+      <point x="588" y="-576" type="line"/>
+      <point x="588" y="304" type="line"/>
+      <point x="420" y="744" type="line"/>
+      <point x="588" y="1272" type="line"/>
+      <point x="588" y="2048" type="line"/>
     </contour>
-    <component base="rightloop.cn" xOffset="-128"/>
+    <component base="rightloop.cn" xOffset="-84"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/u.glif b/src/Inter-UI-Black.ufo/glyphs/u.glif
index 2d2f6e419..ba05ca0b8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/u.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/u.glif
@@ -1,54 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="u" format="1">
-  <advance width="1648"/>
+  <advance width="1624"/>
   <unicode hex="0075"/>
   <outline>
     <contour>
-      <point x="808" y="1776" type="move" name="top"/>
+      <point x="1036" y="720" type="line" smooth="yes"/>
+      <point x="1036" y="504"/>
+      <point x="980" y="344"/>
+      <point x="808" y="344" type="curve" smooth="yes"/>
+      <point x="684" y="344"/>
+      <point x="588" y="428"/>
+      <point x="588" y="592" type="curve" smooth="yes"/>
+      <point x="588" y="1536" type="line"/>
+      <point x="128" y="1536" type="line"/>
+      <point x="128" y="576" type="line" smooth="yes"/>
+      <point x="128" y="132"/>
+      <point x="384" y="-20"/>
+      <point x="644" y="-20" type="curve" smooth="yes"/>
+      <point x="820" y="-20"/>
+      <point x="968" y="52"/>
+      <point x="1056" y="164" type="curve"/>
+      <point x="1072" y="164" type="line"/>
+      <point x="1072" y="0" type="line"/>
+      <point x="1496" y="0" type="line"/>
+      <point x="1496" y="1536" type="line"/>
+      <point x="1036" y="1536" type="line"/>
     </contour>
     <contour>
-      <point x="1416" y="0" type="move" name="ogonek"/>
+      <point x="788" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="648" y="0" type="move" name="bottomu"/>
+      <point x="1396" y="0" type="move" name="ogonek"/>
     </contour>
     <contour>
-      <point x="1604" y="2200" type="move" name="top_dd"/>
+      <point x="628" y="0" type="move" name="bottomu"/>
     </contour>
     <contour>
-      <point x="1604" y="-560" type="move" name="bottom_dd"/>
+      <point x="1584" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1296" y="900" type="move" name="rhotichook"/>
+      <point x="1584" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1604" y="1776" type="move" name="top0315"/>
+      <point x="1276" y="900" type="move" name="rhotichook"/>
     </contour>
     <contour>
-      <point x="808" y="0" type="move" name="bottom"/>
+      <point x="1584" y="1776" type="move" name="top0315"/>
     </contour>
     <contour>
-      <point x="1056" y="720" type="line" smooth="yes"/>
-      <point x="1056" y="504"/>
-      <point x="1000" y="344"/>
-      <point x="828" y="344" type="curve" smooth="yes"/>
-      <point x="704" y="344"/>
-      <point x="608" y="428"/>
-      <point x="608" y="592" type="curve" smooth="yes"/>
-      <point x="608" y="1536" type="line"/>
-      <point x="148" y="1536" type="line"/>
-      <point x="148" y="576" type="line" smooth="yes"/>
-      <point x="148" y="132"/>
-      <point x="404" y="-20"/>
-      <point x="664" y="-20" type="curve" smooth="yes"/>
-      <point x="840" y="-20"/>
-      <point x="988" y="52"/>
-      <point x="1076" y="164" type="curve"/>
-      <point x="1092" y="164" type="line"/>
-      <point x="1092" y="0" type="line"/>
-      <point x="1516" y="0" type="line"/>
-      <point x="1516" y="1536" type="line"/>
-      <point x="1056" y="1536" type="line"/>
+      <point x="788" y="0" type="move" name="bottom"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ubar.glif b/src/Inter-UI-Black.ufo/glyphs/ubar.glif
index d62f3dc85..58e080852 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ubar.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ubar.glif
@@ -3,6 +3,13 @@
   <advance width="2048"/>
   <unicode hex="0289"/>
   <outline>
+    <contour>
+      <point x="1960" y="916" type="line"/>
+      <point x="88" y="916" type="line"/>
+      <point x="88" y="652" type="line"/>
+      <point x="1960" y="652" type="line"/>
+    </contour>
+    <component base="u" xOffset="232"/>
     <contour>
       <point x="1028" y="1776" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="2004" y="1776" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1960" y="916" type="line"/>
-      <point x="88" y="916" type="line"/>
-      <point x="88" y="652" type="line"/>
-      <point x="1960" y="652" type="line"/>
-    </contour>
-    <component base="u" xOffset="232"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uhorn.glif b/src/Inter-UI-Black.ufo/glyphs/uhorn.glif
index 80bbab1c9..9b4188de3 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uhorn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uhorn.glif
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uhorn" format="1">
-  <advance width="1916"/>
+  <advance width="1852"/>
   <unicode hex="01B0"/>
   <outline>
+    <contour>
+      <point x="1604" y="1624" type="line"/>
+      <point x="1604" y="1392"/>
+      <point x="1568" y="1280"/>
+      <point x="1292" y="1280" type="curve"/>
+      <point x="1292" y="1084" type="line"/>
+      <point x="1716" y="1084"/>
+      <point x="1852" y="1268"/>
+      <point x="1852" y="1624" type="curve"/>
+    </contour>
+    <component base="u"/>
     <contour>
       <point x="792" y="1744" type="move" name="top"/>
     </contour>
@@ -18,17 +29,6 @@
     <contour>
       <point x="792" y="0" type="move" name="bottom"/>
     </contour>
-    <contour>
-      <point x="1604" y="1624" type="line"/>
-      <point x="1604" y="1392"/>
-      <point x="1568" y="1280"/>
-      <point x="1292" y="1280" type="curve"/>
-      <point x="1292" y="1084" type="line"/>
-      <point x="1716" y="1084"/>
-      <point x="1852" y="1268"/>
-      <point x="1852" y="1624" type="curve"/>
-    </contour>
-    <component base="u"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni006A_.ccmp.glif b/src/Inter-UI-Black.ufo/glyphs/uni006A_.ccmp.glif
index d713cdca1..c8868290e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni006A_.ccmp.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni006A_.ccmp.glif
@@ -2,6 +2,7 @@
 <glyph name="uni006A.ccmp" format="1">
   <advance width="768"/>
   <outline>
+    <component base="dotlessj" xOffset="128"/>
     <contour>
       <point x="504" y="1744" type="move" name="top"/>
     </contour>
@@ -11,7 +12,6 @@
     <contour>
       <point x="388" y="-632" type="move" name="bottom"/>
     </contour>
-    <component base="dotlessj" xOffset="128"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0249.ccmp.glif b/src/Inter-UI-Black.ufo/glyphs/uni0249.ccmp.glif
index 34bc589b0..8fc535c72 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0249.ccmp.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0249.ccmp.glif
@@ -2,6 +2,8 @@
 <glyph name="uni0249.ccmp" format="1">
   <advance width="1280"/>
   <outline>
+    <component base="dotlessj" xOffset="272"/>
+    <component base="crossbar" yOffset="-160"/>
     <contour>
       <point x="648" y="1744" type="move" name="top"/>
     </contour>
@@ -11,8 +13,6 @@
     <contour>
       <point x="648" y="-632" type="move" name="bottom"/>
     </contour>
-    <component base="dotlessj" xOffset="272"/>
-    <component base="crossbar" yOffset="-160"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0249.glif b/src/Inter-UI-Black.ufo/glyphs/uni0249.glif
index 5de442d9f..2f8ea1a59 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0249.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0249.glif
@@ -3,6 +3,8 @@
   <advance width="1280"/>
   <unicode hex="0249"/>
   <outline>
+    <component base="j" xOffset="308"/>
+    <component base="crossbar" yOffset="-244"/>
     <contour>
       <point x="692" y="2200" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="644" y="-632" type="move" name="bottom"/>
     </contour>
-    <component base="j" xOffset="308"/>
-    <component base="crossbar" yOffset="-244"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni024D_.glif b/src/Inter-UI-Black.ufo/glyphs/uni024D_.glif
index ddef57790..c73955eee 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni024D_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni024D_.glif
@@ -3,6 +3,8 @@
   <advance width="1280"/>
   <unicode hex="024D"/>
   <outline>
+    <component base="r" xOffset="172"/>
+    <component base="crossbar" xOffset="-120" yOffset="-316"/>
     <contour>
       <point x="680" y="1776" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="532" y="16" type="move" name="bottom"/>
     </contour>
-    <component base="r" xOffset="172"/>
-    <component base="crossbar" xOffset="-120" yOffset="-316"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni02AB__.glif b/src/Inter-UI-Black.ufo/glyphs/uni02AB__.glif
index 256020aad..f886f7e9e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni02AB__.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni02AB__.glif
@@ -3,15 +3,6 @@
   <advance width="2048"/>
   <unicode hex="02AB"/>
   <outline>
-    <contour>
-      <point x="1156" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1156" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1968" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1872" y="360" type="line"/>
       <point x="716" y="360" type="line"/>
@@ -33,6 +24,15 @@
       <point x="1708" y="1132" type="line"/>
     </contour>
     <component base="l" xOffset="16"/>
+    <contour>
+      <point x="1156" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1156" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1968" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni03F3_.ccmp.glif b/src/Inter-UI-Black.ufo/glyphs/uni03F3_.ccmp.glif
index e49e66a59..275363339 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni03F3_.ccmp.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni03F3_.ccmp.glif
@@ -2,6 +2,7 @@
 <glyph name="uni03F3.ccmp" format="1">
   <advance width="1024"/>
   <outline>
+    <component base="dotlessj" xOffset="128"/>
     <contour>
       <point x="504" y="1744" type="move" name="top"/>
     </contour>
@@ -11,7 +12,6 @@
     <contour>
       <point x="508" y="-632" type="move" name="bottom"/>
     </contour>
-    <component base="dotlessj" xOffset="128"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0458.ccmp.glif b/src/Inter-UI-Black.ufo/glyphs/uni0458.ccmp.glif
index 77fe1f43d..5b8bc2044 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0458.ccmp.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0458.ccmp.glif
@@ -2,6 +2,7 @@
 <glyph name="uni0458.ccmp" format="1">
   <advance width="768"/>
   <outline>
+    <component base="dotlessj" xOffset="128"/>
     <contour>
       <point x="504" y="1744" type="move" name="top"/>
     </contour>
@@ -11,7 +12,6 @@
     <contour>
       <point x="504" y="-632" type="move" name="bottom"/>
     </contour>
-    <component base="dotlessj" xOffset="128"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/w.glif b/src/Inter-UI-Black.ufo/glyphs/w.glif
index 489126cad..b3e0bcdd0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/w.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/w.glif
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="w" format="1">
-  <advance width="2176"/>
+  <advance width="2172"/>
   <unicode hex="0077"/>
   <outline>
     <contour>
-      <point x="1152" y="1776" type="move" name="top"/>
+      <point x="2092" y="1536" type="line"/>
+      <point x="1652" y="1536" type="line"/>
+      <point x="1496" y="624" type="line"/>
+      <point x="1476" y="624" type="line"/>
+      <point x="1240" y="1536" type="line"/>
+      <point x="928" y="1536" type="line"/>
+      <point x="692" y="616" type="line"/>
+      <point x="672" y="616" type="line"/>
+      <point x="520" y="1536" type="line"/>
+      <point x="80" y="1536" type="line"/>
+      <point x="456" y="0" type="line"/>
+      <point x="828" y="0" type="line"/>
+      <point x="1072" y="852" type="line"/>
+      <point x="1096" y="852" type="line"/>
+      <point x="1344" y="0" type="line"/>
+      <point x="1716" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="1160" y="16" type="move" name="bottom"/>
+      <point x="1148" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1152" y="1776" type="move" name="marktop"/>
+      <point x="1156" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="2184" y="2200" type="move" name="top_dd"/>
+      <point x="1148" y="1776" type="move" name="marktop"/>
     </contour>
     <contour>
-      <point x="2184" y="-560" type="move" name="bottom_dd"/>
+      <point x="2180" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="2184" y="1776" type="move" name="top0315"/>
+      <point x="2180" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="2096" y="1536" type="line"/>
-      <point x="1656" y="1536" type="line"/>
-      <point x="1500" y="624" type="line"/>
-      <point x="1480" y="624" type="line"/>
-      <point x="1244" y="1536" type="line"/>
-      <point x="932" y="1536" type="line"/>
-      <point x="696" y="616" type="line"/>
-      <point x="676" y="616" type="line"/>
-      <point x="524" y="1536" type="line"/>
-      <point x="84" y="1536" type="line"/>
-      <point x="460" y="0" type="line"/>
-      <point x="832" y="0" type="line"/>
-      <point x="1076" y="852" type="line"/>
-      <point x="1100" y="852" type="line"/>
-      <point x="1348" y="0" type="line"/>
-      <point x="1720" y="0" type="line"/>
+      <point x="2180" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/z.glif b/src/Inter-UI-Black.ufo/glyphs/z.glif
index 1c3713ab2..1c7ec04c8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/z.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/z.glif
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="z" format="1">
-  <advance width="1536"/>
+  <advance width="1512"/>
   <unicode hex="007A"/>
   <outline>
     <contour>
-      <point x="768" y="1776" type="move" name="top"/>
+      <point x="1384" y="360" type="line"/>
+      <point x="240" y="360" type="line"/>
+      <point x="240" y="0" type="line"/>
+      <point x="1384" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="768" y="16" type="move" name="bottom"/>
+      <point x="1368" y="1276" type="line"/>
+      <point x="1368" y="1536" type="line"/>
+      <point x="1064" y="1536" type="line"/>
+      <point x="128" y="260" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="432" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="1492" y="2200" type="move" name="top_dd"/>
+      <point x="1220" y="1536" type="line"/>
+      <point x="156" y="1536" type="line"/>
+      <point x="156" y="1176" type="line"/>
+      <point x="1220" y="1176" type="line"/>
     </contour>
     <contour>
-      <point x="1492" y="-560" type="move" name="bottom_dd"/>
+      <point x="756" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1492" y="1776" type="move" name="top0315"/>
+      <point x="756" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1396" y="360" type="line"/>
-      <point x="252" y="360" type="line"/>
-      <point x="252" y="0" type="line"/>
-      <point x="1396" y="0" type="line"/>
+      <point x="1480" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1380" y="1276" type="line"/>
-      <point x="1380" y="1536" type="line"/>
-      <point x="1076" y="1536" type="line"/>
-      <point x="140" y="260" type="line"/>
-      <point x="140" y="0" type="line"/>
-      <point x="444" y="0" type="line"/>
+      <point x="1480" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1232" y="1536" type="line"/>
-      <point x="168" y="1536" type="line"/>
-      <point x="168" y="1176" type="line"/>
-      <point x="1232" y="1176" type="line"/>
+      <point x="1480" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/zbar.glif b/src/Inter-UI-Black.ufo/glyphs/zbar.glif
index ceab581f1..1e2c6b1be 100644
--- a/src/Inter-UI-Black.ufo/glyphs/zbar.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/zbar.glif
@@ -3,6 +3,13 @@
   <advance width="1536"/>
   <unicode hex="01B6"/>
   <outline>
+    <contour>
+      <point x="1312" y="896" type="line"/>
+      <point x="224" y="896" type="line"/>
+      <point x="224" y="636" type="line"/>
+      <point x="1312" y="636" type="line"/>
+    </contour>
+    <component base="z" xOffset="48"/>
     <contour>
       <point x="768" y="1776" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="1492" y="1776" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1312" y="896" type="line"/>
-      <point x="224" y="896" type="line"/>
-      <point x="224" y="636" type="line"/>
-      <point x="1312" y="636" type="line"/>
-    </contour>
-    <component base="z" xOffset="48"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/groups.plist b/src/Inter-UI-Black.ufo/groups.plist
index 33fa30a2e..3808ef778 100644
--- a/src/Inter-UI-Black.ufo/groups.plist
+++ b/src/Inter-UI-Black.ufo/groups.plist
@@ -210,6 +210,7 @@
 		<string>Scircumflex</string>
 		<string>Scedilla</string>
 		<string>Scaron</string>
+		<string>Germandbls</string>
 	</array>
 	<key>@KERN_LEFT_T</key>
 	<array>
@@ -266,6 +267,7 @@
 		<string>h</string>
 		<string>m</string>
 		<string>n</string>
+		<string>eta</string>
 		<string>hbar</string>
 		<string>agrave</string>
 		<string>aacute</string>
@@ -609,6 +611,7 @@
 		<string>scircumflex</string>
 		<string>scedilla</string>
 		<string>scaron</string>
+		<string>germandbls</string>
 	</array>
 	<key>@KERN_LEFT_t</key>
 	<array>
@@ -1147,6 +1150,7 @@
 		<string>p</string>
 		<string>m</string>
 		<string>r</string>
+		<string>eta</string>
 		<string>ntilde</string>
 		<string>nacute</string>
 		<string>ncommaaccent</string>
diff --git a/src/Inter-UI-Black.ufo/kerning.plist b/src/Inter-UI-Black.ufo/kerning.plist
index 53ea67dcf..7a7ad98a4 100644
--- a/src/Inter-UI-Black.ufo/kerning.plist
+++ b/src/Inter-UI-Black.ufo/kerning.plist
@@ -315,8 +315,10 @@
 	</dict>
 	<key>@KERN_LEFT_E</key>
 	<dict>
+		<key>@KERN_RIGHT_A</key>
+		<integer>-32</integer>
 		<key>@KERN_RIGHT_B</key>
-		<integer>-128</integer>
+		<integer>0</integer>
 		<key>@KERN_RIGHT_C</key>
 		<integer>-144</integer>
 		<key>@KERN_RIGHT_v</key>
@@ -600,12 +602,10 @@
 	</dict>
 	<key>@KERN_LEFT_H</key>
 	<dict>
-		<key>@KERN_RIGHT_B</key>
-		<integer>0</integer>
+		<key>@KERN_RIGHT_A</key>
+		<integer>-24</integer>
 		<key>@KERN_RIGHT_C</key>
-		<integer>-48</integer>
-		<key>@KERN_RIGHT_b</key>
-		<integer>-48</integer>
+		<integer>-32</integer>
 		<key>@KERN_RIGHT_dotlessj</key>
 		<integer>-224</integer>
 		<key>backslash</key>
@@ -1089,7 +1089,7 @@
 		<key>@KERN_RIGHT_AE</key>
 		<integer>-63</integer>
 		<key>@KERN_RIGHT_V</key>
-		<integer>-33</integer>
+		<integer>-163</integer>
 		<key>@KERN_RIGHT_W</key>
 		<integer>-80</integer>
 		<key>@KERN_RIGHT_X</key>
diff --git a/src/Inter-UI-Black.ufo/lib.plist b/src/Inter-UI-Black.ufo/lib.plist
index 8be72af3e..cedcc16cb 100644
--- a/src/Inter-UI-Black.ufo/lib.plist
+++ b/src/Inter-UI-Black.ufo/lib.plist
@@ -345,6 +345,7 @@
 				<string>q</string>
 				<string>r</string>
 				<string>s</string>
+				<string>germandbls</string>
 				<string>t</string>
 				<string>u</string>
 				<string>uhorn</string>
@@ -439,7 +440,6 @@
 				<string>dz</string>
 				<string>Dzcaron_</string>
 				<string>dzcaron</string>
-				<string>germandbls</string>
 				<string>dotlessi</string>
 				<string>dotlessj</string>
 				<string>dollar</string>
@@ -1844,6 +1844,7 @@
 		<string>q</string>
 		<string>r</string>
 		<string>s</string>
+		<string>germandbls</string>
 		<string>t</string>
 		<string>u</string>
 		<string>uhorn</string>
@@ -1938,7 +1939,6 @@
 		<string>dz</string>
 		<string>Dzcaron_</string>
 		<string>dzcaron</string>
-		<string>germandbls</string>
 		<string>dotlessi</string>
 		<string>dotlessj</string>
 		<string>dollar</string>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/G_.glif b/src/Inter-UI-Regular.ufo/glyphs/G_.glif
index 360347bc5..4de04ad03 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/G_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/G_.glif
@@ -8,30 +8,30 @@
       <point x="1100" y="1016" type="line"/>
       <point x="1100" y="796" type="line"/>
       <point x="1584" y="796" type="line"/>
-      <point x="1584" y="436"/>
-      <point x="1380" y="200"/>
-      <point x="1020" y="200" type="curve" smooth="yes"/>
-      <point x="760" y="200"/>
-      <point x="416" y="412"/>
+      <point x="1584" y="364"/>
+      <point x="1288" y="204"/>
+      <point x="1020" y="204" type="curve" smooth="yes"/>
+      <point x="748" y="204"/>
+      <point x="416" y="368"/>
       <point x="416" y="1024" type="curve"/>
       <point x="416" y="1552"/>
-      <point x="668" y="1852"/>
-      <point x="1016" y="1852" type="curve" smooth="yes"/>
-      <point x="1312" y="1852"/>
-      <point x="1500" y="1640"/>
-      <point x="1552" y="1448" type="curve"/>
+      <point x="660" y="1856"/>
+      <point x="1024" y="1856" type="curve" smooth="yes"/>
+      <point x="1332" y="1856"/>
+      <point x="1528" y="1648"/>
+      <point x="1560" y="1448" type="curve"/>
       <point x="1824" y="1448" type="line"/>
-      <point x="1772" y="1800"/>
-      <point x="1468" y="2076"/>
-      <point x="1008" y="2076" type="curve" smooth="yes"/>
-      <point x="536" y="2076"/>
+      <point x="1776" y="1788"/>
+      <point x="1472" y="2076"/>
+      <point x="1032" y="2076" type="curve" smooth="yes"/>
+      <point x="544" y="2076"/>
       <point x="176" y="1716"/>
       <point x="176" y="1024" type="curve"/>
-      <point x="176" y="340"/>
-      <point x="560" y="-28"/>
-      <point x="996" y="-28" type="curve" smooth="yes"/>
-      <point x="1564" y="-28"/>
-      <point x="1840" y="332"/>
+      <point x="176" y="324"/>
+      <point x="540" y="-28"/>
+      <point x="1032" y="-28" type="curve" smooth="yes"/>
+      <point x="1536" y="-28"/>
+      <point x="1840" y="336"/>
       <point x="1840" y="792" type="curve"/>
     </contour>
     <contour>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/Gbar_.glif b/src/Inter-UI-Regular.ufo/glyphs/Gbar_.glif
index 208ebd5aa..48e98198f 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/Gbar_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/Gbar_.glif
@@ -3,6 +3,13 @@
   <advance width="2016"/>
   <unicode hex="01E4"/>
   <outline>
+    <contour>
+      <point x="1908" y="616" type="line"/>
+      <point x="1024" y="616" type="line"/>
+      <point x="1024" y="396" type="line"/>
+      <point x="1908" y="396" type="line"/>
+    </contour>
+    <component base="G" xOffset="-76"/>
     <contour>
       <point x="844" y="2244" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="1844" y="2244" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1908" y="616" type="line"/>
-      <point x="1024" y="616" type="line"/>
-      <point x="1024" y="396" type="line"/>
-      <point x="1908" y="396" type="line"/>
-    </contour>
-    <component base="G" xOffset="-76"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/Theta_.glif b/src/Inter-UI-Regular.ufo/glyphs/Theta_.glif
index a3b0fa3c7..7741a149f 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/Theta_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/Theta_.glif
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Theta" format="1">
-  <advance width="2016"/>
+  <advance width="2032"/>
   <unicode hex="0398"/>
   <outline>
     <contour>
-      <point x="1352" y="1136" type="line"/>
-      <point x="652" y="1136" type="line"/>
-      <point x="652" y="916" type="line"/>
-      <point x="1352" y="916" type="line"/>
+      <point x="1368" y="1136" type="line"/>
+      <point x="668" y="1136" type="line"/>
+      <point x="668" y="916" type="line"/>
+      <point x="1368" y="916" type="line"/>
     </contour>
-    <component base="O" xOffset="-16"/>
+    <component base="O"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/a.glif b/src/Inter-UI-Regular.ufo/glyphs/a.glif
index ebef1e8b3..db4b30a0f 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/a.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/a.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="a" format="1">
-  <advance width="1504"/>
+  <advance width="1556"/>
   <unicode hex="0061"/>
   <outline>
     <contour>
@@ -111,7 +111,7 @@
           <array>
           </array>
           <key>width</key>
-          <integer>1504</integer>
+          <integer>1556</integer>
         </dict>
       </dict>
       <key>com.typemytype.robofont.mark</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/a_uni02DE__.glif b/src/Inter-UI-Regular.ufo/glyphs/a_uni02DE__.glif
index 8e3136a53..b71c6dc1c 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/a_uni02DE__.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/a_uni02DE__.glif
@@ -2,6 +2,8 @@
 <glyph name="a_uni02DE" format="1">
   <advance width="2048"/>
   <outline>
+    <component base="a" xOffset="-228"/>
+    <component base="rhotichookmod" xOffset="1252"/>
     <contour>
       <point x="460" y="0" type="move" name="bottom"/>
     </contour>
@@ -26,8 +28,6 @@
     <contour>
       <point x="736" y="1776" type="move" name="rhalfring"/>
     </contour>
-    <component base="a" xOffset="-228"/>
-    <component base="rhotichookmod" xOffset="1252"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ae.glif b/src/Inter-UI-Regular.ufo/glyphs/ae.glif
index a449ef794..fba0b8c6e 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ae.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ae.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="ae" format="1">
-  <advance width="2580"/>
+  <advance width="2596"/>
   <unicode hex="00E6"/>
   <outline>
     <contour>
@@ -139,7 +139,7 @@
           <array>
           </array>
           <key>width</key>
-          <integer>2580</integer>
+          <integer>2596</integer>
         </dict>
       </dict>
       <key>interface.gridadjust.original</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/afii10044.glif b/src/Inter-UI-Regular.ufo/glyphs/afii10044.glif
index f9542fb3b..327e6c0dd 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/afii10044.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/afii10044.glif
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="afii10044" format="1">
-  <advance width="2016"/>
+  <advance width="2092"/>
   <unicode hex="042A"/>
   <outline>
     <contour>
-      <point x="40" y="1828" type="line"/>
-      <point x="644" y="1828" type="line"/>
-      <point x="644" y="2048" type="line"/>
-      <point x="40" y="2048" type="line"/>
+      <point x="0" y="1828" type="line"/>
+      <point x="604" y="1828" type="line"/>
+      <point x="604" y="2048" type="line"/>
+      <point x="0" y="2048" type="line"/>
     </contour>
-    <component base="afii10046" xOffset="360"/>
+    <component base="afii10046" xOffset="320"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/afii10045.glif b/src/Inter-UI-Regular.ufo/glyphs/afii10045.glif
index 424407487..2fe8b3241 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/afii10045.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/afii10045.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="afii10045" format="1">
-  <advance width="2528"/>
+  <advance width="2312"/>
   <unicode hex="042B"/>
   <outline>
+    <component base="afii10046"/>
+    <component base="I" xOffset="1648"/>
     <contour>
-      <point x="1304" y="2216" type="move" name="top"/>
+      <point x="1204" y="2216" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="2528" y="2216" type="move" name="top0315"/>
+      <point x="2428" y="2216" type="move" name="top0315"/>
     </contour>
-    <component base="afii10046" xOffset="100"/>
-    <component base="I" xOffset="1748"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/afii10046.glif b/src/Inter-UI-Regular.ufo/glyphs/afii10046.glif
index dd409d4e4..9ff14803e 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/afii10046.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/afii10046.glif
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="afii10046" format="1">
-  <advance width="1760"/>
+  <advance width="1772"/>
   <unicode hex="042C"/>
   <outline>
     <contour>
-      <point x="300" y="1616" type="move" name="cross"/>
+      <point x="376" y="1188" type="line"/>
+      <point x="376" y="968" type="line"/>
+      <point x="960" y="968" type="line"/>
+      <point x="1240" y="968"/>
+      <point x="1396" y="804"/>
+      <point x="1396" y="608" type="curve"/>
+      <point x="1396" y="408"/>
+      <point x="1240" y="216"/>
+      <point x="960" y="216" type="curve"/>
+      <point x="440" y="216" type="line"/>
+      <point x="440" y="2048" type="line"/>
+      <point x="192" y="2048" type="line"/>
+      <point x="192" y="0" type="line"/>
+      <point x="960" y="0" type="line"/>
+      <point x="1400" y="0"/>
+      <point x="1640" y="248"/>
+      <point x="1640" y="604" type="curve"/>
+      <point x="1640" y="960"/>
+      <point x="1400" y="1188"/>
+      <point x="960" y="1188" type="curve"/>
     </contour>
     <contour>
-      <point x="340" y="1188" type="line"/>
-      <point x="340" y="968" type="line"/>
-      <point x="924" y="968" type="line"/>
-      <point x="1204" y="968"/>
-      <point x="1360" y="804"/>
-      <point x="1360" y="608" type="curve"/>
-      <point x="1360" y="408"/>
-      <point x="1204" y="216"/>
-      <point x="924" y="216" type="curve"/>
-      <point x="404" y="216" type="line"/>
-      <point x="404" y="2048" type="line"/>
-      <point x="156" y="2048" type="line"/>
-      <point x="156" y="0" type="line"/>
-      <point x="924" y="0" type="line"/>
-      <point x="1364" y="0"/>
-      <point x="1604" y="248"/>
-      <point x="1604" y="604" type="curve"/>
-      <point x="1604" y="960"/>
-      <point x="1364" y="1188"/>
-      <point x="924" y="1188" type="curve"/>
+      <point x="336" y="1616" type="move" name="cross"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/afii10047.glif b/src/Inter-UI-Regular.ufo/glyphs/afii10047.glif
index 449467325..ea9cabcf0 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/afii10047.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/afii10047.glif
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="afii10047" format="1">
-  <advance width="1760"/>
+  <advance width="1888"/>
   <unicode hex="042D"/>
   <outline>
     <contour>
-      <point x="852" y="2248" type="move" name="top"/>
+      <point x="1492" y="1108" type="line"/>
+      <point x="648" y="1108" type="line"/>
+      <point x="648" y="888" type="line"/>
+      <point x="1492" y="888" type="line"/>
     </contour>
     <contour>
-      <point x="1808" y="2248" type="move" name="top0315"/>
+      <point x="160" y="640" type="line"/>
+      <point x="204" y="264"/>
+      <point x="436" y="-28"/>
+      <point x="924" y="-28" type="curve" smooth="yes"/>
+      <point x="1400" y="-28"/>
+      <point x="1712" y="340"/>
+      <point x="1712" y="904" type="curve" smooth="yes"/>
+      <point x="1712" y="1096" type="line" smooth="yes"/>
+      <point x="1712" y="1660"/>
+      <point x="1400" y="2032"/>
+      <point x="900" y="2032" type="curve" smooth="yes"/>
+      <point x="440" y="2032"/>
+      <point x="200" y="1748"/>
+      <point x="160" y="1356" type="curve"/>
+      <point x="416" y="1356" type="line"/>
+      <point x="456" y="1640"/>
+      <point x="596" y="1808"/>
+      <point x="900" y="1808" type="curve" smooth="yes"/>
+      <point x="1248" y="1808"/>
+      <point x="1456" y="1516"/>
+      <point x="1456" y="1092" type="curve" smooth="yes"/>
+      <point x="1456" y="908" type="line" smooth="yes"/>
+      <point x="1456" y="524"/>
+      <point x="1276" y="192"/>
+      <point x="924" y="192" type="curve" smooth="yes"/>
+      <point x="592" y="192"/>
+      <point x="460" y="352"/>
+      <point x="416" y="640" type="curve"/>
     </contour>
     <contour>
-      <point x="1408" y="1112" type="line"/>
-      <point x="592" y="1112" type="line"/>
-      <point x="592" y="884" type="line"/>
-      <point x="1408" y="884" type="line"/>
+      <point x="908.0" y="2248.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="104" y="640" type="line"/>
-      <point x="148" y="264"/>
-      <point x="380" y="-28"/>
-      <point x="868" y="-28" type="curve" smooth="yes"/>
-      <point x="1344" y="-28"/>
-      <point x="1656" y="340"/>
-      <point x="1656" y="904" type="curve" smooth="yes"/>
-      <point x="1656" y="1096" type="line" smooth="yes"/>
-      <point x="1656" y="1660"/>
-      <point x="1344" y="2032"/>
-      <point x="844" y="2032" type="curve" smooth="yes"/>
-      <point x="384" y="2032"/>
-      <point x="144" y="1748"/>
-      <point x="104" y="1356" type="curve"/>
-      <point x="392" y="1356" type="line"/>
-      <point x="432" y="1628"/>
-      <point x="540" y="1800"/>
-      <point x="844" y="1800" type="curve" smooth="yes"/>
-      <point x="1192" y="1800"/>
-      <point x="1372" y="1520"/>
-      <point x="1372" y="1096" type="curve" smooth="yes"/>
-      <point x="1372" y="904" type="line" smooth="yes"/>
-      <point x="1372" y="520"/>
-      <point x="1220" y="200"/>
-      <point x="868" y="200" type="curve" smooth="yes"/>
-      <point x="536" y="200"/>
-      <point x="436" y="364"/>
-      <point x="392" y="640" type="curve"/>
+      <point x="1864.0" y="2248.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/afii10058.glif b/src/Inter-UI-Regular.ufo/glyphs/afii10058.glif
index d5b06b85b..6b324676a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/afii10058.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/afii10058.glif
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="afii10058" format="1">
-  <advance width="3040"/>
+  <advance width="3028"/>
   <unicode hex="0409"/>
   <outline>
     <contour>
-      <point x="536" y="2048" type="line"/>
-      <point x="500" y="1060" type="line" smooth="yes"/>
-      <point x="476" y="456"/>
-      <point x="408" y="252"/>
-      <point x="152" y="232" type="curve" smooth="yes"/>
-      <point x="96" y="228" type="line"/>
-      <point x="96" y="0" type="line"/>
-      <point x="172" y="0" type="line" smooth="yes"/>
-      <point x="624" y="0"/>
-      <point x="748" y="316"/>
-      <point x="776" y="1012" type="curve" smooth="yes"/>
-      <point x="820" y="2048" type="line"/>
+      <point x="488" y="2048" type="line"/>
+      <point x="452" y="1060" type="line" smooth="yes"/>
+      <point x="428" y="456"/>
+      <point x="360" y="252"/>
+      <point x="104" y="232" type="curve" smooth="yes"/>
+      <point x="48" y="228" type="line"/>
+      <point x="48" y="0" type="line"/>
+      <point x="124" y="0" type="line" smooth="yes"/>
+      <point x="576" y="0"/>
+      <point x="700" y="316"/>
+      <point x="728" y="1012" type="curve" smooth="yes"/>
+      <point x="772" y="2048" type="line"/>
     </contour>
     <contour>
-      <point x="1532" y="2048" type="line"/>
-      <point x="632" y="2048" type="line"/>
-      <point x="632" y="1816" type="line"/>
-      <point x="1532" y="1816" type="line"/>
+      <point x="1484" y="2048" type="line"/>
+      <point x="584" y="2048" type="line"/>
+      <point x="584" y="1816" type="line"/>
+      <point x="1484" y="1816" type="line"/>
     </contour>
     <contour>
-      <point x="1720" y="1236" type="line"/>
-      <point x="1720" y="1008" type="line"/>
-      <point x="2264" y="1008" type="line" smooth="yes"/>
-      <point x="2544" y="1008"/>
-      <point x="2660" y="816"/>
-      <point x="2660" y="620" type="curve" smooth="yes"/>
-      <point x="2660" y="424"/>
-      <point x="2544" y="228"/>
-      <point x="2264" y="228" type="curve" smooth="yes"/>
-      <point x="1784" y="228" type="line"/>
-      <point x="1784" y="2048" type="line"/>
-      <point x="1496" y="2048" type="line"/>
-      <point x="1496" y="0" type="line"/>
-      <point x="2264" y="0" type="line" smooth="yes"/>
-      <point x="2704" y="0"/>
-      <point x="2944" y="264"/>
-      <point x="2944" y="616" type="curve" smooth="yes"/>
-      <point x="2944" y="976"/>
-      <point x="2704" y="1236"/>
-      <point x="2264" y="1236" type="curve" smooth="yes"/>
+      <point x="1672" y="1236" type="line"/>
+      <point x="1672" y="1008" type="line"/>
+      <point x="2216" y="1008" type="line" smooth="yes"/>
+      <point x="2496" y="1008"/>
+      <point x="2612" y="816"/>
+      <point x="2612" y="620" type="curve" smooth="yes"/>
+      <point x="2612" y="424"/>
+      <point x="2496" y="228"/>
+      <point x="2216" y="228" type="curve" smooth="yes"/>
+      <point x="1736" y="228" type="line"/>
+      <point x="1736" y="2048" type="line"/>
+      <point x="1448" y="2048" type="line"/>
+      <point x="1448" y="0" type="line"/>
+      <point x="2216" y="0" type="line" smooth="yes"/>
+      <point x="2656" y="0"/>
+      <point x="2896" y="264"/>
+      <point x="2896" y="616" type="curve" smooth="yes"/>
+      <point x="2896" y="976"/>
+      <point x="2656" y="1236"/>
+      <point x="2216" y="1236" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/afii10059.glif b/src/Inter-UI-Regular.ufo/glyphs/afii10059.glif
index 708e6572c..eeaa436b1 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/afii10059.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/afii10059.glif
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="afii10059" format="1">
-  <advance width="3040"/>
+  <advance width="3012"/>
   <unicode hex="040A"/>
   <outline>
     <contour>
-      <point x="1452" y="1144" type="line"/>
-      <point x="420" y="1144" type="line"/>
-      <point x="420" y="916" type="line"/>
-      <point x="1452" y="916" type="line"/>
+      <point x="1468" y="1144" type="line"/>
+      <point x="436" y="1144" type="line"/>
+      <point x="436" y="916" type="line"/>
+      <point x="1468" y="916" type="line"/>
     </contour>
     <contour>
-      <point x="464" y="2048" type="line"/>
-      <point x="176" y="2048" type="line"/>
-      <point x="176" y="0" type="line"/>
-      <point x="464" y="0" type="line"/>
+      <point x="480" y="2048" type="line"/>
+      <point x="192" y="2048" type="line"/>
+      <point x="192" y="0" type="line"/>
+      <point x="480" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="1640" y="1168" type="line"/>
-      <point x="1640" y="940" type="line"/>
-      <point x="2184" y="940" type="line"/>
-      <point x="2464" y="940"/>
-      <point x="2580" y="780"/>
-      <point x="2580" y="596" type="curve"/>
-      <point x="2580" y="408"/>
-      <point x="2464" y="244"/>
-      <point x="2184" y="244" type="curve"/>
-      <point x="1704" y="244" type="line"/>
-      <point x="1704" y="2048" type="line"/>
-      <point x="1416" y="2048" type="line"/>
-      <point x="1416" y="0" type="line"/>
-      <point x="2184" y="0" type="line"/>
-      <point x="2624" y="0"/>
-      <point x="2864" y="252"/>
-      <point x="2864" y="592" type="curve"/>
-      <point x="2864" y="932"/>
-      <point x="2624" y="1168"/>
-      <point x="2184" y="1168" type="curve"/>
+      <point x="1656" y="1168" type="line"/>
+      <point x="1656" y="940" type="line"/>
+      <point x="2200" y="940" type="line"/>
+      <point x="2480" y="940"/>
+      <point x="2596" y="780"/>
+      <point x="2596" y="596" type="curve"/>
+      <point x="2596" y="408"/>
+      <point x="2480" y="244"/>
+      <point x="2200" y="244" type="curve"/>
+      <point x="1720" y="244" type="line"/>
+      <point x="1720" y="2048" type="line"/>
+      <point x="1432" y="2048" type="line"/>
+      <point x="1432" y="0" type="line"/>
+      <point x="2200" y="0" type="line"/>
+      <point x="2640" y="0"/>
+      <point x="2880" y="252"/>
+      <point x="2880" y="592" type="curve"/>
+      <point x="2880" y="932"/>
+      <point x="2640" y="1168"/>
+      <point x="2200" y="1168" type="curve"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/alpha.glif b/src/Inter-UI-Regular.ufo/glyphs/alpha.glif
index 74ba6412c..de8c7d7f6 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/alpha.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/alpha.glif
@@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="alpha" format="1">
-  <advance width="1716"/>
+  <advance width="1604"/>
   <unicode hex="03B1"/>
   <outline>
-    <contour>
-      <point x="856.0" y="1776.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="752.0" y="-16.0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1588.0" y="1776.0" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="132" y="688" type="line"/>
       <point x="132" y="272"/>
@@ -30,7 +21,7 @@
     </contour>
     <contour>
       <point x="376" y="716" type="line"/>
-      <point x="376" y="1028"/>
+      <point x="376" y="1040"/>
       <point x="512" y="1296"/>
       <point x="784" y="1296" type="curve" smooth="yes"/>
       <point x="1076" y="1296"/>
@@ -41,7 +32,7 @@
       <point x="1072" y="192"/>
       <point x="780" y="192" type="curve" smooth="yes"/>
       <point x="520" y="192"/>
-      <point x="376" y="416"/>
+      <point x="376" y="404"/>
       <point x="376" y="688" type="curve" smooth="yes"/>
     </contour>
     <contour>
@@ -63,6 +54,15 @@
       <point x="1388" y="348" type="curve" smooth="yes"/>
       <point x="1388" y="1488" type="line"/>
     </contour>
+    <contour>
+      <point x="856.0" y="1776.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="752.0" y="-16.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1588.0" y="1776.0" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/b.glif b/src/Inter-UI-Regular.ufo/glyphs/b.glif
index 3cade8e78..a62f2eb89 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/b.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/b.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="b" format="1">
-  <advance width="1628"/>
+  <advance width="1604"/>
   <unicode hex="0062"/>
   <outline>
     <contour>
-      <point x="896" y="2304" type="move" name="top"/>
+      <point x="200" y="2048" type="line"/>
+      <point x="200" y="0" type="line"/>
+      <point x="404" y="0" type="line"/>
+      <point x="436" y="288" type="line"/>
+      <point x="344" y="784" type="line"/>
+      <point x="436" y="1172" type="line"/>
+      <point x="436" y="2048" type="line"/>
+    </contour>
+    <component base="rightloop.cn" xOffset="-40"/>
+    <contour>
+      <point x="872" y="2304" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="892" y="-28" type="move" name="bottom"/>
+      <point x="868" y="-28" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1696" y="2200" type="move" name="top_dd"/>
+      <point x="1672" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1696" y="-560" type="move" name="bottom_dd"/>
+      <point x="1672" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1696" y="2216" type="move" name="top0315"/>
+      <point x="1672" y="2216" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="224" y="2048" type="line"/>
-      <point x="224" y="0" type="line"/>
-      <point x="428" y="0" type="line"/>
-      <point x="460" y="288" type="line"/>
-      <point x="368" y="784" type="line"/>
-      <point x="460" y="1172" type="line"/>
-      <point x="460" y="2048" type="line"/>
-    </contour>
-    <component base="rightloop.cn" xOffset="-16"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/bbar.glif b/src/Inter-UI-Regular.ufo/glyphs/bbar.glif
index 80a6c8b9f..8d776e80a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/bbar.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/bbar.glif
@@ -3,6 +3,8 @@
   <advance width="1760"/>
   <unicode hex="0180"/>
   <outline>
+    <component base="b" xOffset="156"/>
+    <component base="crossbar" xOffset="-132" yOffset="792"/>
     <contour>
       <point x="856" y="-16" type="move" name="markbottom"/>
     </contour>
@@ -18,8 +20,6 @@
     <contour>
       <point x="856" y="-16" type="move" name="bottom"/>
     </contour>
-    <component base="b" xOffset="156"/>
-    <component base="crossbar" xOffset="-132" yOffset="792"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/beta.glif b/src/Inter-UI-Regular.ufo/glyphs/beta.glif
index 4eb638def..23eab776f 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/beta.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/beta.glif
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="beta" format="1">
-  <advance width="1680"/>
+  <advance width="1636"/>
   <unicode hex="03B2"/>
   <outline>
     <contour>
-      <point x="728.0" y="1184.0" type="line" name="hr00"/>
-      <point x="728.0" y="980.0" type="line"/>
-      <point x="924.0" y="980.0" type="line" smooth="yes"/>
-      <point x="1148.0" y="980.0"/>
-      <point x="1292.0" y="788.0"/>
-      <point x="1292.0" y="588.0" type="curve" smooth="yes"/>
-      <point x="1292.0" y="376.0"/>
-      <point x="1132.0" y="192.0"/>
-      <point x="872.0" y="192.0" type="curve" smooth="yes"/>
-      <point x="624.0" y="192.0"/>
-      <point x="472.0" y="360.0"/>
-      <point x="472.0" y="556.0" type="curve"/>
-      <point x="472" y="100" type="line"/>
-      <point x="486.0" y="106.0" type="line"/>
-      <point x="598.0" y="14.0"/>
-      <point x="751.0" y="-28.0"/>
-      <point x="900.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="1264.0" y="-28.0"/>
-      <point x="1528.0" y="240.0"/>
-      <point x="1528.0" y="588.0" type="curve" smooth="yes"/>
-      <point x="1528.0" y="876.0"/>
-      <point x="1348.0" y="1184.0"/>
-      <point x="928.0" y="1184.0" type="curve" smooth="yes"/>
+      <point x="704" y="1184" type="line" name="hr00"/>
+      <point x="704" y="980" type="line"/>
+      <point x="900" y="980" type="line" smooth="yes"/>
+      <point x="1124" y="980"/>
+      <point x="1268" y="788"/>
+      <point x="1268" y="588" type="curve" smooth="yes"/>
+      <point x="1268" y="376"/>
+      <point x="1108" y="192"/>
+      <point x="848" y="192" type="curve" smooth="yes"/>
+      <point x="600" y="192"/>
+      <point x="448" y="360"/>
+      <point x="448" y="556" type="curve"/>
+      <point x="448" y="100" type="line"/>
+      <point x="464" y="108" type="line"/>
+      <point x="576" y="16"/>
+      <point x="728" y="-28"/>
+      <point x="876" y="-28" type="curve" smooth="yes"/>
+      <point x="1240" y="-28"/>
+      <point x="1504" y="240"/>
+      <point x="1504" y="588" type="curve" smooth="yes"/>
+      <point x="1504" y="876"/>
+      <point x="1324" y="1184"/>
+      <point x="904" y="1184" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="844" y="2076" type="curve" smooth="yes"/>
-      <point x="492" y="2076"/>
-      <point x="224" y="1840"/>
-      <point x="224" y="1524" type="curve"/>
-      <point x="224" y="-576" type="line"/>
-      <point x="472" y="-576" type="line"/>
-      <point x="472" y="1524" type="line" smooth="yes"/>
-      <point x="472" y="1720"/>
-      <point x="640" y="1856"/>
-      <point x="844" y="1856" type="curve" smooth="yes"/>
-      <point x="1048" y="1856"/>
-      <point x="1208" y="1720"/>
-      <point x="1208" y="1536" type="curve" smooth="yes"/>
-      <point x="1208" y="1364"/>
-      <point x="1072" y="1200"/>
-      <point x="840" y="1200" type="curve" smooth="yes"/>
-      <point x="728" y="1200" type="line"/>
-      <point x="728" y="996" type="line"/>
-      <point x="844" y="996" type="line" smooth="yes"/>
-      <point x="1252" y="996"/>
-      <point x="1440" y="1284"/>
-      <point x="1440" y="1536" type="curve" smooth="yes"/>
-      <point x="1440" y="1804"/>
-      <point x="1224" y="2076"/>
+      <point x="820" y="2076" type="curve" smooth="yes"/>
+      <point x="468" y="2076"/>
+      <point x="200" y="1840"/>
+      <point x="200" y="1524" type="curve"/>
+      <point x="200" y="-576" type="line"/>
+      <point x="448" y="-576" type="line"/>
+      <point x="448" y="1524" type="line" smooth="yes"/>
+      <point x="448" y="1720"/>
+      <point x="616" y="1856"/>
+      <point x="820" y="1856" type="curve" smooth="yes"/>
+      <point x="1024" y="1856"/>
+      <point x="1184" y="1720"/>
+      <point x="1184" y="1536" type="curve" smooth="yes"/>
+      <point x="1184" y="1364"/>
+      <point x="1048" y="1200"/>
+      <point x="816" y="1200" type="curve" smooth="yes"/>
+      <point x="704" y="1200" type="line"/>
+      <point x="704" y="996" type="line"/>
+      <point x="820" y="996" type="line" smooth="yes"/>
+      <point x="1228" y="996"/>
+      <point x="1416" y="1284"/>
+      <point x="1416" y="1536" type="curve" smooth="yes"/>
+      <point x="1416" y="1804"/>
+      <point x="1200" y="2076"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/d.glif b/src/Inter-UI-Regular.ufo/glyphs/d.glif
index cca5b09c5..d639d6f17 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/d.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/d.glif
@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="d" format="1">
-  <advance width="1648"/>
+  <advance width="1644"/>
   <unicode hex="0064"/>
   <outline>
+    <contour>
+      <point x="1208" y="344" type="line"/>
+      <point x="1228" y="0" type="line"/>
+      <point x="1444" y="0" type="line"/>
+      <point x="1444" y="2048" type="line"/>
+      <point x="1208" y="2048" type="line"/>
+      <point x="1208" y="1156" type="line"/>
+      <point x="1280" y="748" type="line"/>
+    </contour>
+    <component base="leftloop.cn"/>
     <contour>
       <point x="1536" y="2112" type="move" name="caron"/>
     </contour>
@@ -24,16 +34,6 @@
     <contour>
       <point x="1596" y="2216" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1208" y="344" type="line"/>
-      <point x="1228" y="0" type="line"/>
-      <point x="1444" y="0" type="line"/>
-      <point x="1444" y="2048" type="line"/>
-      <point x="1208" y="2048" type="line"/>
-      <point x="1208" y="1156" type="line"/>
-      <point x="1280" y="748" type="line"/>
-    </contour>
-    <component base="leftloop.cn"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dcroat.glif b/src/Inter-UI-Regular.ufo/glyphs/dcroat.glif
index 354583493..cca270541 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dcroat.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dcroat.glif
@@ -1,46 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="dcroat" format="1">
-  <advance width="1728"/>
+  <advance width="1664"/>
   <unicode hex="0111"/>
   <outline>
-    <contour>
-      <point x="1540" y="2112" type="move" name="caron"/>
-    </contour>
-    <contour>
-      <point x="856" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="784" y="2304" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1600" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1600" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="856" y="0" type="move" name="markbottom"/>
-    </contour>
-    <contour>
-      <point x="1704" y="2216" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="1220" y="1800" type="move" name="parenthesses.w2"/>
-    </contour>
-    <contour>
-      <point x="1164" y="288" type="line"/>
-      <point x="1188" y="0" type="line"/>
-      <point x="1400" y="0" type="line"/>
-      <point x="1400" y="2112" type="line"/>
-      <point x="1164" y="2112" type="line"/>
-    </contour>
     <contour>
       <point x="1664" y="1912" type="line"/>
       <point x="780" y="1912" type="line"/>
       <point x="780" y="1692" type="line"/>
       <point x="1664" y="1692" type="line"/>
     </contour>
+    <contour>
+      <point x="1208" y="344" type="line"/>
+      <point x="1228" y="0" type="line"/>
+      <point x="1444" y="0" type="line"/>
+      <point x="1444" y="2048" type="line"/>
+      <point x="1208" y="2048" type="line"/>
+      <point x="1208" y="1156" type="line"/>
+      <point x="1280" y="748" type="line"/>
+    </contour>
     <component base="leftloop.cn"/>
+    <contour>
+      <point x="1540.0" y="2112.0" type="move" name="caron"/>
+    </contour>
+    <contour>
+      <point x="856.0" y="0.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="784.0" y="2304.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1600.0" y="2200.0" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1600.0" y="-560.0" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="856.0" y="0.0" type="move" name="markbottom"/>
+    </contour>
+    <contour>
+      <point x="1704.0" y="2216.0" type="move" name="top0315"/>
+    </contour>
+    <contour>
+      <point x="1220.0" y="1800.0" type="move" name="parenthesses.w2"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dotlessi.glif b/src/Inter-UI-Regular.ufo/glyphs/dotlessi.glif
index 8fa9abf10..5bd512202 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dotlessi.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dotlessi.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="dotlessi" format="1">
-  <advance width="736"/>
+  <advance width="636"/>
   <unicode hex="0131"/>
   <outline>
     <contour>
-      <point x="368" y="1796" type="move" name="top"/>
+      <point x="436" y="1536" type="line"/>
+      <point x="200" y="1536" type="line"/>
+      <point x="200" y="0" type="line"/>
+      <point x="436" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="332" y="16" type="move" name="bottom"/>
+      <point x="328" y="1796" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="376" y="900" type="move" name="rhotichook"/>
+      <point x="292" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="696" y="1776" type="move" name="top0315"/>
+      <point x="336" y="900" type="move" name="rhotichook"/>
     </contour>
     <contour>
-      <point x="480" y="1536" type="line"/>
-      <point x="240" y="1536" type="line"/>
-      <point x="240" y="0" type="line"/>
-      <point x="480" y="0" type="line"/>
+      <point x="656" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dotlessj.glif b/src/Inter-UI-Regular.ufo/glyphs/dotlessj.glif
index ef11021de..6ecaed896 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dotlessj.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dotlessj.glif
@@ -1,34 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="dotlessj" format="1">
-  <advance width="736"/>
+  <advance width="636"/>
   <unicode hex="0237"/>
   <outline>
     <contour>
-      <point x="532" y="1716" type="move" name="top"/>
+      <point x="200" y="1536" type="line"/>
+      <point x="200" y="-112" type="line"/>
+      <point x="200" y="-268"/>
+      <point x="136" y="-360"/>
+      <point x="-8" y="-360" type="curve"/>
+      <point x="-52" y="-360" type="line"/>
+      <point x="-52" y="-580" type="line"/>
+      <point x="-4" y="-580" type="line"/>
+      <point x="292" y="-580"/>
+      <point x="436" y="-396"/>
+      <point x="436" y="-112" type="curve"/>
+      <point x="436" y="1536" type="line"/>
     </contour>
     <contour>
-      <point x="668" y="0" type="move" name="_right"/>
+      <point x="500.0" y="1716.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="884" y="1716" type="move" name="top0315"/>
+      <point x="636.0" y="0.0" type="move" name="_right"/>
     </contour>
     <contour>
-      <point x="396" y="1488" type="line"/>
-      <point x="396" y="-124" type="line"/>
-      <point x="396" y="-284"/>
-      <point x="332" y="-380"/>
-      <point x="220" y="-380" type="curve" smooth="yes"/>
-      <point x="200" y="-380"/>
-      <point x="116" y="-376"/>
-      <point x="88" y="-364" type="curve"/>
-      <point x="68" y="-580" type="line"/>
-      <point x="120" y="-596"/>
-      <point x="164" y="-600"/>
-      <point x="220" y="-600" type="curve" smooth="yes"/>
-      <point x="500" y="-600"/>
-      <point x="668" y="-432"/>
-      <point x="668" y="-124" type="curve"/>
-      <point x="668" y="1488" type="line"/>
+      <point x="852.0" y="1716.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/drthook.glif b/src/Inter-UI-Regular.ufo/glyphs/drthook.glif
index 901d97d9b..38c5a7579 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/drthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/drthook.glif
@@ -3,15 +3,6 @@
   <advance width="1760"/>
   <unicode hex="0256"/>
   <outline>
-    <contour>
-      <point x="684" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="764" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1576" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1036" y="316" type="line"/>
       <point x="1036" y="-192" type="line" smooth="yes"/>
@@ -31,6 +22,15 @@
       <point x="1308" y="316" type="line"/>
     </contour>
     <component base="d" xOffset="-88"/>
+    <contour>
+      <point x="684" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="764" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1576" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dyogh.glif b/src/Inter-UI-Regular.ufo/glyphs/dyogh.glif
index 21d2a193a..11349e865 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dyogh.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dyogh.glif
@@ -3,15 +3,6 @@
   <advance width="2528"/>
   <unicode hex="02A4"/>
   <outline>
-    <contour>
-      <point x="1676" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1676" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="2504" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1096" y="1488" type="line"/>
       <point x="1096" y="1268" type="line"/>
@@ -47,6 +38,15 @@
       <point x="1652" y="596" type="curve"/>
     </contour>
     <component base="d" xOffset="-88"/>
+    <contour>
+      <point x="1676" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1676" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="2504" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dz.glif b/src/Inter-UI-Regular.ufo/glyphs/dz.glif
index 2b0a9258d..4c73709bd 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dz.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dz.glif
@@ -3,15 +3,6 @@
   <advance width="2784"/>
   <unicode hex="02A3"/>
   <outline>
-    <contour>
-      <point x="1908" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1908" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="2652" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="2552" y="220" type="line"/>
       <point x="1476" y="220" type="line"/>
@@ -33,6 +24,15 @@
       <point x="2396" y="1268" type="line"/>
     </contour>
     <component base="d" xOffset="-24"/>
+    <contour>
+      <point x="1908" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1908" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="2652" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dzcurl.glif b/src/Inter-UI-Regular.ufo/glyphs/dzcurl.glif
index d8607b762..ec29c7b6a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dzcurl.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dzcurl.glif
@@ -3,15 +3,6 @@
   <advance width="3040"/>
   <unicode hex="02A5"/>
   <outline>
-    <contour>
-      <point x="1820" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1820" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="2904" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1596" y="-140" type="line"/>
       <point x="1792" y="-284" type="line"/>
@@ -59,6 +50,15 @@
       <point x="2340" y="1268" type="line"/>
     </contour>
     <component base="d" xOffset="-80"/>
+    <contour>
+      <point x="1820" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1820" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="2904" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/eta.glif b/src/Inter-UI-Regular.ufo/glyphs/eta.glif
index 0bd5c4c41..c050beafb 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/eta.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/eta.glif
@@ -1,41 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="eta" format="1">
-  <advance width="1504"/>
+  <advance width="1604"/>
   <unicode hex="03B7"/>
   <outline>
     <contour>
-      <point x="752" y="1776" type="move" name="top"/>
+      <point x="436" y="908" type="line" smooth="yes"/>
+      <point x="436" y="1196"/>
+      <point x="656" y="1328"/>
+      <point x="832" y="1328" type="curve" smooth="yes"/>
+      <point x="1028" y="1328"/>
+      <point x="1168" y="1184"/>
+      <point x="1168" y="960" type="curve" smooth="yes"/>
+      <point x="1168" y="-576" type="line"/>
+      <point x="1404" y="-576" type="line"/>
+      <point x="1404" y="976" type="line" smooth="yes"/>
+      <point x="1404" y="1368"/>
+      <point x="1196" y="1556"/>
+      <point x="908" y="1556" type="curve" smooth="yes"/>
+      <point x="676" y="1556"/>
+      <point x="524" y="1432"/>
+      <point x="452" y="1276" type="curve"/>
+      <point x="436" y="1276" type="line"/>
+      <point x="436" y="1536" type="line"/>
+      <point x="200" y="1536" type="line"/>
+      <point x="200" y="0" type="line"/>
+      <point x="436" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="292" y="16" type="move" name="bottom"/>
+      <point x="800" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1560" y="1776" type="move" name="top0315"/>
+      <point x="340" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="428" y="1172" type="line"/>
-      <point x="400" y="1488" type="line"/>
-      <point x="152" y="1488" type="line"/>
-      <point x="152" y="0" type="line"/>
-      <point x="428" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="372" y="796" type="line"/>
-      <point x="372" y="1072"/>
-      <point x="488" y="1296"/>
-      <point x="764" y="1296" type="curve" smooth="yes"/>
-      <point x="968" y="1296"/>
-      <point x="1076" y="1212"/>
-      <point x="1076" y="952" type="curve"/>
-      <point x="1076" y="-572" type="line"/>
-      <point x="1352" y="-572" type="line"/>
-      <point x="1352" y="956" type="line"/>
-      <point x="1352" y="1388"/>
-      <point x="1156" y="1516"/>
-      <point x="848" y="1516" type="curve" smooth="yes"/>
-      <point x="484" y="1516"/>
-      <point x="256" y="1212"/>
-      <point x="256" y="792" type="curve"/>
+      <point x="1608" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/eth.glif b/src/Inter-UI-Regular.ufo/glyphs/eth.glif
index 62962721b..f88540f3e 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/eth.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/eth.glif
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="eth" format="1">
-  <advance width="1504"/>
+  <advance width="1556"/>
   <unicode hex="00F0"/>
   <outline>
     <contour>
-      <point x="272" y="1944" type="line"/>
-      <point x="736" y="1824"/>
-      <point x="1132" y="1508"/>
-      <point x="1132" y="876" type="curve" smooth="yes"/>
-      <point x="1132" y="736" type="line" smooth="yes"/>
-      <point x="1132" y="428"/>
-      <point x="992" y="192"/>
-      <point x="760" y="192" type="curve" smooth="yes"/>
-      <point x="512" y="192"/>
-      <point x="372" y="424"/>
-      <point x="372" y="644" type="curve"/>
-      <point x="372" y="944"/>
-      <point x="528" y="1128"/>
-      <point x="784" y="1128" type="curve"/>
-      <point x="1036" y="1128"/>
-      <point x="1160" y="968"/>
-      <point x="1160" y="852" type="curve"/>
-      <point x="1264" y="848" type="line"/>
-      <point x="1264" y="1088"/>
-      <point x="1028" y="1348"/>
-      <point x="716" y="1348" type="curve"/>
-      <point x="364" y="1348"/>
-      <point x="100" y="1068"/>
-      <point x="100" y="644" type="curve"/>
-      <point x="100" y="272"/>
-      <point x="368" y="-28"/>
-      <point x="756" y="-28" type="curve" smooth="yes"/>
-      <point x="1132" y="-28"/>
-      <point x="1408" y="284"/>
-      <point x="1408" y="736" type="curve"/>
-      <point x="1408" y="872" type="line"/>
-      <point x="1408" y="1564"/>
-      <point x="972" y="2044"/>
-      <point x="356" y="2176" type="curve"/>
+      <point x="316" y="1960" type="line"/>
+      <point x="788" y="1840"/>
+      <point x="1188" y="1516"/>
+      <point x="1188" y="876" type="curve" smooth="yes"/>
+      <point x="1188" y="736" type="line" smooth="yes"/>
+      <point x="1188" y="428"/>
+      <point x="1020" y="192"/>
+      <point x="788" y="192" type="curve" smooth="yes"/>
+      <point x="540" y="192"/>
+      <point x="384" y="424"/>
+      <point x="384" y="644" type="curve"/>
+      <point x="384" y="944"/>
+      <point x="556" y="1128"/>
+      <point x="812" y="1128" type="curve"/>
+      <point x="1064" y="1128"/>
+      <point x="1188" y="920"/>
+      <point x="1188" y="784" type="curve"/>
+      <point x="1292" y="784" type="line"/>
+      <point x="1292" y="1088"/>
+      <point x="1056" y="1348"/>
+      <point x="744" y="1348" type="curve"/>
+      <point x="392" y="1348"/>
+      <point x="128" y="1068"/>
+      <point x="128" y="644" type="curve"/>
+      <point x="128" y="272"/>
+      <point x="396" y="-28"/>
+      <point x="784" y="-28" type="curve" smooth="yes"/>
+      <point x="1160" y="-28"/>
+      <point x="1436" y="284"/>
+      <point x="1436" y="736" type="curve"/>
+      <point x="1436" y="872" type="line"/>
+      <point x="1436" y="1564"/>
+      <point x="1000" y="2044"/>
+      <point x="384" y="2176" type="curve"/>
     </contour>
     <contour>
-      <point x="1292" y="1948" type="line"/>
-      <point x="1184" y="2092" type="line"/>
-      <point x="436" y="1576" type="line"/>
-      <point x="544" y="1436" type="line"/>
+      <point x="1320" y="1948" type="line"/>
+      <point x="1212" y="2092" type="line"/>
+      <point x="464" y="1576" type="line"/>
+      <point x="572" y="1436" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/finalkaf.glif b/src/Inter-UI-Regular.ufo/glyphs/finalkaf.glif
index 36f948f2d..09f4bc2f8 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/finalkaf.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/finalkaf.glif
@@ -3,15 +3,6 @@
   <advance width="1760"/>
   <unicode hex="02AA"/>
   <outline>
-    <contour>
-      <point x="1036" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1036" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1756" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1348" y="396" type="curve" smooth="yes"/>
       <point x="1348" y="280"/>
@@ -53,6 +44,15 @@
       <point x="1348" y="524"/>
     </contour>
     <component base="l" xOffset="-116"/>
+    <contour>
+      <point x="1036" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1036" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1756" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/fitacyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/fitacyrillic.glif
index 7eea3e0a2..bdbe1c1b1 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/fitacyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/fitacyrillic.glif
@@ -3,12 +3,6 @@
   <advance width="1760"/>
   <unicode hex="0473"/>
   <outline>
-    <contour>
-      <point x="752" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1588" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1220" y="864" type="line"/>
       <point x="336" y="864" type="line"/>
@@ -16,6 +10,12 @@
       <point x="1220" y="644" type="line"/>
     </contour>
     <component base="o" xOffset="-16"/>
+    <contour>
+      <point x="752" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1588" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/g.glif b/src/Inter-UI-Regular.ufo/glyphs/g.glif
index 2c7b5de58..6cc5a5aca 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/g.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/g.glif
@@ -1,23 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="g" format="1">
-  <advance width="1612"/>
+  <advance width="1628"/>
   <unicode hex="0067"/>
   <outline>
-    <contour>
-      <point x="812" y="1792" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="748" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1568" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1568" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1568" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1192" y="1528" type="line"/>
       <point x="1192" y="1200" type="line"/>
@@ -74,6 +59,21 @@
       <point x="376" y="464"/>
       <point x="376" y="752" type="curve" smooth="yes"/>
     </contour>
+    <contour>
+      <point x="812" y="1792" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="748" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1568" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1568" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1568" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/gcursive.glif b/src/Inter-UI-Regular.ufo/glyphs/gcursive.glif
index 515c35188..08597a3e0 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/gcursive.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/gcursive.glif
@@ -3,6 +3,7 @@
   <advance width="1760"/>
   <unicode hex="0261"/>
   <outline>
+    <component base="g" xOffset="-16"/>
     <contour>
       <point x="748" y="1776" type="move" name="top"/>
     </contour>
@@ -12,7 +13,6 @@
     <contour>
       <point x="748" y="-616" type="move" name="bottom"/>
     </contour>
-    <component base="g" xOffset="-16"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/gecyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/gecyrillic.glif
index f07ada939..ab6ef07ec 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/gecyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/gecyrillic.glif
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="gecyrillic" format="1">
-  <advance width="1248"/>
+  <advance width="1236"/>
   <unicode hex="0433"/>
   <outline>
     <contour>
-      <point x="536" y="1744" type="move" name="top"/>
+      <point x="1140" y="1488" type="line"/>
+      <point x="192" y="1488" type="line"/>
+      <point x="192" y="0" type="line"/>
+      <point x="428" y="0" type="line"/>
+      <point x="428" y="1268" type="line"/>
+      <point x="1140" y="1268" type="line"/>
     </contour>
     <contour>
-      <point x="372" y="760" type="move" name="cross"/>
+      <point x="576" y="1744" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="424" y="0" type="move" name="right"/>
+      <point x="412" y="760" type="move" name="cross"/>
     </contour>
     <contour>
-      <point x="1120" y="1744" type="move" name="top0315"/>
+      <point x="464" y="0" type="move" name="right"/>
     </contour>
     <contour>
-      <point x="1100" y="1488" type="line"/>
-      <point x="152" y="1488" type="line"/>
-      <point x="152" y="0" type="line"/>
-      <point x="424" y="0" type="line"/>
-      <point x="424" y="1268" type="line"/>
-      <point x="1100" y="1268" type="line"/>
+      <point x="1160" y="1744" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/germandbls.glif b/src/Inter-UI-Regular.ufo/glyphs/germandbls.glif
index 25a4b543f..64149d34e 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/germandbls.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/germandbls.glif
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="germandbls" format="1">
-  <advance width="1760"/>
+  <advance width="1684"/>
   <unicode hex="00DF"/>
   <outline>
     <contour>
-      <point x="468" y="1524" type="line" name="hr00"/>
-      <point x="468" y="1796"/>
-      <point x="572" y="1928"/>
-      <point x="756" y="1928" type="curve" smooth="yes"/>
-      <point x="904" y="1928"/>
-      <point x="1048" y="1828"/>
-      <point x="1048" y="1644" type="curve" smooth="yes"/>
-      <point x="1048" y="1436"/>
-      <point x="848" y="1344"/>
-      <point x="848" y="1128" type="curve" smooth="yes"/>
-      <point x="848" y="756"/>
-      <point x="1332" y="680"/>
-      <point x="1332" y="424" type="curve" smooth="yes"/>
-      <point x="1332" y="268"/>
-      <point x="1244" y="180"/>
-      <point x="1008" y="180" type="curve" smooth="yes"/>
-      <point x="884" y="180"/>
-      <point x="748" y="256"/>
-      <point x="688" y="296" type="curve"/>
-      <point x="628" y="72" type="line"/>
-      <point x="696" y="20"/>
-      <point x="888" y="-28"/>
-      <point x="1036" y="-28" type="curve" smooth="yes"/>
-      <point x="1352" y="-28"/>
-      <point x="1568" y="120"/>
-      <point x="1568" y="440" type="curve" smooth="yes"/>
-      <point x="1568" y="792"/>
-      <point x="1092" y="876"/>
-      <point x="1092" y="1128" type="curve" smooth="yes"/>
-      <point x="1092" y="1308"/>
-      <point x="1272" y="1372"/>
-      <point x="1272" y="1668" type="curve" smooth="yes"/>
-      <point x="1272" y="1996"/>
-      <point x="1052" y="2140"/>
-      <point x="744" y="2140" type="curve" smooth="yes"/>
-      <point x="420" y="2140"/>
-      <point x="240" y="1932"/>
-      <point x="240" y="1524" type="curve" smooth="yes"/>
-      <point x="240" y="0" type="line"/>
-      <point x="468" y="0" type="line"/>
+      <point x="460" y="1524" type="line" name="hr00"/>
+      <point x="460" y="1796"/>
+      <point x="556" y="1924"/>
+      <point x="740" y="1924" type="curve" smooth="yes"/>
+      <point x="888" y="1924"/>
+      <point x="1032" y="1848"/>
+      <point x="1032" y="1668" type="curve" smooth="yes"/>
+      <point x="1032" y="1456"/>
+      <point x="832" y="1344"/>
+      <point x="832" y="1128" type="curve" smooth="yes"/>
+      <point x="832" y="756"/>
+      <point x="1316" y="680"/>
+      <point x="1316" y="424" type="curve" smooth="yes"/>
+      <point x="1316" y="268"/>
+      <point x="1228" y="180"/>
+      <point x="992" y="180" type="curve" smooth="yes"/>
+      <point x="868" y="180"/>
+      <point x="748" y="244"/>
+      <point x="688" y="280" type="curve"/>
+      <point x="592" y="84" type="line"/>
+      <point x="672" y="28"/>
+      <point x="832" y="-28"/>
+      <point x="1020" y="-28" type="curve" smooth="yes"/>
+      <point x="1336" y="-28"/>
+      <point x="1552" y="120"/>
+      <point x="1552" y="440" type="curve" smooth="yes"/>
+      <point x="1552" y="796"/>
+      <point x="1076" y="876"/>
+      <point x="1076" y="1128" type="curve" smooth="yes"/>
+      <point x="1076" y="1308"/>
+      <point x="1256" y="1372"/>
+      <point x="1256" y="1668" type="curve" smooth="yes"/>
+      <point x="1256" y="1996"/>
+      <point x="996" y="2140"/>
+      <point x="740" y="2140" type="curve" smooth="yes"/>
+      <point x="432" y="2140"/>
+      <point x="224" y="1932"/>
+      <point x="224" y="1524" type="curve" smooth="yes"/>
+      <point x="224" y="0" type="line"/>
+      <point x="460" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/gheupturncyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/gheupturncyrillic.glif
index 63cab1ed1..7c6c046d5 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/gheupturncyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/gheupturncyrillic.glif
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="gheupturncyrillic" format="1">
-  <advance width="1248"/>
+  <advance width="1236"/>
   <unicode hex="0491"/>
   <outline>
     <contour>
-      <point x="1124" y="1916" type="line"/>
-      <point x="848" y="1916" type="line"/>
-      <point x="848" y="1268" type="line"/>
-      <point x="1124" y="1268" type="line"/>
+      <point x="1140" y="1916" type="line"/>
+      <point x="904" y="1916" type="line"/>
+      <point x="904" y="1268" type="line"/>
+      <point x="1140" y="1268" type="line"/>
     </contour>
-    <component base="gecyrillic" xOffset="-44"/>
+    <component base="gecyrillic"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/h.glif b/src/Inter-UI-Regular.ufo/glyphs/h.glif
index dfc118061..8eda84178 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/h.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/h.glif
@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="h" format="1">
-  <advance width="1632"/>
+  <advance width="1604"/>
   <unicode hex="0068"/>
   <outline>
     <contour>
-      <point x="460" y="928" type="line" smooth="yes"/>
-      <point x="460" y="1216"/>
-      <point x="680" y="1328"/>
-      <point x="856" y="1328" type="curve" smooth="yes"/>
-      <point x="1052" y="1328"/>
-      <point x="1188" y="1200"/>
-      <point x="1188" y="976" type="curve" smooth="yes"/>
-      <point x="1188" y="0" type="line"/>
-      <point x="1428" y="0" type="line"/>
-      <point x="1428" y="976" type="line" smooth="yes"/>
-      <point x="1428" y="1368"/>
-      <point x="1156" y="1556"/>
-      <point x="932" y="1556" type="curve" smooth="yes"/>
-      <point x="700" y="1556"/>
-      <point x="552" y="1436"/>
-      <point x="476" y="1320" type="curve"/>
-      <point x="460" y="1320" type="line"/>
-      <point x="460" y="2048" type="line"/>
-      <point x="224" y="2048" type="line"/>
-      <point x="224" y="0" type="line"/>
-      <point x="460" y="0" type="line"/>
+      <point x="436" y="928" type="line" smooth="yes"/>
+      <point x="436" y="1216"/>
+      <point x="656" y="1328"/>
+      <point x="832" y="1328" type="curve" smooth="yes"/>
+      <point x="1028" y="1328"/>
+      <point x="1164" y="1200"/>
+      <point x="1164" y="976" type="curve" smooth="yes"/>
+      <point x="1164" y="0" type="line"/>
+      <point x="1404" y="0" type="line"/>
+      <point x="1404" y="976" type="line" smooth="yes"/>
+      <point x="1404" y="1368"/>
+      <point x="1132" y="1556"/>
+      <point x="908" y="1556" type="curve" smooth="yes"/>
+      <point x="676" y="1556"/>
+      <point x="528" y="1436"/>
+      <point x="452" y="1320" type="curve"/>
+      <point x="436" y="1320" type="line"/>
+      <point x="436" y="2048" type="line"/>
+      <point x="200" y="2048" type="line"/>
+      <point x="200" y="0" type="line"/>
+      <point x="436" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="892" y="2304" type="move" name="top"/>
+      <point x="868" y="2304" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="372" y="1796" type="move" name="cross"/>
+      <point x="348" y="1796" type="move" name="cross"/>
     </contour>
     <contour>
-      <point x="796" y="16" type="move" name="bottom"/>
+      <point x="772" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1356" y="0" type="move" name="right"/>
+      <point x="1332" y="0" type="move" name="right"/>
     </contour>
     <contour>
-      <point x="1536" y="2200" type="move" name="top_dd"/>
+      <point x="1512" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1536" y="-560" type="move" name="bottom_dd"/>
+      <point x="1512" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1536" y="2216" type="move" name="top0315"/>
+      <point x="1512" y="2216" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
@@ -68,7 +68,7 @@
                 <integer>0</integer>
                 <integer>0</integer>
                 <integer>1</integer>
-                <integer>-16</integer>
+                <integer>-40</integer>
                 <integer>0</integer>
               </array>
             </dict>
@@ -85,7 +85,7 @@
           <array>
           </array>
           <key>width</key>
-          <integer>1632</integer>
+          <integer>1604</integer>
         </dict>
       </dict>
       <key>com.typemytype.robofont.mark</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/hcedilla.glif b/src/Inter-UI-Regular.ufo/glyphs/hcedilla.glif
index 78e5cf1bd..820ea22d2 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/hcedilla.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/hcedilla.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="hcedilla" format="1">
-  <advance width="1760"/>
+  <advance width="1612"/>
   <unicode hex="1E29"/>
   <outline>
-    <component base="h" xOffset="16"/>
-    <component base="cedilla" xOffset="8"/>
+    <component base="h" xOffset="8"/>
+    <component base="cedilla" xOffset="-32"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/i.glif b/src/Inter-UI-Regular.ufo/glyphs/i.glif
index 8e38d8383..cc9ab275c 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/i.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/i.glif
@@ -1,52 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="i" format="1">
-  <advance width="736"/>
+  <advance width="636"/>
   <unicode hex="0069"/>
   <outline>
     <contour>
-      <point x="364" y="16" type="move" name="bottom"/>
+      <point x="436" y="1536" type="line"/>
+      <point x="200" y="1536" type="line"/>
+      <point x="200" y="0" type="line"/>
+      <point x="436" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="480" y="0" type="move" name="ogonek"/>
+      <point x="148" y="1920" type="curve" smooth="yes"/>
+      <point x="148" y="1832"/>
+      <point x="212" y="1760"/>
+      <point x="316" y="1760" type="curve"/>
+      <point x="420" y="1760"/>
+      <point x="484" y="1832"/>
+      <point x="484" y="1920" type="curve"/>
+      <point x="484" y="2000"/>
+      <point x="420" y="2080"/>
+      <point x="316" y="2080" type="curve"/>
+      <point x="212" y="2080"/>
+      <point x="148" y="2000"/>
     </contour>
     <contour>
-      <point x="368" y="2304" type="move" name="top"/>
+      <point x="316" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="712" y="2200" type="move" name="top_dd"/>
+      <point x="432" y="0" type="move" name="ogonek"/>
     </contour>
     <contour>
-      <point x="712" y="-560" type="move" name="bottom_dd"/>
+      <point x="320" y="2304" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="408" y="900" type="move" name="rhotichook"/>
+      <point x="664" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="712" y="2200" type="move" name="top0315"/>
+      <point x="664" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="484" y="1536" type="line"/>
-      <point x="248" y="1536" type="line"/>
-      <point x="248" y="0" type="line"/>
-      <point x="484" y="0" type="line"/>
+      <point x="360" y="900" type="move" name="rhotichook"/>
     </contour>
     <contour>
-      <point x="200" y="1920" type="curve" smooth="yes"/>
-      <point x="200" y="1832"/>
-      <point x="264" y="1760"/>
-      <point x="368" y="1760" type="curve"/>
-      <point x="472" y="1760"/>
-      <point x="536" y="1832"/>
-      <point x="536" y="1920" type="curve"/>
-      <point x="536" y="2000"/>
-      <point x="472" y="2080"/>
-      <point x="368" y="2080" type="curve"/>
-      <point x="264" y="2080"/>
-      <point x="200" y="2000"/>
+      <point x="664" y="2200" 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>316</integer>
+          <key>y</key>
+          <integer>1444</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ibar.glif b/src/Inter-UI-Regular.ufo/glyphs/ibar.glif
index f383b307d..f9b74f48e 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ibar.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ibar.glif
@@ -3,6 +3,8 @@
   <advance width="992"/>
   <unicode hex="0268"/>
   <outline>
+    <component base="i" xOffset="148"/>
+    <component base="crossbar" xOffset="-148" yOffset="-164"/>
     <contour>
       <point x="496" y="2200" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="496" y="0" type="move" name="bottom"/>
     </contour>
-    <component base="i" xOffset="148"/>
-    <component base="crossbar" xOffset="-148" yOffset="-164"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/idieresisacute.glif b/src/Inter-UI-Regular.ufo/glyphs/idieresisacute.glif
index 67336c222..d7a3c4602 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/idieresisacute.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/idieresisacute.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="idieresisacute" format="1">
-  <advance width="1024"/>
+  <advance width="877"/>
   <unicode hex="1E2F"/>
   <outline>
+    <component base="dotlessi" xOffset="80"/>
+    <component base="dieresisacutecomb.lc" xOffset="1260"/>
     <contour>
-      <point x="548" y="900" type="move" name="rhotichook"/>
+      <point x="492" y="900" type="move" name="rhotichook"/>
     </contour>
     <contour>
-      <point x="508" y="1776" type="move" name="top"/>
+      <point x="452" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="868" y="1776" type="move" name="top0315"/>
+      <point x="812" y="1776" type="move" name="top0315"/>
     </contour>
     <contour>
-      <point x="508" y="2668" type="move" name="mkmktop_acc"/>
+      <point x="452" y="2668" type="move" name="mkmktop_acc"/>
     </contour>
     <contour>
-      <point x="504" y="16" type="move" name="bottom"/>
+      <point x="448" y="16" type="move" name="bottom"/>
     </contour>
-    <component base="dotlessi" xOffset="136"/>
-    <component base="dieresisacutecomb.lc" xOffset="1316"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/iota.glif b/src/Inter-UI-Regular.ufo/glyphs/iota.glif
index 84537c281..a7130e4c8 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/iota.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/iota.glif
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="iota" format="1">
-  <advance width="992"/>
+  <advance width="732"/>
   <unicode hex="03B9"/>
   <outline>
     <contour>
-      <point x="368" y="1744" type="move" name="top"/>
+      <point x="200" y="1488" type="line"/>
+      <point x="200" y="380" type="line"/>
+      <point x="200" y="84"/>
+      <point x="340" y="-20"/>
+      <point x="528" y="-20" type="curve" smooth="yes"/>
+      <point x="624" y="-20"/>
+      <point x="688" y="-4"/>
+      <point x="728" y="8" type="curve"/>
+      <point x="728" y="232" type="line"/>
+      <point x="708" y="224"/>
+      <point x="652" y="212"/>
+      <point x="612" y="212" type="curve" smooth="yes"/>
+      <point x="528" y="212"/>
+      <point x="436" y="236"/>
+      <point x="436" y="380" type="curve"/>
+      <point x="436" y="1488" type="line"/>
     </contour>
     <contour>
-      <point x="880" y="1744" type="move" name="top0315"/>
+      <point x="324" y="1744" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="224" y="1488" type="line"/>
-      <point x="224" y="380" type="line"/>
-      <point x="224" y="84"/>
-      <point x="384" y="-20"/>
-      <point x="572" y="-20" type="curve" smooth="yes"/>
-      <point x="668" y="-20"/>
-      <point x="732" y="0"/>
-      <point x="772" y="12" type="curve"/>
-      <point x="772" y="232" type="line"/>
-      <point x="752" y="224"/>
-      <point x="696" y="212"/>
-      <point x="656" y="212" type="curve" smooth="yes"/>
-      <point x="572" y="212"/>
-      <point x="496" y="236"/>
-      <point x="496" y="380" type="curve"/>
-      <point x="496" y="1488" type="line"/>
+      <point x="836" y="1744" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/itildebelow.glif b/src/Inter-UI-Regular.ufo/glyphs/itildebelow.glif
index 6bb86da39..c7197eff3 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/itildebelow.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/itildebelow.glif
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="itildebelow" format="1">
-  <advance width="1004"/>
+  <advance width="896"/>
   <unicode hex="1E2D"/>
   <outline>
+    <component base="i" xOffset="80"/>
+    <component base="tilde" xOffset="-176" yOffset="-2216"/>
     <contour>
-      <point x="548" y="16" type="move" name="bottom"/>
+      <point x="440" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="592" y="900" type="move" name="rhotichook"/>
+      <point x="484" y="900" type="move" name="rhotichook"/>
     </contour>
     <contour>
-      <point x="548" y="-580" type="move" name="mkmkbottom_acc"/>
+      <point x="440" y="-580" type="move" name="mkmkbottom_acc"/>
     </contour>
     <contour>
-      <point x="552" y="2304" type="move" name="top"/>
+      <point x="444" y="2304" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="896" y="2200" type="move" name="top0315"/>
+      <point x="788" y="2200" type="move" name="top0315"/>
     </contour>
     <contour>
-      <point x="896" y="2200" type="move" name="top_dd"/>
+      <point x="788" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="664" y="0" type="move" name="ogonek"/>
+      <point x="556" y="0" type="move" name="ogonek"/>
     </contour>
     <contour>
-      <point x="896" y="-560" type="move" name="bottom_dd"/>
+      <point x="788" y="-560" type="move" name="bottom_dd"/>
     </contour>
-    <component base="i" xOffset="188"/>
-    <component base="tilde" xOffset="-132" yOffset="-2216"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/iucyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/iucyrillic.glif
index f7d4a585d..f22a849a2 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/iucyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/iucyrillic.glif
@@ -3,12 +3,6 @@
   <advance width="2272"/>
   <unicode hex="044E"/>
   <outline>
-    <contour>
-      <point x="1020" y="1744" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="2184" y="1744" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="944" y="864" type="line"/>
       <point x="132" y="864" type="line"/>
@@ -17,6 +11,12 @@
     </contour>
     <component base="dotlessi" xOffset="-112"/>
     <component base="o" xOffset="584"/>
+    <contour>
+      <point x="1020" y="1744" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="2184" y="1744" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/j.glif b/src/Inter-UI-Regular.ufo/glyphs/j.glif
index 0d49813cd..fa273bbda 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/j.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/j.glif
@@ -1,54 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="j" format="1">
-  <advance width="704"/>
+  <advance width="636"/>
   <unicode hex="006A"/>
   <outline>
     <contour>
-      <point x="356" y="2304" type="move" name="top"/>
+      <point x="152" y="1920" type="curve" smooth="yes"/>
+      <point x="152" y="1832"/>
+      <point x="216" y="1760"/>
+      <point x="320" y="1760" type="curve"/>
+      <point x="424" y="1760"/>
+      <point x="488" y="1832"/>
+      <point x="488" y="1920" type="curve"/>
+      <point x="488" y="2000"/>
+      <point x="424" y="2080"/>
+      <point x="320" y="2080" type="curve"/>
+      <point x="216" y="2080"/>
+      <point x="152" y="2000"/>
+    </contour>
+    <component base="dotlessj"/>
+    <contour>
+      <point x="372" y="2304" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="232" y="-632" type="move" name="bottom"/>
+      <point x="248" y="-632" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="652" y="2200" type="move" name="top_dd"/>
+      <point x="668" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="652" y="-560" type="move" name="bottom_dd"/>
+      <point x="668" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="652" y="2200" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="236" y="1536" type="line"/>
-      <point x="236" y="-112" type="line"/>
-      <point x="236" y="-268"/>
-      <point x="172" y="-360"/>
-      <point x="28" y="-360" type="curve"/>
-      <point x="-16" y="-360" type="line"/>
-      <point x="-16" y="-580" type="line"/>
-      <point x="32" y="-580" type="line"/>
-      <point x="328" y="-580"/>
-      <point x="472" y="-396"/>
-      <point x="472" y="-112" type="curve"/>
-      <point x="472" y="1536" type="line"/>
-    </contour>
-    <contour>
-      <point x="188" y="1920" type="curve" smooth="yes"/>
-      <point x="188" y="1832"/>
-      <point x="252" y="1760"/>
-      <point x="356" y="1760" type="curve"/>
-      <point x="460" y="1760"/>
-      <point x="524" y="1832"/>
-      <point x="524" y="1920" type="curve"/>
-      <point x="524" y="2000"/>
-      <point x="460" y="2080"/>
-      <point x="356" y="2080" type="curve"/>
-      <point x="252" y="2080"/>
-      <point x="188" y="2000"/>
+      <point x="668" y="2200" 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>320</integer>
+          <key>y</key>
+          <integer>1428</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/jcrosstail.glif b/src/Inter-UI-Regular.ufo/glyphs/jcrosstail.glif
index 600c90976..879016de0 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/jcrosstail.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/jcrosstail.glif
@@ -3,15 +3,6 @@
   <advance width="1248"/>
   <unicode hex="029D"/>
   <outline>
-    <contour>
-      <point x="788" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="788" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1208" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1180" y="132" type="line"/>
       <point x="464" y="132" type="line" smooth="yes"/>
@@ -39,6 +30,15 @@
       <point x="1180" y="-88" type="line"/>
     </contour>
     <component base="i" xOffset="436"/>
+    <contour>
+      <point x="788" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="788" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1208" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/k.glif b/src/Inter-UI-Regular.ufo/glyphs/k.glif
index 615802892..540120856 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/k.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/k.glif
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="k" format="1">
-  <advance width="1504"/>
+  <advance width="1468"/>
   <unicode hex="006B"/>
   <outline>
     <contour>
-      <point x="712" y="92" type="move" name="bottom"/>
+      <point x="436" y="2048" type="line"/>
+      <point x="200" y="2048" type="line"/>
+      <point x="200" y="0" type="line"/>
+      <point x="436" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="316" y="1772" type="move" name="cross"/>
+      <point x="1380" y="1536" type="line"/>
+      <point x="1080" y="1536" type="line"/>
+      <point x="456" y="844" type="line"/>
+      <point x="416" y="844" type="line"/>
+      <point x="420" y="492" type="line"/>
     </contour>
     <contour>
-      <point x="740" y="2304" type="move" name="top"/>
+      <point x="1160" y="0" type="line"/>
+      <point x="1444" y="0" type="line"/>
+      <point x="744" y="924" type="line"/>
+      <point x="600" y="732" type="line"/>
     </contour>
     <contour>
-      <point x="740" y="2304" type="move" name="marktop"/>
+      <point x="688" y="92" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1424" y="2200" type="move" name="top_dd"/>
+      <point x="292" y="1772" type="move" name="cross"/>
     </contour>
     <contour>
-      <point x="1424" y="-560" type="move" name="bottom_dd"/>
+      <point x="716" y="2304" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1244" y="2216" type="move" name="top0315"/>
+      <point x="716" y="2304" type="move" name="marktop"/>
     </contour>
     <contour>
-      <point x="460" y="2048" type="line"/>
-      <point x="224" y="2048" type="line"/>
-      <point x="224" y="0" type="line"/>
-      <point x="460" y="0" type="line"/>
+      <point x="1400" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1404" y="1536" type="line"/>
-      <point x="1104" y="1536" type="line"/>
-      <point x="480" y="844" type="line"/>
-      <point x="440" y="844" type="line"/>
-      <point x="444" y="492" type="line"/>
+      <point x="1400" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1184" y="0" type="line"/>
-      <point x="1468" y="0" type="line"/>
-      <point x="768" y="924" type="line"/>
-      <point x="624" y="732" type="line"/>
+      <point x="1220" y="2216" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/l.glif b/src/Inter-UI-Regular.ufo/glyphs/l.glif
index f316101fd..d1a6b419b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/l.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/l.glif
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="l" format="1">
-  <advance width="736"/>
+  <advance width="636"/>
   <unicode hex="006C"/>
   <outline>
     <contour>
-      <point x="364" y="2304" type="move" name="top"/>
+      <point x="436" y="2048" type="line"/>
+      <point x="200" y="2048" type="line"/>
+      <point x="200" y="0" type="line"/>
+      <point x="436" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="332" y="16" type="move" name="bottom"/>
+      <point x="316" y="2304" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="648" y="2112" type="move" name="caron"/>
+      <point x="284" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="640" y="1064" type="move" name="dot"/>
+      <point x="600" y="2112" type="move" name="caron"/>
     </contour>
     <contour>
-      <point x="772" y="2124" type="move" name="marktop"/>
+      <point x="592" y="1064" type="move" name="dot"/>
     </contour>
     <contour>
-      <point x="680" y="2200" type="move" name="top_dd"/>
+      <point x="724" y="2124" type="move" name="marktop"/>
     </contour>
     <contour>
-      <point x="680" y="-560" type="move" name="bottom_dd"/>
+      <point x="632" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="680" y="2336" type="move" name="top0315"/>
+      <point x="632" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="484" y="2048" type="line"/>
-      <point x="248" y="2048" type="line"/>
-      <point x="248" y="0" type="line"/>
-      <point x="484" y="0" type="line"/>
+      <point x="632" y="2336" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/lbar.glif b/src/Inter-UI-Regular.ufo/glyphs/lbar.glif
index 4b5244613..6a2c8e7ec 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/lbar.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/lbar.glif
@@ -3,6 +3,8 @@
   <advance width="992"/>
   <unicode hex="019A"/>
   <outline>
+    <component base="l" xOffset="148"/>
+    <component base="crossbar" xOffset="-148" yOffset="96"/>
     <contour>
       <point x="496" y="2336" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="496" y="16" type="move" name="bottom"/>
     </contour>
-    <component base="l" xOffset="148"/>
-    <component base="crossbar" xOffset="-148" yOffset="96"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/lbelt.glif b/src/Inter-UI-Regular.ufo/glyphs/lbelt.glif
index c52f8056c..1a3136b5e 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/lbelt.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/lbelt.glif
@@ -3,15 +3,6 @@
   <advance width="1248"/>
   <unicode hex="026C"/>
   <outline>
-    <contour>
-      <point x="760" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="760" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1236" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="892" y="1080" type="line"/>
       <point x="892" y="1300"/>
@@ -39,6 +30,15 @@
       <point x="892" y="604" type="line"/>
     </contour>
     <component base="l" xOffset="408"/>
+    <contour>
+      <point x="760" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="760" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1236" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/lmidtilde.glif b/src/Inter-UI-Regular.ufo/glyphs/lmidtilde.glif
index f6da36776..658816457 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/lmidtilde.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/lmidtilde.glif
@@ -3,6 +3,8 @@
   <advance width="1024"/>
   <unicode hex="026B"/>
   <outline>
+    <component base="l" xOffset="156"/>
+    <component base="tilde" xOffset="-156" yOffset="-824"/>
     <contour>
       <point x="504" y="2200" type="move" name="top"/>
     </contour>
@@ -15,8 +17,6 @@
     <contour>
       <point x="504" y="0" type="move" name="bottom"/>
     </contour>
-    <component base="l" xOffset="156"/>
-    <component base="tilde" xOffset="-156" yOffset="-824"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/lslash.glif b/src/Inter-UI-Regular.ufo/glyphs/lslash.glif
index 122630375..110a17863 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/lslash.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/lslash.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="lslash" format="1">
-  <advance width="992"/>
+  <advance width="636"/>
   <unicode hex="0142"/>
   <outline>
     <contour>
-      <point x="484" y="2304" type="move" name="top"/>
+      <point x="656" y="1280" type="line"/>
+      <point x="-16" y="1024" type="line"/>
+      <point x="-16" y="848" type="line"/>
+      <point x="656" y="1104" type="line"/>
+    </contour>
+    <component base="l"/>
+    <contour>
+      <point x="368" y="2304" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="496" y="16" type="move" name="bottom"/>
+      <point x="380" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="876" y="2336" type="move" name="top0315"/>
+      <point x="760" y="2336" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="832" y="1280" type="line"/>
-      <point x="160" y="1024" type="line"/>
-      <point x="160" y="848" type="line"/>
-      <point x="832" y="1104" type="line"/>
-    </contour>
-    <component base="l" xOffset="116"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/lyogh.glif b/src/Inter-UI-Regular.ufo/glyphs/lyogh.glif
index a06e8262c..c7cba2185 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/lyogh.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/lyogh.glif
@@ -3,15 +3,6 @@
   <advance width="1760"/>
   <unicode hex="026E"/>
   <outline>
-    <contour>
-      <point x="864" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="864" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1716" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="276" y="1488" type="line"/>
       <point x="276" y="1268" type="line"/>
@@ -47,6 +38,15 @@
       <point x="836" y="596" type="curve"/>
     </contour>
     <component base="l" xOffset="4"/>
+    <contour>
+      <point x="864" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="864" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1716" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/m.glif b/src/Inter-UI-Regular.ufo/glyphs/m.glif
index 70b173e73..8cf289cfe 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/m.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/m.glif
@@ -1,64 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="m" format="1">
-  <advance width="2400"/>
+  <advance width="2372"/>
   <unicode hex="006D"/>
   <outline>
     <contour>
-      <point x="1332" y="964" type="line" smooth="yes"/>
-      <point x="1332" y="1180"/>
-      <point x="1452" y="1328"/>
-      <point x="1660" y="1328" type="curve" smooth="yes"/>
-      <point x="1788" y="1328"/>
-      <point x="1960" y="1252"/>
-      <point x="1960" y="1012" type="curve" smooth="yes"/>
-      <point x="1960" y="0" type="line"/>
-      <point x="2196" y="0" type="line"/>
-      <point x="2196" y="1004" type="line" smooth="yes"/>
-      <point x="2196" y="1380"/>
-      <point x="1988" y="1556"/>
-      <point x="1732" y="1556" type="curve" smooth="yes"/>
-      <point x="1508" y="1556"/>
-      <point x="1332" y="1408"/>
-      <point x="1288" y="1280" type="curve"/>
-      <point x="1272" y="1280" type="line"/>
-      <point x="1204" y="1432"/>
-      <point x="1068" y="1556"/>
-      <point x="876" y="1556" type="curve" smooth="yes"/>
-      <point x="680" y="1556"/>
-      <point x="520" y="1408"/>
-      <point x="476" y="1276" type="curve"/>
-      <point x="460" y="1276" type="line"/>
-      <point x="460" y="1536" type="line"/>
-      <point x="224" y="1536" type="line"/>
-      <point x="224" y="0" type="line"/>
-      <point x="460" y="0" type="line"/>
-      <point x="460" y="916" type="line" smooth="yes"/>
-      <point x="460" y="1168"/>
-      <point x="632" y="1328"/>
-      <point x="812" y="1328" type="curve" smooth="yes"/>
-      <point x="984" y="1328"/>
-      <point x="1092" y="1236"/>
-      <point x="1092" y="1004" type="curve" smooth="yes"/>
-      <point x="1092" y="0" type="line"/>
-      <point x="1332" y="0" type="line"/>
+      <point x="1308" y="964" type="line" smooth="yes"/>
+      <point x="1308" y="1180"/>
+      <point x="1428" y="1328"/>
+      <point x="1636" y="1328" type="curve" smooth="yes"/>
+      <point x="1764" y="1328"/>
+      <point x="1936" y="1252"/>
+      <point x="1936" y="1012" type="curve" smooth="yes"/>
+      <point x="1936" y="0" type="line"/>
+      <point x="2172" y="0" type="line"/>
+      <point x="2172" y="1004" type="line" smooth="yes"/>
+      <point x="2172" y="1380"/>
+      <point x="1964" y="1556"/>
+      <point x="1708" y="1556" type="curve" smooth="yes"/>
+      <point x="1484" y="1556"/>
+      <point x="1308" y="1408"/>
+      <point x="1264" y="1280" type="curve"/>
+      <point x="1248" y="1280" type="line"/>
+      <point x="1180" y="1432"/>
+      <point x="1044" y="1556"/>
+      <point x="852" y="1556" type="curve" smooth="yes"/>
+      <point x="656" y="1556"/>
+      <point x="496" y="1408"/>
+      <point x="452" y="1276" type="curve"/>
+      <point x="436" y="1276" type="line"/>
+      <point x="436" y="1536" type="line"/>
+      <point x="200" y="1536" type="line"/>
+      <point x="200" y="0" type="line"/>
+      <point x="436" y="0" type="line"/>
+      <point x="436" y="916" type="line" smooth="yes"/>
+      <point x="436" y="1168"/>
+      <point x="608" y="1328"/>
+      <point x="788" y="1328" type="curve" smooth="yes"/>
+      <point x="960" y="1328"/>
+      <point x="1068" y="1236"/>
+      <point x="1068" y="1004" type="curve" smooth="yes"/>
+      <point x="1068" y="0" type="line"/>
+      <point x="1308" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="1280" y="1792" type="move" name="top"/>
+      <point x="1256" y="1792" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1216.0" y="16.0" type="move" name="bottom"/>
+      <point x="1192" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1280" y="1792" type="move" name="marktop"/>
+      <point x="1256" y="1792" type="move" name="marktop"/>
     </contour>
     <contour>
-      <point x="2448.0" y="2200.0" type="move" name="top_dd"/>
+      <point x="2424" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="2448.0" y="-560.0" type="move" name="bottom_dd"/>
+      <point x="2424" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="2448.0" y="1776.0" type="move" name="top0315"/>
+      <point x="2424" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
@@ -81,7 +81,7 @@
                 <integer>0</integer>
                 <integer>0</integer>
                 <integer>1</integer>
-                <integer>0</integer>
+                <integer>-24</integer>
                 <integer>0</integer>
               </array>
             </dict>
@@ -98,7 +98,7 @@
           <array>
           </array>
           <key>width</key>
-          <integer>2400</integer>
+          <integer>2372</integer>
         </dict>
       </dict>
       <key>com.typemytype.robofont.mark</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/mhook.glif b/src/Inter-UI-Regular.ufo/glyphs/mhook.glif
index 0fc35b7ce..b49fab378 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/mhook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/mhook.glif
@@ -3,15 +3,6 @@
   <advance width="2528"/>
   <unicode hex="0271"/>
   <outline>
-    <contour>
-      <point x="1232" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1232" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="2448" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1984" y="472" type="line"/>
       <point x="1984" y="-192" type="line" smooth="yes"/>
@@ -31,6 +22,15 @@
       <point x="2260" y="472" type="line"/>
     </contour>
     <component base="m" xOffset="-16"/>
+    <contour>
+      <point x="1232" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1232" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="2448" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/n.glif b/src/Inter-UI-Regular.ufo/glyphs/n.glif
index 487105619..3c44941ad 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/n.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/n.glif
@@ -1,54 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="n" format="1">
-  <advance width="1632"/>
+  <advance width="1604"/>
   <unicode hex="006E"/>
   <outline>
     <contour>
-      <point x="460" y="908" type="line" smooth="yes"/>
-      <point x="460" y="1196"/>
-      <point x="680" y="1328"/>
-      <point x="856" y="1328" type="curve" smooth="yes"/>
-      <point x="1052" y="1328"/>
-      <point x="1192" y="1184"/>
-      <point x="1192" y="960" type="curve" smooth="yes"/>
-      <point x="1192" y="0" type="line"/>
-      <point x="1428" y="0" type="line"/>
-      <point x="1428" y="976" type="line" smooth="yes"/>
-      <point x="1428" y="1368"/>
-      <point x="1220" y="1556"/>
-      <point x="932" y="1556" type="curve" smooth="yes"/>
-      <point x="700" y="1556"/>
-      <point x="548" y="1432"/>
-      <point x="476" y="1276" type="curve"/>
-      <point x="460" y="1276" type="line"/>
-      <point x="460" y="1536" type="line"/>
-      <point x="224" y="1536" type="line"/>
-      <point x="224" y="0" type="line"/>
-      <point x="460" y="0" type="line"/>
+      <point x="436" y="908" type="line" smooth="yes"/>
+      <point x="436" y="1196"/>
+      <point x="656" y="1328"/>
+      <point x="832" y="1328" type="curve" smooth="yes"/>
+      <point x="1028" y="1328"/>
+      <point x="1168" y="1184"/>
+      <point x="1168" y="960" type="curve" smooth="yes"/>
+      <point x="1168" y="0" type="line"/>
+      <point x="1404" y="0" type="line"/>
+      <point x="1404" y="976" type="line" smooth="yes"/>
+      <point x="1404" y="1368"/>
+      <point x="1196" y="1556"/>
+      <point x="908" y="1556" type="curve" smooth="yes"/>
+      <point x="676" y="1556"/>
+      <point x="524" y="1432"/>
+      <point x="452" y="1276" type="curve"/>
+      <point x="436" y="1276" type="line"/>
+      <point x="436" y="1536" type="line"/>
+      <point x="200" y="1536" type="line"/>
+      <point x="200" y="0" type="line"/>
+      <point x="436" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="832" y="1792" type="move" name="top"/>
+      <point x="808" y="1792" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="624.0" y="16.0" type="move" name="bottom"/>
+      <point x="600" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="-184.0" y="2120.0" type="move" name="caron"/>
+      <point x="-208" y="2120" type="move" name="caron"/>
     </contour>
     <contour>
-      <point x="1224.0" y="0.0" type="move" name="right"/>
+      <point x="1200" y="0" type="move" name="right"/>
     </contour>
     <contour>
-      <point x="832" y="1792" type="move" name="marktop"/>
+      <point x="808" y="1792" type="move" name="marktop"/>
     </contour>
     <contour>
-      <point x="1416.0" y="2200.0" type="move" name="top_dd"/>
+      <point x="1392" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1416.0" y="-560.0" type="move" name="bottom_dd"/>
+      <point x="1392" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1416.0" y="1776.0" type="move" name="top0315"/>
+      <point x="1392" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
@@ -71,7 +71,7 @@
                 <integer>0</integer>
                 <integer>0</integer>
                 <integer>1</integer>
-                <integer>-16</integer>
+                <integer>-40</integer>
                 <integer>0</integer>
               </array>
             </dict>
@@ -88,7 +88,7 @@
           <array>
           </array>
           <key>width</key>
-          <integer>1632</integer>
+          <integer>1604</integer>
         </dict>
       </dict>
       <key>com.typemytype.robofont.mark</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/nlfthook.glif b/src/Inter-UI-Regular.ufo/glyphs/nlfthook.glif
index 9715caddd..860d20638 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/nlfthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/nlfthook.glif
@@ -3,15 +3,6 @@
   <advance width="1760"/>
   <unicode hex="0272"/>
   <outline>
-    <contour>
-      <point x="956" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="956" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1716" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="348" y="472" type="line"/>
       <point x="348" y="-192" type="line" smooth="yes"/>
@@ -31,6 +22,15 @@
       <point x="624" y="472" type="line"/>
     </contour>
     <component base="n" xOffset="160"/>
+    <contour>
+      <point x="956" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="956" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1716" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/nrthook.glif b/src/Inter-UI-Regular.ufo/glyphs/nrthook.glif
index 38889ae9e..38b91a0ab 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/nrthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/nrthook.glif
@@ -3,15 +3,6 @@
   <advance width="1760"/>
   <unicode hex="0273"/>
   <outline>
-    <contour>
-      <point x="716" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="716" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1564" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1024" y="472" type="line"/>
       <point x="1024" y="-192" type="line" smooth="yes"/>
@@ -31,6 +22,15 @@
       <point x="1296" y="472" type="line"/>
     </contour>
     <component base="n" xOffset="-72"/>
+    <contour>
+      <point x="716" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="716" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1564" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/o_uni02DE__.glif b/src/Inter-UI-Regular.ufo/glyphs/o_uni02DE__.glif
index 8011bd563..f3889d7f3 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/o_uni02DE__.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/o_uni02DE__.glif
@@ -2,6 +2,8 @@
 <glyph name="o_uni02DE" format="1">
   <advance width="2304"/>
   <outline>
+    <component base="o" xOffset="-168"/>
+    <component base="rhotichookmod" xOffset="1448"/>
     <contour>
       <point x="2012" y="1776" type="move" name="top0315"/>
     </contour>
@@ -20,8 +22,6 @@
     <contour>
       <point x="1448" y="-560" type="move" name="bottom_dd"/>
     </contour>
-    <component base="o" xOffset="-168"/>
-    <component base="rhotichookmod" xOffset="1448"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/oe.glif b/src/Inter-UI-Regular.ufo/glyphs/oe.glif
index 30a9cb657..8ba8cfdc2 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/oe.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/oe.glif
@@ -3,6 +3,8 @@
   <advance width="2764"/>
   <unicode hex="0153"/>
   <outline>
+    <component base="o"/>
+    <component base="e" xOffset="1156"/>
     <contour>
       <point x="1280" y="1776" type="move" name="top"/>
     </contour>
@@ -18,8 +20,6 @@
     <contour>
       <point x="2536" y="1776" type="move" name="top0315"/>
     </contour>
-    <component base="o"/>
-    <component base="e" xOffset="1156"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ohorn.glif b/src/Inter-UI-Regular.ufo/glyphs/ohorn.glif
index 3e315060a..fd55f3dcd 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ohorn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ohorn.glif
@@ -3,15 +3,6 @@
   <advance width="1676"/>
   <unicode hex="01A1"/>
   <outline>
-    <contour>
-      <point x="904" y="1792" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="804" y="-16" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1620" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1456" y="1652" type="line"/>
       <point x="1456" y="1456"/>
@@ -23,6 +14,15 @@
       <point x="1676" y="1652" type="curve"/>
     </contour>
     <component base="o"/>
+    <contour>
+      <point x="904" y="1792" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="804" y="-16" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1620" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/omegaroundcyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/omegaroundcyrillic.glif
index 4508383ad..15503e1dc 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/omegaroundcyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/omegaroundcyrillic.glif
@@ -3,12 +3,6 @@
   <advance width="1760"/>
   <unicode hex="047B"/>
   <outline>
-    <contour>
-      <point x="796" y="1872" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1588" y="1872" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="924" y="1656" type="line"/>
       <point x="648" y="1656" type="line"/>
@@ -22,6 +16,12 @@
       <point x="924" y="-160" type="line"/>
     </contour>
     <component base="o" xOffset="-16"/>
+    <contour>
+      <point x="796" y="1872" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1588" y="1872" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/oslash.glif b/src/Inter-UI-Regular.ufo/glyphs/oslash.glif
index 94e43296d..be6a13448 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/oslash.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/oslash.glif
@@ -3,6 +3,13 @@
   <advance width="1648"/>
   <unicode hex="00F8"/>
   <outline>
+    <contour>
+      <point x="1360" y="1660" type="line"/>
+      <point x="1180" y="1660" type="line"/>
+      <point x="272" y="-184" type="line"/>
+      <point x="448" y="-184" type="line"/>
+    </contour>
+    <component base="o"/>
     <contour>
       <point x="844" y="1792" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="1588" y="1792" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1360" y="1660" type="line"/>
-      <point x="1180" y="1660" type="line"/>
-      <point x="272" y="-184" type="line"/>
-      <point x="448" y="-184" type="line"/>
-    </contour>
-    <component base="o"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/p.glif b/src/Inter-UI-Regular.ufo/glyphs/p.glif
index 471e41f4c..92b7c5064 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/p.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/p.glif
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="p" format="1">
-  <advance width="1628"/>
+  <advance width="1604"/>
   <unicode hex="0070"/>
   <outline>
     <contour>
-      <point x="880" y="1792" type="move" name="top"/>
+      <point x="200" y="-576" type="line"/>
+      <point x="436" y="-576" type="line"/>
+      <point x="436" y="392" type="line"/>
+      <point x="336" y="728" type="line"/>
+      <point x="440" y="1148" type="line"/>
+      <point x="440" y="1244" type="line"/>
+      <point x="412" y="1536" type="line"/>
+      <point x="200" y="1536" type="line"/>
+    </contour>
+    <component base="rightloop.cn" xOffset="-40"/>
+    <contour>
+      <point x="856" y="1792" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="308" y="-560" type="move" name="bottom"/>
+      <point x="284" y="-560" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="880" y="1792" type="move" name="marktop"/>
+      <point x="856" y="1792" type="move" name="marktop"/>
     </contour>
     <contour>
-      <point x="1568" y="2200" type="move" name="top_dd"/>
+      <point x="1544" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1568" y="-560" type="move" name="bottom_dd"/>
+      <point x="1544" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1568" y="1760" type="move" name="top0315"/>
+      <point x="1544" y="1760" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="224" y="-576" type="line"/>
-      <point x="460" y="-576" type="line"/>
-      <point x="460" y="392" type="line"/>
-      <point x="360" y="728" type="line"/>
-      <point x="464" y="1148" type="line"/>
-      <point x="464" y="1244" type="line"/>
-      <point x="436" y="1536" type="line"/>
-      <point x="224" y="1536" type="line"/>
-    </contour>
-    <component base="rightloop.cn" xOffset="-16"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/phi.glif b/src/Inter-UI-Regular.ufo/glyphs/phi.glif
index fac0dc9d4..83e268a92 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/phi.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/phi.glif
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="phi" format="1">
-  <advance width="2016"/>
+  <advance width="2028"/>
   <unicode hex="03C6"/>
   <outline>
     <contour>
-      <point x="860" y="-656" type="line"/>
-      <point x="1132" y="-656" type="line"/>
-      <point x="1132" y="1180" type="line"/>
-      <point x="1132" y="1224"/>
-      <point x="1160" y="1268"/>
-      <point x="1216" y="1268" type="curve"/>
-      <point x="1480" y="1268"/>
-      <point x="1612" y="1008"/>
-      <point x="1620" y="748" type="curve"/>
-      <point x="1620" y="484"/>
-      <point x="1460" y="192"/>
-      <point x="996" y="192" type="curve" smooth="yes"/>
+      <point x="884" y="-640" type="line"/>
+      <point x="1120" y="-640" type="line"/>
+      <point x="1120" y="1248" type="line"/>
+      <point x="1120" y="1300"/>
+      <point x="1152" y="1344"/>
+      <point x="1220" y="1344" type="curve"/>
+      <point x="1492" y="1344"/>
+      <point x="1656" y="1084"/>
+      <point x="1664" y="780" type="curve"/>
+      <point x="1664" y="488"/>
+      <point x="1464" y="192"/>
+      <point x="1000" y="192" type="curve" smooth="yes"/>
       <point x="552" y="192"/>
-      <point x="400" y="500"/>
-      <point x="400" y="780" type="curve"/>
-      <point x="408" y="956"/>
-      <point x="464" y="1152"/>
-      <point x="624" y="1296" type="curve"/>
-      <point x="472" y="1488" type="line"/>
-      <point x="240" y="1328"/>
-      <point x="124" y="1080"/>
-      <point x="124" y="780" type="curve" smooth="yes"/>
-      <point x="124" y="356"/>
+      <point x="364" y="496"/>
+      <point x="364" y="812" type="curve"/>
+      <point x="372" y="1056"/>
+      <point x="456" y="1232"/>
+      <point x="616" y="1376" type="curve"/>
+      <point x="476" y="1556" type="line"/>
+      <point x="244" y="1396"/>
+      <point x="128" y="1128"/>
+      <point x="128" y="812" type="curve" smooth="yes"/>
+      <point x="128" y="356"/>
       <point x="360" y="-28"/>
-      <point x="996" y="-28" type="curve" smooth="yes"/>
-      <point x="1652" y="-28"/>
-      <point x="1896" y="340"/>
-      <point x="1896" y="748" type="curve" smooth="yes"/>
-      <point x="1896" y="1172"/>
-      <point x="1584" y="1488"/>
-      <point x="1216" y="1488" type="curve"/>
-      <point x="1000" y="1488"/>
-      <point x="860" y="1364"/>
-      <point x="860" y="1172" type="curve"/>
+      <point x="1000" y="-28" type="curve" smooth="yes"/>
+      <point x="1656" y="-28"/>
+      <point x="1900" y="356"/>
+      <point x="1900" y="780" type="curve" smooth="yes"/>
+      <point x="1900" y="1224"/>
+      <point x="1596" y="1556"/>
+      <point x="1220" y="1556" type="curve"/>
+      <point x="1004" y="1556"/>
+      <point x="884" y="1460"/>
+      <point x="884" y="1240" type="curve"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/pi.glif b/src/Inter-UI-Regular.ufo/glyphs/pi.glif
index 7ab34add7..81df0df8c 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/pi.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/pi.glif
@@ -4,21 +4,21 @@
   <unicode hex="03C0"/>
   <outline>
     <contour>
-      <point x="1600" y="1488" type="line"/>
-      <point x="92" y="1488" type="line"/>
-      <point x="92" y="1268" type="line"/>
-      <point x="1600" y="1268" type="line"/>
+      <point x="1600" y="1536" type="line"/>
+      <point x="92" y="1536" type="line"/>
+      <point x="92" y="1316" type="line"/>
+      <point x="1600" y="1316" type="line"/>
     </contour>
     <contour>
-      <point x="592" y="1488" type="line"/>
-      <point x="320" y="1488" type="line"/>
+      <point x="556" y="1536" type="line"/>
+      <point x="320" y="1536" type="line"/>
       <point x="320" y="0" type="line"/>
-      <point x="592" y="0" type="line"/>
+      <point x="556" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="1120" y="1488" type="line"/>
-      <point x="1120" y="380" type="line"/>
-      <point x="1120" y="84"/>
+      <point x="1144" y="1536" type="line"/>
+      <point x="1144" y="380" type="line"/>
+      <point x="1144" y="84"/>
       <point x="1280" y="-20"/>
       <point x="1468" y="-20" type="curve" smooth="yes"/>
       <point x="1564" y="-20"/>
@@ -29,9 +29,9 @@
       <point x="1596" y="212"/>
       <point x="1552" y="212" type="curve" smooth="yes"/>
       <point x="1472" y="212"/>
-      <point x="1396" y="236"/>
-      <point x="1396" y="380" type="curve"/>
-      <point x="1396" y="1488" type="line"/>
+      <point x="1380" y="236"/>
+      <point x="1380" y="380" type="curve"/>
+      <point x="1380" y="1536" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/q.glif b/src/Inter-UI-Regular.ufo/glyphs/q.glif
index 7df1d948a..6c8b2a444 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/q.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/q.glif
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="q" format="1">
-  <advance width="1668"/>
+  <advance width="1644"/>
   <unicode hex="0071"/>
   <outline>
+    <contour>
+      <point x="1444" y="1536" type="line"/>
+      <point x="1228" y="1536" type="line"/>
+      <point x="1204" y="1244" type="line"/>
+      <point x="1204" y="1148" type="line"/>
+      <point x="1304" y="728" type="line"/>
+      <point x="1208" y="392" type="line"/>
+      <point x="1208" y="-576" type="line"/>
+      <point x="1444" y="-576" type="line"/>
+    </contour>
+    <component base="leftloop.cn"/>
     <contour>
       <point x="768" y="1792" type="move" name="top"/>
     </contour>
@@ -21,17 +32,6 @@
     <contour>
       <point x="1412" y="1792" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1444" y="1536" type="line"/>
-      <point x="1228" y="1536" type="line"/>
-      <point x="1204" y="1244" type="line"/>
-      <point x="1204" y="1148" type="line"/>
-      <point x="1304" y="728" type="line"/>
-      <point x="1208" y="392" type="line"/>
-      <point x="1208" y="-576" type="line"/>
-      <point x="1444" y="-576" type="line"/>
-    </contour>
-    <component base="leftloop.cn"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/r.glif b/src/Inter-UI-Regular.ufo/glyphs/r.glif
index bb4f11449..4c9b1e1cf 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/r.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/r.glif
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="r" format="1">
-  <advance width="1072"/>
+  <advance width="1048"/>
   <unicode hex="0072"/>
   <outline>
     <contour>
-      <point x="544" y="1792" type="move" name="top"/>
+      <point x="972" y="1552" type="line"/>
+      <point x="956" y="1556"/>
+      <point x="912" y="1560"/>
+      <point x="856" y="1560" type="curve"/>
+      <point x="676" y="1560"/>
+      <point x="496" y="1420"/>
+      <point x="452" y="1272" type="curve"/>
+      <point x="436" y="1272" type="line"/>
+      <point x="436" y="1536" type="line"/>
+      <point x="200" y="1536" type="line"/>
+      <point x="200" y="0" type="line"/>
+      <point x="436" y="0" type="line"/>
+      <point x="436" y="880" type="line"/>
+      <point x="440" y="1080"/>
+      <point x="592" y="1316"/>
+      <point x="848" y="1316" type="curve"/>
+      <point x="908" y="1316"/>
+      <point x="948" y="1312"/>
+      <point x="972" y="1308" type="curve"/>
     </contour>
     <contour>
-      <point x="328" y="16" type="move" name="bottom"/>
+      <point x="520" y="1792" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="940" y="2200" type="move" name="top_dd"/>
+      <point x="304" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="940" y="-560" type="move" name="bottom_dd"/>
+      <point x="916" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="940" y="1792" type="move" name="top0315"/>
+      <point x="916" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="996" y="1552" type="line"/>
-      <point x="980" y="1556"/>
-      <point x="936" y="1560"/>
-      <point x="880" y="1560" type="curve"/>
-      <point x="700" y="1560"/>
-      <point x="520" y="1420"/>
-      <point x="476" y="1272" type="curve"/>
-      <point x="460" y="1272" type="line"/>
-      <point x="460" y="1536" type="line"/>
-      <point x="224" y="1536" type="line"/>
-      <point x="224" y="0" type="line"/>
-      <point x="460" y="0" type="line"/>
-      <point x="460" y="880" type="line"/>
-      <point x="464" y="1080"/>
-      <point x="616" y="1316"/>
-      <point x="872" y="1316" type="curve"/>
-      <point x="932" y="1316"/>
-      <point x="972" y="1312"/>
-      <point x="996" y="1308" type="curve"/>
+      <point x="916" y="1792" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rho.glif b/src/Inter-UI-Regular.ufo/glyphs/rho.glif
index 246a1aa8d..2e9fdbf56 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rho.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rho.glif
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="rho" format="1">
-  <advance width="1504"/>
+  <advance width="1576"/>
   <unicode hex="03C1"/>
   <outline>
     <contour>
-      <point x="744" y="1760" type="move" name="top"/>
+      <point x="180" y="-572" type="line"/>
+      <point x="416" y="-572" type="line"/>
+      <point x="416" y="788" type="line" smooth="yes"/>
+      <point x="416" y="1008"/>
+      <point x="556" y="1296"/>
+      <point x="800" y="1296" type="curve" smooth="yes"/>
+      <point x="1072" y="1296"/>
+      <point x="1200" y="1028"/>
+      <point x="1200" y="716" type="curve" smooth="yes"/>
+      <point x="1200" y="688" type="line" smooth="yes"/>
+      <point x="1200" y="416"/>
+      <point x="1060" y="184"/>
+      <point x="792" y="184" type="curve" smooth="yes"/>
+      <point x="548" y="184"/>
+      <point x="416" y="476"/>
+      <point x="416" y="668" type="curve"/>
+      <point x="416" y="668"/>
+      <point x="256" y="540"/>
+      <point x="252" y="544" type="curve"/>
+      <point x="360" y="232"/>
+      <point x="488" y="-28"/>
+      <point x="872" y="-28" type="curve" smooth="yes"/>
+      <point x="1244" y="-28"/>
+      <point x="1444" y="272"/>
+      <point x="1444" y="688" type="curve" smooth="yes"/>
+      <point x="1444" y="716" type="line" smooth="yes"/>
+      <point x="1444" y="1184"/>
+      <point x="1232" y="1516"/>
+      <point x="800" y="1516" type="curve" smooth="yes"/>
+      <point x="464" y="1516"/>
+      <point x="180" y="1264"/>
+      <point x="180" y="788" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="1528" y="1760" type="move" name="top0315"/>
+      <point x="804" y="1760" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="120" y="-572" type="line"/>
-      <point x="396" y="-572" type="line"/>
-      <point x="396" y="788" type="line" smooth="yes"/>
-      <point x="396" y="1008"/>
-      <point x="496" y="1296"/>
-      <point x="740" y="1296" type="curve" smooth="yes"/>
-      <point x="1012" y="1296"/>
-      <point x="1108" y="1028"/>
-      <point x="1108" y="716" type="curve" smooth="yes"/>
-      <point x="1108" y="688" type="line" smooth="yes"/>
-      <point x="1108" y="416"/>
-      <point x="996" y="192"/>
-      <point x="728" y="192" type="curve" smooth="yes"/>
-      <point x="484" y="192"/>
-      <point x="380" y="368"/>
-      <point x="324" y="560" type="curve"/>
-      <point x="324" y="560"/>
-      <point x="196" y="668"/>
-      <point x="192" y="672" type="curve"/>
-      <point x="232" y="240"/>
-      <point x="428" y="-28"/>
-      <point x="812" y="-28" type="curve" smooth="yes"/>
-      <point x="1184" y="-28"/>
-      <point x="1384" y="272"/>
-      <point x="1384" y="688" type="curve" smooth="yes"/>
-      <point x="1384" y="716" type="line" smooth="yes"/>
-      <point x="1384" y="1184"/>
-      <point x="1172" y="1516"/>
-      <point x="740" y="1516" type="curve" smooth="yes"/>
-      <point x="404" y="1516"/>
-      <point x="120" y="1264"/>
-      <point x="120" y="788" type="curve" smooth="yes"/>
+      <point x="1588" y="1760" 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 92cb889a2..2cf6bdeb7 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rrthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rrthook.glif
@@ -3,18 +3,6 @@
   <advance width="992"/>
   <unicode hex="027D"/>
   <outline>
-    <contour>
-      <point x="360" y="-424" type="move" name="parenthesses.w1"/>
-    </contour>
-    <contour>
-      <point x="536" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="536" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="848" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="80" y="472" type="line"/>
       <point x="80" y="-192" type="line" smooth="yes"/>
@@ -34,6 +22,18 @@
       <point x="352" y="472" type="line"/>
     </contour>
     <component base="r" xOffset="-112"/>
+    <contour>
+      <point x="360" y="-424" type="move" name="parenthesses.w1"/>
+    </contour>
+    <contour>
+      <point x="536" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="536" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="848" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rturnrthook.glif b/src/Inter-UI-Regular.ufo/glyphs/rturnrthook.glif
index 26ffb2663..db0a501ff 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rturnrthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rturnrthook.glif
@@ -3,15 +3,6 @@
   <advance width="1248"/>
   <unicode hex="027B"/>
   <outline>
-    <contour>
-      <point x="456" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="456" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1168" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="628" y="336" type="line"/>
       <point x="628" y="-192" type="line" smooth="yes"/>
@@ -31,6 +22,15 @@
       <point x="900" y="336" type="line"/>
     </contour>
     <component base="r" xScale="-1" yScale="-1" xOffset="1092" yOffset="1488"/>
+    <contour>
+      <point x="456" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="456" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1168" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/tau.glif b/src/Inter-UI-Regular.ufo/glyphs/tau.glif
index 6e39645c5..344feefdd 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/tau.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/tau.glif
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="tau" format="1">
-  <advance width="1504"/>
+  <advance width="1312"/>
   <unicode hex="03C4"/>
   <outline>
     <contour>
-      <point x="1376" y="1488" type="line"/>
-      <point x="128" y="1488" type="line"/>
-      <point x="128" y="1272" type="line"/>
-      <point x="1376" y="1272" type="line"/>
+      <point x="1280" y="1536" type="line"/>
+      <point x="32" y="1536" type="line"/>
+      <point x="32" y="1316" type="line"/>
+      <point x="1280" y="1316" type="line"/>
     </contour>
     <contour>
-      <point x="600" y="1488" type="line"/>
-      <point x="600" y="384" type="line"/>
-      <point x="600" y="88"/>
-      <point x="728" y="-28"/>
-      <point x="936" y="-28" type="curve" smooth="yes"/>
-      <point x="1024" y="-28"/>
-      <point x="1104" y="-16"/>
-      <point x="1196" y="52" type="curve"/>
-      <point x="1132" y="240" type="line"/>
-      <point x="1104" y="220"/>
-      <point x="1056" y="200"/>
-      <point x="1008" y="200" type="curve" smooth="yes"/>
-      <point x="940" y="200"/>
-      <point x="876" y="232"/>
-      <point x="876" y="372" type="curve"/>
-      <point x="876" y="1488" type="line"/>
+      <point x="524" y="1536" type="line"/>
+      <point x="524" y="384" type="line"/>
+      <point x="524" y="88"/>
+      <point x="632" y="-28"/>
+      <point x="840" y="-28" type="curve" smooth="yes"/>
+      <point x="928" y="-28"/>
+      <point x="1008" y="-16"/>
+      <point x="1100" y="52" type="curve"/>
+      <point x="1036" y="240" type="line"/>
+      <point x="1008" y="220"/>
+      <point x="960" y="196"/>
+      <point x="912" y="196" type="curve" smooth="yes"/>
+      <point x="848" y="196"/>
+      <point x="760" y="196"/>
+      <point x="760" y="372" type="curve"/>
+      <point x="760" y="1536" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/theta.glif b/src/Inter-UI-Regular.ufo/glyphs/theta.glif
index 38f95eacc..141e4c5b6 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/theta.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/theta.glif
@@ -4,10 +4,10 @@
   <unicode hex="03B8"/>
   <outline>
     <contour>
-      <point x="1208" y="1108" type="line"/>
-      <point x="232" y="1108" type="line"/>
-      <point x="232" y="888" type="line"/>
-      <point x="1208" y="888" type="line"/>
+      <point x="1244" y="1108" type="line"/>
+      <point x="268" y="1108" type="line"/>
+      <point x="268" y="888" type="line"/>
+      <point x="1244" y="888" type="line"/>
     </contour>
     <contour>
       <point x="1388" y="1132" type="line"/>
@@ -26,20 +26,20 @@
       <point x="1388" y="888" type="curve"/>
     </contour>
     <contour>
-      <point x="1112" y="844" type="line"/>
-      <point x="1112" y="432"/>
-      <point x="992" y="192"/>
-      <point x="756" y="192" type="curve" smooth="yes"/>
-      <point x="524" y="192"/>
-      <point x="392" y="432"/>
-      <point x="392" y="844" type="curve" smooth="yes"/>
-      <point x="392" y="1176" type="line" smooth="yes"/>
-      <point x="392" y="1588"/>
-      <point x="520" y="1812"/>
-      <point x="752" y="1812" type="curve" smooth="yes"/>
-      <point x="988" y="1812"/>
-      <point x="1112" y="1588"/>
-      <point x="1112" y="1176" type="curve"/>
+      <point x="1148" y="844" type="line"/>
+      <point x="1148" y="432"/>
+      <point x="992" y="184"/>
+      <point x="756" y="184" type="curve" smooth="yes"/>
+      <point x="524" y="184"/>
+      <point x="352" y="432"/>
+      <point x="352" y="844" type="curve" smooth="yes"/>
+      <point x="352" y="1176" type="line" smooth="yes"/>
+      <point x="352" y="1588"/>
+      <point x="520" y="1820"/>
+      <point x="752" y="1820" type="curve" smooth="yes"/>
+      <point x="988" y="1820"/>
+      <point x="1148" y="1588"/>
+      <point x="1148" y="1176" type="curve"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/thorn.glif b/src/Inter-UI-Regular.ufo/glyphs/thorn.glif
index 59d3b82f5..ef9e81593 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/thorn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/thorn.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="thorn" format="1">
-  <advance width="1628"/>
+  <advance width="1604"/>
   <unicode hex="00FE"/>
   <outline>
     <contour>
-      <point x="224" y="2048" type="line"/>
-      <point x="224" y="-576" type="line"/>
-      <point x="460" y="-576" type="line"/>
-      <point x="460" y="288" type="line"/>
-      <point x="368" y="784" type="line"/>
-      <point x="460" y="1172" type="line"/>
-      <point x="460" y="2048" type="line"/>
+      <point x="200" y="2048" type="line"/>
+      <point x="200" y="-576" type="line"/>
+      <point x="436" y="-576" type="line"/>
+      <point x="436" y="288" type="line"/>
+      <point x="344" y="784" type="line"/>
+      <point x="436" y="1172" type="line"/>
+      <point x="436" y="2048" type="line"/>
     </contour>
-    <component base="rightloop.cn" xOffset="-16"/>
+    <component base="rightloop.cn" xOffset="-40"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/u.glif b/src/Inter-UI-Regular.ufo/glyphs/u.glif
index 652ceab77..1539b7260 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/u.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/u.glif
@@ -1,54 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="u" format="1">
-  <advance width="1632"/>
+  <advance width="1604"/>
   <unicode hex="0075"/>
   <outline>
     <contour>
-      <point x="828" y="1792" type="move" name="top"/>
+      <point x="1168" y="608" type="line" smooth="yes"/>
+      <point x="1168" y="320"/>
+      <point x="948" y="208"/>
+      <point x="772" y="208" type="curve" smooth="yes"/>
+      <point x="576" y="208"/>
+      <point x="436" y="336"/>
+      <point x="436" y="560" type="curve" smooth="yes"/>
+      <point x="436" y="1536" type="line"/>
+      <point x="200" y="1536" type="line"/>
+      <point x="200" y="560" type="line" smooth="yes"/>
+      <point x="200" y="168"/>
+      <point x="472" y="-20"/>
+      <point x="696" y="-20" type="curve" smooth="yes"/>
+      <point x="928" y="-20"/>
+      <point x="1076" y="100"/>
+      <point x="1152" y="216" type="curve"/>
+      <point x="1168" y="216" type="line"/>
+      <point x="1168" y="0" type="line"/>
+      <point x="1404" y="0" type="line"/>
+      <point x="1404" y="1536" type="line"/>
+      <point x="1168" y="1536" type="line"/>
     </contour>
     <contour>
-      <point x="1280" y="0" type="move" name="ogonek"/>
+      <point x="804" y="1792" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="628" y="0" type="move" name="bottomu"/>
+      <point x="1256" y="0" type="move" name="ogonek"/>
     </contour>
     <contour>
-      <point x="1484" y="2200" type="move" name="top_dd"/>
+      <point x="604" y="0" type="move" name="bottomu"/>
     </contour>
     <contour>
-      <point x="1484" y="-560" type="move" name="bottom_dd"/>
+      <point x="1460" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1192" y="900" type="move" name="rhotichook"/>
+      <point x="1460" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1448" y="1776" type="move" name="top0315"/>
+      <point x="1168" y="900" type="move" name="rhotichook"/>
     </contour>
     <contour>
-      <point x="704" y="0" type="move" name="bottom"/>
+      <point x="1424" y="1776" type="move" name="top0315"/>
     </contour>
     <contour>
-      <point x="1192" y="608" type="line" smooth="yes"/>
-      <point x="1192" y="320"/>
-      <point x="972" y="208"/>
-      <point x="796" y="208" type="curve" smooth="yes"/>
-      <point x="600" y="208"/>
-      <point x="460" y="336"/>
-      <point x="460" y="560" type="curve" smooth="yes"/>
-      <point x="460" y="1536" type="line"/>
-      <point x="224" y="1536" type="line"/>
-      <point x="224" y="560" type="line" smooth="yes"/>
-      <point x="224" y="168"/>
-      <point x="496" y="-20"/>
-      <point x="720" y="-20" type="curve" smooth="yes"/>
-      <point x="952" y="-20"/>
-      <point x="1100" y="100"/>
-      <point x="1176" y="216" type="curve"/>
-      <point x="1192" y="216" type="line"/>
-      <point x="1192" y="0" type="line"/>
-      <point x="1428" y="0" type="line"/>
-      <point x="1428" y="1536" type="line"/>
-      <point x="1192" y="1536" type="line"/>
+      <point x="680" y="0" type="move" name="bottom"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ubar.glif b/src/Inter-UI-Regular.ufo/glyphs/ubar.glif
index 7d6c89288..2a7c5bc88 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ubar.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ubar.glif
@@ -3,6 +3,13 @@
   <advance width="1760"/>
   <unicode hex="0289"/>
   <outline>
+    <contour>
+      <point x="1748" y="888" type="line"/>
+      <point x="16" y="888" type="line"/>
+      <point x="16" y="668" type="line"/>
+      <point x="1748" y="668" type="line"/>
+    </contour>
+    <component base="u" xOffset="104"/>
     <contour>
       <point x="872" y="1776" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="1772" y="1776" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1748" y="888" type="line"/>
-      <point x="16" y="888" type="line"/>
-      <point x="16" y="668" type="line"/>
-      <point x="1748" y="668" type="line"/>
-    </contour>
-    <component base="u" xOffset="104"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uhorn.glif b/src/Inter-UI-Regular.ufo/glyphs/uhorn.glif
index 5eef5247d..75d1c9167 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uhorn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uhorn.glif
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uhorn" format="1">
-  <advance width="1800"/>
+  <advance width="1728"/>
   <unicode hex="01B0"/>
   <outline>
+    <contour>
+      <point x="1592" y="1604" type="line"/>
+      <point x="1592" y="1396"/>
+      <point x="1588" y="1308"/>
+      <point x="1340" y="1308" type="curve"/>
+      <point x="1340" y="1144" type="line"/>
+      <point x="1700" y="1144"/>
+      <point x="1800" y="1300"/>
+      <point x="1800" y="1604" type="curve"/>
+    </contour>
+    <component base="u"/>
     <contour>
       <point x="824" y="1792" type="move" name="top"/>
     </contour>
@@ -18,17 +29,6 @@
     <contour>
       <point x="776" y="0" type="move" name="bottom"/>
     </contour>
-    <contour>
-      <point x="1592" y="1604" type="line"/>
-      <point x="1592" y="1396"/>
-      <point x="1588" y="1308"/>
-      <point x="1340" y="1308" type="curve"/>
-      <point x="1340" y="1144" type="line"/>
-      <point x="1700" y="1144"/>
-      <point x="1800" y="1300"/>
-      <point x="1800" y="1604" type="curve"/>
-    </contour>
-    <component base="u"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni0069.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni0069.ccmp.glif
index a2f953167..bc272d173 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni0069.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni0069.ccmp.glif
@@ -2,6 +2,7 @@
 <glyph name="uni0069.ccmp" format="1">
   <advance width="736"/>
   <outline>
+    <component base="dotlessi" xOffset="-8"/>
     <contour>
       <point x="344" y="1776" type="move" name="top"/>
     </contour>
@@ -11,7 +12,6 @@
     <contour>
       <point x="340" y="16" type="move" name="bottom"/>
     </contour>
-    <component base="dotlessi" xOffset="-8"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni006A_.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni006A_.ccmp.glif
index 3ef69d380..05b179c79 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni006A_.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni006A_.ccmp.glif
@@ -2,6 +2,7 @@
 <glyph name="uni006A.ccmp" format="1">
   <advance width="768"/>
   <outline>
+    <component base="dotlessj" xOffset="176"/>
     <contour>
       <point x="548" y="1716" type="move" name="top"/>
     </contour>
@@ -11,7 +12,6 @@
     <contour>
       <point x="436" y="-632" type="move" name="bottom"/>
     </contour>
-    <component base="dotlessj" xOffset="176"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni012F_.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni012F_.ccmp.glif
index 57e8c8bb8..13430da1a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni012F_.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni012F_.ccmp.glif
@@ -2,6 +2,8 @@
 <glyph name="uni012F.ccmp" format="1">
   <advance width="736"/>
   <outline>
+    <component base="dotlessi" xOffset="124"/>
+    <component base="ogonek" xOffset="48" yOffset="16"/>
     <contour>
       <point x="480" y="1776" type="move" name="top"/>
     </contour>
@@ -11,8 +13,6 @@
     <contour>
       <point x="472" y="-632" type="move" name="bottom"/>
     </contour>
-    <component base="dotlessi" xOffset="124"/>
-    <component base="ogonek" xOffset="48" yOffset="16"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni0249.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni0249.ccmp.glif
index 541cabd3e..f80cb2e1a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni0249.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni0249.ccmp.glif
@@ -2,6 +2,8 @@
 <glyph name="uni0249.ccmp" format="1">
   <advance width="992"/>
   <outline>
+    <component base="dotlessj" xOffset="140"/>
+    <component base="crossbar" xOffset="-140" yOffset="-164"/>
     <contour>
       <point x="512" y="1716" type="move" name="top"/>
     </contour>
@@ -11,8 +13,6 @@
     <contour>
       <point x="512" y="-632" type="move" name="bottom"/>
     </contour>
-    <component base="dotlessj" xOffset="140"/>
-    <component base="crossbar" xOffset="-140" yOffset="-164"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni0249.glif b/src/Inter-UI-Regular.ufo/glyphs/uni0249.glif
index 27c354258..779477654 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni0249.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni0249.glif
@@ -3,6 +3,8 @@
   <advance width="992"/>
   <unicode hex="0249"/>
   <outline>
+    <component base="j" xOffset="172"/>
+    <component base="crossbar" xOffset="-148" yOffset="-164"/>
     <contour>
       <point x="504" y="2200" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="460" y="-632" type="move" name="bottom"/>
     </contour>
-    <component base="j" xOffset="172"/>
-    <component base="crossbar" xOffset="-148" yOffset="-164"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni024D_.glif b/src/Inter-UI-Regular.ufo/glyphs/uni024D_.glif
index 457a5e5de..f4b5958f6 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni024D_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni024D_.glif
@@ -3,6 +3,8 @@
   <advance width="1248"/>
   <unicode hex="024D"/>
   <outline>
+    <component base="r" xOffset="156"/>
+    <component base="crossbar" xOffset="-132" yOffset="-220"/>
     <contour>
       <point x="588" y="1776" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="480" y="16" type="move" name="bottom"/>
     </contour>
-    <component base="r" xOffset="156"/>
-    <component base="crossbar" xOffset="-132" yOffset="-220"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni0268.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni0268.ccmp.glif
index 593a11233..8da8d505c 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni0268.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni0268.ccmp.glif
@@ -2,6 +2,8 @@
 <glyph name="uni0268.ccmp" format="1">
   <advance width="992"/>
   <outline>
+    <component base="dotlessi" xOffset="156"/>
+    <component base="crossbar" xOffset="-148" yOffset="-164"/>
     <contour>
       <point x="512" y="1776" type="move" name="top"/>
     </contour>
@@ -11,8 +13,6 @@
     <contour>
       <point x="504" y="16" type="move" name="bottom"/>
     </contour>
-    <component base="dotlessi" xOffset="156"/>
-    <component base="crossbar" xOffset="-148" yOffset="-164"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni029D_.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni029D_.ccmp.glif
index 0418a2308..c67d1303c 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni029D_.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni029D_.ccmp.glif
@@ -2,15 +2,6 @@
 <glyph name="uni029D.ccmp" format="1">
   <advance width="1248"/>
   <outline>
-    <contour>
-      <point x="788" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="784" y="-632" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1208" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1180" y="132" type="line"/>
       <point x="464" y="132" type="line" smooth="yes"/>
@@ -38,6 +29,15 @@
       <point x="1180" y="-88" type="line"/>
     </contour>
     <component base="dotlessi" xOffset="436"/>
+    <contour>
+      <point x="788" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="784" y="-632" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1208" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni02AB__.glif b/src/Inter-UI-Regular.ufo/glyphs/uni02AB__.glif
index 8a462645d..54d60c881 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni02AB__.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni02AB__.glif
@@ -3,15 +3,6 @@
   <advance width="1760"/>
   <unicode hex="02AB"/>
   <outline>
-    <contour>
-      <point x="980" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="980" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1684" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1588" y="220" type="line"/>
       <point x="416" y="220" type="line"/>
@@ -33,6 +24,15 @@
       <point x="1432" y="1268" type="line"/>
     </contour>
     <component base="l" xOffset="-84"/>
+    <contour>
+      <point x="980" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="980" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1684" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni03F3_.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni03F3_.ccmp.glif
index 07946944a..825706886 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni03F3_.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni03F3_.ccmp.glif
@@ -2,6 +2,7 @@
 <glyph name="uni03F3.ccmp" format="1">
   <advance width="736"/>
   <outline>
+    <component base="dotlessj" xOffset="-16"/>
     <contour>
       <point x="360" y="1716" type="move" name="top"/>
     </contour>
@@ -11,7 +12,6 @@
     <contour>
       <point x="360" y="-632" type="move" name="bottom"/>
     </contour>
-    <component base="dotlessj" xOffset="-16"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni0456.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni0456.ccmp.glif
index e87f4d711..e327506e4 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni0456.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni0456.ccmp.glif
@@ -2,6 +2,7 @@
 <glyph name="uni0456.ccmp" format="1">
   <advance width="736"/>
   <outline>
+    <component base="dotlessi" xOffset="-8"/>
     <contour>
       <point x="344" y="1776" type="move" name="top"/>
     </contour>
@@ -11,7 +12,6 @@
     <contour>
       <point x="340" y="16" type="move" name="bottom"/>
     </contour>
-    <component base="dotlessi" xOffset="-8"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni0458.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni0458.ccmp.glif
index a3381beed..f2607eb7a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni0458.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni0458.ccmp.glif
@@ -2,6 +2,7 @@
 <glyph name="uni0458.ccmp" format="1">
   <advance width="768"/>
   <outline>
+    <component base="dotlessj" xOffset="176"/>
     <contour>
       <point x="548" y="1716" type="move" name="top"/>
     </contour>
@@ -11,7 +12,6 @@
     <contour>
       <point x="548" y="-632" type="move" name="bottom"/>
     </contour>
-    <component base="dotlessj" xOffset="176"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/upsilon.glif b/src/Inter-UI-Regular.ufo/glyphs/upsilon.glif
index 0c0ec39a5..461be1adc 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/upsilon.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/upsilon.glif
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="upsilon" format="1">
-  <advance width="1504"/>
+  <advance width="1564"/>
   <unicode hex="03C5"/>
   <outline>
     <contour>
-      <point x="704" y="1744" type="move" name="top"/>
+      <point x="200" y="1488" type="line"/>
+      <point x="200" y="596" type="line"/>
+      <point x="200" y="164"/>
+      <point x="428" y="-28"/>
+      <point x="756" y="-28" type="curve" smooth="yes"/>
+      <point x="1220" y="-28"/>
+      <point x="1416" y="356"/>
+      <point x="1416" y="780" type="curve"/>
+      <point x="1416" y="1080"/>
+      <point x="1340" y="1320"/>
+      <point x="1256" y="1488" type="curve"/>
+      <point x="1008" y="1488" type="line"/>
+      <point x="1100" y="1260"/>
+      <point x="1176" y="1024"/>
+      <point x="1180" y="780" type="curve"/>
+      <point x="1180" y="456"/>
+      <point x="996" y="188"/>
+      <point x="748" y="188" type="curve" smooth="yes"/>
+      <point x="592" y="188"/>
+      <point x="436" y="292"/>
+      <point x="436" y="592" type="curve"/>
+      <point x="436" y="1488" type="line"/>
     </contour>
     <contour>
-      <point x="1496" y="1744" type="move" name="top0315"/>
+      <point x="760" y="1744" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="144" y="1488" type="line"/>
-      <point x="144" y="596" type="line"/>
-      <point x="144" y="164"/>
-      <point x="356" y="-28"/>
-      <point x="700" y="-28" type="curve" smooth="yes"/>
-      <point x="1152" y="-28"/>
-      <point x="1360" y="356"/>
-      <point x="1360" y="780" type="curve"/>
-      <point x="1360" y="1080"/>
-      <point x="1284" y="1320"/>
-      <point x="1200" y="1488" type="curve"/>
-      <point x="916" y="1488" type="line"/>
-      <point x="1008" y="1260"/>
-      <point x="1080" y="1024"/>
-      <point x="1084" y="780" type="curve"/>
-      <point x="1084" y="500"/>
-      <point x="944" y="192"/>
-      <point x="684" y="192" type="curve" smooth="yes"/>
-      <point x="532" y="192"/>
-      <point x="420" y="300"/>
-      <point x="420" y="592" type="curve"/>
-      <point x="420" y="1488" type="line"/>
+      <point x="1552" y="1744" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/yericyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/yericyrillic.glif
index 33b7b5beb..1aca40a4b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/yericyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/yericyrillic.glif
@@ -3,14 +3,14 @@
   <advance width="2272"/>
   <unicode hex="044B"/>
   <outline>
+    <component base="softsigncyrillic" xOffset="72"/>
+    <component base="dotlessi" xOffset="1536"/>
     <contour>
       <point x="1156" y="1744" type="move" name="top"/>
     </contour>
     <contour>
       <point x="2276" y="1744" type="move" name="top0315"/>
     </contour>
-    <component base="softsigncyrillic" xOffset="72"/>
-    <component base="dotlessi" xOffset="1536"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/groups.plist b/src/Inter-UI-Regular.ufo/groups.plist
index 51f3a9917..fdc1152e6 100644
--- a/src/Inter-UI-Regular.ufo/groups.plist
+++ b/src/Inter-UI-Regular.ufo/groups.plist
@@ -204,6 +204,7 @@
 		<string>Scircumflex</string>
 		<string>Scedilla</string>
 		<string>Scaron</string>
+		<string>Germandbls</string>
 	</array>
 	<key>@KERN_LEFT_T</key>
 	<array>
@@ -591,6 +592,7 @@
 		<string>scircumflex</string>
 		<string>scedilla</string>
 		<string>scaron</string>
+		<string>germandbls</string>
 	</array>
 	<key>@KERN_LEFT_t</key>
 	<array>
diff --git a/src/Inter-UI-Regular.ufo/kerning.plist b/src/Inter-UI-Regular.ufo/kerning.plist
index a687ea6d1..bcff51578 100644
--- a/src/Inter-UI-Regular.ufo/kerning.plist
+++ b/src/Inter-UI-Regular.ufo/kerning.plist
@@ -497,9 +497,9 @@
 		<key>@KERN_RIGHT_B</key>
 		<integer>-32</integer>
 		<key>@KERN_RIGHT_b</key>
-		<integer>-48</integer>
+		<integer>0</integer>
 		<key>@KERN_RIGHT_dotlessj</key>
-		<integer>-32</integer>
+		<integer>-8</integer>
 		<key>backslash</key>
 		<integer>55</integer>
 	</dict>
@@ -1509,7 +1509,7 @@
 		<key>@KERN_RIGHT_dagger</key>
 		<integer>-29</integer>
 		<key>@KERN_RIGHT_dotlessj</key>
-		<integer>-32</integer>
+		<integer>-8</integer>
 		<key>@KERN_RIGHT_quotedblleft</key>
 		<integer>-123</integer>
 		<key>@KERN_RIGHT_t</key>
diff --git a/src/Inter-UI-Regular.ufo/lib.plist b/src/Inter-UI-Regular.ufo/lib.plist
index 287ea7b47..941b61620 100644
--- a/src/Inter-UI-Regular.ufo/lib.plist
+++ b/src/Inter-UI-Regular.ufo/lib.plist
@@ -420,9 +420,11 @@
 				<string>g</string>
 				<string>h</string>
 				<string>hcedilla</string>
+				<string>dotlessi</string>
 				<string>i</string>
 				<string>idieresisacute</string>
 				<string>itildebelow</string>
+				<string>dotlessj</string>
 				<string>j</string>
 				<string>k</string>
 				<string>l</string>
@@ -437,6 +439,7 @@
 				<string>q</string>
 				<string>r</string>
 				<string>s</string>
+				<string>germandbls</string>
 				<string>t</string>
 				<string>u</string>
 				<string>uhorn</string>
@@ -530,9 +533,6 @@
 				<string>izhitsacyrillic</string>
 				<string>dz</string>
 				<string>dzcaron</string>
-				<string>germandbls</string>
-				<string>dotlessi</string>
-				<string>dotlessj</string>
 				<string>dollar</string>
 				<string>cent</string>
 				<string>yen</string>
@@ -1915,9 +1915,11 @@
 		<string>g</string>
 		<string>h</string>
 		<string>hcedilla</string>
+		<string>dotlessi</string>
 		<string>i</string>
 		<string>idieresisacute</string>
 		<string>itildebelow</string>
+		<string>dotlessj</string>
 		<string>j</string>
 		<string>k</string>
 		<string>l</string>
@@ -1932,6 +1934,7 @@
 		<string>q</string>
 		<string>r</string>
 		<string>s</string>
+		<string>germandbls</string>
 		<string>t</string>
 		<string>u</string>
 		<string>uhorn</string>
@@ -2025,9 +2028,6 @@
 		<string>izhitsacyrillic</string>
 		<string>dz</string>
 		<string>dzcaron</string>
-		<string>germandbls</string>
-		<string>dotlessi</string>
-		<string>dotlessj</string>
 		<string>dollar</string>
 		<string>cent</string>
 		<string>yen</string>
diff --git a/src/glyphorder.txt b/src/glyphorder.txt
index 5d988cac1..994d2f682 100644
--- a/src/glyphorder.txt
+++ b/src/glyphorder.txt
@@ -123,10 +123,12 @@ idieresisacute
 itildebelow
 j
 k
+dotlessi
 l
 lslash
 m
 n
+dotlessj
 o
 oslash
 ohorn
@@ -135,6 +137,7 @@ p
 q
 r
 s
+germandbls
 t
 u
 uhorn
@@ -228,9 +231,6 @@ dzeabkhasiancyrillic
 izhitsacyrillic
 dz
 dzcaron
-germandbls
-dotlessi
-dotlessj
 dollar
 cent
 yen