Adjustments and major changes to glyphs a, afii10048, afii10147, bullseye, C, dhook, e, G, O, Ohorn, Oslash, Q, R, s, U, Uhorn, uni0244

21 files changed, 905 insertions, 407 deletions

diff --git a/src/Inter-UI-Black.ufo/glyphs/C_.glif b/src/Inter-UI-Black.ufo/glyphs/C_.glif
index c8aeb0463..ecdee7db9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/C_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/C_.glif
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="C" format="1">
-  <advance width="1876"/>
+  <advance width="1932"/>
   <unicode hex="0043"/>
   <outline>
     <contour>
-      <point x="1324" y="696" type="line"/>
-      <point x="1300" y="564"/>
-      <point x="1244" y="360"/>
-      <point x="988" y="360" type="curve" smooth="yes"/>
-      <point x="720" y="360"/>
-      <point x="588" y="584"/>
-      <point x="588" y="1028" type="curve"/>
-      <point x="588" y="1468"/>
-      <point x="720" y="1688"/>
-      <point x="988" y="1688" type="curve" smooth="yes"/>
-      <point x="1244" y="1688"/>
-      <point x="1304" y="1488"/>
-      <point x="1328" y="1340" type="curve"/>
-      <point x="1776" y="1404" type="line"/>
-      <point x="1720" y="1796"/>
-      <point x="1448" y="2076"/>
-      <point x="960" y="2076" type="curve" smooth="yes"/>
-      <point x="452" y="2076"/>
-      <point x="120" y="1692"/>
-      <point x="120" y="1028" type="curve"/>
-      <point x="120" y="352"/>
-      <point x="436" y="-28"/>
-      <point x="964" y="-28" type="curve" smooth="yes"/>
-      <point x="1432" y="-28"/>
-      <point x="1728" y="240"/>
-      <point x="1780" y="632" type="curve"/>
+      <point x="1812" y="1404" type="line"/>
+      <point x="1700" y="1836"/>
+      <point x="1392" y="2076"/>
+      <point x="992" y="2076" type="curve" smooth="yes"/>
+      <point x="480" y="2076"/>
+      <point x="120.0" y="1688.0"/>
+      <point x="120.0" y="1020.0" type="curve"/>
+      <point x="120.0" y="356.0"/>
+      <point x="480.0" y="-28.0"/>
+      <point x="992.0" y="-28.0" type="curve" smooth="yes"/>
+      <point x="1391.0" y="-28.0"/>
+      <point x="1696" y="208"/>
+      <point x="1808" y="632" type="curve"/>
+      <point x="1364" y="696" type="line"/>
+      <point x="1304" y="488"/>
+      <point x="1180" y="388"/>
+      <point x="992.0" y="388.0" type="curve" smooth="yes"/>
+      <point x="740" y="388"/>
+      <point x="588.0" y="568.0"/>
+      <point x="588.0" y="1020.0" type="curve"/>
+      <point x="588.0" y="1472.0"/>
+      <point x="740" y="1660"/>
+      <point x="992.0" y="1660.0" type="curve" smooth="yes"/>
+      <point x="1180" y="1660"/>
+      <point x="1304" y="1556"/>
+      <point x="1364" y="1340" type="curve"/>
     </contour>
     <contour>
-      <point x="1004" y="2200" type="move" name="top"/>
+      <point x="1004.0" y="2200.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1000" y="0" type="move" name="bottom"/>
+      <point x="1000.0" y="0.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1900" y="2200" type="move" name="top_dd"/>
+      <point x="1900.0" y="2200.0" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1900" y="-560" type="move" name="bottom_dd"/>
+      <point x="1900.0" y="-560.0" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1900" y="2200" type="move" name="top0315"/>
+      <point x="1900.0" y="2200.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
@@ -61,9 +61,9 @@
           <key>name</key>
           <string></string>
           <key>x</key>
-          <integer>1280</integer>
+          <integer>1180</integer>
           <key>y</key>
-          <integer>640</integer>
+          <integer>1648</integer>
         </dict>
         <dict>
           <key>angle</key>
@@ -93,6 +93,34 @@
           <key>y</key>
           <integer>696</integer>
         </dict>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>1304</integer>
+          <key>y</key>
+          <integer>464</integer>
+        </dict>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>992</integer>
+          <key>y</key>
+          <integer>1692</integer>
+        </dict>
       </array>
       <key>com.typemytype.robofont.layerData</key>
       <dict>
@@ -112,7 +140,7 @@
                 <integer>0</integer>
                 <integer>0</integer>
                 <integer>1</integer>
-                <integer>-36</integer>
+                <integer>0</integer>
                 <integer>0</integer>
               </array>
             </dict>
@@ -129,7 +157,7 @@
           <array>
           </array>
           <key>width</key>
-          <integer>1876</integer>
+          <integer>1932</integer>
         </dict>
       </dict>
       <key>com.typemytype.robofont.mark</key>
diff --git a/src/Inter-UI-Black.ufo/glyphs/G_.glif b/src/Inter-UI-Black.ufo/glyphs/G_.glif
index 7539e09ab..14f240d9b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/G_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/G_.glif
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="G" format="1">
-  <advance width="1904"/>
+  <advance width="1928"/>
   <unicode hex="0047"/>
   <outline>
     <contour>
-      <point x="1784" y="1096" type="line"/>
-      <point x="976" y="1096" type="line"/>
-      <point x="976" y="756" type="line"/>
-      <point x="1340" y="756" type="line"/>
-      <point x="1340" y="460"/>
-      <point x="1232" y="352"/>
-      <point x="1020" y="352" type="curve" smooth="yes"/>
-      <point x="728" y="352"/>
-      <point x="588" y="556"/>
+      <point x="1800" y="1096" type="line"/>
+      <point x="992" y="1096" type="line"/>
+      <point x="992" y="756" type="line"/>
+      <point x="1356" y="756" type="line"/>
+      <point x="1356" y="516"/>
+      <point x="1208" y="388"/>
+      <point x="992" y="388" type="curve" smooth="yes"/>
+      <point x="756" y="388"/>
+      <point x="592" y="540"/>
       <point x="588" y="1020" type="curve"/>
-      <point x="588" y="1496"/>
-      <point x="744" y="1688"/>
-      <point x="988" y="1688" type="curve" smooth="yes"/>
-      <point x="1240" y="1688"/>
+      <point x="592" y="1484"/>
+      <point x="740" y="1660"/>
+      <point x="992" y="1660" type="curve" smooth="yes"/>
+      <point x="1244" y="1660"/>
       <point x="1312" y="1484"/>
       <point x="1340" y="1376" type="curve"/>
-      <point x="1776" y="1436" type="line"/>
-      <point x="1716" y="1728"/>
-      <point x="1488" y="2076"/>
-      <point x="984" y="2076" type="curve" smooth="yes"/>
+      <point x="1792" y="1436" type="line"/>
+      <point x="1736" y="1716"/>
+      <point x="1484" y="2076"/>
+      <point x="992" y="2076" type="curve" smooth="yes"/>
       <point x="476" y="2076"/>
-      <point x="120" y="1716"/>
+      <point x="120" y="1688"/>
       <point x="120" y="1024" type="curve"/>
-      <point x="120" y="332"/>
-      <point x="472" y="-28"/>
-      <point x="1000" y="-28" type="curve" smooth="yes"/>
-      <point x="1432" y="-28"/>
-      <point x="1784" y="220"/>
-      <point x="1784" y="720" type="curve"/>
+      <point x="120" y="376"/>
+      <point x="464" y="-28"/>
+      <point x="992" y="-28" type="curve" smooth="yes"/>
+      <point x="1428" y="-28"/>
+      <point x="1800" y="280"/>
+      <point x="1800" y="784" type="curve"/>
     </contour>
     <contour>
-      <point x="1028" y="2200" type="move" name="top"/>
+      <point x="1028.0" y="2200.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1056" y="0" type="move" name="bottom"/>
+      <point x="1056.0" y="0.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1980" y="2200" type="move" name="top_dd"/>
+      <point x="1980.0" y="2200.0" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1980" y="-560" type="move" name="bottom_dd"/>
+      <point x="1980.0" y="-560.0" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1980" y="2200" type="move" name="top0315"/>
+      <point x="1980.0" y="2200.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
@@ -104,6 +104,20 @@
           <key>y</key>
           <integer>1376</integer>
         </dict>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>992</integer>
+          <key>y</key>
+          <integer>1136</integer>
+        </dict>
       </array>
       <key>com.typemytype.robofont.layerData</key>
       <dict>
@@ -123,7 +137,7 @@
                 <integer>0</integer>
                 <integer>0</integer>
                 <integer>1</integer>
-                <integer>-32</integer>
+                <integer>0</integer>
                 <integer>0</integer>
               </array>
             </dict>
@@ -140,7 +154,7 @@
           <array>
           </array>
           <key>width</key>
-          <integer>1904</integer>
+          <integer>1928</integer>
         </dict>
       </dict>
       <key>com.typemytype.robofont.mark</key>
diff --git a/src/Inter-UI-Black.ufo/glyphs/O_.glif b/src/Inter-UI-Black.ufo/glyphs/O_.glif
index f2aab8c4f..5be4b8d57 100644
--- a/src/Inter-UI-Black.ufo/glyphs/O_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/O_.glif
@@ -6,9 +6,9 @@
     <contour>
       <point x="1856" y="1020" type="curve"/>
       <point x="1856" y="1688"/>
-      <point x="1496" y="2076"/>
-      <point x="988" y="2076" type="curve" smooth="yes"/>
-      <point x="476" y="2076"/>
+      <point x="1500" y="2076"/>
+      <point x="992" y="2076" type="curve" smooth="yes"/>
+      <point x="480" y="2076"/>
       <point x="120" y="1688"/>
       <point x="120" y="1020" type="curve"/>
       <point x="120" y="356"/>
@@ -18,36 +18,36 @@
       <point x="1856" y="356"/>
     </contour>
     <contour>
-      <point x="1388" y="1000" type="curve"/>
+      <point x="1388" y="1020" type="curve"/>
       <point x="1388" y="568"/>
-      <point x="1248" y="348"/>
-      <point x="992" y="348" type="curve" smooth="yes"/>
-      <point x="728" y="348"/>
+      <point x="1244" y="388"/>
+      <point x="992" y="388" type="curve" smooth="yes"/>
+      <point x="740" y="388"/>
       <point x="588" y="568"/>
-      <point x="588" y="1000" type="curve"/>
-      <point x="588" y="1440"/>
-      <point x="724" y="1652"/>
-      <point x="988" y="1652" type="curve" smooth="yes"/>
-      <point x="1244" y="1652"/>
-      <point x="1388" y="1440"/>
+      <point x="588" y="1020" type="curve"/>
+      <point x="588" y="1472"/>
+      <point x="740" y="1660"/>
+      <point x="992" y="1660" type="curve" smooth="yes"/>
+      <point x="1244" y="1660"/>
+      <point x="1388" y="1472"/>
     </contour>
     <contour>
-      <point x="988" y="2200" type="move" name="top"/>
+      <point x="988.0" y="2200.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="996" y="0" type="move" name="bottom"/>
+      <point x="996.0" y="0.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="156" y="2000" type="move" name="tonos"/>
+      <point x="156.0" y="2000.0" type="move" name="tonos"/>
     </contour>
     <contour>
-      <point x="1960" y="2200" type="move" name="top_dd"/>
+      <point x="1960.0" y="2200.0" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1960" y="-560" type="move" name="bottom_dd"/>
+      <point x="1960.0" y="-560.0" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1960" y="2200" type="move" name="top0315"/>
+      <point x="1960.0" y="2200.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
@@ -62,9 +62,9 @@
           <key>magnetic</key>
           <integer>5</integer>
           <key>x</key>
-          <integer>660</integer>
+          <integer>2072</integer>
           <key>y</key>
-          <integer>1000</integer>
+          <integer>1020</integer>
         </dict>
         <dict>
           <key>angle</key>
@@ -86,9 +86,65 @@
           <key>magnetic</key>
           <integer>5</integer>
           <key>x</key>
-          <real>0.0</real>
+          <integer>1064</integer>
+          <key>y</key>
+          <integer>1472</integer>
+        </dict>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>740</integer>
+          <key>y</key>
+          <integer>388</integer>
+        </dict>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>1244</integer>
+          <key>y</key>
+          <integer>372</integer>
+        </dict>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>992</integer>
+          <key>y</key>
+          <integer>416</integer>
+        </dict>
+        <dict>
+          <key>angle</key>
+          <integer>0</integer>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>824</integer>
           <key>y</key>
-          <real>1725.625</real>
+          <integer>568</integer>
         </dict>
       </array>
       <key>com.typemytype.robofont.mark</key>
diff --git a/src/Inter-UI-Black.ufo/glyphs/R_.glif b/src/Inter-UI-Black.ufo/glyphs/R_.glif
index 024b5a59c..19319f92e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/R_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/R_.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="R" format="1">
-  <advance width="1756"/>
+  <advance width="1764"/>
   <unicode hex="0052"/>
   <outline>
     <contour>
@@ -18,12 +18,12 @@
       <point x="416" y="1132" type="line"/>
       <point x="420" y="752" type="line"/>
       <point x="1072" y="752" type="line"/>
-      <point x="1224" y="840" type="line"/>
-      <point x="1480" y="936"/>
-      <point x="1652" y="1096"/>
-      <point x="1652" y="1440" type="curve" smooth="yes"/>
-      <point x="1652" y="1780"/>
-      <point x="1364" y="2048"/>
+      <point x="1224" y="792" type="line"/>
+      <point x="1480" y="888"/>
+      <point x="1652" y="1104"/>
+      <point x="1652" y="1408" type="curve" smooth="yes"/>
+      <point x="1652" y="1792"/>
+      <point x="1376" y="2048"/>
       <point x="900" y="2048" type="curve" smooth="yes"/>
     </contour>
     <contour>
@@ -116,7 +116,7 @@
           <array>
           </array>
           <key>width</key>
-          <integer>1756</integer>
+          <integer>1764</integer>
         </dict>
       </dict>
       <key>com.typemytype.robofont.mark</key>
diff --git a/src/Inter-UI-Black.ufo/glyphs/U_.glif b/src/Inter-UI-Black.ufo/glyphs/U_.glif
index 3e02779e5..9bf1a58ad 100644
--- a/src/Inter-UI-Black.ufo/glyphs/U_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/U_.glif
@@ -4,45 +4,45 @@
   <unicode hex="0055"/>
   <outline>
     <contour>
-      <point x="960" y="2200" type="move" name="top"/>
+      <point x="1328" y="2048" type="line"/>
+      <point x="1328" y="712" type="line" smooth="yes"/>
+      <point x="1328" y="512"/>
+      <point x="1184" y="388"/>
+      <point x="964" y="388" type="curve" smooth="yes"/>
+      <point x="744" y="388"/>
+      <point x="592" y="512"/>
+      <point x="592" y="712" type="curve" smooth="yes"/>
+      <point x="592" y="2048" type="line"/>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="696" type="line"/>
+      <point x="128" y="228"/>
+      <point x="468" y="-28"/>
+      <point x="964" y="-28" type="curve" smooth="yes"/>
+      <point x="1456" y="-28"/>
+      <point x="1792" y="228"/>
+      <point x="1792" y="696" type="curve"/>
+      <point x="1792" y="2048" type="line"/>
     </contour>
     <contour>
-      <point x="892" y="0" type="move" name="bottom"/>
+      <point x="960.0" y="2200.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1116" y="0" type="move" name="right"/>
+      <point x="892.0" y="0.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1396" y="104" type="move" name="ogonek"/>
+      <point x="1116.0" y="0.0" type="move" name="right"/>
     </contour>
     <contour>
-      <point x="1848" y="2200" type="move" name="top_dd"/>
+      <point x="1396.0" y="104.0" type="move" name="ogonek"/>
     </contour>
     <contour>
-      <point x="1832" y="-560" type="move" name="bottom_dd"/>
+      <point x="1848.0" y="2200.0" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1848" y="2200" type="move" name="top0315"/>
+      <point x="1832.0" y="-560.0" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1328" y="2048" type="line"/>
-      <point x="1328" y="696" type="line" smooth="yes"/>
-      <point x="1328" y="496"/>
-      <point x="1180" y="372"/>
-      <point x="964" y="372" type="curve" smooth="yes"/>
-      <point x="744" y="372"/>
-      <point x="592" y="496"/>
-      <point x="592" y="696" type="curve" smooth="yes"/>
-      <point x="592" y="2048" type="line"/>
-      <point x="128" y="2048" type="line"/>
-      <point x="128" y="696" type="line"/>
-      <point x="128" y="228"/>
-      <point x="468" y="-28"/>
-      <point x="964" y="-28" type="curve" smooth="yes"/>
-      <point x="1456" y="-28"/>
-      <point x="1792" y="228"/>
-      <point x="1792" y="696" type="curve"/>
-      <point x="1792" y="2048" type="line"/>
+      <point x="1848.0" y="2200.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Uhorn_.glif b/src/Inter-UI-Black.ufo/glyphs/Uhorn_.glif
index 90cfc888c..8971ff18d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Uhorn_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Uhorn_.glif
@@ -4,15 +4,6 @@
   <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"/>
       <point x="1784" y="1684"/>
@@ -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/Inter-UI-Black.ufo/glyphs/a.glif b/src/Inter-UI-Black.ufo/glyphs/a.glif
index 5e5cc973e..3e9ec16d4 100644
--- a/src/Inter-UI-Black.ufo/glyphs/a.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/a.glif
@@ -4,7 +4,7 @@
   <unicode hex="0061"/>
   <outline>
     <contour>
-      <point x="936" y="660" type="line"/>
+      <point x="936" y="668" type="line"/>
       <point x="936" y="492" type="line" smooth="yes"/>
       <point x="936" y="384"/>
       <point x="816" y="304"/>
@@ -13,8 +13,8 @@
       <point x="532" y="360"/>
       <point x="532" y="444" type="curve" smooth="yes"/>
       <point x="532" y="556"/>
-      <point x="604" y="660"/>
-      <point x="784" y="660" type="curve" smooth="yes"/>
+      <point x="688" y="652"/>
+      <point x="868" y="664" type="curve" smooth="yes"/>
     </contour>
     <contour>
       <point x="960" y="0" type="line"/>
@@ -33,15 +33,15 @@
       <point x="880" y="1216"/>
       <point x="936" y="1152"/>
       <point x="936" y="1028" type="curve" smooth="yes"/>
-      <point x="936" y="944" type="line"/>
+      <point x="936" y="956" type="line"/>
       <point x="780" y="944" type="line" smooth="yes"/>
-      <point x="272" y="944"/>
-      <point x="88" y="712"/>
-      <point x="88" y="420" type="curve" smooth="yes"/>
+      <point x="272" y="904"/>
+      <point x="88" y="704"/>
+      <point x="88" y="432" type="curve" smooth="yes"/>
       <point x="88" y="128"/>
       <point x="316" y="-28"/>
       <point x="592" y="-28" type="curve" smooth="yes"/>
-      <point x="784" y="-28"/>
+      <point x="788" y="-28"/>
       <point x="900" y="52"/>
       <point x="948" y="132" type="curve"/>
       <point x="960" y="132" type="line"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dhook.glif b/src/Inter-UI-Black.ufo/glyphs/dhook.glif
index 9552eec78..573d8fae8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dhook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dhook.glif
@@ -22,8 +22,7 @@
       <point x="1032" y="1568" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="1076.0" y="0.0" type="line"/>
-      <point x="1492.0" y="0.0" type="line"/>
+      <point x="1492" y="0" type="line"/>
       <point x="1492.0" y="1516.0" type="line"/>
       <point x="1032.0" y="1516.0" type="line"/>
       <point x="1032.0" y="1460.0" type="line"/>
@@ -41,6 +40,7 @@
       <point x="976.0" y="12.0"/>
       <point x="1052.0" y="80.0" type="curve"/>
       <point x="1064.0" y="80.0" type="line"/>
+      <point x="1076.0" y="0.0" type="line"/>
     </contour>
     <contour>
       <point x="516" y="764" type="curve"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0244.glif b/src/Inter-UI-Black.ufo/glyphs/uni0244.glif
index 064f4c062..0cfd42fdb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0244.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0244.glif
@@ -4,6 +4,13 @@
   <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>
     <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/Inter-UI-Regular.ufo/glyphs/C_.glif b/src/Inter-UI-Regular.ufo/glyphs/C_.glif
index 69976cd43..27eaeeb80 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/C_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/C_.glif
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="C" format="1">
-  <advance width="1912"/>
+  <advance width="1904"/>
   <unicode hex="0043"/>
   <outline>
     <contour>
-      <point x="1464" y="528" type="line"/>
-      <point x="1420" y="368"/>
-      <point x="1304" y="208"/>
-      <point x="1016" y="208" type="curve" smooth="yes"/>
-      <point x="592" y="208"/>
-      <point x="416" y="584"/>
-      <point x="416" y="1024" type="curve"/>
-      <point x="416" y="1496"/>
-      <point x="632" y="1852"/>
-      <point x="1016" y="1852" type="curve" smooth="yes"/>
-      <point x="1260" y="1852"/>
-      <point x="1432" y="1708"/>
-      <point x="1472" y="1520" type="curve"/>
-      <point x="1752" y="1520" type="line"/>
-      <point x="1692" y="1828"/>
-      <point x="1436" y="2076"/>
-      <point x="1016" y="2076" type="curve" smooth="yes"/>
-      <point x="468" y="2076"/>
-      <point x="176" y="1644"/>
-      <point x="176" y="1024" type="curve"/>
-      <point x="176" y="404"/>
-      <point x="468" y="-28"/>
-      <point x="1016" y="-28" type="curve" smooth="yes"/>
-      <point x="1444" y="-28"/>
-      <point x="1688" y="224"/>
+      <point x="1744" y="1520" type="line"/>
+      <point x="1676" y="1872"/>
+      <point x="1366.0" y="2076.0"/>
+      <point x="1016.0" y="2076.0" type="curve" smooth="yes"/>
+      <point x="524.0" y="2076.0"/>
+      <point x="176.0" y="1672.0"/>
+      <point x="176.0" y="1024.0" type="curve"/>
+      <point x="176.0" y="372.0"/>
+      <point x="524.0" y="-28.0"/>
+      <point x="1016.0" y="-28.0" type="curve" smooth="yes"/>
+      <point x="1367.0" y="-28.0"/>
+      <point x="1676" y="176"/>
       <point x="1744" y="528" type="curve"/>
+      <point x="1484" y="528" type="line"/>
+      <point x="1436" y="324"/>
+      <point x="1228" y="204"/>
+      <point x="1016.0" y="204.0" type="curve" smooth="yes"/>
+      <point x="676" y="204"/>
+      <point x="416.0" y="512.0"/>
+      <point x="416.0" y="1024.0" type="curve"/>
+      <point x="416.0" y="1536.0"/>
+      <point x="676" y="1844"/>
+      <point x="1016.0" y="1844.0" type="curve" smooth="yes"/>
+      <point x="1228" y="1844"/>
+      <point x="1440" y="1724"/>
+      <point x="1484" y="1520" type="curve"/>
     </contour>
     <contour>
-      <point x="984" y="2304" type="move" name="top"/>
+      <point x="984.0" y="2304.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="984" y="-16" type="move" name="bottom"/>
+      <point x="984.0" y="-16.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1884" y="2200" type="move" name="top_dd"/>
+      <point x="1884.0" y="2200.0" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1884" y="-560" type="move" name="bottom_dd"/>
+      <point x="1884.0" y="-560.0" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1884" y="2244" type="move" name="top0315"/>
+      <point x="1884.0" y="2244.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
@@ -65,6 +65,34 @@
           <key>y</key>
           <integer>1852</integer>
         </dict>
+        <dict>
+          <key>angle</key>
+          <integer>0</integer>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>1912</integer>
+          <key>y</key>
+          <integer>1520</integer>
+        </dict>
+        <dict>
+          <key>angle</key>
+          <integer>0</integer>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>1888</integer>
+          <key>y</key>
+          <integer>528</integer>
+        </dict>
       </array>
       <key>com.typemytype.robofont.layerData</key>
       <dict>
@@ -84,7 +112,7 @@
                 <integer>0</integer>
                 <integer>0</integer>
                 <integer>1</integer>
-                <integer>64</integer>
+                <integer>0</integer>
                 <integer>0</integer>
               </array>
             </dict>
@@ -101,7 +129,7 @@
           <array>
           </array>
           <key>width</key>
-          <integer>1912</integer>
+          <integer>1904</integer>
         </dict>
       </dict>
       <key>com.typemytype.robofont.mark</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/O_.glif b/src/Inter-UI-Regular.ufo/glyphs/O_.glif
index 44d90fa63..281bb6c15 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/O_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/O_.glif
@@ -4,24 +4,6 @@
   <unicode hex="004F"/>
   <outline>
     <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>
-    <contour>
       <point x="1856" y="1024" type="curve"/>
       <point x="1856" y="1672"/>
       <point x="1508" y="2076"/>
@@ -29,29 +11,176 @@
       <point x="524" y="2076"/>
       <point x="176" y="1672"/>
       <point x="176" y="1024" type="curve"/>
-      <point x="176" y="372"/>
+      <point x="176" y="376"/>
       <point x="524" y="-28"/>
       <point x="1016" y="-28" type="curve" smooth="yes"/>
       <point x="1508" y="-28"/>
-      <point x="1856" y="372"/>
+      <point x="1856" y="376"/>
     </contour>
     <contour>
       <point x="1616" y="1024" type="curve"/>
-      <point x="1616" y="504"/>
-      <point x="1348" y="204"/>
-      <point x="1024" y="204" type="curve" smooth="yes"/>
-      <point x="700" y="204"/>
-      <point x="416" y="504"/>
+      <point x="1616" y="492"/>
+      <point x="1356" y="204"/>
+      <point x="1016" y="204" type="curve" smooth="yes"/>
+      <point x="676" y="204"/>
+      <point x="416" y="492"/>
       <point x="416" y="1024" type="curve"/>
-      <point x="416" y="1568"/>
-      <point x="676" y="1856"/>
-      <point x="1008" y="1856" type="curve" smooth="yes"/>
-      <point x="1360" y="1856"/>
-      <point x="1616" y="1536"/>
+      <point x="416" y="1556"/>
+      <point x="676" y="1844"/>
+      <point x="1016" y="1844" type="curve" smooth="yes"/>
+      <point x="1356" y="1844"/>
+      <point x="1616" y="1556"/>
+    </contour>
+    <contour>
+      <point x="1012.0" y="2304.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1024.0" y="0.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="176.0" y="2048.0" type="move" name="tonos"/>
+    </contour>
+    <contour>
+      <point x="1928.0" y="2200.0" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1992.0" y="-560.0" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1928.0" y="2200.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <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>1016</integer>
+          <key>y</key>
+          <integer>988</integer>
+        </dict>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>524</integer>
+          <key>y</key>
+          <integer>2060</integer>
+        </dict>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>1508</integer>
+          <key>y</key>
+          <integer>2096</integer>
+        </dict>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>676</integer>
+          <key>y</key>
+          <integer>1840</integer>
+        </dict>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>1356</integer>
+          <key>y</key>
+          <integer>1828</integer>
+        </dict>
+        <dict>
+          <key>angle</key>
+          <integer>0</integer>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>1652</integer>
+          <key>y</key>
+          <integer>1556</integer>
+        </dict>
+        <dict>
+          <key>angle</key>
+          <integer>0</integer>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>1876</integer>
+          <key>y</key>
+          <integer>492</integer>
+        </dict>
+        <dict>
+          <key>angle</key>
+          <integer>0</integer>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>180</integer>
+          <key>y</key>
+          <integer>1672</integer>
+        </dict>
+        <dict>
+          <key>angle</key>
+          <integer>0</integer>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>1860</integer>
+          <key>y</key>
+          <integer>376</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/Ohorn_.glif b/src/Inter-UI-Regular.ufo/glyphs/Ohorn_.glif
index 109364c52..e6988c1c1 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/Ohorn_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/Ohorn_.glif
@@ -4,15 +4,6 @@
   <unicode hex="01A0"/>
   <outline>
     <contour>
-      <point x="1012" y="2304" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="980" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1956" y="2192" type="move" name="top0315"/>
-    </contour>
-    <contour>
       <point x="1756" y="2196" type="line"/>
       <point x="1756" y="1964"/>
       <point x="1676" y="1828"/>
@@ -23,6 +14,15 @@
       <point x="2004" y="2196" type="curve"/>
     </contour>
     <component base="O"/>
+    <contour>
+      <point x="1012" y="2304" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="980" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1956" y="2192" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/Oslash_.glif b/src/Inter-UI-Regular.ufo/glyphs/Oslash_.glif
index 883cac3ed..7a23f30ce 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/Oslash_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/Oslash_.glif
@@ -4,6 +4,13 @@
   <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="1012" y="2304" type="move" name="top"/>
     </contour>
     <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/Inter-UI-Regular.ufo/glyphs/Q_.glif b/src/Inter-UI-Regular.ufo/glyphs/Q_.glif
index 07fa729ce..9417719c8 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/Q_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/Q_.glif
@@ -4,6 +4,13 @@
   <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="1012" y="2304" type="move" name="top"/>
     </contour>
     <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/Inter-UI-Regular.ufo/glyphs/R_.glif b/src/Inter-UI-Regular.ufo/glyphs/R_.glif
index 91848d09f..877175cc5 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/R_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/R_.glif
@@ -1,44 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="R" format="1">
-  <advance width="1772"/>
+  <advance width="1784"/>
   <unicode hex="0052"/>
   <outline>
     <contour>
-      <point x="896" y="2304" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="840" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1724" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1724" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1724" y="2200" type="move" name="top0315"/>
-    </contour>
-    <contour>
       <point x="240" y="2048" type="line"/>
       <point x="240" y="0" type="line"/>
       <point x="488" y="0" type="line"/>
       <point x="488" y="1828" type="line"/>
       <point x="896" y="1828" type="line" smooth="yes"/>
       <point x="1236" y="1828"/>
-      <point x="1356" y="1668"/>
-      <point x="1356" y="1408" type="curve" smooth="yes"/>
-      <point x="1356" y="1204"/>
-      <point x="1176" y="1016"/>
-      <point x="896" y="1016" type="curve" smooth="yes"/>
-      <point x="432" y="1016" type="line"/>
+      <point x="1368" y="1604"/>
+      <point x="1368" y="1408" type="curve" smooth="yes"/>
+      <point x="1368" y="1216"/>
+      <point x="1240" y="1024"/>
+      <point x="896" y="1024" type="curve" smooth="yes"/>
+      <point x="432" y="1024" type="line"/>
       <point x="432" y="796" type="line"/>
       <point x="1060" y="796" type="line"/>
-      <point x="1136" y="824" type="line"/>
-      <point x="1428" y="904"/>
-      <point x="1608" y="1132"/>
+      <point x="1136" y="816" type="line"/>
+      <point x="1428" y="896"/>
+      <point x="1608" y="1120"/>
       <point x="1608" y="1408" type="curve" smooth="yes"/>
-      <point x="1608" y="1800"/>
-      <point x="1352" y="2048"/>
+      <point x="1608" y="1748"/>
+      <point x="1360" y="2048"/>
       <point x="896" y="2048" type="curve"/>
     </contour>
     <contour>
@@ -48,6 +33,21 @@
       <point x="1204" y="900" type="line"/>
       <point x="924" y="900" type="line"/>
     </contour>
+    <contour>
+      <point x="896" y="2304" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="840" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1724" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1724" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1724" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/a.glif b/src/Inter-UI-Regular.ufo/glyphs/a.glif
index a3bbb5974..4ce3fa1e6 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/a.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/a.glif
@@ -4,71 +4,71 @@
   <unicode hex="0061"/>
   <outline>
     <contour>
-      <point x="1128" y="700" type="line"/>
-      <point x="1128" y="544" type="line" smooth="yes"/>
-      <point x="1128" y="352"/>
-      <point x="936" y="176"/>
-      <point x="652" y="176" type="curve" smooth="yes"/>
-      <point x="544" y="176"/>
-      <point x="372" y="212"/>
-      <point x="372" y="404" type="curve" smooth="yes"/>
-      <point x="372" y="656"/>
-      <point x="644" y="700"/>
-      <point x="1004" y="700" type="curve" smooth="yes"/>
+      <point x="1128" y="764" type="line"/>
+      <point x="1128" y="556" type="line" smooth="yes"/>
+      <point x="1128" y="364"/>
+      <point x="972" y="176"/>
+      <point x="664" y="176" type="curve" smooth="yes"/>
+      <point x="508" y="176"/>
+      <point x="372" y="268"/>
+      <point x="372" y="424" type="curve" smooth="yes"/>
+      <point x="372" y="744"/>
+      <point x="924" y="748"/>
+      <point x="1080" y="760" type="curve" smooth="yes"/>
     </contour>
     <contour>
       <point x="1128" y="0" type="line"/>
       <point x="1364" y="0" type="line"/>
-      <point x="1364" y="884" type="line" smooth="yes"/>
-      <point x="1364" y="1416"/>
-      <point x="1076" y="1556"/>
-      <point x="768" y="1556" type="curve" smooth="yes"/>
-      <point x="596" y="1556"/>
-      <point x="280" y="1504"/>
+      <point x="1364" y="948" type="line" smooth="yes"/>
+      <point x="1364" y="1400"/>
+      <point x="1064" y="1556"/>
+      <point x="752" y="1556" type="curve" smooth="yes"/>
+      <point x="588" y="1556"/>
+      <point x="280" y="1512"/>
       <point x="156" y="1180" type="curve"/>
       <point x="376" y="1096" type="line"/>
-      <point x="452" y="1248"/>
-      <point x="592" y="1348"/>
-      <point x="772" y="1348" type="curve" smooth="yes"/>
-      <point x="968" y="1348"/>
-      <point x="1128" y="1232"/>
-      <point x="1128" y="928" type="curve" smooth="yes"/>
-      <point x="1128" y="900" type="line"/>
-      <point x="1004" y="900" type="line" smooth="yes"/>
-      <point x="480" y="900"/>
-      <point x="136" y="772"/>
-      <point x="136" y="404" type="curve" smooth="yes"/>
-      <point x="136" y="140"/>
-      <point x="352" y="-36"/>
+      <point x="448" y="1260"/>
+      <point x="572" y="1348"/>
+      <point x="756" y="1348" type="curve" smooth="yes"/>
+      <point x="984" y="1348"/>
+      <point x="1128" y="1212"/>
+      <point x="1128" y="992" type="curve" smooth="yes"/>
+      <point x="1128" y="972" type="line"/>
+      <point x="1056" y="964" type="line" smooth="yes"/>
+      <point x="796" y="936"/>
+      <point x="136" y="912"/>
+      <point x="136" y="424" type="curve" smooth="yes"/>
+      <point x="136" y="136"/>
+      <point x="368" y="-36"/>
       <point x="660" y="-36" type="curve" smooth="yes"/>
-      <point x="908" y="-36"/>
+      <point x="928" y="-36"/>
       <point x="1068" y="108"/>
       <point x="1116" y="208" type="curve"/>
       <point x="1128" y="208" type="line"/>
     </contour>
     <contour>
-      <point x="760" y="1792" type="move" name="top"/>
+      <point x="760.0" y="1792.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="756" y="0" type="move" name="bottom"/>
+      <point x="756.0" y="0.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1364" y="0" type="move" name="ogonek"/>
+      <point x="1364.0" y="0.0" type="move" name="ogonek"/>
     </contour>
     <contour>
-      <point x="760" y="1792" type="move" name="rhalfring"/>
+      <point x="760.0" y="1792.0" type="move" name="rhalfring"/>
     </contour>
     <contour>
-      <point x="1504" y="2176" type="move" name="top_dd"/>
+      <point x="1504.0" y="2176.0" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1504" y="-560" type="move" name="bottom_dd"/>
+      <point x="1504.0" y="-560.0" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1272" y="908" type="move" name="rhotichook"/>
+      <point x="1272.0" y="908.0" type="move" name="rhotichook"/>
     </contour>
     <contour>
-      <point x="1272" y="1792" type="move" name="top0315"/>
+      <point x="1272.0" y="1792.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/afii10048.glif b/src/Inter-UI-Regular.ufo/glyphs/afii10048.glif
index 74000f615..e853a0fc0 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/afii10048.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/afii10048.glif
@@ -3,15 +3,15 @@
   <advance width="2528"/>
   <unicode hex="042E"/>
   <outline>
+    <component base="I" xOffset="-80"/>
+    <component base="hyphen" xScale="0.7" xOffset="96" yOffset="128"/>
+    <component base="O" xOffset="560"/>
     <contour>
       <point x="1184" y="2200" type="move" name="top"/>
     </contour>
     <contour>
       <point x="2432" y="2200" type="move" name="top0315"/>
     </contour>
-    <component base="I" xOffset="-80"/>
-    <component base="hyphen" xScale="0.7" xOffset="96" yOffset="128"/>
-    <component base="O" xOffset="560"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/afii10147.glif b/src/Inter-UI-Regular.ufo/glyphs/afii10147.glif
index 610b3ced2..84733491b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/afii10147.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/afii10147.glif
@@ -4,12 +4,6 @@
   <unicode hex="0472"/>
   <outline>
     <contour>
-      <point x="996.0" y="2212.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1928.0" y="2212.0" type="move" name="top0315"/>
-    </contour>
-    <contour>
       <point x="1640" y="1136" type="line"/>
       <point x="1128" y="1024"/>
       <point x="872" y="1280"/>
@@ -20,6 +14,12 @@
       <point x="1640" y="916" type="curve"/>
     </contour>
     <component base="O" xOffset="-16"/>
+    <contour>
+      <point x="996.0" y="2212.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1928.0" y="2212.0" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/bullseye.glif b/src/Inter-UI-Regular.ufo/glyphs/bullseye.glif
index c71cf7873..b3ab1adf3 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/bullseye.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/bullseye.glif
@@ -4,15 +4,6 @@
   <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"/>
       <point x="848" y="852"/>
@@ -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/Inter-UI-Regular.ufo/glyphs/e.glif b/src/Inter-UI-Regular.ufo/glyphs/e.glif
index e9f2f5a98..5fe63dc42 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/e.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/e.glif
@@ -1,63 +1,80 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="e" format="1">
-  <advance width="1616"/>
+  <advance width="1652"/>
   <unicode hex="0065"/>
   <outline>
     <contour>
-      <point x="840" y="-32" type="curve"/>
-      <point x="1148" y="-32"/>
-      <point x="1348" y="112"/>
-      <point x="1436" y="316" type="curve"/>
-      <point x="1220" y="412" type="line"/>
-      <point x="1156" y="268"/>
+      <point x="848" y="-32" type="curve"/>
+      <point x="1156" y="-32"/>
+      <point x="1392" y="112"/>
+      <point x="1484" y="332" type="curve"/>
+      <point x="1272" y="424" type="line"/>
+      <point x="1200" y="276"/>
       <point x="1028" y="180"/>
       <point x="840" y="180" type="curve" smooth="yes"/>
-      <point x="548" y="180"/>
-      <point x="372" y="420"/>
+      <point x="572" y="180"/>
+      <point x="372" y="376"/>
       <point x="372" y="768" type="curve"/>
-      <point x="372" y="1104"/>
-      <point x="552" y="1344"/>
-      <point x="820" y="1344" type="curve" smooth="yes"/>
-      <point x="1088" y="1344"/>
-      <point x="1252" y="1176"/>
-      <point x="1252" y="872" type="curve"/>
-      <point x="304" y="872" type="line"/>
-      <point x="304" y="668" type="line"/>
-      <point x="1480" y="668" type="line"/>
-      <point x="1480" y="768" type="line" smooth="yes"/>
-      <point x="1480" y="1332"/>
-      <point x="1200" y="1556"/>
-      <point x="816" y="1556" type="curve" smooth="yes"/>
-      <point x="404" y="1556"/>
-      <point x="136" y="1228"/>
-      <point x="136" y="768" type="curve"/>
-      <point x="136" y="296"/>
-      <point x="400" y="-32"/>
+      <point x="372" y="1132"/>
+      <point x="548" y="1344"/>
+      <point x="836" y="1344" type="curve"/>
+      <point x="1116" y="1344"/>
+      <point x="1288" y="1140"/>
+      <point x="1288" y="880" type="curve"/>
+      <point x="304" y="880" type="line"/>
+      <point x="304" y="676" type="line"/>
+      <point x="1520" y="676" type="line"/>
+      <point x="1520" y="776" type="line" smooth="yes"/>
+      <point x="1520" y="1340"/>
+      <point x="1180" y="1556"/>
+      <point x="828" y="1556" type="curve" smooth="yes"/>
+      <point x="388" y="1556"/>
+      <point x="136" y="1220"/>
+      <point x="136" y="764" type="curve"/>
+      <point x="136" y="308"/>
+      <point x="380" y="-32"/>
     </contour>
     <contour>
-      <point x="820" y="1792" type="move" name="top"/>
+      <point x="820.0" y="1792.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="840" y="0" type="move" name="bottom"/>
+      <point x="840.0" y="0.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1252" y="92" type="move" name="ogonek"/>
+      <point x="1252.0" y="92.0" type="move" name="ogonek"/>
     </contour>
     <contour>
-      <point x="1488" y="2176" type="move" name="top_dd"/>
+      <point x="1488.0" y="2176.0" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1488" y="-560" type="move" name="bottom_dd"/>
+      <point x="1488.0" y="-560.0" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1196" y="788" type="move" name="rhotichook"/>
+      <point x="1196.0" y="788.0" type="move" name="rhotichook"/>
     </contour>
     <contour>
-      <point x="1416" y="1792" type="move" name="top0315"/>
+      <point x="1416.0" y="1792.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>824</integer>
+          <key>y</key>
+          <integer>1480</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.layerData</key>
       <dict>
         <key>reference</key>
@@ -93,7 +110,7 @@
           <array>
           </array>
           <key>width</key>
-          <integer>1616</integer>
+          <integer>1652</integer>
         </dict>
       </dict>
       <key>com.typemytype.robofont.mark</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/s.glif b/src/Inter-UI-Regular.ufo/glyphs/s.glif
index a74c1f442..8150b0761 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/s.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/s.glif
@@ -1,64 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="s" format="1">
-  <advance width="1462"/>
+  <advance width="1448"/>
   <unicode hex="0073"/>
   <outline>
     <contour>
-      <point x="740" y="1792" type="move" name="top"/>
+      <point x="168" y="1112" type="curve" smooth="yes"/>
+      <point x="168" y="928"/>
+      <point x="296" y="760"/>
+      <point x="572" y="692" type="curve" smooth="yes"/>
+      <point x="828" y="628" type="line" smooth="yes"/>
+      <point x="980" y="592"/>
+      <point x="1044" y="516"/>
+      <point x="1044" y="416" type="curve" smooth="yes"/>
+      <point x="1044" y="288"/>
+      <point x="920" y="176"/>
+      <point x="700" y="176" type="curve" smooth="yes"/>
+      <point x="472" y="176"/>
+      <point x="364" y="296"/>
+      <point x="308" y="436" type="curve"/>
+      <point x="92" y="356" type="line"/>
+      <point x="168" y="164"/>
+      <point x="336" y="-32"/>
+      <point x="704" y="-32" type="curve" smooth="yes"/>
+      <point x="1084" y="-32"/>
+      <point x="1288" y="192"/>
+      <point x="1288" y="424" type="curve" smooth="yes"/>
+      <point x="1288" y="600"/>
+      <point x="1172" y="764"/>
+      <point x="892" y="832" type="curve" smooth="yes"/>
+      <point x="664" y="888" type="line" smooth="yes"/>
+      <point x="488" y="932"/>
+      <point x="404" y="1020"/>
+      <point x="404" y="1124" type="curve" smooth="yes"/>
+      <point x="404" y="1256"/>
+      <point x="544" y="1352"/>
+      <point x="732" y="1352" type="curve" smooth="yes"/>
+      <point x="968" y="1352"/>
+      <point x="1028" y="1200"/>
+      <point x="1056" y="1132" type="curve"/>
+      <point x="1268" y="1192" type="line"/>
+      <point x="1188" y="1416"/>
+      <point x="1008" y="1556"/>
+      <point x="732" y="1556" type="curve" smooth="yes"/>
+      <point x="408" y="1556"/>
+      <point x="168" y="1364"/>
     </contour>
     <contour>
-      <point x="736" y="0" type="move" name="bottom"/>
+      <point x="740.0" y="1792.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1428" y="2200" type="move" name="top_dd"/>
+      <point x="736.0" y="0.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1428" y="-560" type="move" name="bottom_dd"/>
+      <point x="1428.0" y="2200.0" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1428" y="1776" type="move" name="top0315"/>
+      <point x="1428.0" y="-560.0" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="168" y="1112" type="curve" smooth="yes"/>
-      <point x="168" y="900"/>
-      <point x="296" y="760"/>
-      <point x="572" y="692" type="curve" smooth="yes"/>
-      <point x="828" y="628" type="line" smooth="yes"/>
-      <point x="984" y="588"/>
-      <point x="1064" y="508"/>
-      <point x="1064" y="404" type="curve" smooth="yes"/>
-      <point x="1064" y="268"/>
-      <point x="912" y="176"/>
-      <point x="712" y="176" type="curve" smooth="yes"/>
-      <point x="524" y="176"/>
-      <point x="400" y="272"/>
-      <point x="340" y="364" type="curve"/>
-      <point x="156" y="232" type="line"/>
-      <point x="244" y="64"/>
-      <point x="444" y="-32"/>
-      <point x="704" y="-32" type="curve" smooth="yes"/>
-      <point x="1084" y="-32"/>
-      <point x="1308" y="156"/>
-      <point x="1308" y="424" type="curve" smooth="yes"/>
-      <point x="1308" y="636"/>
-      <point x="1172" y="772"/>
-      <point x="892" y="840" type="curve" smooth="yes"/>
-      <point x="664" y="896" type="line" smooth="yes"/>
-      <point x="488" y="940"/>
-      <point x="408" y="1020"/>
-      <point x="408" y="1124" type="curve" smooth="yes"/>
-      <point x="408" y="1256"/>
-      <point x="544" y="1352"/>
-      <point x="720" y="1352" type="curve" smooth="yes"/>
-      <point x="908" y="1352"/>
-      <point x="1028" y="1256"/>
-      <point x="1092" y="1160" type="curve"/>
-      <point x="1264" y="1284" type="line"/>
-      <point x="1176" y="1448"/>
-      <point x="980" y="1556"/>
-      <point x="720" y="1556" type="curve" smooth="yes"/>
-      <point x="408" y="1556"/>
-      <point x="168" y="1360"/>
+      <point x="1428.0" y="1776.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
@@ -67,7 +67,7 @@
       <array>
         <dict>
           <key>angle</key>
-          <real>-144.8193006387579</real>
+          <real>19.95889021754606</real>
           <key>isGlobal</key>
           <false/>
           <key>magnetic</key>
@@ -75,13 +75,13 @@
           <key>name</key>
           <string></string>
           <key>x</key>
-          <integer>1008</integer>
+          <integer>752</integer>
           <key>y</key>
-          <integer>1072</integer>
+          <integer>960</integer>
         </dict>
         <dict>
           <key>angle</key>
-          <real>-144.78240703180728</real>
+          <real>20.033923164462895</real>
           <key>isGlobal</key>
           <false/>
           <key>magnetic</key>
@@ -89,11 +89,237 @@
           <key>name</key>
           <string></string>
           <key>x</key>
-          <integer>388</integer>
+          <integer>1264</integer>
           <key>y</key>
-          <integer>380</integer>
+          <integer>784</integer>
         </dict>
       </array>
+      <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>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <integer>1248</integer>
+                  <key>y</key>
+                  <integer>412</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>1248</integer>
+                  <key>y</key>
+                  <integer>596</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>1120</integer>
+                  <key>y</key>
+                  <integer>764</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>844</integer>
+                  <key>y</key>
+                  <integer>832</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <integer>588</integer>
+                  <key>y</key>
+                  <integer>896</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>524</integer>
+                  <key>y</key>
+                  <integer>692</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <integer>752</integer>
+                  <key>y</key>
+                  <integer>636</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>928</integer>
+                  <key>y</key>
+                  <integer>592</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>1012</integer>
+                  <key>y</key>
+                  <integer>504</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <integer>1012</integer>
+                  <key>y</key>
+                  <integer>400</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>1012</integer>
+                  <key>y</key>
+                  <integer>268</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>872</integer>
+                  <key>y</key>
+                  <integer>172</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <integer>684</integer>
+                  <key>y</key>
+                  <integer>172</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>476</integer>
+                  <key>y</key>
+                  <integer>172</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>352</integer>
+                  <key>y</key>
+                  <integer>288</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>300</integer>
+                  <key>y</key>
+                  <integer>428</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>92</integer>
+                  <key>y</key>
+                  <integer>356</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>188</integer>
+                  <key>y</key>
+                  <integer>108</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>408</integer>
+                  <key>y</key>
+                  <integer>-32</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <integer>684</integer>
+                  <key>y</key>
+                  <integer>-32</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>1008</integer>
+                  <key>y</key>
+                  <integer>-32</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>1248</integer>
+                  <key>y</key>
+                  <integer>160</integer>
+                </dict>
+              </array>
+            </dict>
+          </array>
+          <key>lib</key>
+          <dict>
+          </dict>
+          <key>name</key>
+          <string>s</string>
+          <key>unicodes</key>
+          <array>
+          </array>
+          <key>width</key>
+          <integer>1448</integer>
+        </dict>
+      </dict>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>