diff --git a/src/Inter-UI-Black.ufo/glyphs/Hadescendercyrillic_.glif b/src/Inter-UI-Black.ufo/glyphs/Hadescendercyrillic_.glif
index 9fb9456fb..ff0693396 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Hadescendercyrillic_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Hadescendercyrillic_.glif
@@ -3,6 +3,8 @@
   <advance width="2048"/>
   <unicode hex="04B2"/>
   <outline>
+    <component base="X"/>
+    <component base="cyrillictic" xOffset="1324"/>
     <contour>
       <point x="1796" y="2200" type="move" name="top_dd"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="1796" y="2216" type="move" name="top0315"/>
     </contour>
-    <component base="X"/>
-    <component base="cyrillictic" xOffset="1324"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/X_.glif b/src/Inter-UI-Black.ufo/glyphs/X_.glif
index 3d604e894..d9e6a40c6 100644
--- a/src/Inter-UI-Black.ufo/glyphs/X_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/X_.glif
@@ -1,56 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="X" format="1">
-  <advance width="2048"/>
+  <advance width="1960"/>
   <unicode hex="0058"/>
   <outline>
     <contour>
-      <point x="1024" y="28" type="move" name="bottom"/>
+      <point x="640" y="2048" type="line"/>
+      <point x="112" y="2048" type="line"/>
+      <point x="676" y="1024" type="line"/>
+      <point x="96" y="0" type="line"/>
+      <point x="628" y="0" type="line"/>
+      <point x="968" y="672" type="line" smooth="yes"/>
+      <point x="976" y="692"/>
+      <point x="980" y="696"/>
+      <point x="980" y="712" type="curve"/>
+      <point x="988" y="712" type="line"/>
+      <point x="988" y="696"/>
+      <point x="988" y="692"/>
+      <point x="996" y="672" type="curve" smooth="yes"/>
+      <point x="1332" y="0" type="line"/>
+      <point x="1864" y="0" type="line"/>
+      <point x="1284" y="1024" type="line"/>
+      <point x="1848" y="2048" type="line"/>
+      <point x="1324" y="2048" type="line"/>
+      <point x="996" y="1392" type="line" smooth="yes"/>
+      <point x="988" y="1376"/>
+      <point x="988" y="1372"/>
+      <point x="988" y="1356" type="curve"/>
+      <point x="980" y="1356" type="line"/>
+      <point x="980" y="1372"/>
+      <point x="976" y="1376"/>
+      <point x="968" y="1392" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="1688" y="0" type="move" name="right"/>
+      <point x="980" y="28" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1020" y="1020" type="move" name="cross"/>
+      <point x="1644" y="0" type="move" name="right"/>
     </contour>
     <contour>
-      <point x="1004" y="2216" type="move" name="top"/>
+      <point x="976" y="1020" type="move" name="cross"/>
     </contour>
     <contour>
-      <point x="1924" y="2200" type="move" name="top_dd"/>
+      <point x="960" y="2216" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1924" y="-560" type="move" name="bottom_dd"/>
+      <point x="1880" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1924" y="2216" type="move" name="top0315"/>
+      <point x="1880" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="684" y="2048" type="line"/>
-      <point x="156" y="2048" type="line"/>
-      <point x="720" y="1024" type="line"/>
-      <point x="140" y="0" type="line"/>
-      <point x="672" y="0" type="line"/>
-      <point x="1012" y="672" type="line" smooth="yes"/>
-      <point x="1020" y="692"/>
-      <point x="1024" y="696"/>
-      <point x="1024" y="712" type="curve"/>
-      <point x="1032" y="712" type="line"/>
-      <point x="1032" y="696"/>
-      <point x="1032" y="692"/>
-      <point x="1040" y="672" type="curve" smooth="yes"/>
-      <point x="1376" y="0" type="line"/>
-      <point x="1908" y="0" type="line"/>
-      <point x="1328" y="1024" type="line"/>
-      <point x="1892" y="2048" type="line"/>
-      <point x="1368" y="2048" type="line"/>
-      <point x="1040" y="1392" type="line" smooth="yes"/>
-      <point x="1032" y="1376"/>
-      <point x="1032" y="1372"/>
-      <point x="1032" y="1356" type="curve"/>
-      <point x="1024" y="1356" type="line"/>
-      <point x="1024" y="1372"/>
-      <point x="1020" y="1376"/>
-      <point x="1012" y="1392" type="curve" smooth="yes"/>
+      <point x="1880" y="2216" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/f.glif b/src/Inter-UI-Black.ufo/glyphs/f.glif
index f63292b8a..547a5f148 100644
--- a/src/Inter-UI-Black.ufo/glyphs/f.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/f.glif
@@ -1,8 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="f" format="1">
-  <advance width="1068"/>
+  <advance width="1072"/>
   <unicode hex="0066"/>
   <outline>
+    <contour>
+      <point x="992" y="1536" type="line"/>
+      <point x="60" y="1536" type="line"/>
+      <point x="60" y="1216" type="line"/>
+      <point x="992" y="1216" type="line"/>
+    </contour>
+    <contour>
+      <point x="248" y="0" type="line"/>
+      <point x="708" y="0" type="line" name="hr00"/>
+      <point x="708" y="1560" type="line" smooth="yes"/>
+      <point x="708" y="1664"/>
+      <point x="752" y="1712"/>
+      <point x="856" y="1712" type="curve" smooth="yes"/>
+      <point x="900" y="1712"/>
+      <point x="948" y="1704"/>
+      <point x="988" y="1692" type="curve"/>
+      <point x="1064" y="2032" type="line"/>
+      <point x="1008" y="2048"/>
+      <point x="892" y="2076"/>
+      <point x="752" y="2076" type="curve" smooth="yes"/>
+      <point x="456" y="2076"/>
+      <point x="248" y="1908"/>
+      <point x="248" y="1560" type="curve" smooth="yes"/>
+    </contour>
     <contour>
       <point x="628" y="2284" type="move" name="top"/>
     </contour>
@@ -18,30 +42,6 @@
     <contour>
       <point x="1032" y="2284" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="708" y="0" type="line" name="hr00"/>
-      <point x="708" y="1560" type="line" smooth="yes"/>
-      <point x="708" y="1684"/>
-      <point x="804" y="1716"/>
-      <point x="916" y="1716" type="curve" smooth="yes"/>
-      <point x="956" y="1716"/>
-      <point x="1000" y="1712"/>
-      <point x="1032" y="1708" type="curve"/>
-      <point x="1032" y="2060" type="line"/>
-      <point x="992" y="2068"/>
-      <point x="884" y="2076"/>
-      <point x="820" y="2076" type="curve" smooth="yes"/>
-      <point x="524" y="2076"/>
-      <point x="248" y="1908"/>
-      <point x="248" y="1560" type="curve" smooth="yes"/>
-      <point x="248" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="992" y="1536" type="line"/>
-      <point x="60" y="1536" type="line"/>
-      <point x="60" y="1216" type="line"/>
-      <point x="992" y="1216" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/feng.glif b/src/Inter-UI-Black.ufo/glyphs/feng.glif
index c06bd1a1d..a46252586 100644
--- a/src/Inter-UI-Black.ufo/glyphs/feng.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/feng.glif
@@ -3,6 +3,8 @@
   <advance width="2464"/>
   <unicode hex="02A9"/>
   <outline>
+    <component base="f"/>
+    <component base="eng" xOffset="840"/>
     <contour>
       <point x="1796" y="2340" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="2580" y="2340" type="move" name="top0315"/>
     </contour>
-    <component base="f"/>
-    <component base="eng" xOffset="840"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/fitacyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/fitacyrillic.glif
index 65e73c88f..707d64e12 100644
--- a/src/Inter-UI-Black.ufo/glyphs/fitacyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/fitacyrillic.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="fitacyrillic" format="1">
-  <advance width="1792"/>
+  <advance width="1608"/>
   <unicode hex="0473"/>
   <outline>
     <contour>
-      <point x="1248" y="868" type="line"/>
-      <point x="312" y="868" type="line"/>
-      <point x="312" y="604" type="line"/>
-      <point x="1248" y="604" type="line"/>
+      <point x="1272" y="896" type="line"/>
+      <point x="336" y="896" type="line"/>
+      <point x="336" y="632" type="line"/>
+      <point x="1272" y="632" type="line"/>
     </contour>
-    <component base="o" xOffset="-4"/>
+    <component base="o"/>
     <contour>
-      <point x="784" y="1776" type="move" name="top"/>
+      <point x="788" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1588" y="1776" type="move" name="top0315"/>
+      <point x="1592" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/iucyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/iucyrillic.glif
index a3898623d..59819a474 100644
--- a/src/Inter-UI-Black.ufo/glyphs/iucyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/iucyrillic.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="iucyrillic" format="1">
-  <advance width="2304"/>
+  <advance width="2220"/>
   <unicode hex="044E"/>
   <outline>
     <contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/o_uni02DE__.glif b/src/Inter-UI-Black.ufo/glyphs/o_uni02DE__.glif
index be9dfa7f5..31c4a743b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/o_uni02DE__.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/o_uni02DE__.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="o_uni02DE" format="1">
-  <advance width="2304"/>
+  <advance width="2424"/>
   <outline>
-    <component base="o" xOffset="-120"/>
-    <component base="rhotichookmod" xOffset="1404"/>
+    <component base="o"/>
+    <component base="rhotichookmod" xOffset="1524"/>
     <contour>
-      <point x="2088" y="1776" type="move" name="top0315"/>
+      <point x="2208" y="1776" type="move" name="top0315"/>
     </contour>
     <contour>
-      <point x="672" y="1776" type="move" name="top"/>
+      <point x="792" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="672" y="-16" type="move" name="bottom"/>
+      <point x="792" y="-16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="672" y="-16" type="move" name="markbottom"/>
+      <point x="792" y="-16" type="move" name="markbottom"/>
     </contour>
     <contour>
-      <point x="1468" y="2200" type="move" name="top_dd"/>
+      <point x="1588" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1468" y="-560" type="move" name="bottom_dd"/>
+      <point x="1588" y="-560" type="move" name="bottom_dd"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/odieresis.glif b/src/Inter-UI-Black.ufo/glyphs/odieresis.glif
index 59a7ee83a..a5718cf7e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/odieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/odieresis.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="odieresis" format="1">
-  <advance width="1544"/>
+  <advance width="1608"/>
   <unicode hex="00F6"/>
   <outline>
-    <component base="dieresis" xOffset="132"/>
+    <component base="dieresis" xOffset="164"/>
     <component base="o"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/oe.glif b/src/Inter-UI-Black.ufo/glyphs/oe.glif
index a7781d393..e63ecdc8d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/oe.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/oe.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="oe" format="1">
-  <advance width="2552"/>
+  <advance width="2616"/>
   <unicode hex="0153"/>
   <outline>
     <component base="o"/>
-    <component base="e" xOffset="948"/>
+    <component base="e" xOffset="1012"/>
     <contour>
       <point x="1248" y="1776" type="move" name="top"/>
     </contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/ohorn.glif b/src/Inter-UI-Black.ufo/glyphs/ohorn.glif
index 72b7d139c..d2b6b50c6 100644
--- a/src/Inter-UI-Black.ufo/glyphs/ohorn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/ohorn.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="ohorn" format="1">
-  <advance width="1660"/>
+  <advance width="1708"/>
   <unicode hex="01A1"/>
   <outline>
     <contour>
-      <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"/>
+      <point x="1472" y="1620" type="line"/>
+      <point x="1472" y="1388"/>
+      <point x="1424" y="1248"/>
+      <point x="1216" y="1248" type="curve"/>
+      <point x="1216" y="1076" type="line"/>
+      <point x="1568" y="1076"/>
+      <point x="1724" y="1276"/>
+      <point x="1724" y="1620" type="curve"/>
     </contour>
     <component base="o"/>
     <contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/omegaroundcyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/omegaroundcyrillic.glif
index 39c307065..5dcb9c130 100644
--- a/src/Inter-UI-Black.ufo/glyphs/omegaroundcyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/omegaroundcyrillic.glif
@@ -1,30 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="omegaroundcyrillic" format="1">
-  <advance width="1792"/>
+  <advance width="1608"/>
   <unicode hex="047B"/>
   <outline>
     <contour>
-      <point x="900" y="1656" type="line"/>
-      <point x="692" y="1656" type="line"/>
-      <point x="692" y="1000" type="line"/>
-      <point x="900" y="1000" type="line"/>
+      <point x="908" y="1664" type="line"/>
+      <point x="700" y="1664" type="line"/>
+      <point x="700" y="1008" type="line"/>
+      <point x="908" y="1008" type="line"/>
     </contour>
     <contour>
-      <point x="892" y="512" type="line"/>
-      <point x="680" y="512" type="line"/>
-      <point x="680" y="-172" type="line"/>
-      <point x="892" y="-172" type="line"/>
+      <point x="908" y="512" type="line"/>
+      <point x="700" y="512" type="line"/>
+      <point x="700" y="-172" type="line"/>
+      <point x="908" y="-172" type="line"/>
     </contour>
-    <component base="o" xOffset="-4"/>
+    <component base="o"/>
     <contour>
-      <point x="788" y="1872" type="move" name="top"/>
+      <point x="792" y="1872" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1584" y="1872" type="move" name="top0315"/>
+      <point x="1588" y="1872" 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>804</integer>
+          <key>y</key>
+          <integer>1148</integer>
+        </dict>
+      </array>
       <key>interface.gridadjust.original</key>
       <string>{'width': 1585, 'leftMargin': 184, 'rightMargin': -27}</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/oslash.glif b/src/Inter-UI-Black.ufo/glyphs/oslash.glif
index a5519796c..b7fc4f4ba 100644
--- a/src/Inter-UI-Black.ufo/glyphs/oslash.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/oslash.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="oslash" format="1">
-  <advance width="1544"/>
+  <advance width="1608"/>
   <unicode hex="00F8"/>
   <outline>
     <contour>
-      <point x="332" y="-100" type="line"/>
-      <point x="1404" y="1488" type="line"/>
-      <point x="1204" y="1624" type="line"/>
-      <point x="132" y="36" type="line"/>
+      <point x="364" y="-100" type="line"/>
+      <point x="1436" y="1488" type="line"/>
+      <point x="1236" y="1624" type="line"/>
+      <point x="164" y="36" type="line"/>
     </contour>
     <component base="o"/>
     <contour>
-      <point x="612.0" y="1768.0" type="move" name="top"/>
+      <point x="644.0" y="1768.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1456.0" y="2200.0" type="move" name="top_dd"/>
+      <point x="1488.0" y="2200.0" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1456.0" y="1768.0" type="move" name="top0315"/>
+      <point x="1488.0" y="1768.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/otilde.glif b/src/Inter-UI-Black.ufo/glyphs/otilde.glif
index e39862296..0b0d1eb45 100644
--- a/src/Inter-UI-Black.ufo/glyphs/otilde.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/otilde.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="otilde" format="1">
-  <advance width="1544"/>
+  <advance width="1608"/>
   <unicode hex="00F5"/>
   <outline>
-    <component base="tilde" xOffset="132"/>
+    <component base="tilde" xOffset="164"/>
     <component base="o"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/t.glif b/src/Inter-UI-Black.ufo/glyphs/t.glif
index f00e96139..88a23a7aa 100644
--- a/src/Inter-UI-Black.ufo/glyphs/t.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/t.glif
@@ -3,30 +3,6 @@
   <advance width="1016"/>
   <unicode hex="0074"/>
   <outline>
-    <contour>
-      <point x="604" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="868" y="2296" type="move" name="caron"/>
-    </contour>
-    <contour>
-      <point x="460" y="824" type="move" name="cross"/>
-    </contour>
-    <contour>
-      <point x="488" y="2032" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="984" y="1756" type="move" name="marktop"/>
-    </contour>
-    <contour>
-      <point x="980" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="980" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="980" y="2032" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="924" y="1536" type="line"/>
       <point x="52" y="1536" type="line"/>
@@ -37,23 +13,221 @@
       <point x="224" y="1864" type="line"/>
       <point x="224" y="428" type="line"/>
       <point x="224" y="156"/>
-      <point x="452" y="-28"/>
-      <point x="688" y="-28" type="curve" smooth="yes"/>
-      <point x="760" y="-28"/>
-      <point x="820" y="-28"/>
-      <point x="944" y="-8" type="curve"/>
-      <point x="944" y="344" type="line"/>
-      <point x="920" y="344"/>
-      <point x="876" y="344"/>
-      <point x="828" y="344" type="curve" smooth="yes"/>
-      <point x="772" y="344"/>
+      <point x="420" y="-20"/>
+      <point x="668" y="-20" type="curve" smooth="yes"/>
+      <point x="836" y="-20"/>
+      <point x="952" y="12"/>
+      <point x="980" y="24" type="curve"/>
+      <point x="912" y="364" type="line"/>
+      <point x="884" y="356"/>
+      <point x="844" y="352"/>
+      <point x="816" y="352" type="curve" smooth="yes"/>
+      <point x="740" y="352"/>
       <point x="684" y="368"/>
       <point x="684" y="484" type="curve"/>
       <point x="684" y="1864" type="line"/>
     </contour>
+    <contour>
+      <point x="604.0" y="0.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="868.0" y="2296.0" type="move" name="caron"/>
+    </contour>
+    <contour>
+      <point x="460.0" y="824.0" type="move" name="cross"/>
+    </contour>
+    <contour>
+      <point x="488.0" y="2032.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="984.0" y="1756.0" type="move" name="marktop"/>
+    </contour>
+    <contour>
+      <point x="980.0" y="2200.0" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="980.0" y="-560.0" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="980.0" y="2032.0" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.layerData</key>
+      <dict>
+        <key>reference</key>
+        <dict>
+          <key>anchors</key>
+          <array>
+          </array>
+          <key>components</key>
+          <array>
+          </array>
+          <key>contours</key>
+          <array>
+            <dict>
+              <key>points</key>
+              <array>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>320</integer>
+                  <key>y</key>
+                  <integer>1936</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>320</integer>
+                  <key>y</key>
+                  <integer>448</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>320</integer>
+                  <key>y</key>
+                  <integer>180</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>536</integer>
+                  <key>y</key>
+                  <integer>52</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <integer>736</integer>
+                  <key>y</key>
+                  <integer>52</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>824</integer>
+                  <key>y</key>
+                  <integer>52</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>880</integer>
+                  <key>y</key>
+                  <integer>68</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>912</integer>
+                  <key>y</key>
+                  <integer>80</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>864</integer>
+                  <key>y</key>
+                  <integer>292</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>844</integer>
+                  <key>y</key>
+                  <integer>288</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>812</integer>
+                  <key>y</key>
+                  <integer>280</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <integer>760</integer>
+                  <key>y</key>
+                  <integer>280</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>656</integer>
+                  <key>y</key>
+                  <integer>280</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>556</integer>
+                  <key>y</key>
+                  <integer>312</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>556</integer>
+                  <key>y</key>
+                  <integer>512</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>556</integer>
+                  <key>y</key>
+                  <integer>1936</integer>
+                </dict>
+              </array>
+            </dict>
+          </array>
+          <key>lib</key>
+          <dict>
+          </dict>
+          <key>name</key>
+          <string>t</string>
+          <key>unicodes</key>
+          <array>
+          </array>
+          <key>width</key>
+          <integer>1016</integer>
+        </dict>
+      </dict>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tturn.glif b/src/Inter-UI-Black.ufo/glyphs/tturn.glif
index 11e90bd1b..183ace592 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tturn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tturn.glif
@@ -3,6 +3,7 @@
   <advance width="1024.0"/>
   <unicode hex="0287"/>
   <outline>
+    <component base="t" xScale="-1.0" yScale="-1.0" xOffset="1024" yOffset="1864"/>
     <contour>
       <point x="440" y="2200" type="move" name="top"/>
     </contour>
@@ -12,7 +13,6 @@
     <contour>
       <point x="976" y="2200" type="move" name="top0315"/>
     </contour>
-    <component base="t" xScale="-1.0" yScale="-1.0" xOffset="1024" yOffset="1864"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni03D9_.glif b/src/Inter-UI-Black.ufo/glyphs/uni03D9_.glif
index bc4b9b226..4ce529f8d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni03D9_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni03D9_.glif
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni03D9" format="1">
-  <advance width="1792"/>
+  <advance width="1608"/>
   <unicode hex="03D9"/>
   <outline>
     <contour>
-      <point x="1016" y="56" type="line" name="hr00"/>
-      <point x="572" y="56" type="line"/>
-      <point x="572" y="-572" type="line"/>
-      <point x="1016" y="-572" type="line"/>
+      <point x="1024" y="52" type="line" name="hr00"/>
+      <point x="584" y="52" type="line"/>
+      <point x="584" y="-576" type="line"/>
+      <point x="1024" y="-576" type="line"/>
     </contour>
-    <component base="o" xOffset="-4"/>
+    <component base="o"/>
   </outline>
   <lib>
     <dict>
@@ -26,9 +26,9 @@
           <key>magnetic</key>
           <integer>5</integer>
           <key>x</key>
-          <real>793.375</real>
+          <integer>804</integer>
           <key>y</key>
-          <real>0.0</real>
+          <integer>360</integer>
         </dict>
       </array>
       <key>interface.gridadjust.original</key>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni04FC__.glif b/src/Inter-UI-Black.ufo/glyphs/uni04FC__.glif
index 3ffc85b2c..48fb27eda 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni04FC__.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni04FC__.glif
@@ -3,6 +3,8 @@
   <advance width="2048"/>
   <unicode hex="04FC"/>
   <outline>
+    <component base="X" xOffset="-128"/>
+    <component base="cyrillichook" xOffset="1268"/>
     <contour>
       <point x="1668" y="2200" type="move" name="top_dd"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="1668" y="2216" type="move" name="top0315"/>
     </contour>
-    <component base="X" xOffset="-128"/>
-    <component base="cyrillichook" xOffset="1268"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/kerning.plist b/src/Inter-UI-Black.ufo/kerning.plist
index 1efcd8559..25479f296 100644
--- a/src/Inter-UI-Black.ufo/kerning.plist
+++ b/src/Inter-UI-Black.ufo/kerning.plist
@@ -165,7 +165,7 @@
 		<key>@KERN_RIGHT_W</key>
 		<integer>-154</integer>
 		<key>@KERN_RIGHT_X</key>
-		<integer>-256</integer>
+		<integer>-224</integer>
 		<key>@KERN_RIGHT_Y</key>
 		<integer>-292</integer>
 		<key>@KERN_RIGHT_Z</key>
@@ -1534,7 +1534,7 @@
 	<key>@KERN_LEFT_X</key>
 	<dict>
 		<key>@KERN_RIGHT_C</key>
-		<integer>-256</integer>
+		<integer>-224</integer>
 		<key>@KERN_RIGHT_J</key>
 		<integer>-27</integer>
 		<key>@KERN_RIGHT_S</key>
@@ -2645,13 +2645,13 @@
 	<key>@KERN_LEFT_f</key>
 	<dict>
 		<key>@KERN_RIGHT_A</key>
-		<integer>-125</integer>
+		<integer>-128</integer>
 		<key>@KERN_RIGHT_AE</key>
 		<integer>-218</integer>
 		<key>@KERN_RIGHT_J</key>
 		<integer>-200</integer>
 		<key>@KERN_RIGHT_X</key>
-		<integer>-27</integer>
+		<integer>32</integer>
 		<key>@KERN_RIGHT_Y</key>
 		<integer>64</integer>
 		<key>@KERN_RIGHT_a</key>
@@ -3872,11 +3872,11 @@
 		<key>@KERN_RIGHT_W</key>
 		<integer>-70</integer>
 		<key>@KERN_RIGHT_X</key>
-		<integer>-33</integer>
+		<integer>-16</integer>
 		<key>@KERN_RIGHT_Y</key>
 		<integer>-111</integer>
 		<key>@KERN_RIGHT_c</key>
-		<integer>-11</integer>
+		<integer>-16</integer>
 		<key>@KERN_RIGHT_divide</key>
 		<integer>-28</integer>
 		<key>@KERN_RIGHT_dotlessj</key>
@@ -3884,19 +3884,19 @@
 		<key>@KERN_RIGHT_eightsub</key>
 		<integer>48</integer>
 		<key>@KERN_RIGHT_f</key>
-		<integer>14</integer>
+		<integer>24</integer>
 		<key>@KERN_RIGHT_guillemotleft</key>
 		<integer>-40</integer>
 		<key>@KERN_RIGHT_m</key>
-		<integer>8</integer>
+		<integer>16</integer>
 		<key>@KERN_RIGHT_quotedblleft</key>
 		<integer>-54</integer>
 		<key>@KERN_RIGHT_quotedblright</key>
 		<integer>29</integer>
 		<key>@KERN_RIGHT_s</key>
-		<integer>-14</integer>
+		<integer>-8</integer>
 		<key>@KERN_RIGHT_t</key>
-		<integer>14</integer>
+		<integer>16</integer>
 		<key>four</key>
 		<integer>-28</integer>
 		<key>less</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/f.glif b/src/Inter-UI-Regular.ufo/glyphs/f.glif
index d0e999b52..832200b39 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/f.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/f.glif
@@ -3,35 +3,35 @@
   <advance width="992"/>
   <unicode hex="0066"/>
   <outline>
-    <contour>
-      <point x="548" y="0" type="line"/>
-      <point x="548" y="1640" type="line" smooth="yes"/>
-      <point x="548" y="1820"/>
-      <point x="712" y="1860"/>
-      <point x="788" y="1860" type="curve" smooth="yes"/>
-      <point x="860" y="1860"/>
-      <point x="864" y="1856"/>
-      <point x="896" y="1852" type="curve"/>
-      <point x="896" y="2060" type="line"/>
-      <point x="872" y="2068"/>
-      <point x="828" y="2076"/>
-      <point x="772" y="2076" type="curve" smooth="yes"/>
-      <point x="520" y="2076"/>
-      <point x="312" y="1920"/>
-      <point x="312" y="1640" type="curve" smooth="yes"/>
-      <point x="312" y="0" type="line"/>
-    </contour>
     <contour>
       <point x="892" y="1536" type="line"/>
       <point x="64" y="1536" type="line"/>
       <point x="64" y="1316" type="line"/>
-      <point x="888" y="1316" type="line"/>
+      <point x="892" y="1316" type="line"/>
+    </contour>
+    <contour>
+      <point x="312" y="0" type="line"/>
+      <point x="548" y="0" type="line"/>
+      <point x="548" y="1624" type="line"/>
+      <point x="548" y="1776"/>
+      <point x="612" y="1856"/>
+      <point x="768" y="1856" type="curve" smooth="yes"/>
+      <point x="836" y="1856"/>
+      <point x="876" y="1840"/>
+      <point x="900" y="1832" type="curve"/>
+      <point x="968" y="2036" type="line"/>
+      <point x="932" y="2052"/>
+      <point x="860" y="2076"/>
+      <point x="744" y="2076" type="curve" smooth="yes"/>
+      <point x="524" y="2076"/>
+      <point x="312" y="1944"/>
+      <point x="312" y="1680" type="curve"/>
     </contour>
     <contour>
       <point x="536.0" y="2304.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="432" y="0" type="move" name="bottom"/>
+      <point x="432.0" y="0.0" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="756.0" y="1484.0" type="move" name="top_dd"/>
@@ -63,7 +63,7 @@
                 <integer>0</integer>
                 <integer>0</integer>
                 <integer>1</integer>
-                <integer>-16</integer>
+                <integer>24</integer>
                 <integer>0</integer>
               </array>
             </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/feng.glif b/src/Inter-UI-Regular.ufo/glyphs/feng.glif
index 4c3d01980..27949930c 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/feng.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/feng.glif
@@ -3,6 +3,8 @@
   <advance width="2296"/>
   <unicode hex="02A9"/>
   <outline>
+    <component base="f"/>
+    <component base="eng" xOffset="676"/>
     <contour>
       <point x="1616" y="2340" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="2364" y="2340" type="move" name="top0315"/>
     </contour>
-    <component base="f"/>
-    <component base="eng" xOffset="676"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/t.glif b/src/Inter-UI-Regular.ufo/glyphs/t.glif
index 20f558154..7e0d3eb91 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/t.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/t.glif
@@ -13,17 +13,17 @@
       <point x="288" y="1864" type="line"/>
       <point x="288" y="376" type="line"/>
       <point x="288" y="108"/>
-      <point x="520" y="-12"/>
-      <point x="704" y="-12" type="curve" smooth="yes"/>
-      <point x="800" y="-12"/>
-      <point x="816" y="-8"/>
-      <point x="856" y="4" type="curve"/>
-      <point x="856" y="220" type="line"/>
-      <point x="816" y="216"/>
-      <point x="804" y="212"/>
-      <point x="764" y="212" type="curve" smooth="yes"/>
-      <point x="676" y="212"/>
-      <point x="524" y="216"/>
+      <point x="504" y="-20"/>
+      <point x="704" y="-20" type="curve" smooth="yes"/>
+      <point x="792" y="-20"/>
+      <point x="848" y="-4"/>
+      <point x="880" y="8" type="curve"/>
+      <point x="832" y="220" type="line"/>
+      <point x="812" y="216"/>
+      <point x="780" y="208"/>
+      <point x="728" y="208" type="curve" smooth="yes"/>
+      <point x="624" y="208"/>
+      <point x="524" y="240"/>
       <point x="524" y="440" type="curve"/>
       <point x="524" y="1864" type="line"/>
     </contour>
@@ -89,7 +89,7 @@
                 <integer>0</integer>
                 <integer>0</integer>
                 <integer>1</integer>
-                <integer>-40</integer>
+                <integer>-24</integer>
                 <integer>0</integer>
               </array>
             </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/tturn.glif b/src/Inter-UI-Regular.ufo/glyphs/tturn.glif
index a1c109344..60d51dbf7 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/tturn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/tturn.glif
@@ -3,6 +3,7 @@
   <advance width="992.0"/>
   <unicode hex="0287"/>
   <outline>
+    <component base="t" xScale="-1.0" yScale="-1.0" xOffset="992" yOffset="1540"/>
     <contour>
       <point x="360" y="2200" type="move" name="top"/>
     </contour>
@@ -12,7 +13,6 @@
     <contour>
       <point x="964" y="2200" type="move" name="top0315"/>
     </contour>
-    <component base="t" xScale="-1.0" yScale="-1.0" xOffset="992" yOffset="1540"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/kerning.plist b/src/Inter-UI-Regular.ufo/kerning.plist
index f2815a1df..5154cd0cf 100644
--- a/src/Inter-UI-Regular.ufo/kerning.plist
+++ b/src/Inter-UI-Regular.ufo/kerning.plist
@@ -2285,7 +2285,7 @@
 		<key>@KERN_RIGHT_J</key>
 		<integer>-166</integer>
 		<key>@KERN_RIGHT_Y</key>
-		<integer>41</integer>
+		<integer>64</integer>
 		<key>@KERN_RIGHT_a</key>
 		<integer>-42</integer>
 		<key>@KERN_RIGHT_c</key>