diff --git a/src/Inter-UI-Black.ufo/glyphs/P_.glif b/src/Inter-UI-Black.ufo/glyphs/P_.glif
index 86fd2e137..d6987430b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/P_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/P_.glif
@@ -5,43 +5,43 @@
   <outline>
     <contour>
       <point x="936" y="704" type="line"/>
-      <point x="1440" y="704"/>
-      <point x="1684" y="952"/>
-      <point x="1684" y="1352" type="curve"/>
-      <point x="1684" y="1744"/>
-      <point x="1452" y="2048"/>
+      <point x="1448" y="704"/>
+      <point x="1668" y="960"/>
+      <point x="1668" y="1372" type="curve"/>
+      <point x="1668" y="1776"/>
+      <point x="1460" y="2048"/>
       <point x="936" y="2048" type="curve"/>
       <point x="144" y="2048" type="line"/>
       <point x="144" y="0" type="line"/>
       <point x="608" y="0" type="line"/>
       <point x="608" y="1664" type="line"/>
       <point x="936" y="1664" type="line"/>
-      <point x="1144" y="1664"/>
-      <point x="1224" y="1520"/>
-      <point x="1224" y="1372" type="curve"/>
-      <point x="1224" y="1224"/>
-      <point x="1144" y="1084"/>
+      <point x="1136" y="1664"/>
+      <point x="1208" y="1532"/>
+      <point x="1208" y="1372" type="curve"/>
+      <point x="1208" y="1212"/>
+      <point x="1136" y="1084"/>
       <point x="936" y="1084" type="curve"/>
       <point x="436" y="1084" type="line"/>
       <point x="436" y="704" type="line"/>
     </contour>
     <contour>
-      <point x="28" y="2000" type="move" name="tonos"/>
+      <point x="28.0" y="2000.0" type="move" name="tonos"/>
     </contour>
     <contour>
-      <point x="920" y="2216" type="move" name="top"/>
+      <point x="920.0" y="2216.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="828" y="16" type="move" name="bottom"/>
+      <point x="828.0" y="16.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1928" y="2200" type="move" name="top_dd"/>
+      <point x="1928.0" y="2200.0" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1928" y="-560" type="move" name="bottom_dd"/>
+      <point x="1928.0" y="-560.0" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1928" y="2216" type="move" name="top0315"/>
+      <point x="1928.0" y="2216.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
@@ -84,6 +84,20 @@
           <key>y</key>
           <real>1552.375</real>
         </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>808</integer>
+          <key>y</key>
+          <integer>1372</integer>
+        </dict>
       </array>
       <key>com.typemytype.robofont.layerData</key>
       <dict>
@@ -103,7 +117,7 @@
                 <integer>0</integer>
                 <integer>0</integer>
                 <integer>1</integer>
-                <integer>16</integer>
+                <integer>0</integer>
                 <integer>0</integer>
               </array>
             </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/R_.glif b/src/Inter-UI-Black.ufo/glyphs/R_.glif
index 810fcc201..510919eba 100644
--- a/src/Inter-UI-Black.ufo/glyphs/R_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/R_.glif
@@ -8,29 +8,29 @@
       <point x="144" y="0" type="line"/>
       <point x="608" y="0" type="line"/>
       <point x="608" y="1664" type="line"/>
-      <point x="916" y="1664" type="line" smooth="yes"/>
-      <point x="1116" y="1664"/>
-      <point x="1208" y="1564"/>
+      <point x="932" y="1664" type="line" smooth="yes"/>
+      <point x="1100" y="1664"/>
+      <point x="1208" y="1572"/>
       <point x="1208" y="1396" type="curve" smooth="yes"/>
-      <point x="1208" y="1220"/>
-      <point x="1108" y="1132"/>
-      <point x="916" y="1132" type="curve" smooth="yes"/>
+      <point x="1208" y="1216"/>
+      <point x="1096" y="1132"/>
+      <point x="932" y="1132" type="curve" smooth="yes"/>
       <point x="432" y="1132" type="line"/>
       <point x="436" y="752" type="line"/>
       <point x="1088" y="752" type="line"/>
       <point x="1240" y="792" type="line"/>
-      <point x="1496" y="888"/>
-      <point x="1668" y="1084"/>
+      <point x="1480" y="888"/>
+      <point x="1668" y="1076"/>
       <point x="1668" y="1408" type="curve" smooth="yes"/>
-      <point x="1668" y="1800"/>
+      <point x="1668" y="1808"/>
       <point x="1416" y="2048"/>
-      <point x="916" y="2048" type="curve" smooth="yes"/>
+      <point x="932" y="2048" type="curve" smooth="yes"/>
     </contour>
     <contour>
       <point x="1244" y="0" type="line"/>
       <point x="1752" y="0" type="line"/>
-      <point x="1224" y="932" type="line"/>
-      <point x="724" y="932" type="line"/>
+      <point x="1288" y="932" type="line"/>
+      <point x="788" y="932" type="line"/>
     </contour>
     <contour>
       <point x="900" y="2200" type="move" name="top"/>
@@ -89,54 +89,22 @@
           </array>
           <key>components</key>
           <array>
+            <dict>
+              <key>baseGlyph</key>
+              <string>P</string>
+              <key>transformation</key>
+              <array>
+                <integer>1</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+                <integer>1</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+              </array>
+            </dict>
           </array>
           <key>contours</key>
           <array>
-            <dict>
-              <key>points</key>
-              <array>
-                <dict>
-                  <key>segmentType</key>
-                  <string>line</string>
-                  <key>smooth</key>
-                  <false/>
-                  <key>x</key>
-                  <integer>1284</integer>
-                  <key>y</key>
-                  <integer>0</integer>
-                </dict>
-                <dict>
-                  <key>segmentType</key>
-                  <string>line</string>
-                  <key>smooth</key>
-                  <false/>
-                  <key>x</key>
-                  <integer>1572</integer>
-                  <key>y</key>
-                  <integer>0</integer>
-                </dict>
-                <dict>
-                  <key>segmentType</key>
-                  <string>line</string>
-                  <key>smooth</key>
-                  <false/>
-                  <key>x</key>
-                  <integer>1040</integer>
-                  <key>y</key>
-                  <integer>900</integer>
-                </dict>
-                <dict>
-                  <key>segmentType</key>
-                  <string>line</string>
-                  <key>smooth</key>
-                  <false/>
-                  <key>x</key>
-                  <integer>760</integer>
-                  <key>y</key>
-                  <integer>900</integer>
-                </dict>
-              </array>
-            </dict>
           </array>
           <key>lib</key>
           <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Rx_.glif b/src/Inter-UI-Black.ufo/glyphs/Rx_.glif
index 62f850815..11eebb7c2 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Rx_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Rx_.glif
@@ -4,41 +4,39 @@
   <unicode hex="211E"/>
   <outline>
     <contour>
-      <point x="144" y="2004" type="line"/>
+      <point x="144" y="2048" type="line" name="hr00"/>
       <point x="144" y="0" type="line"/>
-      <point x="604" y="0" type="line"/>
-      <point x="604" y="1628" type="line"/>
-      <point x="916" y="1628" type="line" smooth="yes"/>
-      <point x="1112" y="1628"/>
-      <point x="1208" y="1524"/>
-      <point x="1208" y="1352" type="curve" smooth="yes"/>
-      <point x="1208" y="1184"/>
-      <point x="1112" y="1080"/>
-      <point x="916" y="1080" type="curve" smooth="yes"/>
-      <point x="432" y="1080" type="line"/>
-      <point x="436" y="708" type="line"/>
-      <point x="1092" y="708" type="line"/>
-      <point x="1240" y="796" type="line"/>
-      <point x="1496" y="892"/>
-      <point x="1668" y="1052"/>
-      <point x="1668" y="1396" type="curve" smooth="yes"/>
-      <point x="1668" y="1792"/>
-      <point x="1380" y="2004"/>
-      <point x="916" y="2004" type="curve" smooth="yes"/>
+      <point x="608" y="0" type="line"/>
+      <point x="608" y="1664" type="line"/>
+      <point x="932" y="1664" type="line" smooth="yes"/>
+      <point x="1100" y="1664"/>
+      <point x="1208" y="1572"/>
+      <point x="1208" y="1396" type="curve" smooth="yes"/>
+      <point x="1208" y="1216"/>
+      <point x="1096" y="1132"/>
+      <point x="932" y="1132" type="curve" smooth="yes"/>
+      <point x="432" y="1132" type="line"/>
+      <point x="436" y="752" type="line"/>
+      <point x="1088" y="752" type="line"/>
+      <point x="1240" y="792" type="line"/>
+      <point x="1480" y="888"/>
+      <point x="1668" y="1076"/>
+      <point x="1668" y="1408" type="curve" smooth="yes"/>
+      <point x="1668" y="1808"/>
+      <point x="1416" y="2048"/>
+      <point x="932" y="2048" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="1596" y="0" type="line"/>
-      <point x="2072" y="0" type="line"/>
-      <point x="2072" y="20" type="line"/>
-      <point x="1340" y="892" type="line"/>
-      <point x="872" y="892" type="line"/>
+      <point x="1580" y="0" type="line"/>
+      <point x="2024" y="0" type="line"/>
+      <point x="1368" y="932" type="line"/>
+      <point x="932" y="932" type="line"/>
     </contour>
     <contour>
-      <point x="1336" y="0" type="line"/>
-      <point x="2060" y="892" type="line"/>
-      <point x="1592" y="892" type="line"/>
-      <point x="860" y="20" type="line"/>
-      <point x="860" y="0" type="line"/>
+      <point x="1376" y="0" type="line"/>
+      <point x="2024" y="932" type="line"/>
+      <point x="1588" y="932" type="line"/>
+      <point x="932" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/a.glif b/src/Inter-UI-Black.ufo/glyphs/a.glif
index f9e1978e1..067c9f5c0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/a.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/a.glif
@@ -1,78 +1,78 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="a" format="1">
-  <advance width="1560"/>
+  <advance width="1552"/>
   <unicode hex="0061"/>
   <outline>
     <contour>
-      <point x="952" y="492" type="line" smooth="yes"/>
-      <point x="952" y="384"/>
-      <point x="832" y="304"/>
-      <point x="712" y="304" type="curve" smooth="yes"/>
-      <point x="612" y="304"/>
-      <point x="548" y="360"/>
-      <point x="548" y="444" type="curve" smooth="yes"/>
-      <point x="548" y="556"/>
-      <point x="608" y="620"/>
-      <point x="792" y="640" type="curve" smooth="yes"/>
-      <point x="848" y="648"/>
-      <point x="928" y="664"/>
-      <point x="952" y="688" type="curve"/>
+      <point x="944" y="492" type="line" smooth="yes"/>
+      <point x="944" y="384"/>
+      <point x="824" y="304"/>
+      <point x="704" y="304" type="curve" smooth="yes"/>
+      <point x="604" y="304"/>
+      <point x="540" y="360"/>
+      <point x="540" y="444" type="curve" smooth="yes"/>
+      <point x="540" y="556"/>
+      <point x="600" y="620"/>
+      <point x="784" y="640" type="curve" smooth="yes"/>
+      <point x="840" y="648"/>
+      <point x="920" y="664"/>
+      <point x="944" y="688" type="curve"/>
     </contour>
     <contour>
-      <point x="976" y="0" type="line"/>
-      <point x="1416" y="0" type="line"/>
-      <point x="1416" y="1040" type="line" smooth="yes"/>
-      <point x="1416" y="1384"/>
-      <point x="1152" y="1556"/>
-      <point x="796" y="1556" type="curve" smooth="yes"/>
-      <point x="424" y="1556"/>
-      <point x="176" y="1368"/>
-      <point x="128" y="1084" type="curve"/>
-      <point x="552" y="1020" type="line"/>
-      <point x="580" y="1128"/>
-      <point x="656" y="1192"/>
-      <point x="764" y="1192" type="curve" smooth="yes"/>
-      <point x="868" y="1192"/>
-      <point x="952" y="1132"/>
-      <point x="952" y="1052" type="curve" smooth="yes"/>
-      <point x="952" y="1020" type="line"/>
-      <point x="952" y="948"/>
-      <point x="832" y="936"/>
-      <point x="732" y="928" type="curve" smooth="yes"/>
-      <point x="296" y="892"/>
-      <point x="104" y="704"/>
-      <point x="104" y="432" type="curve" smooth="yes"/>
-      <point x="104" y="136"/>
-      <point x="328" y="-28"/>
-      <point x="608" y="-28" type="curve" smooth="yes"/>
-      <point x="804" y="-28"/>
-      <point x="916" y="52"/>
-      <point x="964" y="132" type="curve"/>
-      <point x="976" y="132" type="line"/>
+      <point x="968" y="0" type="line"/>
+      <point x="1408" y="0" type="line"/>
+      <point x="1408" y="1040" type="line" smooth="yes"/>
+      <point x="1408" y="1384"/>
+      <point x="1144" y="1556"/>
+      <point x="788" y="1556" type="curve" smooth="yes"/>
+      <point x="416" y="1556"/>
+      <point x="168" y="1368"/>
+      <point x="120" y="1084" type="curve"/>
+      <point x="544" y="1020" type="line"/>
+      <point x="572" y="1128"/>
+      <point x="648" y="1192"/>
+      <point x="756" y="1192" type="curve" smooth="yes"/>
+      <point x="860" y="1192"/>
+      <point x="944" y="1132"/>
+      <point x="944" y="1052" type="curve" smooth="yes"/>
+      <point x="944" y="1020" type="line"/>
+      <point x="944" y="948"/>
+      <point x="824" y="936"/>
+      <point x="724" y="928" type="curve" smooth="yes"/>
+      <point x="288" y="892"/>
+      <point x="96" y="704"/>
+      <point x="96" y="432" type="curve" smooth="yes"/>
+      <point x="96" y="136"/>
+      <point x="320" y="-28"/>
+      <point x="600" y="-28" type="curve" smooth="yes"/>
+      <point x="796" y="-28"/>
+      <point x="908" y="52"/>
+      <point x="956" y="132" type="curve"/>
+      <point x="968" y="132" type="line"/>
     </contour>
     <contour>
-      <point x="788" y="1776" type="move" name="top"/>
+      <point x="780" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="784" y="0" type="move" name="bottom"/>
+      <point x="776" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1404" y="0" type="move" name="ogonek"/>
+      <point x="1396" y="0" type="move" name="ogonek"/>
     </contour>
     <contour>
-      <point x="788" y="1776" type="move" name="rhalfring"/>
+      <point x="780" y="1776" type="move" name="rhalfring"/>
     </contour>
     <contour>
-      <point x="1552" y="2200" type="move" name="top_dd"/>
+      <point x="1544" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1552" y="-560" type="move" name="bottom_dd"/>
+      <point x="1544" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1228" y="900" type="move" name="rhotichook"/>
+      <point x="1220" y="900" type="move" name="rhotichook"/>
     </contour>
     <contour>
-      <point x="1560" y="1776" type="move" name="top0315"/>
+      <point x="1552" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
@@ -128,7 +128,7 @@
                   <key>smooth</key>
                   <true/>
                   <key>x</key>
-                  <integer>1144</integer>
+                  <integer>1136</integer>
                   <key>y</key>
                   <integer>556</integer>
                 </dict>
@@ -136,7 +136,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>1144</integer>
+                  <integer>1136</integer>
                   <key>y</key>
                   <integer>364</integer>
                 </dict>
@@ -144,7 +144,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>988</integer>
+                  <integer>980</integer>
                   <key>y</key>
                   <integer>176</integer>
                 </dict>
@@ -154,7 +154,7 @@
                   <key>smooth</key>
                   <true/>
                   <key>x</key>
-                  <integer>712</integer>
+                  <integer>704</integer>
                   <key>y</key>
                   <integer>176</integer>
                 </dict>
@@ -162,7 +162,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>524</integer>
+                  <integer>516</integer>
                   <key>y</key>
                   <integer>176</integer>
                 </dict>
@@ -170,7 +170,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>388</integer>
+                  <integer>380</integer>
                   <key>y</key>
                   <integer>264</integer>
                 </dict>
@@ -180,7 +180,7 @@
                   <key>smooth</key>
                   <true/>
                   <key>x</key>
-                  <integer>388</integer>
+                  <integer>380</integer>
                   <key>y</key>
                   <integer>436</integer>
                 </dict>
@@ -188,7 +188,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>388</integer>
+                  <integer>380</integer>
                   <key>y</key>
                   <integer>624</integer>
                 </dict>
@@ -196,7 +196,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>552</integer>
+                  <integer>544</integer>
                   <key>y</key>
                   <integer>672</integer>
                 </dict>
@@ -206,7 +206,7 @@
                   <key>smooth</key>
                   <true/>
                   <key>x</key>
-                  <integer>736</integer>
+                  <integer>728</integer>
                   <key>y</key>
                   <integer>696</integer>
                 </dict>
@@ -214,7 +214,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>836</integer>
+                  <integer>828</integer>
                   <key>y</key>
                   <integer>708</integer>
                 </dict>
@@ -222,7 +222,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>1104</integer>
+                  <integer>1096</integer>
                   <key>y</key>
                   <integer>728</integer>
                 </dict>
@@ -232,7 +232,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>1144</integer>
+                  <integer>1136</integer>
                   <key>y</key>
                   <integer>768</integer>
                 </dict>
@@ -247,7 +247,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>1144</integer>
+                  <integer>1136</integer>
                   <key>y</key>
                   <integer>0</integer>
                 </dict>
@@ -257,7 +257,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>1380</integer>
+                  <integer>1372</integer>
                   <key>y</key>
                   <integer>0</integer>
                 </dict>
@@ -267,7 +267,7 @@
                   <key>smooth</key>
                   <true/>
                   <key>x</key>
-                  <integer>1380</integer>
+                  <integer>1372</integer>
                   <key>y</key>
                   <integer>1012</integer>
                 </dict>
@@ -275,7 +275,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>1380</integer>
+                  <integer>1372</integer>
                   <key>y</key>
                   <integer>1500</integer>
                 </dict>
@@ -283,7 +283,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>1008</integer>
+                  <integer>1000</integer>
                   <key>y</key>
                   <integer>1556</integer>
                 </dict>
@@ -293,7 +293,7 @@
                   <key>smooth</key>
                   <true/>
                   <key>x</key>
-                  <integer>812</integer>
+                  <integer>804</integer>
                   <key>y</key>
                   <integer>1556</integer>
                 </dict>
@@ -301,7 +301,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>580</integer>
+                  <integer>572</integer>
                   <key>y</key>
                   <integer>1556</integer>
                 </dict>
@@ -309,7 +309,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>316</integer>
+                  <integer>308</integer>
                   <key>y</key>
                   <integer>1476</integer>
                 </dict>
@@ -319,7 +319,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>196</integer>
+                  <integer>188</integer>
                   <key>y</key>
                   <integer>1196</integer>
                 </dict>
@@ -329,7 +329,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>420</integer>
+                  <integer>412</integer>
                   <key>y</key>
                   <integer>1116</integer>
                 </dict>
@@ -337,7 +337,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>472</integer>
+                  <integer>464</integer>
                   <key>y</key>
                   <integer>1228</integer>
                 </dict>
@@ -345,7 +345,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>596</integer>
+                  <integer>588</integer>
                   <key>y</key>
                   <integer>1348</integer>
                 </dict>
@@ -355,7 +355,7 @@
                   <key>smooth</key>
                   <true/>
                   <key>x</key>
-                  <integer>824</integer>
+                  <integer>816</integer>
                   <key>y</key>
                   <integer>1348</integer>
                 </dict>
@@ -363,7 +363,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>1008</integer>
+                  <integer>1000</integer>
                   <key>y</key>
                   <integer>1348</integer>
                 </dict>
@@ -371,7 +371,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>1144</integer>
+                  <integer>1136</integer>
                   <key>y</key>
                   <integer>1268</integer>
                 </dict>
@@ -381,7 +381,7 @@
                   <key>smooth</key>
                   <true/>
                   <key>x</key>
-                  <integer>1144</integer>
+                  <integer>1136</integer>
                   <key>y</key>
                   <integer>1012</integer>
                 </dict>
@@ -391,7 +391,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>1144</integer>
+                  <integer>1136</integer>
                   <key>y</key>
                   <integer>1008</integer>
                 </dict>
@@ -399,7 +399,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>1144</integer>
+                  <integer>1136</integer>
                   <key>y</key>
                   <integer>908</integer>
                 </dict>
@@ -407,7 +407,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>960</integer>
+                  <integer>952</integer>
                   <key>y</key>
                   <integer>916</integer>
                 </dict>
@@ -417,7 +417,7 @@
                   <key>smooth</key>
                   <true/>
                   <key>x</key>
-                  <integer>748</integer>
+                  <integer>740</integer>
                   <key>y</key>
                   <integer>888</integer>
                 </dict>
@@ -425,7 +425,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>460</integer>
+                  <integer>452</integer>
                   <key>y</key>
                   <integer>852</integer>
                 </dict>
@@ -433,7 +433,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>152</integer>
+                  <integer>144</integer>
                   <key>y</key>
                   <integer>784</integer>
                 </dict>
@@ -443,7 +443,7 @@
                   <key>smooth</key>
                   <true/>
                   <key>x</key>
-                  <integer>152</integer>
+                  <integer>144</integer>
                   <key>y</key>
                   <integer>436</integer>
                 </dict>
@@ -451,7 +451,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>152</integer>
+                  <integer>144</integer>
                   <key>y</key>
                   <integer>136</integer>
                 </dict>
@@ -459,7 +459,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>384</integer>
+                  <integer>376</integer>
                   <key>y</key>
                   <integer>-36</integer>
                 </dict>
@@ -469,7 +469,7 @@
                   <key>smooth</key>
                   <true/>
                   <key>x</key>
-                  <integer>676</integer>
+                  <integer>668</integer>
                   <key>y</key>
                   <integer>-36</integer>
                 </dict>
@@ -477,7 +477,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>944</integer>
+                  <integer>936</integer>
                   <key>y</key>
                   <integer>-36</integer>
                 </dict>
@@ -485,7 +485,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>1084</integer>
+                  <integer>1076</integer>
                   <key>y</key>
                   <integer>108</integer>
                 </dict>
@@ -495,7 +495,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>1132</integer>
+                  <integer>1124</integer>
                   <key>y</key>
                   <integer>208</integer>
                 </dict>
@@ -505,7 +505,7 @@
                   <key>smooth</key>
                   <false/>
                   <key>x</key>
-                  <integer>1144</integer>
+                  <integer>1136</integer>
                   <key>y</key>
                   <integer>208</integer>
                 </dict>
@@ -521,7 +521,7 @@
           <array>
           </array>
           <key>width</key>
-          <integer>1560</integer>
+          <integer>1552</integer>
         </dict>
       </dict>
       <key>com.typemytype.robofont.mark</key>
diff --git a/src/Inter-UI-Black.ufo/glyphs/five.glif b/src/Inter-UI-Black.ufo/glyphs/five.glif
index 4bc7fc934..1eec89a72 100644
--- a/src/Inter-UI-Black.ufo/glyphs/five.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/five.glif
@@ -9,25 +9,25 @@
       <point x="660" y="1020"/>
       <point x="796" y="1020" type="curve" smooth="yes"/>
       <point x="1004" y="1020"/>
-      <point x="1096" y="872"/>
+      <point x="1096" y="888"/>
       <point x="1096" y="676" type="curve" smooth="yes"/>
-      <point x="1096" y="492"/>
+      <point x="1096" y="504"/>
       <point x="1036" y="332"/>
       <point x="844" y="332" type="curve" smooth="yes"/>
-      <point x="700" y="332"/>
-      <point x="608" y="424"/>
-      <point x="596" y="568" type="curve"/>
-      <point x="152" y="568" type="line"/>
-      <point x="152" y="200"/>
-      <point x="496" y="-28"/>
+      <point x="660" y="332"/>
+      <point x="608" y="488"/>
+      <point x="596" y="632" type="curve"/>
+      <point x="152" y="632" type="line"/>
+      <point x="152" y="264"/>
+      <point x="412" y="-28"/>
       <point x="848" y="-28" type="curve" smooth="yes"/>
       <point x="1320" y="-28"/>
-      <point x="1536" y="300"/>
-      <point x="1536" y="644" type="curve" smooth="yes"/>
-      <point x="1536" y="1076"/>
-      <point x="1276" y="1340"/>
+      <point x="1536" y="312"/>
+      <point x="1536" y="672" type="curve" smooth="yes"/>
+      <point x="1536" y="1068"/>
+      <point x="1280" y="1340"/>
       <point x="940" y="1340" type="curve" smooth="yes"/>
-      <point x="764" y="1340"/>
+      <point x="776" y="1340"/>
       <point x="672" y="1276"/>
       <point x="636" y="1224" type="curve"/>
       <point x="628" y="1224" type="line"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/four.glif b/src/Inter-UI-Black.ufo/glyphs/four.glif
index 14cb664d6..ccd7e89ec 100644
--- a/src/Inter-UI-Black.ufo/glyphs/four.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/four.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="four" format="1">
-  <advance width="1824"/>
+  <advance width="1756"/>
   <unicode hex="0034"/>
   <outline>
     <contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tpalatalhook.glif b/src/Inter-UI-Black.ufo/glyphs/tpalatalhook.glif
index 55c25dd78..9e84117c1 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tpalatalhook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tpalatalhook.glif
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="tpalatalhook" format="1">
-  <advance width="1056"/>
+  <advance width="1048"/>
   <unicode hex="01AB"/>
   <outline>
     <contour>
-      <point x="652" y="80" type="line"/>
-      <point x="652" y="-80" type="line" smooth="yes"/>
-      <point x="652" y="-232"/>
-      <point x="520" y="-264"/>
-      <point x="416" y="-264" type="curve" smooth="yes"/>
-      <point x="376" y="-264"/>
-      <point x="344" y="-260"/>
-      <point x="304" y="-256" type="curve"/>
-      <point x="304" y="-552" type="line"/>
-      <point x="372" y="-568"/>
-      <point x="424" y="-572"/>
-      <point x="488" y="-572" type="curve" smooth="yes"/>
-      <point x="780" y="-572"/>
-      <point x="956" y="-396"/>
-      <point x="956" y="-80" type="curve" smooth="yes"/>
-      <point x="956" y="80" type="line"/>
+      <point x="692" y="316" type="line"/>
+      <point x="692" y="-80" type="line" smooth="yes"/>
+      <point x="692" y="-232"/>
+      <point x="560" y="-264"/>
+      <point x="456" y="-264" type="curve" smooth="yes"/>
+      <point x="416" y="-264"/>
+      <point x="384" y="-260"/>
+      <point x="344" y="-256" type="curve"/>
+      <point x="344" y="-552" type="line"/>
+      <point x="412" y="-568"/>
+      <point x="464" y="-572"/>
+      <point x="528" y="-572" type="curve" smooth="yes"/>
+      <point x="820" y="-572"/>
+      <point x="996" y="-396"/>
+      <point x="996" y="-80" type="curve" smooth="yes"/>
+      <point x="996" y="380" type="line"/>
     </contour>
-    <component base="t" xOffset="-4"/>
+    <component base="t"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni024C_.glif b/src/Inter-UI-Black.ufo/glyphs/uni024C_.glif
index 507d08dcc..5eaf603fe 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni024C_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni024C_.glif
@@ -1,46 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni024C" format="1">
-  <advance width="2080"/>
+  <advance width="1796"/>
   <unicode hex="024C"/>
   <outline>
     <contour>
-      <point x="356" y="2004" type="line"/>
-      <point x="356" y="0" type="line"/>
-      <point x="816" y="0" type="line"/>
-      <point x="816" y="1628" type="line"/>
-      <point x="1132" y="1628" type="line" smooth="yes"/>
-      <point x="1324" y="1628"/>
-      <point x="1420" y="1524"/>
-      <point x="1420" y="1352" type="curve" smooth="yes"/>
-      <point x="1420" y="1184"/>
-      <point x="1324" y="1080"/>
-      <point x="1132" y="1080" type="curve" smooth="yes"/>
-      <point x="128" y="1080" type="line"/>
-      <point x="128" y="708" type="line"/>
-      <point x="1304" y="708" type="line"/>
-      <point x="1452" y="796" type="line"/>
-      <point x="1712" y="892"/>
-      <point x="1884" y="1052"/>
-      <point x="1884" y="1396" type="curve" smooth="yes"/>
-      <point x="1884" y="1792"/>
-      <point x="1592" y="2004"/>
-      <point x="1132" y="2004" type="curve" smooth="yes"/>
+      <point x="144" y="2048" type="line" name="hr00"/>
+      <point x="144" y="0" type="line"/>
+      <point x="608" y="0" type="line"/>
+      <point x="608" y="1664" type="line"/>
+      <point x="932" y="1664" type="line" smooth="yes"/>
+      <point x="1100" y="1664"/>
+      <point x="1208" y="1572"/>
+      <point x="1208" y="1396" type="curve" smooth="yes"/>
+      <point x="1208" y="1216"/>
+      <point x="1096" y="1132"/>
+      <point x="932" y="1132" type="curve" smooth="yes"/>
+      <point x="0" y="1132" type="line"/>
+      <point x="0" y="752" type="line"/>
+      <point x="1088" y="752" type="line"/>
+      <point x="1240" y="792" type="line"/>
+      <point x="1480" y="888"/>
+      <point x="1668" y="1076"/>
+      <point x="1668" y="1408" type="curve" smooth="yes"/>
+      <point x="1668" y="1808"/>
+      <point x="1416" y="2048"/>
+      <point x="932" y="2048" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="1460" y="0" type="line"/>
-      <point x="1952" y="0" type="line"/>
-      <point x="1952" y="20" type="line"/>
-      <point x="1500" y="888" type="line"/>
-      <point x="1012" y="888" type="line"/>
+      <point x="1244" y="0" type="line"/>
+      <point x="1752" y="0" type="line"/>
+      <point x="1288" y="932" type="line"/>
+      <point x="788" y="932" type="line"/>
     </contour>
     <contour>
-      <point x="916" y="2200" type="move" name="top"/>
+      <point x="932" y="2200" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="944" y="16" type="move" name="bottom"/>
+      <point x="960" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="2020" y="2200" type="move" name="top0315"/>
+      <point x="2036" y="2200" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/v.glif b/src/Inter-UI-Black.ufo/glyphs/v.glif
index d36e832b8..4a0d3f14b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/v.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/v.glif
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="v" format="1">
-  <advance width="1568"/>
+  <advance width="1668"/>
   <unicode hex="0076"/>
   <outline>
     <contour>
-      <point x="1508" y="1536" type="line"/>
-      <point x="1044" y="1536" type="line"/>
-      <point x="792" y="556" type="line"/>
-      <point x="776" y="556" type="line"/>
-      <point x="524" y="1536" type="line"/>
-      <point x="60" y="1536" type="line"/>
-      <point x="560" y="0" type="line"/>
-      <point x="1008" y="0" type="line"/>
+      <point x="1612" y="1536" type="line"/>
+      <point x="1140" y="1536" type="line"/>
+      <point x="844" y="580" type="line"/>
+      <point x="828" y="580" type="line"/>
+      <point x="528" y="1536" type="line"/>
+      <point x="56" y="1536" type="line"/>
+      <point x="616" y="0" type="line"/>
+      <point x="1048" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="784" y="1760" type="move" name="top"/>
+      <point x="856" y="1760" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="784" y="0" type="move" name="bottom"/>
+      <point x="856" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1508" y="2200" type="move" name="top_dd"/>
+      <point x="1580" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1508" y="-560" type="move" name="bottom_dd"/>
+      <point x="1580" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1508" y="1760" type="move" name="top0315"/>
+      <point x="1580" y="1760" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
@@ -67,11 +67,49 @@
           <key>name</key>
           <string></string>
           <key>x</key>
-          <integer>768</integer>
+          <integer>836</integer>
           <key>y</key>
-          <integer>448</integer>
+          <integer>652</integer>
         </dict>
       </array>
+      <key>com.typemytype.robofont.layerData</key>
+      <dict>
+        <key>reference</key>
+        <dict>
+          <key>anchors</key>
+          <array>
+          </array>
+          <key>components</key>
+          <array>
+            <dict>
+              <key>baseGlyph</key>
+              <string>y</string>
+              <key>transformation</key>
+              <array>
+                <integer>1</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+                <integer>1</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+              </array>
+            </dict>
+          </array>
+          <key>contours</key>
+          <array>
+          </array>
+          <key>lib</key>
+          <dict>
+          </dict>
+          <key>name</key>
+          <string>v</string>
+          <key>unicodes</key>
+          <array>
+          </array>
+          <key>width</key>
+          <integer>1668</integer>
+        </dict>
+      </dict>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/Inter-UI-Black.ufo/glyphs/y.glif b/src/Inter-UI-Black.ufo/glyphs/y.glif
index 4e4b7d3af..f8971cdc4 100644
--- a/src/Inter-UI-Black.ufo/glyphs/y.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/y.glif
@@ -1,53 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="y" format="1">
-  <advance width="1568"/>
+  <advance width="1668"/>
   <unicode hex="0079"/>
   <outline>
     <contour>
-      <point x="580" y="-24" type="line" smooth="yes"/>
-      <point x="544" y="-148"/>
-      <point x="476" y="-224"/>
-      <point x="300" y="-224" type="curve" smooth="yes"/>
-      <point x="280" y="-224"/>
-      <point x="276" y="-224"/>
-      <point x="240" y="-220" type="curve"/>
-      <point x="240" y="-572" type="line"/>
-      <point x="316" y="-596"/>
-      <point x="344" y="-600"/>
+      <point x="592" y="-24" type="line" smooth="yes"/>
+      <point x="532" y="-184"/>
+      <point x="496" y="-264"/>
+      <point x="296" y="-204" type="curve"/>
+      <point x="196" y="-556" type="line"/>
+      <point x="272" y="-584"/>
+      <point x="340" y="-600"/>
       <point x="428" y="-600" type="curve" smooth="yes"/>
       <point x="760" y="-600"/>
-      <point x="920" y="-372"/>
+      <point x="912" y="-372"/>
       <point x="968" y="-220" type="curve" smooth="yes"/>
-      <point x="1512" y="1536" type="line"/>
-      <point x="1036" y="1536" type="line"/>
+      <point x="1612" y="1536" type="line"/>
+      <point x="1140" y="1536" type="line"/>
+      <point x="820" y="552" type="line"/>
+      <point x="632" y="84" type="line"/>
     </contour>
     <contour>
-      <point x="532" y="1536" type="line"/>
+      <point x="528" y="1536" type="line"/>
       <point x="56" y="1536" type="line"/>
       <point x="616" y="4" type="line"/>
-      <point x="924" y="4" type="line"/>
-      <point x="868" y="496" type="line"/>
+      <point x="968" y="192" type="line"/>
     </contour>
     <contour>
-      <point x="796" y="1776" type="move" name="top"/>
+      <point x="816" y="588" type="line"/>
+      <point x="856" y="588" type="line"/>
+      <point x="856" y="624" type="line"/>
+      <point x="816" y="624" type="line"/>
     </contour>
     <contour>
-      <point x="748" y="-576" type="move" name="bottom"/>
+      <point x="796.0" y="1776.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="796" y="1776" type="move" name="marktop"/>
+      <point x="748.0" y="-576.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1504" y="2200" type="move" name="top_dd"/>
+      <point x="796.0" y="1776.0" type="move" name="marktop"/>
     </contour>
     <contour>
-      <point x="1504" y="-560" type="move" name="bottom_dd"/>
+      <point x="1504.0" y="2200.0" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1184" y="900" type="move" name="rhotichook"/>
+      <point x="1504.0" y="-560.0" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1504" y="1776" type="move" name="top0315"/>
+      <point x="1184.0" y="900.0" type="move" name="rhotichook"/>
+    </contour>
+    <contour>
+      <point x="1504.0" y="1776.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
@@ -64,11 +68,49 @@
           <key>name</key>
           <string></string>
           <key>x</key>
-          <integer>780</integer>
+          <integer>836</integer>
           <key>y</key>
-          <integer>556</integer>
+          <integer>316</integer>
         </dict>
       </array>
+      <key>com.typemytype.robofont.layerData</key>
+      <dict>
+        <key>reference</key>
+        <dict>
+          <key>anchors</key>
+          <array>
+          </array>
+          <key>components</key>
+          <array>
+            <dict>
+              <key>baseGlyph</key>
+              <string>x</string>
+              <key>transformation</key>
+              <array>
+                <integer>1</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+                <integer>1</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+              </array>
+            </dict>
+          </array>
+          <key>contours</key>
+          <array>
+          </array>
+          <key>lib</key>
+          <dict>
+          </dict>
+          <key>name</key>
+          <string>y</string>
+          <key>unicodes</key>
+          <array>
+          </array>
+          <key>width</key>
+          <integer>1668</integer>
+        </dict>
+      </dict>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/Inter-UI-Black.ufo/kerning.plist b/src/Inter-UI-Black.ufo/kerning.plist
index 25479f296..eb0152853 100644
--- a/src/Inter-UI-Black.ufo/kerning.plist
+++ b/src/Inter-UI-Black.ufo/kerning.plist
@@ -1798,6 +1798,8 @@
 		<integer>-144</integer>
 		<key>@KERN_RIGHT_quotedblleft</key>
 		<integer>-76</integer>
+		<key>@KERN_RIGHT_t</key>
+		<integer>-16</integer>
 		<key>@KERN_RIGHT_v</key>
 		<integer>-58</integer>
 		<key>@KERN_RIGHT_w</key>
@@ -1986,6 +1988,10 @@
 		<integer>-70</integer>
 		<key>@KERN_RIGHT_quotedblleft</key>
 		<integer>-137</integer>
+		<key>@KERN_RIGHT_t</key>
+		<integer>-48</integer>
+		<key>@KERN_RIGHT_two</key>
+		<integer>-16</integer>
 		<key>@KERN_RIGHT_v</key>
 		<integer>-63</integer>
 		<key>@KERN_RIGHT_w</key>
@@ -2679,7 +2685,7 @@
 		<key>@KERN_RIGHT_s</key>
 		<integer>-56</integer>
 		<key>@KERN_RIGHT_t</key>
-		<integer>64</integer>
+		<integer>32</integer>
 		<key>ampersand</key>
 		<integer>-68</integer>
 		<key>four</key>
@@ -3786,7 +3792,7 @@
 		<key>@KERN_RIGHT_quotedblright</key>
 		<integer>103</integer>
 		<key>@KERN_RIGHT_s</key>
-		<integer>-33</integer>
+		<integer>-48</integer>
 		<key>@KERN_RIGHT_v</key>
 		<integer>48</integer>
 		<key>@KERN_RIGHT_w</key>
@@ -3876,7 +3882,7 @@
 		<key>@KERN_RIGHT_Y</key>
 		<integer>-111</integer>
 		<key>@KERN_RIGHT_c</key>
-		<integer>-16</integer>
+		<integer>-32</integer>
 		<key>@KERN_RIGHT_divide</key>
 		<integer>-28</integer>
 		<key>@KERN_RIGHT_dotlessj</key>
@@ -3884,7 +3890,7 @@
 		<key>@KERN_RIGHT_eightsub</key>
 		<integer>48</integer>
 		<key>@KERN_RIGHT_f</key>
-		<integer>24</integer>
+		<integer>-16</integer>
 		<key>@KERN_RIGHT_guillemotleft</key>
 		<integer>-40</integer>
 		<key>@KERN_RIGHT_m</key>
@@ -3896,7 +3902,7 @@
 		<key>@KERN_RIGHT_s</key>
 		<integer>-8</integer>
 		<key>@KERN_RIGHT_t</key>
-		<integer>16</integer>
+		<integer>-32</integer>
 		<key>four</key>
 		<integer>-28</integer>
 		<key>less</key>
@@ -5832,6 +5838,11 @@
 		<key>periodcentered</key>
 		<integer>40</integer>
 	</dict>
+	<key>m</key>
+	<dict>
+		<key>a</key>
+		<integer>0</integer>
+	</dict>
 	<key>mturn</key>
 	<dict>
 		<key>T</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/P_.glif b/src/Inter-UI-Regular.ufo/glyphs/P_.glif
index 1c38cd106..49a2afc97 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/P_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/P_.glif
@@ -5,22 +5,22 @@
   <outline>
     <contour>
       <point x="928" y="740" type="line"/>
-      <point x="1396" y="740"/>
-      <point x="1612" y="1040"/>
+      <point x="1404" y="740"/>
+      <point x="1612" y="1032"/>
       <point x="1612" y="1400" type="curve"/>
-      <point x="1612" y="1760"/>
-      <point x="1396" y="2048"/>
+      <point x="1612" y="1768"/>
+      <point x="1404" y="2048"/>
       <point x="924" y="2048" type="curve"/>
       <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="924" y="1828" type="line"/>
-      <point x="1248" y="1828"/>
-      <point x="1372" y="1648"/>
-      <point x="1372" y="1400" type="curve"/>
-      <point x="1372" y="1152"/>
-      <point x="1248" y="960"/>
+      <point x="1256" y="1828"/>
+      <point x="1368" y="1652"/>
+      <point x="1368" y="1400" type="curve"/>
+      <point x="1368" y="1148"/>
+      <point x="1256" y="960"/>
       <point x="928" y="960" type="curve"/>
       <point x="440" y="960" type="line"/>
       <point x="440" y="740" type="line"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/R_.glif b/src/Inter-UI-Regular.ufo/glyphs/R_.glif
index c3a09baa9..f18bad974 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/R_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/R_.glif
@@ -9,28 +9,28 @@
       <point x="488" y="0" type="line"/>
       <point x="488" y="1828" type="line"/>
       <point x="924" y="1828" type="line" smooth="yes"/>
-      <point x="1280" y="1828"/>
-      <point x="1372" y="1608"/>
-      <point x="1372" y="1420" type="curve" smooth="yes"/>
-      <point x="1372" y="1196"/>
-      <point x="1244" y="1024"/>
+      <point x="1288" y="1828"/>
+      <point x="1368" y="1612"/>
+      <point x="1368" y="1420" type="curve" smooth="yes"/>
+      <point x="1368" y="1192"/>
+      <point x="1256" 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="816" type="line"/>
-      <point x="1428" y="896"/>
-      <point x="1612" y="1108"/>
+      <point x="1440" y="896"/>
+      <point x="1612" y="1100"/>
       <point x="1612" y="1420" type="curve" smooth="yes"/>
-      <point x="1612" y="1752"/>
-      <point x="1404" y="2048"/>
+      <point x="1612" y="1760"/>
+      <point x="1412" y="2048"/>
       <point x="924" y="2048" type="curve"/>
     </contour>
     <contour>
       <point x="1396" y="0" type="line"/>
       <point x="1684" y="0" type="line"/>
-      <point x="1152" y="900" type="line"/>
-      <point x="872" y="900" type="line"/>
+      <point x="1216" y="900" type="line"/>
+      <point x="936" y="900" type="line"/>
     </contour>
     <contour>
       <point x="896.0" y="2304.0" type="move" name="top"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/Rx_.glif b/src/Inter-UI-Regular.ufo/glyphs/Rx_.glif
index bc592edfe..883a7aebb 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/Rx_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/Rx_.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Rx" format="1">
-  <advance width="1916"/>
+  <advance width="1908"/>
   <unicode hex="211E"/>
   <outline>
     <contour>
@@ -8,37 +8,35 @@
       <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="924" y="1828" type="line" smooth="yes"/>
+      <point x="1288" y="1828"/>
+      <point x="1368" y="1612"/>
+      <point x="1368" y="1420" type="curve" smooth="yes"/>
+      <point x="1368" y="1192"/>
+      <point x="1256" 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="1608" y="1408" type="curve" smooth="yes"/>
-      <point x="1608" y="1800"/>
-      <point x="1352" y="2048"/>
-      <point x="896" y="2048" type="curve"/>
+      <point x="1136" y="816" type="line"/>
+      <point x="1440" y="896"/>
+      <point x="1612" y="1100"/>
+      <point x="1612" y="1420" type="curve" smooth="yes"/>
+      <point x="1612" y="1760"/>
+      <point x="1412" y="2048"/>
+      <point x="924" y="2048" type="curve"/>
     </contour>
     <contour>
       <point x="1524" y="0" type="line"/>
-      <point x="1804" y="0" type="line"/>
-      <point x="1804" y="16" type="line"/>
-      <point x="1204" y="900" type="line"/>
-      <point x="924" y="900" type="line"/>
+      <point x="1812" y="0" type="line"/>
+      <point x="1152" y="900" type="line"/>
+      <point x="872" y="900" type="line"/>
     </contour>
     <contour>
-      <point x="1204" y="0" type="line"/>
-      <point x="1804" y="900" type="line"/>
-      <point x="1524" y="900" type="line"/>
-      <point x="924" y="16" type="line"/>
-      <point x="924" y="0" type="line"/>
+      <point x="1160" y="0" type="line"/>
+      <point x="1812" y="900" type="line"/>
+      <point x="1532" y="900" type="line"/>
+      <point x="872" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/hadescendercyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/hadescendercyrillic.glif
index 9a67a611a..158d16671 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/hadescendercyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/hadescendercyrillic.glif
@@ -3,6 +3,8 @@
   <advance width="1504"/>
   <unicode hex="04B3"/>
   <outline>
+    <component base="x" xOffset="-28"/>
+    <component base="cyrillictic" xOffset="996"/>
     <contour>
       <point x="1376" y="2200" type="move" name="top_dd"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="1376" y="1760" type="move" name="top0315"/>
     </contour>
-    <component base="x" xOffset="-28"/>
-    <component base="cyrillictic" xOffset="996"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rdescend.glif b/src/Inter-UI-Regular.ufo/glyphs/rdescend.glif
index 1b6b0bb3c..c8723b483 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rdescend.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rdescend.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="rdescend" format="1">
-  <advance width="1060"/>
+  <advance width="1072"/>
   <unicode hex="027C"/>
   <outline>
     <contour>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rrthook.glif b/src/Inter-UI-Regular.ufo/glyphs/rrthook.glif
index e3e290e39..afa9503a3 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rrthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rrthook.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="rrthook" format="1">
-  <advance width="1060"/>
+  <advance width="1072"/>
   <unicode hex="027D"/>
   <outline>
     <contour>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rturn.glif b/src/Inter-UI-Regular.ufo/glyphs/rturn.glif
index d2e28718e..9b4a3e03b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rturn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rturn.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="rturn" format="1">
-  <advance width="1060.0"/>
+  <advance width="1072.0"/>
   <unicode hex="0279"/>
   <outline>
-    <component base="r" xScale="-1.0" yScale="-1.0" xOffset="1060" yOffset="1536"/>
+    <component base="r" xScale="-1.0" yScale="-1.0" xOffset="1072" yOffset="1536"/>
     <contour>
-      <point x="284" y="1776" type="move" name="top"/>
+      <point x="296" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="284" y="0" type="move" name="bottom"/>
+      <point x="296" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="916" y="1776" type="move" name="top0315"/>
+      <point x="928" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rturnrthook.glif b/src/Inter-UI-Regular.ufo/glyphs/rturnrthook.glif
index dfea5bba1..0c659eb20 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rturnrthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rturnrthook.glif
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="rturnrthook" format="1">
-  <advance width="1088"/>
+  <advance width="1100"/>
   <unicode hex="027B"/>
   <outline>
     <contour>
-      <point x="616" y="336" type="line"/>
-      <point x="616" y="-192" type="line" smooth="yes"/>
-      <point x="616" y="-456"/>
-      <point x="792" y="-600"/>
-      <point x="1016" y="-600" type="curve" smooth="yes"/>
-      <point x="1060" y="-600"/>
-      <point x="1116" y="-596"/>
-      <point x="1152" y="-584" type="curve"/>
-      <point x="1152" y="-400" type="line"/>
-      <point x="1132" y="-408"/>
-      <point x="1096" y="-408"/>
-      <point x="1076" y="-408" type="curve" smooth="yes"/>
-      <point x="948" y="-408"/>
-      <point x="852" y="-352"/>
-      <point x="852" y="-192" type="curve" smooth="yes"/>
-      <point x="852" y="336" type="line"/>
+      <point x="628" y="336" type="line"/>
+      <point x="628" y="-192" type="line" smooth="yes"/>
+      <point x="628" y="-456"/>
+      <point x="804" y="-600"/>
+      <point x="1028" y="-600" type="curve" smooth="yes"/>
+      <point x="1072" y="-600"/>
+      <point x="1128" y="-596"/>
+      <point x="1164" y="-584" type="curve"/>
+      <point x="1164" y="-400" type="line"/>
+      <point x="1144" y="-408"/>
+      <point x="1108" y="-408"/>
+      <point x="1088" y="-408" type="curve" smooth="yes"/>
+      <point x="960" y="-408"/>
+      <point x="864" y="-352"/>
+      <point x="864" y="-192" type="curve" smooth="yes"/>
+      <point x="864" y="336" type="line"/>
     </contour>
-    <component base="r" xScale="-1" yScale="-1" xOffset="1060" yOffset="1488"/>
+    <component base="r" xScale="-1" yScale="-1" xOffset="1072" yOffset="1488"/>
     <contour>
-      <point x="424" y="1776" type="move" name="top"/>
+      <point x="436" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="424" y="-616" type="move" name="bottom"/>
+      <point x="436" y="-616" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1136" y="1776" type="move" name="top0315"/>
+      <point x="1148" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/tpalatalhook.glif b/src/Inter-UI-Regular.ufo/glyphs/tpalatalhook.glif
index e297c912c..50f817727 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/tpalatalhook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/tpalatalhook.glif
@@ -4,7 +4,7 @@
   <unicode hex="01AB"/>
   <outline>
     <contour>
-      <point x="644" y="36" type="line"/>
+      <point x="644" y="184" type="line"/>
       <point x="644" y="-164" type="line" smooth="yes"/>
       <point x="644" y="-324"/>
       <point x="548" y="-372"/>
@@ -19,7 +19,7 @@
       <point x="704" y="-576"/>
       <point x="880" y="-428"/>
       <point x="880" y="-164" type="curve" smooth="yes"/>
-      <point x="880" y="36" type="line"/>
+      <point x="880" y="232" type="line"/>
     </contour>
     <component base="t"/>
   </outline>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni024C_.glif b/src/Inter-UI-Regular.ufo/glyphs/uni024C_.glif
index dac70a602..96d45c070 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni024C_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni024C_.glif
@@ -3,6 +3,35 @@
   <advance width="1780"/>
   <unicode hex="024C"/>
   <outline>
+    <contour>
+      <point x="248" y="2048" type="line"/>
+      <point x="248" y="0" type="line"/>
+      <point x="496" y="0" type="line"/>
+      <point x="496" y="1828" type="line"/>
+      <point x="932" y="1828" type="line" smooth="yes"/>
+      <point x="1296" y="1828"/>
+      <point x="1376" y="1612"/>
+      <point x="1376" y="1420" type="curve" smooth="yes"/>
+      <point x="1376" y="1192"/>
+      <point x="1264" y="1024"/>
+      <point x="904" y="1024" type="curve" smooth="yes"/>
+      <point x="0" y="1024" type="line"/>
+      <point x="0" y="796" type="line"/>
+      <point x="1068" y="796" type="line"/>
+      <point x="1144" y="816" type="line"/>
+      <point x="1448" y="896"/>
+      <point x="1620" y="1100"/>
+      <point x="1620" y="1420" type="curve" smooth="yes"/>
+      <point x="1620" y="1760"/>
+      <point x="1420" y="2048"/>
+      <point x="932" y="2048" type="curve"/>
+    </contour>
+    <contour>
+      <point x="1404" y="0" type="line"/>
+      <point x="1692" y="0" type="line"/>
+      <point x="1224" y="900" type="line"/>
+      <point x="944" y="900" type="line"/>
+    </contour>
     <contour>
       <point x="936" y="2200" type="move" name="top"/>
     </contour>
@@ -12,36 +41,6 @@
     <contour>
       <point x="1912" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="248" y="2048" type="line"/>
-      <point x="248" y="0" type="line"/>
-      <point x="496" y="0" type="line"/>
-      <point x="496" y="1828" type="line"/>
-      <point x="904" y="1828" type="line" smooth="yes"/>
-      <point x="1244" y="1828"/>
-      <point x="1364" y="1668"/>
-      <point x="1364" y="1408" type="curve" smooth="yes"/>
-      <point x="1364" y="1204"/>
-      <point x="1184" y="1016"/>
-      <point x="904" y="1016" type="curve" smooth="yes"/>
-      <point x="0" y="1016" type="line"/>
-      <point x="0" y="796" type="line"/>
-      <point x="1068" y="796" type="line"/>
-      <point x="1144" y="824" type="line"/>
-      <point x="1436" y="904"/>
-      <point x="1616" y="1132"/>
-      <point x="1616" y="1408" type="curve" smooth="yes"/>
-      <point x="1616" y="1800"/>
-      <point x="1360" y="2048"/>
-      <point x="904" y="2048" type="curve"/>
-    </contour>
-    <contour>
-      <point x="1404" y="0" type="line"/>
-      <point x="1684" y="0" type="line"/>
-      <point x="1684" y="16" type="line"/>
-      <point x="1212" y="900" type="line"/>
-      <point x="932" y="900" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni024D_.glif b/src/Inter-UI-Regular.ufo/glyphs/uni024D_.glif
index e453264f9..a8289681f 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni024D_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni024D_.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni024D" format="1">
-  <advance width="1116"/>
+  <advance width="1128"/>
   <unicode hex="024D"/>
   <outline>
     <component base="r" xOffset="56"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni024F_.glif b/src/Inter-UI-Regular.ufo/glyphs/uni024F_.glif
index 2fa167442..188963708 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni024F_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni024F_.glif
@@ -3,6 +3,13 @@
   <advance width="1504"/>
   <unicode hex="024F"/>
   <outline>
+    <contour>
+      <point x="1428" y="1096" type="line"/>
+      <point x="84" y="1096" type="line"/>
+      <point x="84" y="912" type="line"/>
+      <point x="1428" y="912" type="line"/>
+    </contour>
+    <component base="y"/>
     <contour>
       <point x="648" y="1776" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="1392" y="1776" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1428" y="1096" type="line"/>
-      <point x="84" y="1096" type="line"/>
-      <point x="84" y="912" type="line"/>
-      <point x="1428" y="912" type="line"/>
-    </contour>
-    <component base="y"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni04FD__.glif b/src/Inter-UI-Regular.ufo/glyphs/uni04FD__.glif
index 1884167ef..011131469 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni04FD__.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni04FD__.glif
@@ -3,6 +3,8 @@
   <advance width="1536"/>
   <unicode hex="04FD"/>
   <outline>
+    <component base="x" xOffset="-116"/>
+    <component base="cyrillichook" xOffset="840"/>
     <contour>
       <point x="1288" y="2200" type="move" name="top_dd"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="1288" y="1760" type="move" name="top0315"/>
     </contour>
-    <component base="x" xOffset="-116"/>
-    <component base="cyrillichook" xOffset="840"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/v.glif b/src/Inter-UI-Regular.ufo/glyphs/v.glif
index 12c6643f2..18a4788f9 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/v.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/v.glif
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="v" format="1">
-  <advance width="1504"/>
+  <advance width="1552"/>
   <unicode hex="0076"/>
   <outline>
     <contour>
-      <point x="752" y="1792" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="752" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1352" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1352" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1392" y="1792" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="1416" y="1536" type="line"/>
-      <point x="1176" y="1536" type="line"/>
-      <point x="760" y="364" type="line"/>
-      <point x="744" y="364" type="line"/>
-      <point x="328" y="1536" type="line"/>
+      <point x="1464" y="1536" type="line"/>
+      <point x="1212" y="1536" type="line"/>
+      <point x="784" y="292" type="line"/>
+      <point x="768" y="292" type="line"/>
+      <point x="340" y="1536" type="line"/>
       <point x="88" y="1536" type="line"/>
-      <point x="640" y="0" type="line"/>
-      <point x="864" y="0" type="line"/>
+      <point x="656" y="0" type="line"/>
+      <point x="896" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="752.0" y="1792.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="752.0" y="0.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1352.0" y="2200.0" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1352.0" y="-560.0" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1392.0" y="1792.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
@@ -43,11 +43,49 @@
           <key>name</key>
           <string></string>
           <key>x</key>
-          <integer>752</integer>
+          <integer>776</integer>
           <key>y</key>
-          <integer>288</integer>
+          <integer>360</integer>
         </dict>
       </array>
+      <key>com.typemytype.robofont.layerData</key>
+      <dict>
+        <key>reference</key>
+        <dict>
+          <key>anchors</key>
+          <array>
+          </array>
+          <key>components</key>
+          <array>
+            <dict>
+              <key>baseGlyph</key>
+              <string>y</string>
+              <key>transformation</key>
+              <array>
+                <integer>1</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+                <integer>1</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+              </array>
+            </dict>
+          </array>
+          <key>contours</key>
+          <array>
+          </array>
+          <key>lib</key>
+          <dict>
+          </dict>
+          <key>name</key>
+          <string>v</string>
+          <key>unicodes</key>
+          <array>
+          </array>
+          <key>width</key>
+          <integer>1552</integer>
+        </dict>
+      </dict>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/vturn.glif b/src/Inter-UI-Regular.ufo/glyphs/vturn.glif
index 41d941b7e..c8b631a46 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/vturn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/vturn.glif
@@ -3,6 +3,7 @@
   <advance width="1504"/>
   <unicode hex="028C"/>
   <outline>
+    <component base="v" xScale="-1.0" yScale="-1.0" xOffset="1504" yOffset="1536"/>
     <contour>
       <point x="748" y="1776" type="move" name="top"/>
     </contour>
@@ -12,7 +13,6 @@
     <contour>
       <point x="1436" y="1776" type="move" name="top0315"/>
     </contour>
-    <component base="v" xScale="-1.0" yScale="-1.0" xOffset="1504" yOffset="1536"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/x.glif b/src/Inter-UI-Regular.ufo/glyphs/x.glif
index 416fdc130..a9273da35 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/x.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/x.glif
@@ -3,6 +3,20 @@
   <advance width="1504"/>
   <unicode hex="0078"/>
   <outline>
+    <contour>
+      <point x="384" y="1536" type="line"/>
+      <point x="112" y="1536" type="line"/>
+      <point x="600" y="768" type="line"/>
+      <point x="112" y="0" type="line"/>
+      <point x="384" y="0" type="line"/>
+      <point x="752" y="596" type="line"/>
+      <point x="1120" y="0" type="line"/>
+      <point x="1392" y="0" type="line"/>
+      <point x="896" y="768" type="line"/>
+      <point x="1392" y="1536" type="line"/>
+      <point x="1120" y="1536" type="line"/>
+      <point x="752" y="908" type="line"/>
+    </contour>
     <contour>
       <point x="752" y="0" type="move" name="bottom"/>
     </contour>
@@ -24,20 +38,6 @@
     <contour>
       <point x="1388" y="1760" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="384" y="1536" type="line"/>
-      <point x="112" y="1536" type="line"/>
-      <point x="600" y="768" type="line"/>
-      <point x="112" y="0" type="line"/>
-      <point x="384" y="0" type="line"/>
-      <point x="752" y="596" type="line"/>
-      <point x="1120" y="0" type="line"/>
-      <point x="1392" y="0" type="line"/>
-      <point x="896" y="768" type="line"/>
-      <point x="1392" y="1536" type="line"/>
-      <point x="1120" y="1536" type="line"/>
-      <point x="752" y="908" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
@@ -58,6 +58,44 @@
           <integer>868</integer>
         </dict>
       </array>
+      <key>com.typemytype.robofont.layerData</key>
+      <dict>
+        <key>reference</key>
+        <dict>
+          <key>anchors</key>
+          <array>
+          </array>
+          <key>components</key>
+          <array>
+            <dict>
+              <key>baseGlyph</key>
+              <string>y</string>
+              <key>transformation</key>
+              <array>
+                <integer>1</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+                <integer>1</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+              </array>
+            </dict>
+          </array>
+          <key>contours</key>
+          <array>
+          </array>
+          <key>lib</key>
+          <dict>
+          </dict>
+          <key>name</key>
+          <string>x</string>
+          <key>unicodes</key>
+          <array>
+          </array>
+          <key>width</key>
+          <integer>1504</integer>
+        </dict>
+      </dict>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/y.glif b/src/Inter-UI-Regular.ufo/glyphs/y.glif
index ddf4bccc6..f168e7365 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/y.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/y.glif
@@ -1,53 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="y" format="1">
-  <advance width="1504"/>
+  <advance width="1552"/>
   <unicode hex="0079"/>
   <outline>
     <contour>
-      <point x="584" y="-136" type="line" smooth="yes"/>
-      <point x="500" y="-344"/>
-      <point x="376" y="-368"/>
-      <point x="240" y="-368" type="curve"/>
-      <point x="172" y="-368"/>
-      <point x="136" y="-364"/>
-      <point x="124" y="-360" type="curve"/>
-      <point x="124" y="-580" type="line"/>
-      <point x="152" y="-588"/>
-      <point x="264" y="-600"/>
-      <point x="304" y="-600" type="curve" smooth="yes"/>
-      <point x="528" y="-600"/>
-      <point x="712" y="-464"/>
-      <point x="796" y="-228" type="curve" smooth="yes"/>
-      <point x="1420" y="1536" type="line"/>
-      <point x="1164" y="1536" type="line"/>
+      <point x="604" y="-152" type="line" smooth="yes"/>
+      <point x="516" y="-380"/>
+      <point x="408" y="-400"/>
+      <point x="240" y="-360" type="curve"/>
+      <point x="180" y="-568" type="line"/>
+      <point x="204" y="-580"/>
+      <point x="272" y="-596"/>
+      <point x="352" y="-596" type="curve" smooth="yes"/>
+      <point x="564" y="-596"/>
+      <point x="716" y="-484"/>
+      <point x="804" y="-248" type="curve" smooth="yes"/>
+      <point x="1464" y="1536" type="line"/>
+      <point x="1212" y="1536" type="line"/>
+      <point x="756" y="184" type="line"/>
+      <point x="668" y="16" type="line"/>
     </contour>
     <contour>
-      <point x="344" y="1536" type="line"/>
+      <point x="340" y="1536" type="line"/>
       <point x="88" y="1536" type="line"/>
-      <point x="648" y="-48" type="line"/>
-      <point x="844" y="48" type="line"/>
-      <point x="764" y="316" type="line"/>
+      <point x="672" y="-48" type="line"/>
+      <point x="852" y="48" type="line"/>
     </contour>
     <contour>
-      <point x="752.0" y="1792.0" type="move" name="top"/>
+      <point x="756" y="240" type="line"/>
+      <point x="804" y="240" type="line"/>
+      <point x="804" y="292" type="line"/>
+      <point x="756" y="292" type="line"/>
     </contour>
     <contour>
-      <point x="536" y="-576" type="move" name="bottom"/>
+      <point x="772" y="1792" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="752.0" y="1792.0" type="move" name="marktop"/>
+      <point x="556" y="-576" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1136.0" y="2176.0" type="move" name="top_dd"/>
+      <point x="772" y="1792" type="move" name="marktop"/>
     </contour>
     <contour>
-      <point x="1060" y="-576" type="move" name="bottom_dd"/>
+      <point x="1156" y="2176" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="752" y="896" type="move" name="rhotichook"/>
+      <point x="1080" y="-576" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1328.0" y="1792.0" type="move" name="top0315"/>
+      <point x="772" y="896" type="move" name="rhotichook"/>
+    </contour>
+    <contour>
+      <point x="1348" y="1792" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
@@ -87,7 +91,7 @@
                 <integer>0</integer>
                 <integer>0</integer>
                 <integer>1</integer>
-                <integer>0</integer>
+                <integer>20</integer>
                 <integer>0</integer>
               </array>
             </dict>
@@ -104,7 +108,7 @@
           <array>
           </array>
           <key>width</key>
-          <integer>1504</integer>
+          <integer>1552</integer>
         </dict>
       </dict>
       <key>com.typemytype.robofont.mark</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/yturn.glif b/src/Inter-UI-Regular.ufo/glyphs/yturn.glif
index 8a87cc2d4..6d2c8bd20 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/yturn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/yturn.glif
@@ -3,6 +3,7 @@
   <advance width="1504.0"/>
   <unicode hex="028E"/>
   <outline>
+    <component base="y" xScale="-1.0" yScale="-1.0" xOffset="1504" yOffset="1536"/>
     <contour>
       <point x="732" y="2200" type="move" name="top"/>
     </contour>
@@ -12,7 +13,6 @@
     <contour>
       <point x="1412" y="2200" type="move" name="top0315"/>
     </contour>
-    <component base="y" xScale="-1.0" yScale="-1.0" xOffset="1504" yOffset="1536"/>
   </outline>
   <lib>
     <dict>