diff --git a/src/Inter-UI-Black.ufo/glyphs/B_.glif b/src/Inter-UI-Black.ufo/glyphs/B_.glif
index 1f1cd939e..3a6931e8f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/B_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/B_.glif
@@ -3,29 +3,14 @@
   <advance width="1736"/>
   <unicode hex="0042"/>
   <outline>
-    <contour>
-      <point x="856" y="2260" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="912" y="24" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1904" y="2244" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1904" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1904" y="2260" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="932" y="876" type="line"/>
-      <point x="1064" y="1000" type="line"/>
-      <point x="1468" y="1004"/>
-      <point x="1616" y="1232"/>
-      <point x="1616" y="1480" type="curve"/>
-      <point x="1616" y="1864"/>
-      <point x="1324" y="2048"/>
+      <point x="1064" y="1040" type="line"/>
+      <point x="1468" y="1044"/>
+      <point x="1616" y="1220"/>
+      <point x="1616" y="1488" type="curve"/>
+      <point x="1616" y="1860"/>
+      <point x="1328" y="2048"/>
       <point x="840" y="2048" type="curve"/>
       <point x="128" y="2048" type="line"/>
       <point x="128" y="8" type="line"/>
@@ -35,7 +20,7 @@
       <point x="1060" y="1664"/>
       <point x="1156" y="1596"/>
       <point x="1156" y="1424" type="curve"/>
-      <point x="1156" y="1272"/>
+      <point x="1156" y="1256"/>
       <point x="1064" y="1196"/>
       <point x="840" y="1196" type="curve"/>
       <point x="416" y="1196" type="line"/>
@@ -43,25 +28,40 @@
     </contour>
     <contour>
       <point x="916" y="8" type="line"/>
-      <point x="1400" y="8"/>
-      <point x="1656" y="212"/>
-      <point x="1656" y="612" type="curve" smooth="yes"/>
-      <point x="1656" y="848"/>
-      <point x="1520" y="1084"/>
-      <point x="1128" y="1068" type="curve"/>
-      <point x="1024" y="1196" type="line"/>
+      <point x="1388" y="8"/>
+      <point x="1656" y="184"/>
+      <point x="1656" y="544" type="curve" smooth="yes"/>
+      <point x="1656" y="820"/>
+      <point x="1500" y="1028"/>
+      <point x="1256" y="1044" type="curve"/>
+      <point x="1256" y="1196" type="line"/>
       <point x="532" y="1196" type="line"/>
       <point x="532" y="876" type="line"/>
       <point x="932" y="876" type="line" smooth="yes"/>
       <point x="1124" y="876"/>
-      <point x="1200" y="776"/>
+      <point x="1200" y="760"/>
       <point x="1200" y="620" type="curve" smooth="yes"/>
-      <point x="1200" y="488"/>
+      <point x="1200" y="472"/>
       <point x="1116" y="388"/>
       <point x="916" y="388" type="curve" smooth="yes"/>
       <point x="364" y="388" type="line"/>
       <point x="364" y="8" type="line"/>
     </contour>
+    <contour>
+      <point x="856.0" y="2260.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="912.0" y="24.0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1904.0" y="2244.0" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1904.0" y="-560.0" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1904.0" y="2260.0" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/C_.glif b/src/Inter-UI-Black.ufo/glyphs/C_.glif
index ecdee7db9..2f1c288c4 100644
--- a/src/Inter-UI-Black.ufo/glyphs/C_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/C_.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="C" format="1">
-  <advance width="1932"/>
+  <advance width="1908"/>
   <unicode hex="0043"/>
   <outline>
     <contour>
@@ -157,7 +157,7 @@
           <array>
           </array>
           <key>width</key>
-          <integer>1932</integer>
+          <integer>1908</integer>
         </dict>
       </dict>
       <key>com.typemytype.robofont.mark</key>
diff --git a/src/Inter-UI-Black.ufo/glyphs/D_.glif b/src/Inter-UI-Black.ufo/glyphs/D_.glif
index 08513b346..58e07476e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/D_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/D_.glif
@@ -1,8 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="D" format="1">
-  <advance width="1860"/>
+  <advance width="1912"/>
   <unicode hex="0044"/>
   <outline>
+    <contour>
+      <point x="820" y="0" type="line"/>
+      <point x="1428" y="0"/>
+      <point x="1792" y="384"/>
+      <point x="1792" y="1024" type="curve"/>
+      <point x="1792" y="1664"/>
+      <point x="1428" y="2048"/>
+      <point x="820" y="2048" type="curve"/>
+      <point x="320" y="2048" type="line"/>
+      <point x="320" y="1648" type="line"/>
+      <point x="796" y="1648" type="line"/>
+      <point x="1148" y="1648"/>
+      <point x="1320" y="1472"/>
+      <point x="1320" y="1024" type="curve"/>
+      <point x="1320" y="576"/>
+      <point x="1148" y="400"/>
+      <point x="800" y="400" type="curve"/>
+      <point x="328" y="400" type="line"/>
+      <point x="328" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="592" y="2048" type="line"/>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="592" y="0" type="line"/>
+    </contour>
     <contour>
       <point x="768" y="2200" type="move" name="top"/>
     </contour>
@@ -21,32 +47,6 @@
     <contour>
       <point x="1908" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="820" y="0" type="line"/>
-      <point x="1360" y="0"/>
-      <point x="1764" y="364"/>
-      <point x="1764" y="1044" type="curve"/>
-      <point x="1764" y="1620"/>
-      <point x="1364" y="2048"/>
-      <point x="820" y="2048" type="curve"/>
-      <point x="320" y="2048" type="line"/>
-      <point x="320" y="1648" type="line"/>
-      <point x="796" y="1648" type="line"/>
-      <point x="1084" y="1648"/>
-      <point x="1292" y="1436"/>
-      <point x="1292" y="1044" type="curve"/>
-      <point x="1292" y="548"/>
-      <point x="1084" y="400"/>
-      <point x="800" y="400" type="curve"/>
-      <point x="328" y="400" type="line"/>
-      <point x="328" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="592" y="2048" type="line"/>
-      <point x="128" y="2048" type="line"/>
-      <point x="128" y="0" type="line"/>
-      <point x="592" y="0" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
@@ -60,9 +60,9 @@
           <key>magnetic</key>
           <integer>5</integer>
           <key>x</key>
-          <real>0.0</real>
+          <integer>1908</integer>
           <key>y</key>
-          <real>1238.875</real>
+          <integer>1024</integer>
         </dict>
         <dict>
           <key>angle</key>
@@ -88,7 +88,101 @@
           <key>y</key>
           <real>1549.625</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>1872</integer>
+          <key>y</key>
+          <integer>1696</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>1872</integer>
+          <key>y</key>
+          <integer>348</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>1408</integer>
+          <key>y</key>
+          <integer>1480</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>1472</integer>
+          <key>y</key>
+          <integer>560</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>O</string>
+              <key>transformation</key>
+              <array>
+                <integer>1</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+                <integer>1</integer>
+                <integer>-64</integer>
+                <integer>0</integer>
+              </array>
+            </dict>
+          </array>
+          <key>contours</key>
+          <array>
+          </array>
+          <key>lib</key>
+          <dict>
+          </dict>
+          <key>name</key>
+          <string>D</string>
+          <key>unicodes</key>
+          <array>
+          </array>
+          <key>width</key>
+          <integer>1912</integer>
+        </dict>
+      </dict>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/Inter-UI-Black.ufo/glyphs/O_.glif b/src/Inter-UI-Black.ufo/glyphs/O_.glif
index 0a4157b44..2926c5e1e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/O_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/O_.glif
@@ -3,6 +3,34 @@
   <advance width="1976"/>
   <unicode hex="004F"/>
   <outline>
+    <contour>
+      <point x="1856" y="1020" type="curve"/>
+      <point x="1856" y="1696"/>
+      <point x="1500" y="2076"/>
+      <point x="992" y="2076" type="curve" smooth="yes"/>
+      <point x="480" y="2076"/>
+      <point x="120" y="1696"/>
+      <point x="120" y="1020" type="curve"/>
+      <point x="120" y="348"/>
+      <point x="480" y="-28"/>
+      <point x="992" y="-28" type="curve" smooth="yes"/>
+      <point x="1500" y="-28"/>
+      <point x="1856" y="348"/>
+    </contour>
+    <contour>
+      <point x="1388" y="1020" type="curve"/>
+      <point x="1388" y="560"/>
+      <point x="1244" y="388"/>
+      <point x="992" y="388" type="curve" smooth="yes"/>
+      <point x="740" y="388"/>
+      <point x="588" y="560"/>
+      <point x="588" y="1020" type="curve"/>
+      <point x="588" y="1480"/>
+      <point x="740" y="1660"/>
+      <point x="992" y="1660" type="curve" smooth="yes"/>
+      <point x="1244" y="1660"/>
+      <point x="1388" y="1480"/>
+    </contour>
     <contour>
       <point x="988.0" y="2200.0" type="move" name="top"/>
     </contour>
@@ -21,34 +49,6 @@
     <contour>
       <point x="1960.0" y="2200.0" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1856" y="1020" type="curve"/>
-      <point x="1856" y="1688"/>
-      <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"/>
-      <point x="480" y="-28"/>
-      <point x="992" y="-28" type="curve" smooth="yes"/>
-      <point x="1500" y="-28"/>
-      <point x="1856" y="356"/>
-    </contour>
-    <contour>
-      <point x="1388" y="1020" type="curve"/>
-      <point x="1388" y="568"/>
-      <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="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>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Ohorn_.glif b/src/Inter-UI-Black.ufo/glyphs/Ohorn_.glif
index 2c5b87e0c..f186907a0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Ohorn_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Ohorn_.glif
@@ -3,15 +3,6 @@
   <advance width="2036"/>
   <unicode hex="01A0"/>
   <outline>
-    <contour>
-      <point x="976" y="2212" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="936" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1992" y="2212" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1760" y="2140" type="line"/>
       <point x="1760" y="1888"/>
@@ -23,6 +14,15 @@
       <point x="2036" y="2140" type="curve"/>
     </contour>
     <component base="O"/>
+    <contour>
+      <point x="976" y="2212" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="936" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1992" y="2212" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Oslash_.glif b/src/Inter-UI-Black.ufo/glyphs/Oslash_.glif
index c0dfd22e2..4902ee484 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Oslash_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Oslash_.glif
@@ -3,6 +3,13 @@
   <advance width="1976"/>
   <unicode hex="00D8"/>
   <outline>
+    <contour>
+      <point x="376" y="-100" type="line"/>
+      <point x="1800" y="2008" type="line"/>
+      <point x="1600" y="2144" type="line"/>
+      <point x="176" y="36" type="line"/>
+    </contour>
+    <component base="O"/>
     <contour>
       <point x="972.0" y="2304.0" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="1924.0" y="2304.0" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="376" y="-100" type="line"/>
-      <point x="1800" y="2008" type="line"/>
-      <point x="1600" y="2144" type="line"/>
-      <point x="176" y="36" type="line"/>
-    </contour>
-    <component base="O"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Q_.glif b/src/Inter-UI-Black.ufo/glyphs/Q_.glif
index eddfe14a0..c64bd6656 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Q_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Q_.glif
@@ -3,6 +3,17 @@
   <advance width="1976"/>
   <unicode hex="0051"/>
   <outline>
+    <contour>
+      <point x="792" y="704" type="line"/>
+      <point x="1064" y="316" type="line"/>
+      <point x="1180" y="124" type="line"/>
+      <point x="1400" y="-192" type="line"/>
+      <point x="1828" y="-192" type="line"/>
+      <point x="1508" y="264" type="line"/>
+      <point x="1316" y="500" type="line"/>
+      <point x="1172" y="704" type="line"/>
+    </contour>
+    <component base="O"/>
     <contour>
       <point x="1016" y="2200" type="move" name="top"/>
     </contour>
@@ -18,17 +29,6 @@
     <contour>
       <point x="1996" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="792" y="704" type="line"/>
-      <point x="1064" y="316" type="line"/>
-      <point x="1180" y="124" type="line"/>
-      <point x="1400" y="-192" type="line"/>
-      <point x="1828" y="-192" type="line"/>
-      <point x="1508" y="264" type="line"/>
-      <point x="1316" y="500" type="line"/>
-      <point x="1172" y="704" type="line"/>
-    </contour>
-    <component base="O"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10048.glif b/src/Inter-UI-Black.ufo/glyphs/afii10048.glif
index aebd6c413..0d538eb71 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10048.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10048.glif
@@ -3,15 +3,15 @@
   <advance width="2720"/>
   <unicode hex="042E"/>
   <outline>
+    <component base="I" xOffset="-8"/>
+    <component base="hyphen" xScale="0.7" xOffset="300" yOffset="160"/>
+    <component base="O" xOffset="744"/>
     <contour>
       <point x="1264" y="2200" type="move" name="top"/>
     </contour>
     <contour>
       <point x="2716" y="2200" type="move" name="top0315"/>
     </contour>
-    <component base="I" xOffset="-8"/>
-    <component base="hyphen" xScale="0.7" xOffset="300" yOffset="160"/>
-    <component base="O" xOffset="744"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10147.glif b/src/Inter-UI-Black.ufo/glyphs/afii10147.glif
index 1ec32ff19..951cf8eec 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10147.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10147.glif
@@ -3,12 +3,6 @@
   <advance width="1976"/>
   <unicode hex="0472"/>
   <outline>
-    <contour>
-      <point x="980.0" y="2200.0" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1928.0" y="2200.0" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1536" y="1176" type="line"/>
       <point x="1024" y="1064"/>
@@ -20,6 +14,12 @@
       <point x="1536" y="876" type="curve"/>
     </contour>
     <component base="O"/>
+    <contour>
+      <point x="980.0" y="2200.0" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1928.0" y="2200.0" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/bullseye.glif b/src/Inter-UI-Black.ufo/glyphs/bullseye.glif
index 6107a3b77..dbd86b630 100644
--- a/src/Inter-UI-Black.ufo/glyphs/bullseye.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/bullseye.glif
@@ -3,15 +3,6 @@
   <advance width="2048"/>
   <unicode hex="0298"/>
   <outline>
-    <contour>
-      <point x="968" y="2244" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="968" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1944" y="2244" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="744" y="1024" type="curve" smooth="yes"/>
       <point x="744" y="892"/>
@@ -27,6 +18,15 @@
       <point x="744" y="1156"/>
     </contour>
     <component base="O"/>
+    <contour>
+      <point x="968" y="2244" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="968" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1944" y="2244" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/r.glif b/src/Inter-UI-Black.ufo/glyphs/r.glif
index 0d6f5ccbe..6d1e7f299 100644
--- a/src/Inter-UI-Black.ufo/glyphs/r.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/r.glif
@@ -1,8 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="r" format="1">
-  <advance width="1020"/>
+  <advance width="1128"/>
   <unicode hex="0072"/>
   <outline>
+    <contour>
+      <point x="1112" y="1512" type="line"/>
+      <point x="1068" y="1536"/>
+      <point x="988" y="1556"/>
+      <point x="908" y="1556" type="curve"/>
+      <point x="772" y="1556"/>
+      <point x="644" y="1500"/>
+      <point x="600" y="1340" type="curve"/>
+      <point x="588" y="1340" type="line"/>
+      <point x="588" y="1536" type="line"/>
+      <point x="128" y="1536" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="588" y="0" type="line"/>
+      <point x="588" y="872" type="line"/>
+      <point x="588" y="1024"/>
+      <point x="684" y="1148"/>
+      <point x="836" y="1148" type="curve"/>
+      <point x="892" y="1148"/>
+      <point x="952" y="1132"/>
+      <point x="972" y="1120" type="curve"/>
+    </contour>
     <contour>
       <point x="604" y="1776" type="move" name="top"/>
     </contour>
@@ -18,27 +39,6 @@
     <contour>
       <point x="1092" y="1776" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="972" y="1548" type="line"/>
-      <point x="944" y="1556"/>
-      <point x="912" y="1556"/>
-      <point x="900" y="1556" type="curve"/>
-      <point x="772" y="1556"/>
-      <point x="644" y="1500"/>
-      <point x="600" y="1340" type="curve"/>
-      <point x="588" y="1340" type="line"/>
-      <point x="588" y="1536" type="line"/>
-      <point x="128" y="1536" type="line"/>
-      <point x="128" y="0" type="line"/>
-      <point x="588" y="0" type="line"/>
-      <point x="588" y="888" type="line"/>
-      <point x="588" y="1028"/>
-      <point x="708" y="1124"/>
-      <point x="880" y="1124" type="curve"/>
-      <point x="904" y="1124"/>
-      <point x="948" y="1124"/>
-      <point x="972" y="1120" type="curve"/>
-    </contour>
   </outline>
   <lib>
     <dict>
@@ -69,6 +69,210 @@
           <real>763.125</real>
         </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>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>1088</integer>
+                  <key>y</key>
+                  <integer>1504</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>1040</integer>
+                  <key>y</key>
+                  <integer>1532</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>964</integer>
+                  <key>y</key>
+                  <integer>1560</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>884</integer>
+                  <key>y</key>
+                  <integer>1560</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>704</integer>
+                  <key>y</key>
+                  <integer>1560</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>536</integer>
+                  <key>y</key>
+                  <integer>1420</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>492</integer>
+                  <key>y</key>
+                  <integer>1272</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>476</integer>
+                  <key>y</key>
+                  <integer>1272</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>476</integer>
+                  <key>y</key>
+                  <integer>1536</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>240</integer>
+                  <key>y</key>
+                  <integer>1536</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>240</integer>
+                  <key>y</key>
+                  <integer>0</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>476</integer>
+                  <key>y</key>
+                  <integer>0</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>476</integer>
+                  <key>y</key>
+                  <integer>868</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>480</integer>
+                  <key>y</key>
+                  <integer>1076</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>624</integer>
+                  <key>y</key>
+                  <integer>1316</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>876</integer>
+                  <key>y</key>
+                  <integer>1316</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>944</integer>
+                  <key>y</key>
+                  <integer>1316</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>984</integer>
+                  <key>y</key>
+                  <integer>1296</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>1008</integer>
+                  <key>y</key>
+                  <integer>1284</integer>
+                </dict>
+              </array>
+            </dict>
+          </array>
+          <key>lib</key>
+          <dict>
+          </dict>
+          <key>name</key>
+          <string>r</string>
+          <key>unicodes</key>
+          <array>
+          </array>
+          <key>width</key>
+          <integer>1128</integer>
+        </dict>
+      </dict>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.86</real>
diff --git a/src/Inter-UI-Black.ufo/glyphs/rdescend.glif b/src/Inter-UI-Black.ufo/glyphs/rdescend.glif
index c2874cfaa..84e30b491 100644
--- a/src/Inter-UI-Black.ufo/glyphs/rdescend.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/rdescend.glif
@@ -3,6 +3,13 @@
   <advance width="1020"/>
   <unicode hex="027C"/>
   <outline>
+    <contour>
+      <point x="128" y="-576" type="line"/>
+      <point x="588" y="-576" type="line"/>
+      <point x="588" y="56" type="line"/>
+      <point x="128" y="56" type="line"/>
+    </contour>
+    <component base="r"/>
     <contour>
       <point x="796" y="1776" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="1112" y="1776" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="128" y="-576" type="line"/>
-      <point x="588" y="-576" type="line"/>
-      <point x="588" y="56" type="line"/>
-      <point x="128" y="56" type="line"/>
-    </contour>
-    <component base="r"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/rrthook.glif b/src/Inter-UI-Black.ufo/glyphs/rrthook.glif
index 7c5ba1adb..abd4115f0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/rrthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/rrthook.glif
@@ -3,18 +3,6 @@
   <advance width="1280"/>
   <unicode hex="027D"/>
   <outline>
-    <contour>
-      <point x="592" y="-424" type="move" name="parenthesses.w1"/>
-    </contour>
-    <contour>
-      <point x="796" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="796" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1112" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="648" y="184" type="line"/>
       <point x="188" y="184" type="line"/>
@@ -34,6 +22,18 @@
       <point x="648" y="-80" type="curve" smooth="yes"/>
     </contour>
     <component base="r" xOffset="60"/>
+    <contour>
+      <point x="592" y="-424" type="move" name="parenthesses.w1"/>
+    </contour>
+    <contour>
+      <point x="796" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="796" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1112" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/rturn.glif b/src/Inter-UI-Black.ufo/glyphs/rturn.glif
index 81e28451a..4e6a93b0e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/rturn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/rturn.glif
@@ -3,6 +3,7 @@
   <advance width="1020.0"/>
   <unicode hex="0279"/>
   <outline>
+    <component base="r" xScale="-1.0" yScale="-1.0" xOffset="1020" yOffset="1536"/>
     <contour>
       <point x="652" y="1776" type="move" name="top"/>
     </contour>
@@ -12,7 +13,6 @@
     <contour>
       <point x="1012" y="1776" type="move" name="top0315"/>
     </contour>
-    <component base="r" xScale="-1.0" yScale="-1.0" xOffset="1020" yOffset="1536"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/rturnrthook.glif b/src/Inter-UI-Black.ufo/glyphs/rturnrthook.glif
index bc763e8ac..60319d63f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/rturnrthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/rturnrthook.glif
@@ -3,15 +3,6 @@
   <advance width="1280"/>
   <unicode hex="027B"/>
   <outline>
-    <contour>
-      <point x="340" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="340" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1284" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="496" y="296" type="line"/>
       <point x="496" y="-108" type="line" smooth="yes"/>
@@ -31,6 +22,15 @@
       <point x="940" y="296" type="line"/>
     </contour>
     <component base="r" xScale="-1" yScale="-1" xOffset="1080" yOffset="1488"/>
+    <contour>
+      <point x="340" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="340" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1284" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/section.glif b/src/Inter-UI-Black.ufo/glyphs/section.glif
index 9ef182adf..fb531c2fb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/section.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/section.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="section" format="1">
-  <advance width="1586.4363887569066"/>
+  <advance width="1586.9126112941856"/>
   <unicode hex="00A7"/>
   <outline>
     <contour>
@@ -23,20 +23,20 @@
       <point x="444" y="448" type="curve" smooth="yes"/>
       <point x="812" y="284" type="line" smooth="yes"/>
       <point x="880" y="252"/>
-      <point x="984" y="188"/>
+      <point x="984" y="192"/>
       <point x="984" y="100" type="curve" smooth="yes"/>
-      <point x="984" y="12"/>
-      <point x="900" y="-16"/>
-      <point x="812" y="-16" type="curve" smooth="yes"/>
-      <point x="684" y="-16"/>
-      <point x="624" y="40"/>
-      <point x="624" y="128" type="curve"/>
-      <point x="224" y="128" type="line"/>
-      <point x="224" y="-184"/>
-      <point x="452" y="-412"/>
-      <point x="812" y="-412" type="curve" smooth="yes"/>
-      <point x="1148" y="-412"/>
-      <point x="1388" y="-216"/>
+      <point x="984" y="8"/>
+      <point x="896" y="-24"/>
+      <point x="792" y="-24" type="curve" smooth="yes"/>
+      <point x="660" y="-24"/>
+      <point x="576" y="28"/>
+      <point x="576" y="144" type="curve"/>
+      <point x="176" y="144" type="line"/>
+      <point x="176" y="-196"/>
+      <point x="428" y="-412"/>
+      <point x="796" y="-412" type="curve" smooth="yes"/>
+      <point x="1140" y="-412"/>
+      <point x="1388" y="-220"/>
       <point x="1388" y="100" type="curve" smooth="yes"/>
       <point x="1388" y="256"/>
       <point x="1328" y="380"/>
@@ -129,6 +129,641 @@
           <real>0.0</real>
         </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>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1262.8252225883712</real>
+                  <key>y</key>
+                  <integer>1564</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1262.8252225883712</real>
+                  <key>y</key>
+                  <integer>1864</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1070.8252225883712</real>
+                  <key>y</key>
+                  <integer>2076</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <real>762.8252225883712</real>
+                  <key>y</key>
+                  <integer>2076</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>478.82522258837116</real>
+                  <key>y</key>
+                  <integer>2076</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>274.82522258837116</real>
+                  <key>y</key>
+                  <integer>1896</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>274.82522258837116</real>
+                  <key>y</key>
+                  <integer>1648</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>274.82522258837116</real>
+                  <key>y</key>
+                  <integer>1520</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>330.82522258837116</real>
+                  <key>y</key>
+                  <integer>1416</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>414.82522258837116</real>
+                  <key>y</key>
+                  <integer>1332</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>414.82522258837116</real>
+                  <key>y</key>
+                  <integer>1324</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>250.8252225883711</real>
+                  <key>y</key>
+                  <integer>1276</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>134.8252225883711</real>
+                  <key>y</key>
+                  <integer>1104</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <real>134.8252225883711</real>
+                  <key>y</key>
+                  <integer>960</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>134.8252225883711</real>
+                  <key>y</key>
+                  <integer>708</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>322.82522258837116</real>
+                  <key>y</key>
+                  <integer>576</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <real>426.82522258837116</real>
+                  <key>y</key>
+                  <integer>516</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <real>814.8252225883712</real>
+                  <key>y</key>
+                  <integer>292</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>910.8252225883712</real>
+                  <key>y</key>
+                  <integer>236</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1030.8252225883712</real>
+                  <key>y</key>
+                  <integer>168</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <real>1030.8252225883712</real>
+                  <key>y</key>
+                  <integer>16</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1030.8252225883712</real>
+                  <key>y</key>
+                  <integer>-132</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>898.8252225883712</real>
+                  <key>y</key>
+                  <integer>-204</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <real>750.8252225883712</real>
+                  <key>y</key>
+                  <integer>-204</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>570.8252225883712</real>
+                  <key>y</key>
+                  <integer>-204</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>438.82522258837116</real>
+                  <key>y</key>
+                  <integer>-96</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>438.82522258837116</real>
+                  <key>y</key>
+                  <integer>100</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>206.8252225883711</real>
+                  <key>y</key>
+                  <integer>100</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>206.8252225883711</real>
+                  <key>y</key>
+                  <integer>-220</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>434.82522258837116</real>
+                  <key>y</key>
+                  <integer>-416</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>750.8252225883712</real>
+                  <key>y</key>
+                  <integer>-416</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1014.8252225883712</real>
+                  <key>y</key>
+                  <integer>-416</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1258.8252225883712</real>
+                  <key>y</key>
+                  <integer>-280</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <real>1258.8252225883712</real>
+                  <key>y</key>
+                  <integer>16</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1258.8252225883712</real>
+                  <key>y</key>
+                  <integer>144</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1214.8252225883712</real>
+                  <key>y</key>
+                  <integer>256</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1118.8252225883712</real>
+                  <key>y</key>
+                  <integer>340</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1118.8252225883712</real>
+                  <key>y</key>
+                  <integer>344</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1270.8252225883712</real>
+                  <key>y</key>
+                  <integer>392</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1398.8252225883712</real>
+                  <key>y</key>
+                  <integer>556</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <real>1398.8252225883712</real>
+                  <key>y</key>
+                  <integer>704</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1398.8252225883712</real>
+                  <key>y</key>
+                  <integer>956</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1210.8252225883712</real>
+                  <key>y</key>
+                  <integer>1084</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <real>1106.8252225883712</real>
+                  <key>y</key>
+                  <integer>1144</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <real>718.8252225883712</real>
+                  <key>y</key>
+                  <integer>1372</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>622.8252225883712</real>
+                  <key>y</key>
+                  <integer>1428</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>502.82522258837116</real>
+                  <key>y</key>
+                  <integer>1524</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <real>502.82522258837116</real>
+                  <key>y</key>
+                  <integer>1648</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>502.82522258837116</real>
+                  <key>y</key>
+                  <integer>1748</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>582.8252225883712</real>
+                  <key>y</key>
+                  <integer>1864</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <real>762.8252225883712</real>
+                  <key>y</key>
+                  <integer>1864</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>950.8252225883712</real>
+                  <key>y</key>
+                  <integer>1864</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1034.8252225883712</real>
+                  <key>y</key>
+                  <integer>1736</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1034.8252225883712</real>
+                  <key>y</key>
+                  <integer>1564</integer>
+                </dict>
+              </array>
+            </dict>
+            <dict>
+              <key>points</key>
+              <array>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1178.8252225883712</real>
+                  <key>y</key>
+                  <integer>704</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1178.8252225883712</real>
+                  <key>y</key>
+                  <integer>540</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1002.8252225883712</real>
+                  <key>y</key>
+                  <integer>432</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <real>918.8252225883712</real>
+                  <key>y</key>
+                  <integer>480</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <real>546.8252225883712</real>
+                  <key>y</key>
+                  <integer>696</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>446.82522258837116</real>
+                  <key>y</key>
+                  <integer>756</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>354.82522258837116</real>
+                  <key>y</key>
+                  <integer>832</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <real>354.82522258837116</real>
+                  <key>y</key>
+                  <integer>960</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>354.82522258837116</real>
+                  <key>y</key>
+                  <integer>1128</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>510.82522258837116</real>
+                  <key>y</key>
+                  <integer>1244</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <real>598.8252225883712</real>
+                  <key>y</key>
+                  <integer>1192</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <real>990.8252225883712</real>
+                  <key>y</key>
+                  <integer>964</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1086.8252225883712</real>
+                  <key>y</key>
+                  <integer>908</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>1178.8252225883712</real>
+                  <key>y</key>
+                  <integer>820</integer>
+                </dict>
+              </array>
+            </dict>
+          </array>
+          <key>lib</key>
+          <dict>
+          </dict>
+          <key>name</key>
+          <string>section</string>
+          <key>unicodes</key>
+          <array>
+          </array>
+          <key>width</key>
+          <real>1586.9126112941856</real>
+        </dict>
+      </dict>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.94</real>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0243.glif b/src/Inter-UI-Black.ufo/glyphs/uni0243.glif
index 7dc608153..987776c47 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0243.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0243.glif
@@ -3,6 +3,8 @@
   <advance width="2048"/>
   <unicode hex="0243"/>
   <outline>
+    <component base="B" xOffset="208"/>
+    <component base="crossbar" xOffset="-92" yOffset="-416"/>
     <contour>
       <point x="1000" y="2216" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="1000" y="16" type="move" name="bottom"/>
     </contour>
-    <component base="B" xOffset="208"/>
-    <component base="crossbar" xOffset="-92" yOffset="-416"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni024D_.glif b/src/Inter-UI-Black.ufo/glyphs/uni024D_.glif
index ddef57790..c73955eee 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni024D_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni024D_.glif
@@ -3,6 +3,8 @@
   <advance width="1280"/>
   <unicode hex="024D"/>
   <outline>
+    <component base="r" xOffset="172"/>
+    <component base="crossbar" xOffset="-120" yOffset="-316"/>
     <contour>
       <point x="680" y="1776" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="532" y="16" type="move" name="bottom"/>
     </contour>
-    <component base="r" xOffset="172"/>
-    <component base="crossbar" xOffset="-120" yOffset="-316"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/kerning.plist b/src/Inter-UI-Black.ufo/kerning.plist
index 9f33fb05f..1efcd8559 100644
--- a/src/Inter-UI-Black.ufo/kerning.plist
+++ b/src/Inter-UI-Black.ufo/kerning.plist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>@KERN_LEFT_A</key>
@@ -3762,13 +3762,13 @@
 		<key>@KERN_RIGHT_a</key>
 		<integer>-28</integer>
 		<key>@KERN_RIGHT_c</key>
-		<integer>-34</integer>
+		<integer>-64</integer>
 		<key>@KERN_RIGHT_comma</key>
 		<integer>-240</integer>
 		<key>@KERN_RIGHT_divide</key>
 		<integer>-88</integer>
 		<key>@KERN_RIGHT_dotlessi</key>
-		<integer>13</integer>
+		<integer>8</integer>
 		<key>@KERN_RIGHT_dotlessj</key>
 		<integer>-176</integer>
 		<key>@KERN_RIGHT_eightsub</key>
@@ -3788,7 +3788,7 @@
 		<key>@KERN_RIGHT_s</key>
 		<integer>-33</integer>
 		<key>@KERN_RIGHT_v</key>
-		<integer>32</integer>
+		<integer>48</integer>
 		<key>@KERN_RIGHT_w</key>
 		<integer>22</integer>
 		<key>ampersand</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/r.glif b/src/Inter-UI-Regular.ufo/glyphs/r.glif
index 9c798582a..85f0387e2 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/r.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/r.glif
@@ -1,8 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="r" format="1">
-  <advance width="1060"/>
+  <advance width="1072"/>
   <unicode hex="0072"/>
   <outline>
+    <contour>
+      <point x="1056" y="1504" type="line"/>
+      <point x="1008" y="1532"/>
+      <point x="932" y="1560"/>
+      <point x="852" y="1560" type="curve"/>
+      <point x="672" y="1560"/>
+      <point x="504" y="1420"/>
+      <point x="460" y="1272" type="curve"/>
+      <point x="444" y="1272" type="line"/>
+      <point x="444" y="1536" type="line"/>
+      <point x="208" y="1536" type="line"/>
+      <point x="208" y="0" type="line"/>
+      <point x="444" y="0" type="line"/>
+      <point x="444" y="868" type="line"/>
+      <point x="448" y="1076"/>
+      <point x="592" y="1316"/>
+      <point x="844" y="1316" type="curve"/>
+      <point x="912" y="1316"/>
+      <point x="952" y="1296"/>
+      <point x="976" y="1284" type="curve"/>
+    </contour>
     <contour>
       <point x="544" y="1792" type="move" name="top"/>
     </contour>
@@ -18,27 +39,6 @@
     <contour>
       <point x="924.0" y="1792.0" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="980" y="1552" type="line"/>
-      <point x="964" y="1556"/>
-      <point x="920" y="1560"/>
-      <point x="864" y="1560" type="curve"/>
-      <point x="684" y="1560"/>
-      <point x="504" y="1420"/>
-      <point x="460" y="1272" type="curve"/>
-      <point x="444" y="1272" type="line"/>
-      <point x="444" y="1536" type="line"/>
-      <point x="208" y="1536" type="line"/>
-      <point x="208" y="0" type="line"/>
-      <point x="444" y="0" type="line"/>
-      <point x="444" y="880" type="line"/>
-      <point x="448" y="1080"/>
-      <point x="600" y="1316"/>
-      <point x="856" y="1316" type="curve"/>
-      <point x="916" y="1316"/>
-      <point x="956" y="1312"/>
-      <point x="980" y="1308" type="curve"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rdescend.glif b/src/Inter-UI-Regular.ufo/glyphs/rdescend.glif
index 1418d96ca..1b6b0bb3c 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rdescend.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rdescend.glif
@@ -3,6 +3,13 @@
   <advance width="1060"/>
   <unicode hex="027C"/>
   <outline>
+    <contour>
+      <point x="208" y="-576" type="line"/>
+      <point x="444" y="-576" type="line"/>
+      <point x="444" y="100" type="line"/>
+      <point x="208" y="100" type="line"/>
+    </contour>
+    <component base="r"/>
     <contour>
       <point x="584" y="1792" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="892" y="1792" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="208" y="-576" type="line"/>
-      <point x="444" y="-576" type="line"/>
-      <point x="444" y="100" type="line"/>
-      <point x="208" y="100" type="line"/>
-    </contour>
-    <component base="r"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rrthook.glif b/src/Inter-UI-Regular.ufo/glyphs/rrthook.glif
index 4f9a8f896..e3e290e39 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rrthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rrthook.glif
@@ -3,18 +3,6 @@
   <advance width="1060"/>
   <unicode hex="027D"/>
   <outline>
-    <contour>
-      <point x="360" y="-424" type="move" name="parenthesses.w1"/>
-    </contour>
-    <contour>
-      <point x="568" y="1792" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="480" y="-576" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="880" y="1792" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="444" y="36" type="line"/>
       <point x="208" y="36" type="line"/>
@@ -34,6 +22,18 @@
       <point x="444" y="-164" type="curve" smooth="yes"/>
     </contour>
     <component base="r"/>
+    <contour>
+      <point x="360" y="-424" type="move" name="parenthesses.w1"/>
+    </contour>
+    <contour>
+      <point x="568" y="1792" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="480" y="-576" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="880" y="1792" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rturn.glif b/src/Inter-UI-Regular.ufo/glyphs/rturn.glif
index 397999f1f..d2e28718e 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rturn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rturn.glif
@@ -3,6 +3,7 @@
   <advance width="1060.0"/>
   <unicode hex="0279"/>
   <outline>
+    <component base="r" xScale="-1.0" yScale="-1.0" xOffset="1060" yOffset="1536"/>
     <contour>
       <point x="284" y="1776" type="move" name="top"/>
     </contour>
@@ -12,7 +13,6 @@
     <contour>
       <point x="916" y="1776" type="move" name="top0315"/>
     </contour>
-    <component base="r" xScale="-1.0" yScale="-1.0" xOffset="1060" yOffset="1536"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rturnrthook.glif b/src/Inter-UI-Regular.ufo/glyphs/rturnrthook.glif
index ba638dc2d..dfea5bba1 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rturnrthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rturnrthook.glif
@@ -3,15 +3,6 @@
   <advance width="1088"/>
   <unicode hex="027B"/>
   <outline>
-    <contour>
-      <point x="424" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="424" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1136" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="616" y="336" type="line"/>
       <point x="616" y="-192" type="line" smooth="yes"/>
@@ -31,6 +22,15 @@
       <point x="852" y="336" type="line"/>
     </contour>
     <component base="r" xScale="-1" yScale="-1" xOffset="1060" yOffset="1488"/>
+    <contour>
+      <point x="424" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="424" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1136" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/section.glif b/src/Inter-UI-Regular.ufo/glyphs/section.glif
index 3972e68da..aff15f805 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/section.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/section.glif
@@ -23,23 +23,23 @@
       <point x="428" y="516" type="curve" smooth="yes"/>
       <point x="816" y="292" type="line" smooth="yes"/>
       <point x="912" y="236"/>
-      <point x="1044" y="168"/>
-      <point x="1044" y="16" type="curve" smooth="yes"/>
-      <point x="1044" y="-136"/>
-      <point x="912" y="-196"/>
-      <point x="772" y="-196" type="curve" smooth="yes"/>
-      <point x="588" y="-196"/>
-      <point x="472" y="-96"/>
-      <point x="472" y="100" type="curve"/>
-      <point x="240" y="100" type="line"/>
-      <point x="240" y="-220"/>
-      <point x="460" y="-416"/>
-      <point x="772" y="-416" type="curve" smooth="yes"/>
-      <point x="1036" y="-416"/>
-      <point x="1280" y="-280"/>
-      <point x="1280" y="4" type="curve" smooth="yes"/>
-      <point x="1280" y="152"/>
-      <point x="1212" y="256"/>
+      <point x="1032" y="168"/>
+      <point x="1032" y="16" type="curve" smooth="yes"/>
+      <point x="1032" y="-132"/>
+      <point x="900" y="-204"/>
+      <point x="752" y="-204" type="curve" smooth="yes"/>
+      <point x="572" y="-204"/>
+      <point x="440" y="-96"/>
+      <point x="440" y="100" type="curve"/>
+      <point x="208" y="100" type="line"/>
+      <point x="208" y="-220"/>
+      <point x="436" y="-416"/>
+      <point x="752" y="-416" type="curve"/>
+      <point x="1016" y="-416"/>
+      <point x="1260" y="-280"/>
+      <point x="1260" y="16" type="curve" smooth="yes"/>
+      <point x="1260" y="144"/>
+      <point x="1216" y="256"/>
       <point x="1120" y="340" type="curve"/>
       <point x="1120" y="344" type="line"/>
       <point x="1272" y="392"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni024D_.glif b/src/Inter-UI-Regular.ufo/glyphs/uni024D_.glif
index cef04a12b..e453264f9 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni024D_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni024D_.glif
@@ -3,6 +3,8 @@
   <advance width="1116"/>
   <unicode hex="024D"/>
   <outline>
+    <component base="r" xOffset="56"/>
+    <component base="crossbar" xOffset="-252" yOffset="-268"/>
     <contour>
       <point x="488" y="1776" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="380" y="16" type="move" name="bottom"/>
     </contour>
-    <component base="r" xOffset="56"/>
-    <component base="crossbar" xOffset="-252" yOffset="-268"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/kerning.plist b/src/Inter-UI-Regular.ufo/kerning.plist
index 9492ff677..f2815a1df 100644
--- a/src/Inter-UI-Regular.ufo/kerning.plist
+++ b/src/Inter-UI-Regular.ufo/kerning.plist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>@KERN_LEFT_A</key>
@@ -882,7 +882,7 @@
 		<key>@KERN_RIGHT_Y</key>
 		<integer>-54</integer>
 		<key>@KERN_RIGHT_c</key>
-		<integer>-48</integer>
+		<integer>-32</integer>
 		<key>@KERN_RIGHT_f</key>
 		<integer>28</integer>
 		<key>@KERN_RIGHT_quotedblleft</key>
@@ -3180,7 +3180,7 @@
 		<key>@KERN_RIGHT_Z</key>
 		<integer>-84</integer>
 		<key>@KERN_RIGHT_c</key>
-		<integer>-48</integer>
+		<integer>-64</integer>
 		<key>@KERN_RIGHT_comma</key>
 		<integer>-179</integer>
 		<key>@KERN_RIGHT_divide</key>
@@ -3203,6 +3203,8 @@
 		<integer>83</integer>
 		<key>@KERN_RIGHT_s</key>
 		<integer>-28</integer>
+		<key>@KERN_RIGHT_v</key>
+		<integer>32</integer>
 		<key>ampersand</key>
 		<integer>-27</integer>
 		<key>four</key>
@@ -3218,7 +3220,7 @@
 		<key>slash</key>
 		<integer>-96</integer>
 		<key>t</key>
-		<integer>82</integer>
+		<integer>96</integer>
 		<key>tcaron</key>
 		<integer>82</integer>
 		<key>tccurl</key>