diff --git a/src/Interface-Bold.ufo/glyphs/A_.glif b/src/Interface-Bold.ufo/glyphs/A_.glif
index f6f4fcd3c..68da2ad75 100644
--- a/src/Interface-Bold.ufo/glyphs/A_.glif
+++ b/src/Interface-Bold.ufo/glyphs/A_.glif
@@ -4,7 +4,14 @@
   <unicode hex="0041"/>
   <outline>
     <contour>
-      <point x="1028.0" y="2200.0" type="move" name="top"/>
+      <point x="1468" y="748" type="line"/>
+      <point x="428" y="748" type="line"/>
+      <point x="428" y="376" type="line"/>
+      <point x="1468" y="376" type="line"/>
+    </contour>
+    <component base="V" yScale="-1" yOffset="2004"/>
+    <contour>
+      <point x="1024" y="2200" type="move" name="top"/>
     </contour>
     <contour>
       <point x="1032.0" y="12.0" type="move" name="bottom"/>
@@ -27,13 +34,6 @@
     <contour>
       <point x="1980.0" y="2200.0" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1468" y="748" type="line"/>
-      <point x="428" y="748" type="line"/>
-      <point x="428" y="376" type="line"/>
-      <point x="1468" y="376" type="line"/>
-    </contour>
-    <component base="V" yScale="-1" yOffset="2004"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/C_.glif b/src/Interface-Bold.ufo/glyphs/C_.glif
index 8bd02bd66..e73cf07a9 100644
--- a/src/Interface-Bold.ufo/glyphs/C_.glif
+++ b/src/Interface-Bold.ufo/glyphs/C_.glif
@@ -3,21 +3,6 @@
   <advance width="1920"/>
   <unicode hex="0043"/>
   <outline>
-    <contour>
-      <point x="1040.0" y="2200.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1036.0" y="0.0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1936.0" y="2200.0" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1936.0" y="-560.0" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1936.0" y="2200.0" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1360" y="680" type="line"/>
       <point x="1340" y="468"/>
@@ -46,6 +31,21 @@
       <point x="1796" y="260"/>
       <point x="1820" y="680" type="curve"/>
     </contour>
+    <contour>
+      <point x="1040.0" y="2200.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1036.0" y="0.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1936.0" y="2200.0" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1936.0" y="-560.0" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1936.0" y="2200.0" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/E_.glif b/src/Interface-Bold.ufo/glyphs/E_.glif
index 3d6b25d22..376c59595 100644
--- a/src/Interface-Bold.ufo/glyphs/E_.glif
+++ b/src/Interface-Bold.ufo/glyphs/E_.glif
@@ -3,27 +3,6 @@
   <advance width="1664"/>
   <unicode hex="0045"/>
   <outline>
-    <contour>
-      <point x="932.0" y="2200.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="940.0" y="16.0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="-88.0" y="2004.0" type="move" name="tonos"/>
-    </contour>
-    <contour>
-      <point x="1332.0" y="0.0" type="move" name="ogonek"/>
-    </contour>
-    <contour>
-      <point x="1632.0" y="2200.0" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1632.0" y="-560.0" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1632.0" y="2200.0" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1496" y="384" type="line"/>
       <point x="432" y="384" type="line"/>
@@ -48,6 +27,27 @@
       <point x="432" y="1620" type="line"/>
       <point x="1496" y="1620" type="line"/>
     </contour>
+    <contour>
+      <point x="832" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="940.0" y="16.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="-88.0" y="2004.0" type="move" name="tonos"/>
+    </contour>
+    <contour>
+      <point x="1332.0" y="0.0" type="move" name="ogonek"/>
+    </contour>
+    <contour>
+      <point x="1568" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1632.0" y="-560.0" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1568" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/F_.glif b/src/Interface-Bold.ufo/glyphs/F_.glif
index 22106dbc5..8b338c935 100644
--- a/src/Interface-Bold.ufo/glyphs/F_.glif
+++ b/src/Interface-Bold.ufo/glyphs/F_.glif
@@ -3,24 +3,6 @@
   <advance width="1664"/>
   <unicode hex="0046"/>
   <outline>
-    <contour>
-      <point x="524" y="400" type="move" name="cross"/>
-    </contour>
-    <contour>
-      <point x="952" y="2216" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="800" y="16" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1612" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1612" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1612" y="2216" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="592" y="2004" type="line"/>
       <point x="128" y="2004" type="line"/>
@@ -39,6 +21,24 @@
       <point x="460" y="1620" type="line"/>
       <point x="1496" y="1620" type="line"/>
     </contour>
+    <contour>
+      <point x="524" y="400" type="move" name="cross"/>
+    </contour>
+    <contour>
+      <point x="952" y="2216" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="800" y="16" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1612" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1612" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1612" y="2216" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/G_.glif b/src/Interface-Bold.ufo/glyphs/G_.glif
index cd91f8b2b..5c4f7bfa7 100644
--- a/src/Interface-Bold.ufo/glyphs/G_.glif
+++ b/src/Interface-Bold.ufo/glyphs/G_.glif
@@ -3,21 +3,6 @@
   <advance width="1920"/>
   <unicode hex="0047"/>
   <outline>
-    <contour>
-      <point x="1044.0" y="2200.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1072.0" y="0.0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1996.0" y="2200.0" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1996.0" y="-560.0" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1996.0" y="2200.0" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1800" y="1072" type="line"/>
       <point x="992" y="1072" type="line"/>
@@ -49,6 +34,21 @@
       <point x="1800" y="216"/>
       <point x="1800" y="704" type="curve"/>
     </contour>
+    <contour>
+      <point x="1044.0" y="2200.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1072.0" y="0.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1996.0" y="2200.0" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1996.0" y="-560.0" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1996.0" y="2200.0" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/OE__.glif b/src/Interface-Bold.ufo/glyphs/OE__.glif
index 59be4568b..098640986 100644
--- a/src/Interface-Bold.ufo/glyphs/OE__.glif
+++ b/src/Interface-Bold.ufo/glyphs/OE__.glif
@@ -3,21 +3,6 @@
   <advance width="2816"/>
   <unicode hex="0152"/>
   <outline>
-    <contour>
-      <point x="1384" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1384" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="2748" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="2748" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="2748" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="992" y="2032" type="curve" smooth="yes"/>
       <point x="484" y="2032"/>
@@ -49,6 +34,21 @@
       <point x="1128" y="2032"/>
     </contour>
     <component base="E" xOffset="1100"/>
+    <contour>
+      <point x="1384" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1384" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="2748" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="2748" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="2748" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/R_.glif b/src/Interface-Bold.ufo/glyphs/R_.glif
index ec2cb0d01..0216bcf90 100644
--- a/src/Interface-Bold.ufo/glyphs/R_.glif
+++ b/src/Interface-Bold.ufo/glyphs/R_.glif
@@ -3,21 +3,6 @@
   <advance width="1792"/>
   <unicode hex="0052"/>
   <outline>
-    <contour>
-      <point x="884" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="908" y="16" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1892" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1892" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1892" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="128" y="2004" type="line" name="hr00"/>
       <point x="128" y="0" type="line"/>
@@ -48,6 +33,21 @@
       <point x="1272" y="888" type="line"/>
       <point x="784" y="888" type="line"/>
     </contour>
+    <contour>
+      <point x="884" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="908" y="16" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1892" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1892" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1892" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/U_.glif b/src/Interface-Bold.ufo/glyphs/U_.glif
index a4003c908..3ec987d82 100644
--- a/src/Interface-Bold.ufo/glyphs/U_.glif
+++ b/src/Interface-Bold.ufo/glyphs/U_.glif
@@ -3,27 +3,6 @@
   <advance width="1920"/>
   <unicode hex="0055"/>
   <outline>
-    <contour>
-      <point x="892" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="892" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1116" y="0" type="move" name="right"/>
-    </contour>
-    <contour>
-      <point x="1396" y="104" type="move" name="ogonek"/>
-    </contour>
-    <contour>
-      <point x="1832" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1832" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1832" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1328" y="2004" type="line"/>
       <point x="1328" y="696" type="line" smooth="yes"/>
@@ -44,6 +23,27 @@
       <point x="1792" y="696" type="curve"/>
       <point x="1792" y="2004" type="line"/>
     </contour>
+    <contour>
+      <point x="960" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="892" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1116" y="0" type="move" name="right"/>
+    </contour>
+    <contour>
+      <point x="1396" y="104" type="move" name="ogonek"/>
+    </contour>
+    <contour>
+      <point x="1848" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1832" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1848" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/Uhorn_.glif b/src/Interface-Bold.ufo/glyphs/Uhorn_.glif
index 90cfc888c..8971ff18d 100644
--- a/src/Interface-Bold.ufo/glyphs/Uhorn_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Uhorn_.glif
@@ -3,15 +3,6 @@
   <advance width="2048"/>
   <unicode hex="01AF"/>
   <outline>
-    <contour>
-      <point x="816" y="2216" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="816" y="-16" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1844" y="2216" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1800" y="2112" type="line"/>
       <point x="1800" y="1848"/>
@@ -23,6 +14,15 @@
       <point x="2076" y="2112" type="curve"/>
     </contour>
     <component base="U" xOffset="-176"/>
+    <contour>
+      <point x="816" y="2216" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="816" y="-16" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1844" y="2216" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/Y_.glif b/src/Interface-Bold.ufo/glyphs/Y_.glif
index 2377438b1..abd792a61 100644
--- a/src/Interface-Bold.ufo/glyphs/Y_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Y_.glif
@@ -4,7 +4,18 @@
   <unicode hex="0059"/>
   <outline>
     <contour>
-      <point x="896" y="2200" type="move" name="top"/>
+      <point x="592" y="2004" type="line"/>
+      <point x="92" y="2004" type="line"/>
+      <point x="792" y="720" type="line"/>
+      <point x="792" y="0" type="line"/>
+      <point x="1256" y="0" type="line"/>
+      <point x="1256" y="720" type="line"/>
+      <point x="1956" y="2004" type="line"/>
+      <point x="1456" y="2004" type="line"/>
+      <point x="1024" y="1132" type="line"/>
+    </contour>
+    <contour>
+      <point x="1024" y="2200" type="move" name="top"/>
     </contour>
     <contour>
       <point x="892" y="64" type="move" name="bottom"/>
@@ -16,24 +27,13 @@
       <point x="-84" y="2000" type="move" name="tonos"/>
     </contour>
     <contour>
-      <point x="1776" y="2200" type="move" name="top_dd"/>
+      <point x="1920" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
       <point x="1776" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1776" y="2200" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="592" y="2004" type="line"/>
-      <point x="92" y="2004" type="line"/>
-      <point x="792" y="720" type="line"/>
-      <point x="792" y="0" type="line"/>
-      <point x="1256" y="0" type="line"/>
-      <point x="1256" y="720" type="line"/>
-      <point x="1956" y="2004" type="line"/>
-      <point x="1456" y="2004" type="line"/>
-      <point x="1024" y="1132" type="line"/>
+      <point x="1920" y="2200" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Interface-Bold.ufo/glyphs/a.glif b/src/Interface-Bold.ufo/glyphs/a.glif
index f18b471c5..4ec51657b 100644
--- a/src/Interface-Bold.ufo/glyphs/a.glif
+++ b/src/Interface-Bold.ufo/glyphs/a.glif
@@ -3,30 +3,6 @@
   <advance width="1536"/>
   <unicode hex="0061"/>
   <outline>
-    <contour>
-      <point x="760" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="660" y="32" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1372" y="0" type="move" name="ogonek"/>
-    </contour>
-    <contour>
-      <point x="968" y="1776" type="move" name="rhalfring"/>
-    </contour>
-    <contour>
-      <point x="1520" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1520" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1196" y="900" type="move" name="rhotichook"/>
-    </contour>
-    <contour>
-      <point x="1520" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="964" y="0" type="line"/>
       <point x="1384" y="0" type="line"/>
@@ -70,6 +46,30 @@
       <point x="604" y="660"/>
       <point x="788" y="660" type="curve" smooth="yes"/>
     </contour>
+    <contour>
+      <point x="768" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="660" y="32" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1372" y="0" type="move" name="ogonek"/>
+    </contour>
+    <contour>
+      <point x="976" y="1776" type="move" name="rhalfring"/>
+    </contour>
+    <contour>
+      <point x="1520" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1520" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1196" y="900" type="move" name="rhotichook"/>
+    </contour>
+    <contour>
+      <point x="1528" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/a_uni02DE__.glif b/src/Interface-Bold.ufo/glyphs/a_uni02DE__.glif
index 4b95ca4b3..60ffabb8c 100644
--- a/src/Interface-Bold.ufo/glyphs/a_uni02DE__.glif
+++ b/src/Interface-Bold.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/Interface-Bold.ufo/glyphs/c.glif b/src/Interface-Bold.ufo/glyphs/c.glif
index 25382c582..49421b156 100644
--- a/src/Interface-Bold.ufo/glyphs/c.glif
+++ b/src/Interface-Bold.ufo/glyphs/c.glif
@@ -3,24 +3,6 @@
   <advance width="1536"/>
   <unicode hex="0063"/>
   <outline>
-    <contour>
-      <point x="768.0" y="1776.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="804.0" y="0.0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="768.0" y="1776.0" type="move" name="marktop"/>
-    </contour>
-    <contour>
-      <point x="1496.0" y="2200.0" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1496.0" y="-560.0" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1496.0" y="1776.0" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1460" y="920" type="line"/>
       <point x="1452" y="1248"/>
@@ -49,6 +31,24 @@
       <point x="1032" y="1036"/>
       <point x="1044" y="920" type="curve"/>
     </contour>
+    <contour>
+      <point x="768.0" y="1776.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="804.0" y="0.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="768.0" y="1776.0" type="move" name="marktop"/>
+    </contour>
+    <contour>
+      <point x="1496.0" y="2200.0" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1496.0" y="-560.0" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1496.0" y="1776.0" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/cheabkhasiancyrillic.glif b/src/Interface-Bold.ufo/glyphs/cheabkhasiancyrillic.glif
index b4c8824d8..f275dfc02 100644
--- a/src/Interface-Bold.ufo/glyphs/cheabkhasiancyrillic.glif
+++ b/src/Interface-Bold.ufo/glyphs/cheabkhasiancyrillic.glif
@@ -3,9 +3,6 @@
   <advance width="1792"/>
   <unicode hex="04BD"/>
   <outline>
-    <contour>
-      <point x="1096" y="20" type="move" name="bottom"/>
-    </contour>
     <contour>
       <point x="-4" y="1188" type="line"/>
       <point x="-4" y="828"/>
@@ -17,6 +14,9 @@
       <point x="256" y="1188" type="curve"/>
     </contour>
     <component base="e" xOffset="328"/>
+    <contour>
+      <point x="1096" y="20" type="move" name="bottom"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/diaeresistonosnosp.glif b/src/Interface-Bold.ufo/glyphs/diaeresistonosnosp.glif
index 7db79b352..4959f2da7 100644
--- a/src/Interface-Bold.ufo/glyphs/diaeresistonosnosp.glif
+++ b/src/Interface-Bold.ufo/glyphs/diaeresistonosnosp.glif
@@ -3,13 +3,13 @@
   <advance width="0"/>
   <unicode hex="0344"/>
   <outline>
+    <component base="dieresistonos" xOffset="-1572"/>
     <contour>
       <point x="-813" y="1774" type="move" name="_marktop"/>
     </contour>
     <contour>
       <point x="-813" y="2571" type="move" name="mkmktop"/>
     </contour>
-    <component base="dieresistonos" xOffset="-1572"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/dieresis.glif b/src/Interface-Bold.ufo/glyphs/dieresis.glif
index 2d974b6fe..7c50acb03 100644
--- a/src/Interface-Bold.ufo/glyphs/dieresis.glif
+++ b/src/Interface-Bold.ufo/glyphs/dieresis.glif
@@ -3,12 +3,6 @@
   <advance width="1280"/>
   <unicode hex="00A8"/>
   <outline>
-    <contour>
-      <point x="644" y="1776" type="move" name="_top"/>
-    </contour>
-    <contour>
-      <point x="644" y="2216" type="move" name="mkmktop_acc"/>
-    </contour>
     <contour>
       <point x="96" y="1876" type="curve" smooth="yes"/>
       <point x="96" y="1776"/>
@@ -37,6 +31,12 @@
       <point x="876" y="2060"/>
       <point x="796" y="1980"/>
     </contour>
+    <contour>
+      <point x="640" y="1776" type="move" name="_top"/>
+    </contour>
+    <contour>
+      <point x="644" y="2216" type="move" name="mkmktop_acc"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/dieresisnosp.glif b/src/Interface-Bold.ufo/glyphs/dieresisnosp.glif
index 346b72023..0e51624e1 100644
--- a/src/Interface-Bold.ufo/glyphs/dieresisnosp.glif
+++ b/src/Interface-Bold.ufo/glyphs/dieresisnosp.glif
@@ -3,6 +3,7 @@
   <advance width="0"/>
   <unicode hex="0308"/>
   <outline>
+    <component base="dieresis" xOffset="-1512"/>
     <contour>
       <point x="-868" y="1774" type="move" name="_marktop"/>
     </contour>
@@ -12,7 +13,6 @@
     <contour>
       <point x="-868" y="1877" type="move" name="parent_top"/>
     </contour>
-    <component base="dieresis" xOffset="-1512"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/dieresistonos.glif b/src/Interface-Bold.ufo/glyphs/dieresistonos.glif
index 631bed319..f092739a9 100644
--- a/src/Interface-Bold.ufo/glyphs/dieresistonos.glif
+++ b/src/Interface-Bold.ufo/glyphs/dieresistonos.glif
@@ -4,13 +4,10 @@
   <unicode hex="0385"/>
   <outline>
     <contour>
-      <point x="752" y="1776" type="move" name="_top"/>
-    </contour>
-    <contour>
-      <point x="648" y="1960" type="line"/>
-      <point x="856" y="1960" type="line"/>
-      <point x="1092" y="2448" type="line"/>
-      <point x="704" y="2448" type="line"/>
+      <point x="652" y="1960" type="line"/>
+      <point x="860" y="1960" type="line"/>
+      <point x="1096" y="2448" type="line"/>
+      <point x="708" y="2448" type="line"/>
     </contour>
     <contour>
       <point x="132" y="1876" type="curve" smooth="yes"/>
@@ -40,6 +37,9 @@
       <point x="1088" y="2060"/>
       <point x="1000" y="1980"/>
     </contour>
+    <contour>
+      <point x="768" y="1776" type="move" name="_top"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/e.glif b/src/Interface-Bold.ufo/glyphs/e.glif
index 2de7c6d92..73d380f1b 100644
--- a/src/Interface-Bold.ufo/glyphs/e.glif
+++ b/src/Interface-Bold.ufo/glyphs/e.glif
@@ -3,27 +3,6 @@
   <advance width="1536"/>
   <unicode hex="0065"/>
   <outline>
-    <contour>
-      <point x="728.0" y="1776.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="772.0" y="0.0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1188.0" y="48.0" type="move" name="ogonek"/>
-    </contour>
-    <contour>
-      <point x="1520.0" y="2200.0" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1520.0" y="-560.0" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1256.0" y="900.0" type="move" name="rhotichook"/>
-    </contour>
-    <contour>
-      <point x="1520.0" y="1776.0" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="836" y="-28" type="curve"/>
       <point x="1124" y="-28"/>
@@ -55,6 +34,27 @@
       <point x="80.0" y="304.0"/>
       <point x="360" y="-28"/>
     </contour>
+    <contour>
+      <point x="768" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="772.0" y="0.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1188.0" y="48.0" type="move" name="ogonek"/>
+    </contour>
+    <contour>
+      <point x="1520.0" y="2200.0" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1520.0" y="-560.0" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1256.0" y="900.0" type="move" name="rhotichook"/>
+    </contour>
+    <contour>
+      <point x="1520.0" y="1776.0" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/fitacyrillic.glif b/src/Interface-Bold.ufo/glyphs/fitacyrillic.glif
index 5bc021b3e..65e73c88f 100644
--- a/src/Interface-Bold.ufo/glyphs/fitacyrillic.glif
+++ b/src/Interface-Bold.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/Interface-Bold.ufo/glyphs/iucyrillic.glif b/src/Interface-Bold.ufo/glyphs/iucyrillic.glif
index 25b363b40..a3898623d 100644
--- a/src/Interface-Bold.ufo/glyphs/iucyrillic.glif
+++ b/src/Interface-Bold.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/Interface-Bold.ufo/glyphs/o.glif b/src/Interface-Bold.ufo/glyphs/o.glif
index 605372142..dfb115440 100644
--- a/src/Interface-Bold.ufo/glyphs/o.glif
+++ b/src/Interface-Bold.ufo/glyphs/o.glif
@@ -3,24 +3,6 @@
   <advance width="1536"/>
   <unicode hex="006F"/>
   <outline>
-    <contour>
-      <point x="896.0" y="1776.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="896.0" y="-16.0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1688.0" y="2200.0" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1688.0" y="-560.0" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1428.0" y="900.0" type="move" name="rhotichook"/>
-    </contour>
-    <contour>
-      <point x="1688.0" y="1776.0" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="772" y="332" type="curve" smooth="yes"/>
       <point x="636" y="332"/>
@@ -49,6 +31,24 @@
       <point x="76" y="200"/>
       <point x="432" y="-24"/>
     </contour>
+    <contour>
+      <point x="768" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="896.0" y="-16.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1560" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1688.0" y="-560.0" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1428.0" y="900.0" type="move" name="rhotichook"/>
+    </contour>
+    <contour>
+      <point x="1560" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/o_uni02DE__.glif b/src/Interface-Bold.ufo/glyphs/o_uni02DE__.glif
index e25362396..be9dfa7f5 100644
--- a/src/Interface-Bold.ufo/glyphs/o_uni02DE__.glif
+++ b/src/Interface-Bold.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/Interface-Bold.ufo/glyphs/ohorn.glif b/src/Interface-Bold.ufo/glyphs/ohorn.glif
index 181694b01..fb2bc5fcd 100644
--- a/src/Interface-Bold.ufo/glyphs/ohorn.glif
+++ b/src/Interface-Bold.ufo/glyphs/ohorn.glif
@@ -3,15 +3,6 @@
   <advance width="1792"/>
   <unicode hex="01A1"/>
   <outline>
-    <contour>
-      <point x="772" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="772" y="-16" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1624" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1384" y="1620" type="line"/>
       <point x="1384" y="1388"/>
@@ -23,6 +14,15 @@
       <point x="1636" y="1620" type="curve"/>
     </contour>
     <component base="o" xOffset="-24"/>
+    <contour>
+      <point x="772" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="772" y="-16" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1624" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/omegaroundcyrillic.glif b/src/Interface-Bold.ufo/glyphs/omegaroundcyrillic.glif
index e4787b0b5..39c307065 100644
--- a/src/Interface-Bold.ufo/glyphs/omegaroundcyrillic.glif
+++ b/src/Interface-Bold.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/Interface-Bold.ufo/glyphs/oslash.glif b/src/Interface-Bold.ufo/glyphs/oslash.glif
index 7655dd789..d873806a6 100644
--- a/src/Interface-Bold.ufo/glyphs/oslash.glif
+++ b/src/Interface-Bold.ufo/glyphs/oslash.glif
@@ -3,6 +3,13 @@
   <advance width="1792"/>
   <unicode hex="00F8"/>
   <outline>
+    <contour>
+      <point x="1368" y="1676" type="line"/>
+      <point x="1132" y="1676" type="line"/>
+      <point x="220" y="-200" type="line"/>
+      <point x="456" y="-200" type="line"/>
+    </contour>
+    <component base="o" xOffset="-4"/>
     <contour>
       <point x="740" y="1768" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="1584" y="1768" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1368" y="1676" type="line"/>
-      <point x="1132" y="1676" type="line"/>
-      <point x="220" y="-200" type="line"/>
-      <point x="456" y="-200" type="line"/>
-    </contour>
-    <component base="o" xOffset="-4"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/uni0244.glif b/src/Interface-Bold.ufo/glyphs/uni0244.glif
index 064f4c062..0cfd42fdb 100644
--- a/src/Interface-Bold.ufo/glyphs/uni0244.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni0244.glif
@@ -3,6 +3,13 @@
   <advance width="2304"/>
   <unicode hex="0244"/>
   <outline>
+    <contour>
+      <point x="2204" y="1160" type="line"/>
+      <point x="100" y="1160" type="line"/>
+      <point x="100" y="896" type="line"/>
+      <point x="2204" y="896" type="line"/>
+    </contour>
+    <component base="U" xOffset="220"/>
     <contour>
       <point x="1152" y="2200" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="2260" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="2204" y="1160" type="line"/>
-      <point x="100" y="1160" type="line"/>
-      <point x="100" y="896" type="line"/>
-      <point x="2204" y="896" type="line"/>
-    </contour>
-    <component base="U" xOffset="220"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/uni024E_.glif b/src/Interface-Bold.ufo/glyphs/uni024E_.glif
index cf7af1df8..4f1f41f28 100644
--- a/src/Interface-Bold.ufo/glyphs/uni024E_.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni024E_.glif
@@ -3,6 +3,13 @@
   <advance width="2304"/>
   <unicode hex="024E"/>
   <outline>
+    <contour>
+      <point x="2128" y="1620" type="line"/>
+      <point x="176" y="1620" type="line"/>
+      <point x="176" y="1388" type="line"/>
+      <point x="2128" y="1388" type="line"/>
+    </contour>
+    <component base="Y" xOffset="272"/>
     <contour>
       <point x="1152" y="2200" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="2184" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="2128" y="1620" type="line"/>
-      <point x="176" y="1620" type="line"/>
-      <point x="176" y="1388" type="line"/>
-      <point x="2128" y="1388" type="line"/>
-    </contour>
-    <component base="Y" xOffset="272"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/uni1D6B__.glif b/src/Interface-Bold.ufo/glyphs/uni1D6B__.glif
index 3d19b4384..28c9fa66b 100644
--- a/src/Interface-Bold.ufo/glyphs/uni1D6B__.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni1D6B__.glif
@@ -3,15 +3,6 @@
   <advance width="2560"/>
   <unicode hex="1D6B"/>
   <outline>
-    <contour>
-      <point x="1160" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1160" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="2476" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1036" y="364" type="line"/>
       <point x="1092" y="336" type="line"/>
@@ -38,6 +29,15 @@
       <point x="1228" y="696" type="curve"/>
     </contour>
     <component base="e" xOffset="948"/>
+    <contour>
+      <point x="1160" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1160" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="2476" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/groups.plist b/src/Interface-Bold.ufo/groups.plist
index bc4a2e953..3117c4f12 100644
--- a/src/Interface-Bold.ufo/groups.plist
+++ b/src/Interface-Bold.ufo/groups.plist
@@ -680,6 +680,7 @@
 		<string>P</string>
 		<string>I</string>
 		<string>K</string>
+		<string>k</string>
 		<string>Idieresisacute</string>
 		<string>Hcedilla</string>
 		<string>B</string>
diff --git a/src/Interface-Bold.ufo/kerning.plist b/src/Interface-Bold.ufo/kerning.plist
index ac37e636a..74b8aca1d 100644
--- a/src/Interface-Bold.ufo/kerning.plist
+++ b/src/Interface-Bold.ufo/kerning.plist
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>@KERN_LEFT_A</key>
 	<dict>
 		<key>@KERN_RIGHT_C</key>
-		<integer>-89</integer>
+		<integer>-240</integer>
 		<key>@KERN_RIGHT_T</key>
 		<integer>-212</integer>
 		<key>@KERN_RIGHT_U</key>
@@ -233,6 +233,8 @@
 		<integer>-69</integer>
 		<key>@KERN_RIGHT_a</key>
 		<integer>-15</integer>
+		<key>@KERN_RIGHT_c</key>
+		<integer>-64</integer>
 		<key>@KERN_RIGHT_comma</key>
 		<integer>-138</integer>
 		<key>@KERN_RIGHT_dagger</key>
@@ -390,7 +392,7 @@
 	<key>@KERN_LEFT_F</key>
 	<dict>
 		<key>@KERN_RIGHT_A</key>
-		<integer>-111</integer>
+		<integer>-416</integer>
 		<key>@KERN_RIGHT_AE</key>
 		<integer>-178</integer>
 		<key>@KERN_RIGHT_C</key>
@@ -1722,6 +1724,8 @@
 		<integer>-40</integer>
 		<key>@KERN_RIGHT_quotedblleft</key>
 		<integer>-63</integer>
+		<key>@KERN_RIGHT_t</key>
+		<integer>-16</integer>
 		<key>@KERN_RIGHT_v</key>
 		<integer>-42</integer>
 		<key>@KERN_RIGHT_w</key>
@@ -3836,6 +3840,8 @@
 	<dict>
 		<key>@KERN_RIGHT_A</key>
 		<integer>-42</integer>
+		<key>@KERN_RIGHT_B</key>
+		<integer>-16</integer>
 		<key>@KERN_RIGHT_C</key>
 		<integer>-8</integer>
 		<key>@KERN_RIGHT_T</key>
diff --git a/src/Interface-Regular.ufo/glyphs/A_.glif b/src/Interface-Regular.ufo/glyphs/A_.glif
index 986151644..6c9074f06 100644
--- a/src/Interface-Regular.ufo/glyphs/A_.glif
+++ b/src/Interface-Regular.ufo/glyphs/A_.glif
@@ -4,7 +4,14 @@
   <unicode hex="0041"/>
   <outline>
     <contour>
-      <point x="880" y="2304" type="move" name="top"/>
+      <point x="1412" y="768" type="line"/>
+      <point x="400" y="768" type="line"/>
+      <point x="400" y="548" type="line"/>
+      <point x="1412" y="548" type="line"/>
+    </contour>
+    <component base="V" yScale="-1" yOffset="2048"/>
+    <contour>
+      <point x="896" y="2304" type="move" name="top"/>
     </contour>
     <contour>
       <point x="936" y="0" type="move" name="bottom"/>
@@ -27,13 +34,6 @@
     <contour>
       <point x="1840" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1412" y="768" type="line"/>
-      <point x="400" y="768" type="line"/>
-      <point x="400" y="548" type="line"/>
-      <point x="1412" y="548" type="line"/>
-    </contour>
-    <component base="V" yScale="-1" yOffset="2048"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/E_.glif b/src/Interface-Regular.ufo/glyphs/E_.glif
index 89a9aa385..31ad15bba 100644
--- a/src/Interface-Regular.ufo/glyphs/E_.glif
+++ b/src/Interface-Regular.ufo/glyphs/E_.glif
@@ -3,27 +3,6 @@
   <advance width="1652"/>
   <unicode hex="0045"/>
   <outline>
-    <contour>
-      <point x="896" y="2304" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="880" y="16" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="0" y="2048" type="move" name="tonos"/>
-    </contour>
-    <contour>
-      <point x="1432" y="0" type="move" name="ogonek"/>
-    </contour>
-    <contour>
-      <point x="1628" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1628" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1628" y="2216" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1492" y="220" type="line"/>
       <point x="424" y="220" type="line"/>
@@ -48,6 +27,27 @@
       <point x="424" y="1828" type="line"/>
       <point x="1476" y="1828" type="line"/>
     </contour>
+    <contour>
+      <point x="880" y="2304" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="880" y="16" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="0" y="2048" type="move" name="tonos"/>
+    </contour>
+    <contour>
+      <point x="1432" y="0" type="move" name="ogonek"/>
+    </contour>
+    <contour>
+      <point x="1628" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1628" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1628" y="2216" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/I_.glif b/src/Interface-Regular.ufo/glyphs/I_.glif
index 55a7d5d30..337b96103 100644
--- a/src/Interface-Regular.ufo/glyphs/I_.glif
+++ b/src/Interface-Regular.ufo/glyphs/I_.glif
@@ -4,7 +4,13 @@
   <unicode hex="0049"/>
   <outline>
     <contour>
-      <point x="368" y="2304" type="move" name="top"/>
+      <point x="472" y="2048" type="line"/>
+      <point x="224" y="2048" type="line"/>
+      <point x="224" y="0" type="line"/>
+      <point x="472" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="348" y="2304" type="move" name="top"/>
     </contour>
     <contour>
       <point x="368" y="16" type="move" name="bottom"/>
@@ -27,12 +33,6 @@
     <contour>
       <point x="756" y="2216" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="472" y="2048" type="line"/>
-      <point x="224" y="2048" type="line"/>
-      <point x="224" y="0" type="line"/>
-      <point x="472" y="0" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/Ibar_.glif b/src/Interface-Regular.ufo/glyphs/Ibar_.glif
index dbb07c34c..ffd16692d 100644
--- a/src/Interface-Regular.ufo/glyphs/Ibar_.glif
+++ b/src/Interface-Regular.ufo/glyphs/Ibar_.glif
@@ -3,6 +3,8 @@
   <advance width="992"/>
   <unicode hex="0197"/>
   <outline>
+    <component base="I" xOffset="104"/>
+    <component base="crossbar" xOffset="-148"/>
     <contour>
       <point x="496" y="2216" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="496" y="16" type="move" name="bottom"/>
     </contour>
-    <component base="I" xOffset="104"/>
-    <component base="crossbar" xOffset="-148"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/Idieresisacute_.glif b/src/Interface-Regular.ufo/glyphs/Idieresisacute_.glif
index ea791d549..c6da15595 100644
--- a/src/Interface-Regular.ufo/glyphs/Idieresisacute_.glif
+++ b/src/Interface-Regular.ufo/glyphs/Idieresisacute_.glif
@@ -3,6 +3,8 @@
   <advance width="1024"/>
   <unicode hex="1E2E"/>
   <outline>
+    <component base="I" xOffset="148"/>
+    <component base="dieresisacutecomb" xOffset="1320" yOffset="480"/>
     <contour>
       <point x="648" y="0" type="move" name="right"/>
     </contour>
@@ -27,8 +29,6 @@
     <contour>
       <point x="896" y="-560" type="move" name="bottom_dd"/>
     </contour>
-    <component base="I" xOffset="148"/>
-    <component base="dieresisacutecomb" xOffset="1320" yOffset="480"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/Itildebelow_.glif b/src/Interface-Regular.ufo/glyphs/Itildebelow_.glif
index 2d3126a4d..c0b6d3def 100644
--- a/src/Interface-Regular.ufo/glyphs/Itildebelow_.glif
+++ b/src/Interface-Regular.ufo/glyphs/Itildebelow_.glif
@@ -3,6 +3,8 @@
   <advance width="1004"/>
   <unicode hex="1E2C"/>
   <outline>
+    <component base="I" xOffset="144"/>
+    <component base="tilde" xOffset="-132" yOffset="-2216"/>
     <contour>
       <point x="684" y="0" type="move" name="right"/>
     </contour>
@@ -30,8 +32,6 @@
     <contour>
       <point x="932" y="-560" type="move" name="bottom_dd"/>
     </contour>
-    <component base="I" xOffset="144"/>
-    <component base="tilde" xOffset="-132" yOffset="-2216"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/OE__.glif b/src/Interface-Regular.ufo/glyphs/OE__.glif
index 243822bb3..25a6a8158 100644
--- a/src/Interface-Regular.ufo/glyphs/OE__.glif
+++ b/src/Interface-Regular.ufo/glyphs/OE__.glif
@@ -3,21 +3,6 @@
   <advance width="2636"/>
   <unicode hex="0152"/>
   <outline>
-    <contour>
-      <point x="1340" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1340" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="2728" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="2728" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="2728" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="944" y="2032" type="curve" smooth="yes"/>
       <point x="484" y="2032"/>
@@ -49,6 +34,21 @@
       <point x="1084" y="2032"/>
     </contour>
     <component base="E" xOffset="1004"/>
+    <contour>
+      <point x="1340" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1340" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="2728" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="2728" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="2728" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/O_.glif b/src/Interface-Regular.ufo/glyphs/O_.glif
index 2d392e290..1f249a9f5 100644
--- a/src/Interface-Regular.ufo/glyphs/O_.glif
+++ b/src/Interface-Regular.ufo/glyphs/O_.glif
@@ -3,24 +3,6 @@
   <advance width="2032"/>
   <unicode hex="004F"/>
   <outline>
-    <contour>
-      <point x="1008" y="2304" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1024" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="176" y="2048" type="move" name="tonos"/>
-    </contour>
-    <contour>
-      <point x="1928" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1992" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1928" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1856" y="1024" type="curve"/>
       <point x="1856" y="1672"/>
@@ -49,6 +31,24 @@
       <point x="1360" y="1856"/>
       <point x="1616" y="1536"/>
     </contour>
+    <contour>
+      <point x="1012" y="2304" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1024" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="176" y="2048" type="move" name="tonos"/>
+    </contour>
+    <contour>
+      <point x="1928" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1992" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1928" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/Ohorn_.glif b/src/Interface-Regular.ufo/glyphs/Ohorn_.glif
index 5d9c832bb..dd6cfd404 100644
--- a/src/Interface-Regular.ufo/glyphs/Ohorn_.glif
+++ b/src/Interface-Regular.ufo/glyphs/Ohorn_.glif
@@ -3,15 +3,6 @@
   <advance width="2032"/>
   <unicode hex="01A0"/>
   <outline>
-    <contour>
-      <point x="992" y="2192" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="980" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1956" y="2192" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1756" y="2196" type="line"/>
       <point x="1756" y="1964"/>
@@ -23,6 +14,15 @@
       <point x="2004" y="2196" type="curve"/>
     </contour>
     <component base="O"/>
+    <contour>
+      <point x="992" y="2192" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="980" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1956" y="2192" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/Oslash_.glif b/src/Interface-Regular.ufo/glyphs/Oslash_.glif
index f4dae5462..ef31903a3 100644
--- a/src/Interface-Regular.ufo/glyphs/Oslash_.glif
+++ b/src/Interface-Regular.ufo/glyphs/Oslash_.glif
@@ -3,6 +3,13 @@
   <advance width="2032"/>
   <unicode hex="00D8"/>
   <outline>
+    <contour>
+      <point x="1812" y="2132" type="line"/>
+      <point x="1608" y="2132" type="line"/>
+      <point x="224" y="-88" type="line"/>
+      <point x="432" y="-88" type="line"/>
+    </contour>
+    <component base="O"/>
     <contour>
       <point x="1004" y="2304" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="1964" y="2304" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1812" y="2132" type="line"/>
-      <point x="1608" y="2132" type="line"/>
-      <point x="224" y="-88" type="line"/>
-      <point x="432" y="-88" type="line"/>
-    </contour>
-    <component base="O"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/Q_.glif b/src/Interface-Regular.ufo/glyphs/Q_.glif
index f3ed1a49b..4945000bd 100644
--- a/src/Interface-Regular.ufo/glyphs/Q_.glif
+++ b/src/Interface-Regular.ufo/glyphs/Q_.glif
@@ -3,6 +3,13 @@
   <advance width="2032"/>
   <unicode hex="0051"/>
   <outline>
+    <contour>
+      <point x="1204" y="612" type="line"/>
+      <point x="996" y="460" type="line"/>
+      <point x="1552" y="-272" type="line"/>
+      <point x="1740" y="-124" type="line"/>
+    </contour>
+    <component base="O"/>
     <contour>
       <point x="964" y="2200" type="move" name="top"/>
     </contour>
@@ -18,13 +25,6 @@
     <contour>
       <point x="1944" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1204" y="612" type="line"/>
-      <point x="996" y="460" type="line"/>
-      <point x="1552" y="-272" type="line"/>
-      <point x="1740" y="-124" type="line"/>
-    </contour>
-    <component base="O"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/U_.glif b/src/Interface-Regular.ufo/glyphs/U_.glif
index c3952f213..859c1bd80 100644
--- a/src/Interface-Regular.ufo/glyphs/U_.glif
+++ b/src/Interface-Regular.ufo/glyphs/U_.glif
@@ -3,27 +3,6 @@
   <advance width="2068"/>
   <unicode hex="0055"/>
   <outline>
-    <contour>
-      <point x="1024" y="2304" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="912" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1152" y="0" type="move" name="right"/>
-    </contour>
-    <contour>
-      <point x="1296" y="64" type="move" name="ogonek"/>
-    </contour>
-    <contour>
-      <point x="1820" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1820" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1820" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1580" y="2048" type="line"/>
       <point x="1580" y="700" type="line" smooth="yes"/>
@@ -44,6 +23,27 @@
       <point x="1828" y="700" type="curve"/>
       <point x="1828" y="2048" type="line"/>
     </contour>
+    <contour>
+      <point x="1036" y="2304" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="912.0" y="0.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1152.0" y="0.0" type="move" name="right"/>
+    </contour>
+    <contour>
+      <point x="1296.0" y="64.0" type="move" name="ogonek"/>
+    </contour>
+    <contour>
+      <point x="1820.0" y="2200.0" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1820.0" y="-560.0" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1820.0" y="2200.0" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/Uhorn_.glif b/src/Interface-Regular.ufo/glyphs/Uhorn_.glif
index f66a30272..c4487315c 100644
--- a/src/Interface-Regular.ufo/glyphs/Uhorn_.glif
+++ b/src/Interface-Regular.ufo/glyphs/Uhorn_.glif
@@ -3,15 +3,6 @@
   <advance width="2388"/>
   <unicode hex="01AF"/>
   <outline>
-    <contour>
-      <point x="960" y="2216" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="960" y="-16" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1968" y="2216" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="2060" y="2172" type="line"/>
       <point x="2060" y="1908"/>
@@ -23,6 +14,15 @@
       <point x="2292" y="2172" type="curve"/>
     </contour>
     <component base="U"/>
+    <contour>
+      <point x="960" y="2216" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="960" y="-16" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1968" y="2216" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/Y_.glif b/src/Interface-Regular.ufo/glyphs/Y_.glif
index 4b4a4f6d9..e4dc34160 100644
--- a/src/Interface-Regular.ufo/glyphs/Y_.glif
+++ b/src/Interface-Regular.ufo/glyphs/Y_.glif
@@ -4,7 +4,18 @@
   <unicode hex="0059"/>
   <outline>
     <contour>
-      <point x="816" y="2304" type="move" name="top"/>
+      <point x="328" y="2048" type="line"/>
+      <point x="64" y="2048" type="line"/>
+      <point x="708" y="748" type="line"/>
+      <point x="708" y="0" type="line"/>
+      <point x="956" y="0" type="line"/>
+      <point x="956" y="748" type="line"/>
+      <point x="1600" y="2048" type="line"/>
+      <point x="1336" y="2048" type="line"/>
+      <point x="832" y="1028" type="line"/>
+    </contour>
+    <contour>
+      <point x="832" y="2304" type="move" name="top"/>
     </contour>
     <contour>
       <point x="820" y="0" type="move" name="bottom"/>
@@ -24,17 +35,6 @@
     <contour>
       <point x="1804" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="328" y="2048" type="line"/>
-      <point x="64" y="2048" type="line"/>
-      <point x="708" y="748" type="line"/>
-      <point x="708" y="0" type="line"/>
-      <point x="956" y="0" type="line"/>
-      <point x="956" y="748" type="line"/>
-      <point x="1600" y="2048" type="line"/>
-      <point x="1336" y="2048" type="line"/>
-      <point x="832" y="1028" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/afii10045.glif b/src/Interface-Regular.ufo/glyphs/afii10045.glif
index 424407487..cc26fa872 100644
--- a/src/Interface-Regular.ufo/glyphs/afii10045.glif
+++ b/src/Interface-Regular.ufo/glyphs/afii10045.glif
@@ -3,14 +3,14 @@
   <advance width="2528"/>
   <unicode hex="042B"/>
   <outline>
+    <component base="afii10046" xOffset="100"/>
+    <component base="I" xOffset="1748"/>
     <contour>
       <point x="1304" y="2216" type="move" name="top"/>
     </contour>
     <contour>
       <point x="2528" y="2216" type="move" name="top0315"/>
     </contour>
-    <component base="afii10046" xOffset="100"/>
-    <component base="I" xOffset="1748"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/afii10048.glif b/src/Interface-Regular.ufo/glyphs/afii10048.glif
index aadb4865c..9dbda5979 100644
--- a/src/Interface-Regular.ufo/glyphs/afii10048.glif
+++ b/src/Interface-Regular.ufo/glyphs/afii10048.glif
@@ -3,15 +3,15 @@
   <advance width="2528"/>
   <unicode hex="042E"/>
   <outline>
+    <component base="I" xOffset="-80"/>
+    <component base="hyphen" xScale="0.7" xOffset="404" yOffset="128"/>
+    <component base="O" xOffset="560"/>
     <contour>
       <point x="1184" y="2200" type="move" name="top"/>
     </contour>
     <contour>
       <point x="2432" y="2200" type="move" name="top0315"/>
     </contour>
-    <component base="I" xOffset="-80"/>
-    <component base="hyphen" xScale="0.7" xOffset="404" yOffset="128"/>
-    <component base="O" xOffset="560"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/afii10147.glif b/src/Interface-Regular.ufo/glyphs/afii10147.glif
index e135fce08..0a87b35ef 100644
--- a/src/Interface-Regular.ufo/glyphs/afii10147.glif
+++ b/src/Interface-Regular.ufo/glyphs/afii10147.glif
@@ -3,12 +3,6 @@
   <advance width="2016"/>
   <unicode hex="0472"/>
   <outline>
-    <contour>
-      <point x="996" y="2212" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1928" y="2212" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1544" y="1096" type="line"/>
       <point x="392" y="1096" type="line"/>
@@ -16,6 +10,12 @@
       <point x="1544" y="876" type="line"/>
     </contour>
     <component base="O" xOffset="-16"/>
+    <contour>
+      <point x="996" y="2212" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1928" y="2212" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/bullseye.glif b/src/Interface-Regular.ufo/glyphs/bullseye.glif
index c71cf7873..b3ab1adf3 100644
--- a/src/Interface-Regular.ufo/glyphs/bullseye.glif
+++ b/src/Interface-Regular.ufo/glyphs/bullseye.glif
@@ -3,15 +3,6 @@
   <advance width="2016"/>
   <unicode hex="0298"/>
   <outline>
-    <contour>
-      <point x="960" y="2244" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="960" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1928" y="2244" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="792" y="1008" type="curve" smooth="yes"/>
       <point x="792" y="920"/>
@@ -27,6 +18,15 @@
       <point x="792" y="1096"/>
     </contour>
     <component base="O" xOffset="-16"/>
+    <contour>
+      <point x="960" y="2244" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="960" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1928" y="2244" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/cheabkhasiancyrillic.glif b/src/Interface-Regular.ufo/glyphs/cheabkhasiancyrillic.glif
index f66f7e99b..89c996b86 100644
--- a/src/Interface-Regular.ufo/glyphs/cheabkhasiancyrillic.glif
+++ b/src/Interface-Regular.ufo/glyphs/cheabkhasiancyrillic.glif
@@ -3,9 +3,6 @@
   <advance width="1760"/>
   <unicode hex="04BD"/>
   <outline>
-    <contour>
-      <point x="1040" y="-4" type="move" name="bottom"/>
-    </contour>
     <contour>
       <point x="12" y="1180" type="line"/>
       <point x="12" y="876"/>
@@ -17,6 +14,9 @@
       <point x="228" y="1180" type="curve"/>
     </contour>
     <component base="e" xOffset="216"/>
+    <contour>
+      <point x="1040" y="-4" type="move" name="bottom"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/e.glif b/src/Interface-Regular.ufo/glyphs/e.glif
index 4856b5d9c..01e1ede0c 100644
--- a/src/Interface-Regular.ufo/glyphs/e.glif
+++ b/src/Interface-Regular.ufo/glyphs/e.glif
@@ -35,7 +35,7 @@
       <point x="404" y="-32"/>
     </contour>
     <contour>
-      <point x="808.0" y="1792.0" type="move" name="top"/>
+      <point x="820" y="1792" type="move" name="top"/>
     </contour>
     <contour>
       <point x="884.0" y="0.0" type="move" name="bottom"/>
diff --git a/src/Interface-Regular.ufo/glyphs/fitacyrillic.glif b/src/Interface-Regular.ufo/glyphs/fitacyrillic.glif
index 7eea3e0a2..bdbe1c1b1 100644
--- a/src/Interface-Regular.ufo/glyphs/fitacyrillic.glif
+++ b/src/Interface-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/Interface-Regular.ufo/glyphs/iucyrillic.glif b/src/Interface-Regular.ufo/glyphs/iucyrillic.glif
index f7d4a585d..f22a849a2 100644
--- a/src/Interface-Regular.ufo/glyphs/iucyrillic.glif
+++ b/src/Interface-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/Interface-Regular.ufo/glyphs/o.glif b/src/Interface-Regular.ufo/glyphs/o.glif
index 6679e764a..bfa86bd99 100644
--- a/src/Interface-Regular.ufo/glyphs/o.glif
+++ b/src/Interface-Regular.ufo/glyphs/o.glif
@@ -32,7 +32,7 @@
       <point x="400" y="-32"/>
     </contour>
     <contour>
-      <point x="824" y="1792" type="move" name="top"/>
+      <point x="828" y="1792" type="move" name="top"/>
     </contour>
     <contour>
       <point x="824" y="0" type="move" name="bottom"/>
diff --git a/src/Interface-Regular.ufo/glyphs/o_uni02DE__.glif b/src/Interface-Regular.ufo/glyphs/o_uni02DE__.glif
index 8011bd563..f3889d7f3 100644
--- a/src/Interface-Regular.ufo/glyphs/o_uni02DE__.glif
+++ b/src/Interface-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/Interface-Regular.ufo/glyphs/ohorn.glif b/src/Interface-Regular.ufo/glyphs/ohorn.glif
index 5e9f8cba7..d17ed07fa 100644
--- a/src/Interface-Regular.ufo/glyphs/ohorn.glif
+++ b/src/Interface-Regular.ufo/glyphs/ohorn.glif
@@ -3,15 +3,6 @@
   <advance width="1760"/>
   <unicode hex="01A1"/>
   <outline>
-    <contour>
-      <point x="728" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="728" y="-16" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1544" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1380" y="1652" type="line"/>
       <point x="1380" y="1456"/>
@@ -23,6 +14,15 @@
       <point x="1600" y="1652" type="curve"/>
     </contour>
     <component base="o" xOffset="-76"/>
+    <contour>
+      <point x="728" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="728" y="-16" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1544" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/omegaroundcyrillic.glif b/src/Interface-Regular.ufo/glyphs/omegaroundcyrillic.glif
index 4508383ad..15503e1dc 100644
--- a/src/Interface-Regular.ufo/glyphs/omegaroundcyrillic.glif
+++ b/src/Interface-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/Interface-Regular.ufo/glyphs/oslash.glif b/src/Interface-Regular.ufo/glyphs/oslash.glif
index bb2ec6362..628986696 100644
--- a/src/Interface-Regular.ufo/glyphs/oslash.glif
+++ b/src/Interface-Regular.ufo/glyphs/oslash.glif
@@ -3,6 +3,13 @@
   <advance width="1632"/>
   <unicode hex="00F8"/>
   <outline>
+    <contour>
+      <point x="1344" y="1660" type="line"/>
+      <point x="1164" y="1660" type="line"/>
+      <point x="256" y="-184" type="line"/>
+      <point x="432" y="-184" type="line"/>
+    </contour>
+    <component base="o" xOffset="-16"/>
     <contour>
       <point x="816" y="1792" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="1572" y="1792" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1344" y="1660" type="line"/>
-      <point x="1164" y="1660" type="line"/>
-      <point x="256" y="-184" type="line"/>
-      <point x="432" y="-184" type="line"/>
-    </contour>
-    <component base="o" xOffset="-16"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/u.glif b/src/Interface-Regular.ufo/glyphs/u.glif
index c7a9b5ec6..45e6892f7 100644
--- a/src/Interface-Regular.ufo/glyphs/u.glif
+++ b/src/Interface-Regular.ufo/glyphs/u.glif
@@ -3,30 +3,6 @@
   <advance width="1632"/>
   <unicode hex="0075"/>
   <outline>
-    <contour>
-      <point x="844" y="1792" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1280" y="0" type="move" name="ogonek"/>
-    </contour>
-    <contour>
-      <point x="628" y="0" type="move" name="bottomu"/>
-    </contour>
-    <contour>
-      <point x="1484" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1484" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1192" y="900" type="move" name="rhotichook"/>
-    </contour>
-    <contour>
-      <point x="1448" y="1776" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="704" y="0" type="move" name="bottom"/>
-    </contour>
     <contour>
       <point x="1192" y="608" type="line" smooth="yes"/>
       <point x="1192" y="320"/>
@@ -50,6 +26,30 @@
       <point x="1428" y="1536" type="line"/>
       <point x="1192" y="1536" type="line"/>
     </contour>
+    <contour>
+      <point x="828" y="1792" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1280" y="0" type="move" name="ogonek"/>
+    </contour>
+    <contour>
+      <point x="628" y="0" type="move" name="bottomu"/>
+    </contour>
+    <contour>
+      <point x="1484" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1484" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1192" y="900" type="move" name="rhotichook"/>
+    </contour>
+    <contour>
+      <point x="1448" y="1776" type="move" name="top0315"/>
+    </contour>
+    <contour>
+      <point x="704" y="0" type="move" name="bottom"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/ubar.glif b/src/Interface-Regular.ufo/glyphs/ubar.glif
index 7d6c89288..2a7c5bc88 100644
--- a/src/Interface-Regular.ufo/glyphs/ubar.glif
+++ b/src/Interface-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/Interface-Regular.ufo/glyphs/uhorn.glif b/src/Interface-Regular.ufo/glyphs/uhorn.glif
index 315d94c80..0e8413e00 100644
--- a/src/Interface-Regular.ufo/glyphs/uhorn.glif
+++ b/src/Interface-Regular.ufo/glyphs/uhorn.glif
@@ -3,6 +3,17 @@
   <advance width="1760"/>
   <unicode hex="01B0"/>
   <outline>
+    <contour>
+      <point x="1444" y="1604" type="line"/>
+      <point x="1444" y="1396"/>
+      <point x="1440" y="1308"/>
+      <point x="1192" y="1308" type="curve"/>
+      <point x="1192" y="1144" type="line"/>
+      <point x="1552" y="1144"/>
+      <point x="1652" y="1300"/>
+      <point x="1652" y="1604" type="curve"/>
+    </contour>
+    <component base="u" xOffset="-148"/>
     <contour>
       <point x="652" y="1744" type="move" name="top"/>
     </contour>
@@ -18,17 +29,6 @@
     <contour>
       <point x="628" y="0" type="move" name="bottom"/>
     </contour>
-    <contour>
-      <point x="1444" y="1604" type="line"/>
-      <point x="1444" y="1396"/>
-      <point x="1440" y="1308"/>
-      <point x="1192" y="1308" type="curve"/>
-      <point x="1192" y="1144" type="line"/>
-      <point x="1552" y="1144"/>
-      <point x="1652" y="1300"/>
-      <point x="1652" y="1604" type="curve"/>
-    </contour>
-    <component base="u" xOffset="-148"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/uni0244.glif b/src/Interface-Regular.ufo/glyphs/uni0244.glif
index 834ee78d4..b9d3aa817 100644
--- a/src/Interface-Regular.ufo/glyphs/uni0244.glif
+++ b/src/Interface-Regular.ufo/glyphs/uni0244.glif
@@ -3,6 +3,13 @@
   <advance width="2272"/>
   <unicode hex="0244"/>
   <outline>
+    <contour>
+      <point x="2196" y="1144" type="line"/>
+      <point x="80" y="1144" type="line"/>
+      <point x="80" y="924" type="line"/>
+      <point x="2196" y="924" type="line"/>
+    </contour>
+    <component base="U" xOffset="228"/>
     <contour>
       <point x="1136" y="2200" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="2236" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="2196" y="1144" type="line"/>
-      <point x="80" y="1144" type="line"/>
-      <point x="80" y="924" type="line"/>
-      <point x="2196" y="924" type="line"/>
-    </contour>
-    <component base="U" xOffset="228"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/uni024E_.glif b/src/Interface-Regular.ufo/glyphs/uni024E_.glif
index 168f1902f..62078ac40 100644
--- a/src/Interface-Regular.ufo/glyphs/uni024E_.glif
+++ b/src/Interface-Regular.ufo/glyphs/uni024E_.glif
@@ -3,6 +3,13 @@
   <advance width="2016"/>
   <unicode hex="024E"/>
   <outline>
+    <contour>
+      <point x="1924" y="1628" type="line"/>
+      <point x="96" y="1628" type="line"/>
+      <point x="96" y="1464" type="line"/>
+      <point x="1924" y="1464" type="line"/>
+    </contour>
+    <component base="Y" xOffset="164"/>
     <contour>
       <point x="1008" y="2200" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="1964" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1924" y="1628" type="line"/>
-      <point x="96" y="1628" type="line"/>
-      <point x="96" y="1464" type="line"/>
-      <point x="1924" y="1464" type="line"/>
-    </contour>
-    <component base="Y" xOffset="164"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/uni1D6B__.glif b/src/Interface-Regular.ufo/glyphs/uni1D6B__.glif
index a9b4eee06..48e18a2a2 100644
--- a/src/Interface-Regular.ufo/glyphs/uni1D6B__.glif
+++ b/src/Interface-Regular.ufo/glyphs/uni1D6B__.glif
@@ -3,15 +3,6 @@
   <advance width="2528"/>
   <unicode hex="1D6B"/>
   <outline>
-    <contour>
-      <point x="1104" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1104" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="2388" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1016" y="344" type="line"/>
       <point x="1044" y="336" type="line"/>
@@ -38,6 +29,15 @@
       <point x="1164" y="696" type="curve"/>
     </contour>
     <component base="e" xOffset="884"/>
+    <contour>
+      <point x="1104" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1104" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="2388" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/glyphs/uni1D99_.glif b/src/Interface-Regular.ufo/glyphs/uni1D99_.glif
index ab07fec70..32d81adf7 100644
--- a/src/Interface-Regular.ufo/glyphs/uni1D99_.glif
+++ b/src/Interface-Regular.ufo/glyphs/uni1D99_.glif
@@ -3,15 +3,6 @@
   <advance width="1760"/>
   <unicode hex="1D99"/>
   <outline>
-    <contour>
-      <point x="620" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="620" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1560" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1108" y="220" type="line"/>
       <point x="1108" y="-192" type="line" smooth="yes"/>
@@ -31,6 +22,15 @@
       <point x="1384" y="220" type="line"/>
     </contour>
     <component base="u" xOffset="-160"/>
+    <contour>
+      <point x="620" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="620" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1560" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Regular.ufo/kerning.plist b/src/Interface-Regular.ufo/kerning.plist
index 88a308b22..7a825e82d 100644
--- a/src/Interface-Regular.ufo/kerning.plist
+++ b/src/Interface-Regular.ufo/kerning.plist
@@ -1470,6 +1470,8 @@
 		<integer>-29</integer>
 		<key>@KERN_RIGHT_quotedblleft</key>
 		<integer>-123</integer>
+		<key>@KERN_RIGHT_t</key>
+		<integer>-16</integer>
 		<key>@KERN_RIGHT_v</key>
 		<integer>-54</integer>
 		<key>@KERN_RIGHT_w</key>
diff --git a/src/Interface-Regular.ufo/lib.plist b/src/Interface-Regular.ufo/lib.plist
index 16489553a..89f274849 100644
--- a/src/Interface-Regular.ufo/lib.plist
+++ b/src/Interface-Regular.ufo/lib.plist
@@ -4660,6 +4660,7 @@
 		<string>placeofinterestsign.specz.medium</string>
 		<string>uniE001</string>
 		<string>.notdef</string>
+		<string>DZcaron</string>
 	</array>
 </dict>
 </plist>