more progress on light weight. currencies etc

18 files changed, 419 insertions, 977 deletions

diff --git a/src/Inter-UI-Black.ufo/glyphs/G_bar.glif b/src/Inter-UI-Black.ufo/glyphs/G_bar.glif
index 5398690a8..6ee30e005 100644
--- a/src/Inter-UI-Black.ufo/glyphs/G_bar.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/G_bar.glif
@@ -1,18 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gbar" format="2">
-  <advance width="2220.0"/>
+  <advance width="2176.0"/>
   <unicode hex="01E4"/>
   <outline>
     <contour>
-      <point x="2188.0" y="688.0" type="line"/>
-      <point x="1152.0" y="688.0" type="line"/>
-      <point x="1152.0" y="564.0" type="line"/>
-      <point x="2188.0" y="564.0" type="line"/>
+      <point x="2112.0" y="688.0" type="line"/>
+      <point x="1140.0" y="688.0" type="line"/>
+      <point x="1140.0" y="564.0" type="line"/>
+      <point x="2112.0" y="564.0" type="line"/>
     </contour>
-    <component base="G" xOffset="12.0"/>
+    <component base="G"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>G</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -20,18 +22,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>1.0</real>
+            <real>564.0</real>
+            <real>124.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>0.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -40,18 +37,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>1.0</real>
+            <real>1152.0</real>
+            <real>1036.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>2.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -60,18 +52,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>1.0</real>
+            <real>564.0</real>
+            <real>124.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>0.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/accountof.glif b/src/Inter-UI-Black.ufo/glyphs/accountof.glif
index c1799010a..925331923 100644
--- a/src/Inter-UI-Black.ufo/glyphs/accountof.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/accountof.glif
@@ -1,90 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="accountof" format="2">
-  <advance width="2584.0"/>
+  <advance width="2916.0"/>
   <unicode hex="2100"/>
   <outline>
-    <contour>
-      <point x="740.0" y="1424.0" type="line"/>
-      <point x="764.0" y="1164.0" type="line"/>
-      <point x="1048.0" y="1164.0" type="line"/>
-      <point x="1048.0" y="1772.0" type="line"/>
-      <point x="1047.0" y="1984.0"/>
-      <point x="875.0" y="2096.0"/>
-      <point x="652.0" y="2096.0" type="curve" smooth="yes"/>
-      <point x="391.0" y="2096.0"/>
-      <point x="227.0" y="1976.0"/>
-      <point x="228.0" y="1792.0" type="curve"/>
-      <point x="540.0" y="1792.0" type="line"/>
-      <point x="539.0" y="1849.0"/>
-      <point x="577.0" y="1884.0"/>
-      <point x="640.0" y="1884.0" type="curve" smooth="yes"/>
-      <point x="701.0" y="1884.0"/>
-      <point x="739.0" y="1846.0"/>
-      <point x="740.0" y="1784.0" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="492.0" y="1148.0" type="curve" smooth="yes"/>
-      <point x="669.0" y="1148.0"/>
-      <point x="726.0" y="1280.0"/>
-      <point x="756.0" y="1356.0" type="curve"/>
-      <point x="748.0" y="1456.0" type="line"/>
-      <point x="747.0" y="1420.0"/>
-      <point x="699.0" y="1364.0"/>
-      <point x="608.0" y="1364.0" type="curve" smooth="yes"/>
-      <point x="547.0" y="1364.0"/>
-      <point x="511.0" y="1396.0"/>
-      <point x="512.0" y="1436.0" type="curve" smooth="yes"/>
-      <point x="511.0" y="1492.0"/>
-      <point x="547.0" y="1568.0"/>
-      <point x="644.0" y="1568.0" type="curve" smooth="yes"/>
-      <point x="776.0" y="1568.0" type="line"/>
-      <point x="776.0" y="1720.0" type="line"/>
-      <point x="660.0" y="1720.0" type="line" smooth="yes"/>
-      <point x="347.0" y="1720.0"/>
-      <point x="207.0" y="1608.0"/>
-      <point x="208.0" y="1428.0" type="curve" smooth="yes"/>
-      <point x="207.0" y="1261.0"/>
-      <point x="328.0" y="1148.0"/>
-    </contour>
-    <contour>
-      <point x="1940.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="2239.0" y="-28.0"/>
-      <point x="2379.0" y="156.0"/>
-      <point x="2380.0" y="344.0" type="curve"/>
-      <point x="2052.0" y="344.0" type="line"/>
-      <point x="2051.0" y="308.0"/>
-      <point x="2015.0" y="256.0"/>
-      <point x="1940.0" y="256.0" type="curve" smooth="yes"/>
-      <point x="1859.0" y="256.0"/>
-      <point x="1819.0" y="320.0"/>
-      <point x="1820.0" y="384.0" type="curve" smooth="yes"/>
-      <point x="1820.0" y="492.0" type="line" smooth="yes"/>
-      <point x="1819.0" y="560.0"/>
-      <point x="1855.0" y="620.0"/>
-      <point x="1936.0" y="620.0" type="curve" smooth="yes"/>
-      <point x="2015.0" y="620.0"/>
-      <point x="2051.0" y="564.0"/>
-      <point x="2052.0" y="524.0" type="curve"/>
-      <point x="2380.0" y="524.0" type="line"/>
-      <point x="2379.0" y="724.0"/>
-      <point x="2239.0" y="904.0"/>
-      <point x="1936.0" y="904.0" type="curve" smooth="yes"/>
-      <point x="1643.0" y="904.0"/>
-      <point x="1495.0" y="716.0"/>
-      <point x="1496.0" y="492.0" type="curve" smooth="yes"/>
-      <point x="1496.0" y="384.0" type="line" smooth="yes"/>
-      <point x="1495.0" y="160.0"/>
-      <point x="1643.0" y="-28.0"/>
-    </contour>
-    <component base="fraction" xOffset="920.0"/>
+    <component base="a.sups"/>
+    <component base="fraction" xOffset="1112.0"/>
+    <component base="c.subs" xOffset="1800.0" yOffset="352.0"/>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.nodeUserData.0.16</key>
-      <dict>
-        <key>name</key>
-        <string>hr00</string>
-      </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>a.sups</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>c.subs</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>0</integer>
+        <integer>0</integer>
+        <integer>-1</integer>
+      </array>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -92,10 +26,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>27.0</real>
+            <real>-28.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -112,18 +46,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>21.0</real>
+            <real>1148.0</real>
+            <real>216.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>6.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -132,18 +61,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>12.0</real>
+            <real>1568.0</real>
+            <real>152.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>15.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -152,18 +76,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>5.0</real>
+            <real>2096.0</real>
+            <real>212.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>12.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -172,18 +91,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>27.0</real>
+            <real>-28.0</real>
+            <real>284.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>6.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -192,18 +106,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>13.0</real>
+            <real>620.0</real>
+            <real>284.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>20.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -212,18 +121,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>16.0</real>
+            <real>740.0</real>
+            <real>308.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>1.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -232,18 +136,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>24.0</real>
+            <real>1496.0</real>
+            <real>324.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>9.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -252,10 +151,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>27.0</real>
+            <real>-28.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -267,18 +166,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>21.0</real>
+            <real>1148.0</real>
+            <real>216.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>6.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -287,18 +181,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>12.0</real>
+            <real>1568.0</real>
+            <real>152.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>15.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -307,18 +196,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>5.0</real>
+            <real>2096.0</real>
+            <real>212.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>12.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -327,18 +211,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>27.0</real>
+            <real>-28.0</real>
+            <real>284.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>6.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -347,18 +226,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>13.0</real>
+            <real>620.0</real>
+            <real>284.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>20.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/addresssubject.glif b/src/Inter-UI-Black.ufo/glyphs/addresssubject.glif
index 4ca55ed1a..7de4220b2 100644
--- a/src/Inter-UI-Black.ufo/glyphs/addresssubject.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/addresssubject.glif
@@ -1,100 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="addresssubject" format="2">
-  <advance width="2588.0"/>
+  <advance width="2816.0"/>
   <unicode hex="2101"/>
   <outline>
-    <contour>
-      <point x="1932.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="2187.0" y="-28.0"/>
-      <point x="2355.0" y="104.0"/>
-      <point x="2356.0" y="256.0" type="curve" smooth="yes"/>
-      <point x="2355.0" y="420.0"/>
-      <point x="2231.0" y="504.0"/>
-      <point x="2008.0" y="540.0" type="curve" smooth="yes"/>
-      <point x="1831.0" y="568.0"/>
-      <point x="1819.0" y="612.0"/>
-      <point x="1820.0" y="640.0" type="curve" smooth="yes"/>
-      <point x="1819.0" y="696.0"/>
-      <point x="1875.0" y="728.0"/>
-      <point x="1932.0" y="728.0" type="curve" smooth="yes"/>
-      <point x="2011.0" y="728.0"/>
-      <point x="2047.0" y="692.0"/>
-      <point x="2048.0" y="616.0" type="curve"/>
-      <point x="2356.0" y="616.0" type="line"/>
-      <point x="2355.0" y="800.0"/>
-      <point x="2191.0" y="920.0"/>
-      <point x="1936.0" y="920.0" type="curve" smooth="yes"/>
-      <point x="1675.0" y="920.0"/>
-      <point x="1531.0" y="772.0"/>
-      <point x="1532.0" y="624.0" type="curve" smooth="yes"/>
-      <point x="1531.0" y="468.0"/>
-      <point x="1667.0" y="388.0"/>
-      <point x="1872.0" y="352.0" type="curve" smooth="yes"/>
-      <point x="2051.0" y="320.0"/>
-      <point x="2067.0" y="276.0"/>
-      <point x="2068.0" y="252.0" type="curve" smooth="yes"/>
-      <point x="2067.0" y="200.0"/>
-      <point x="2023.0" y="168.0"/>
-      <point x="1932.0" y="168.0" type="curve" smooth="yes"/>
-      <point x="1847.0" y="168.0"/>
-      <point x="1787.0" y="200.0"/>
-      <point x="1796.0" y="284.0" type="curve"/>
-      <point x="1508.0" y="284.0" type="line"/>
-      <point x="1507.0" y="144.0"/>
-      <point x="1659.0" y="-28.0"/>
-    </contour>
-    <contour>
-      <point x="740.0" y="1424.0" type="line"/>
-      <point x="764.0" y="1164.0" type="line"/>
-      <point x="1048.0" y="1164.0" type="line"/>
-      <point x="1048.0" y="1772.0" type="line"/>
-      <point x="1047.0" y="1984.0"/>
-      <point x="875.0" y="2096.0"/>
-      <point x="652.0" y="2096.0" type="curve" smooth="yes"/>
-      <point x="391.0" y="2096.0"/>
-      <point x="227.0" y="1976.0"/>
-      <point x="228.0" y="1792.0" type="curve"/>
-      <point x="540.0" y="1792.0" type="line"/>
-      <point x="539.0" y="1849.0"/>
-      <point x="577.0" y="1884.0"/>
-      <point x="640.0" y="1884.0" type="curve" smooth="yes"/>
-      <point x="701.0" y="1884.0"/>
-      <point x="739.0" y="1846.0"/>
-      <point x="740.0" y="1784.0" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="492.0" y="1148.0" type="curve" smooth="yes"/>
-      <point x="669.0" y="1148.0"/>
-      <point x="726.0" y="1280.0"/>
-      <point x="756.0" y="1356.0" type="curve"/>
-      <point x="748.0" y="1456.0" type="line"/>
-      <point x="747.0" y="1420.0"/>
-      <point x="699.0" y="1364.0"/>
-      <point x="608.0" y="1364.0" type="curve" smooth="yes"/>
-      <point x="547.0" y="1364.0"/>
-      <point x="511.0" y="1396.0"/>
-      <point x="512.0" y="1436.0" type="curve" smooth="yes"/>
-      <point x="511.0" y="1492.0"/>
-      <point x="547.0" y="1568.0"/>
-      <point x="644.0" y="1568.0" type="curve" smooth="yes"/>
-      <point x="776.0" y="1568.0" type="line"/>
-      <point x="776.0" y="1720.0" type="line"/>
-      <point x="660.0" y="1720.0" type="line" smooth="yes"/>
-      <point x="347.0" y="1720.0"/>
-      <point x="207.0" y="1608.0"/>
-      <point x="208.0" y="1428.0" type="curve" smooth="yes"/>
-      <point x="207.0" y="1261.0"/>
-      <point x="328.0" y="1148.0"/>
-    </contour>
-    <component base="fraction" xOffset="920.0"/>
+    <component base="a.sups"/>
+    <component base="fraction" xOffset="1112.0"/>
+    <component base="s.subs" xOffset="1720.0" yOffset="352.0"/>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.nodeUserData.1.16</key>
-      <dict>
-        <key>name</key>
-        <string>hr00</string>
-      </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>a.sups</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>s.subs</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>0</integer>
+        <integer>0</integer>
+        <integer>-1</integer>
+      </array>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -102,18 +26,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>37.0</real>
+            <real>-28.0</real>
+            <real>196.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>30.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -122,18 +41,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>11.0</real>
+            <real>728.0</real>
+            <real>192.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>18.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -142,18 +56,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>21.0</real>
+            <real>1148.0</real>
+            <real>216.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>6.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -162,18 +71,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>12.0</real>
+            <real>1568.0</real>
+            <real>152.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>15.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -182,18 +86,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>5.0</real>
+            <real>2096.0</real>
+            <real>212.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>12.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -202,18 +101,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>16.0</real>
+            <real>740.0</real>
+            <real>308.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>1.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -222,18 +116,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>37.0</real>
+            <real>-28.0</real>
+            <real>196.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>30.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -242,18 +131,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>11.0</real>
+            <real>728.0</real>
+            <real>192.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>18.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -262,18 +146,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>21.0</real>
+            <real>1148.0</real>
+            <real>216.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>6.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -282,18 +161,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>12.0</real>
+            <real>1568.0</real>
+            <real>152.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>15.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -302,18 +176,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>5.0</real>
+            <real>2096.0</real>
+            <real>212.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>12.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/cadauna.glif b/src/Inter-UI-Black.ufo/glyphs/cadauna.glif
index 2070f12cf..24ac72964 100644
--- a/src/Inter-UI-Black.ufo/glyphs/cadauna.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/cadauna.glif
@@ -1,67 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cadauna" format="2">
-  <advance width="2592.0"/>
+  <advance width="3072.0"/>
   <unicode hex="2106"/>
   <outline>
-    <contour>
-      <point x="716.0" y="1100.0" type="curve" smooth="yes"/>
-      <point x="1021.0" y="1100.0"/>
-      <point x="1161.0" y="1284.0"/>
-      <point x="1160.0" y="1472.0" type="curve"/>
-      <point x="832.0" y="1472.0" type="line"/>
-      <point x="833.0" y="1436.0"/>
-      <point x="793.0" y="1384.0"/>
-      <point x="716.0" y="1384.0" type="curve" smooth="yes"/>
-      <point x="637.0" y="1384.0"/>
-      <point x="601.0" y="1448.0"/>
-      <point x="600.0" y="1512.0" type="curve" smooth="yes"/>
-      <point x="600.0" y="1616.0" type="line" smooth="yes"/>
-      <point x="601.0" y="1688.0"/>
-      <point x="641.0" y="1748.0"/>
-      <point x="712.0" y="1748.0" type="curve" smooth="yes"/>
-      <point x="797.0" y="1748.0"/>
-      <point x="833.0" y="1692.0"/>
-      <point x="832.0" y="1652.0" type="curve"/>
-      <point x="1160.0" y="1652.0" type="line"/>
-      <point x="1161.0" y="1848.0"/>
-      <point x="1021.0" y="2032.0"/>
-      <point x="712.0" y="2032.0" type="curve" smooth="yes"/>
-      <point x="421.0" y="2032.0"/>
-      <point x="273.0" y="1844.0"/>
-      <point x="272.0" y="1616.0" type="curve" smooth="yes"/>
-      <point x="272.0" y="1512.0" type="line" smooth="yes"/>
-      <point x="273.0" y="1288.0"/>
-      <point x="421.0" y="1100.0"/>
-    </contour>
-    <contour>
-      <point x="1772.0" y="-16.0" type="curve" smooth="yes"/>
-      <point x="2021.0" y="-16.0"/>
-      <point x="2157.0" y="168.0"/>
-      <point x="2156.0" y="428.0" type="curve"/>
-      <point x="2048.0" y="428.0" type="line"/>
-      <point x="2049.0" y="308.0"/>
-      <point x="2009.0" y="220.0"/>
-      <point x="1864.0" y="220.0" type="curve" smooth="yes"/>
-      <point x="1797.0" y="220.0"/>
-      <point x="1749.0" y="264.0"/>
-      <point x="1748.0" y="348.0" type="curve" smooth="yes"/>
-      <point x="1748.0" y="916.0" type="line"/>
-      <point x="1448.0" y="916.0" type="line"/>
-      <point x="1448.0" y="368.0" type="line" smooth="yes"/>
-      <point x="1449.0" y="96.0"/>
-      <point x="1581.0" y="-16.0"/>
-    </contour>
-    <contour>
-      <point x="2016.0" y="232.0" type="line"/>
-      <point x="2056.0" y="0.0" type="line"/>
-      <point x="2324.0" y="0.0" type="line"/>
-      <point x="2324.0" y="916.0" type="line"/>
-      <point x="2016.0" y="916.0" type="line"/>
-    </contour>
-    <component base="fraction" xOffset="800.0"/>
+    <component base="c.sups"/>
+    <component base="fraction" xOffset="1116.0"/>
+    <component base="u.subs" xOffset="1884.0" yOffset="352.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>c.sups</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>u.subs</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>0</integer>
+        <integer>0</integer>
+        <integer>-1</integer>
+      </array>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -69,10 +26,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
             <real>0.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -89,18 +46,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>27.0</real>
+            <real>1100.0</real>
+            <real>284.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>6.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -109,18 +61,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>13.0</real>
+            <real>1748.0</real>
+            <real>284.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>20.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -129,18 +76,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>15.0</real>
+            <real>-16.0</real>
+            <real>236.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>6.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -149,18 +91,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>24.0</real>
+            <real>272.0</real>
+            <real>328.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>9.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -169,18 +106,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>12.0</real>
+            <real>1448.0</real>
+            <real>300.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>9.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -189,18 +121,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>4.0</real>
+            <real>2016.0</real>
+            <real>308.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>1.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -209,10 +136,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
             <real>0.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -224,18 +151,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>27.0</real>
+            <real>1100.0</real>
+            <real>284.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>6.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -244,18 +166,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>13.0</real>
+            <real>1748.0</real>
+            <real>284.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>20.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -264,18 +181,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>15.0</real>
+            <real>-16.0</real>
+            <real>236.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>6.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/careof.glif b/src/Inter-UI-Black.ufo/glyphs/careof.glif
index 587c34344..a47ca23f7 100644
--- a/src/Inter-UI-Black.ufo/glyphs/careof.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/careof.glif
@@ -1,74 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="careof" format="2">
-  <advance width="2604.0"/>
+  <advance width="3056.0"/>
   <unicode hex="2105"/>
   <outline>
-    <contour>
-      <point x="888.0" y="1472.0" type="line"/>
-      <point x="890.0" y="1436.0"/>
-      <point x="850.0" y="1384.0"/>
-      <point x="768.0" y="1384.0" type="curve" smooth="yes"/>
-      <point x="690.0" y="1384.0"/>
-      <point x="654.0" y="1448.0"/>
-      <point x="652.0" y="1512.0" type="curve" smooth="yes"/>
-      <point x="652.0" y="1616.0" type="line" smooth="yes"/>
-      <point x="654.0" y="1684.0"/>
-      <point x="690.0" y="1748.0"/>
-      <point x="768.0" y="1748.0" type="curve" smooth="yes"/>
-      <point x="846.0" y="1748.0"/>
-      <point x="890.0" y="1692.0"/>
-      <point x="888.0" y="1652.0" type="curve"/>
-      <point x="1216.0" y="1652.0" type="line"/>
-      <point x="1218.0" y="1848.0"/>
-      <point x="1078.0" y="2032.0"/>
-      <point x="768.0" y="2032.0" type="curve" smooth="yes"/>
-      <point x="478.0" y="2032.0"/>
-      <point x="326.0" y="1844.0"/>
-      <point x="324.0" y="1616.0" type="curve" smooth="yes"/>
-      <point x="324.0" y="1512.0" type="line" smooth="yes"/>
-      <point x="326.0" y="1288.0"/>
-      <point x="478.0" y="1100.0"/>
-      <point x="768.0" y="1100.0" type="curve" smooth="yes"/>
-      <point x="1078.0" y="1100.0"/>
-      <point x="1218.0" y="1284.0"/>
-      <point x="1216.0" y="1472.0" type="curve"/>
-    </contour>
-    <contour>
-      <point x="1328.0" y="384.0" type="line"/>
-      <point x="1330.0" y="143.0"/>
-      <point x="1529.0" y="-28.0"/>
-      <point x="1808.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="2086.0" y="-28.0"/>
-      <point x="2282.0" y="143.0"/>
-      <point x="2280.0" y="384.0" type="curve" smooth="yes"/>
-      <point x="2280.0" y="492.0" type="line" smooth="yes"/>
-      <point x="2282.0" y="733.0"/>
-      <point x="2085.0" y="904.0"/>
-      <point x="1804.0" y="904.0" type="curve" smooth="yes"/>
-      <point x="1527.0" y="904.0"/>
-      <point x="1330.0" y="733.0"/>
-      <point x="1328.0" y="492.0" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="1656.0" y="492.0" type="line"/>
-      <point x="1658.0" y="567.0"/>
-      <point x="1719.0" y="620.0"/>
-      <point x="1804.0" y="620.0" type="curve" smooth="yes"/>
-      <point x="1890.0" y="620.0"/>
-      <point x="1950.0" y="567.0"/>
-      <point x="1948.0" y="492.0" type="curve" smooth="yes"/>
-      <point x="1948.0" y="384.0" type="line" smooth="yes"/>
-      <point x="1950.0" y="309.0"/>
-      <point x="1892.0" y="256.0"/>
-      <point x="1808.0" y="256.0" type="curve" smooth="yes"/>
-      <point x="1721.0" y="256.0"/>
-      <point x="1658.0" y="309.0"/>
-      <point x="1656.0" y="384.0" type="curve" smooth="yes"/>
-    </contour>
-    <component base="fraction" xOffset="868.0"/>
+    <component base="c.sups"/>
+    <component base="fraction" xOffset="1116.0"/>
+    <component base="o.subs" xOffset="1884.0" yOffset="352.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>c.sups</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o.subs</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>0</integer>
+        <integer>0</integer>
+        <integer>-1</integer>
+      </array>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -76,10 +26,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>2.0</real>
+            <real>-28.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -96,18 +46,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>2.0</real>
+            <real>620.0</real>
+            <real>284.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>9.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -116,18 +61,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>23.0</real>
+            <real>1100.0</real>
+            <real>284.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>2.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -136,18 +76,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>9.0</real>
+            <real>1748.0</real>
+            <real>284.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>16.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -156,18 +91,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>2.0</real>
+            <real>-28.0</real>
+            <real>284.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>9.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -176,18 +106,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>20.0</real>
+            <real>324.0</real>
+            <real>328.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>5.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -196,18 +121,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>13.0</real>
+            <real>1328.0</real>
+            <real>328.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>12.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -216,18 +136,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>6.0</real>
+            <real>1948.0</real>
+            <real>332.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>5.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -236,10 +151,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>2.0</real>
+            <real>-28.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -251,18 +166,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>2.0</real>
+            <real>620.0</real>
+            <real>284.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>9.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -271,18 +181,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>23.0</real>
+            <real>1100.0</real>
+            <real>284.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>2.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -291,18 +196,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>9.0</real>
+            <real>1748.0</real>
+            <real>284.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>16.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -311,18 +211,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>2.0</real>
+            <real>-28.0</real>
+            <real>284.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>9.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/cedi.glif b/src/Inter-UI-Black.ufo/glyphs/cedi.glif
index 70589d6c6..f42756e28 100644
--- a/src/Inter-UI-Black.ufo/glyphs/cedi.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/cedi.glif
@@ -1,42 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cedi" format="2">
-  <advance width="2096.0"/>
+  <advance width="2164.0"/>
   <unicode hex="20B5"/>
   <outline>
     <contour>
-      <point x="1252.0" y="2304.0" type="line"/>
-      <point x="836.0" y="2304.0" type="line"/>
-      <point x="836.0" y="-256.0" type="line"/>
-      <point x="1252.0" y="-256.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1976.0" y="1404.0" type="line"/>
-      <point x="1847.0" y="1840.0"/>
-      <point x="1495.0" y="2076.0"/>
-      <point x="1072.0" y="2076.0" type="curve" smooth="yes"/>
-      <point x="527.0" y="2076.0"/>
-      <point x="123.0" y="1692.0"/>
-      <point x="124.0" y="1020.0" type="curve"/>
-      <point x="123.0" y="348.0"/>
-      <point x="531.0" y="-28.0"/>
-      <point x="1072.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="1491.0" y="-28.0"/>
-      <point x="1839.0" y="196.0"/>
-      <point x="1972.0" y="628.0" type="curve"/>
-      <point x="1432.0" y="720.0" type="line"/>
-      <point x="1371.0" y="544.0"/>
-      <point x="1251.0" y="460.0"/>
-      <point x="1072.0" y="460.0" type="curve" smooth="yes"/>
-      <point x="835.0" y="460.0"/>
-      <point x="687.0" y="600.0"/>
-      <point x="688.0" y="1020.0" type="curve"/>
-      <point x="687.0" y="1436.0"/>
-      <point x="835.0" y="1588.0"/>
-      <point x="1072.0" y="1588.0" type="curve" smooth="yes"/>
-      <point x="1259.0" y="1588.0"/>
-      <point x="1383.0" y="1492.0"/>
-      <point x="1444.0" y="1312.0" type="curve"/>
+      <point x="1292.0" y="2304.0" type="line"/>
+      <point x="876.0" y="2304.0" type="line"/>
+      <point x="876.0" y="-256.0" type="line"/>
+      <point x="1292.0" y="-256.0" type="line"/>
     </contour>
+    <component base="C"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/cent.glif b/src/Inter-UI-Black.ufo/glyphs/cent.glif
index 1fd0fd0d7..abc43ebb0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/cent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/cent.glif
@@ -1,14 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cent" format="2">
-  <advance width="1656.0"/>
+  <advance width="1708.0"/>
   <unicode hex="00A2"/>
   <guideline x="1472.0" y="1372.0" angle="90.0"/>
   <outline>
     <contour>
-      <point x="768.0" y="-256.0" type="line"/>
-      <point x="896.0" y="-256.0" type="line"/>
-      <point x="896.0" y="1780.0" type="line"/>
-      <point x="768.0" y="1780.0" type="line"/>
+      <point x="784.0" y="-256.0" type="line"/>
+      <point x="984.0" y="-256.0" type="line"/>
+      <point x="984.0" y="1780.0" type="line"/>
+      <point x="784.0" y="1780.0" type="line"/>
     </contour>
     <component base="c"/>
   </outline>
diff --git a/src/Inter-UI-Black.ufo/glyphs/colon.case.glif b/src/Inter-UI-Black.ufo/glyphs/colon.case.glif
index 67264b125..bca12c989 100644
--- a/src/Inter-UI-Black.ufo/glyphs/colon.case.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/colon.case.glif
@@ -1,12 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="colon.case" format="2">
-  <advance width="876.0"/>
+  <advance width="880.0"/>
   <outline>
-    <component base="period" xOffset="16.0" yOffset="272.0"/>
-    <component base="period" xOffset="16.0" yOffset="1296.0"/>
+    <component base="period" yOffset="272.0"/>
+    <component base="period" yOffset="1296.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>colon</string>
       <key>public.markColor</key>
       <string>0.67,0.95,0.38,1</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/colon.glif b/src/Inter-UI-Black.ufo/glyphs/colon.glif
index 692023212..1e1847e86 100644
--- a/src/Inter-UI-Black.ufo/glyphs/colon.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/colon.glif
@@ -3,11 +3,20 @@
   <advance width="880.0"/>
   <unicode hex="003A"/>
   <outline>
-    <component base="period" xOffset="16.0"/>
-    <component base="period" xOffset="16.0" yOffset="1032.0"/>
+    <component base="period"/>
+    <component base="period" yOffset="1032.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>period</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>period</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>1</integer>
+        <integer>0</integer>
+      </array>
       <key>public.markColor</key>
       <string>0.941,0.941,0.941,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dollar.glif b/src/Inter-UI-Black.ufo/glyphs/dollar.glif
index 973a03da8..d96fd824b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dollar.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dollar.glif
@@ -6,10 +6,10 @@
   <guideline y="764.0"/>
   <outline>
     <contour>
-      <point x="880.0" y="-256.0" type="line"/>
-      <point x="1008.0" y="-256.0" type="line"/>
-      <point x="1008.0" y="2304.0" type="line"/>
-      <point x="880.0" y="2304.0" type="line"/>
+      <point x="804.0" y="-256.0" type="line"/>
+      <point x="1088.0" y="-256.0" type="line"/>
+      <point x="1128.0" y="2304.0" type="line"/>
+      <point x="844.0" y="2304.0" type="line"/>
     </contour>
     <component base="S"/>
   </outline>
diff --git a/src/Inter-UI-Black.ufo/glyphs/guarani.glif b/src/Inter-UI-Black.ufo/glyphs/guarani.glif
index ba482bb0f..9a0cfaf7e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/guarani.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/guarani.glif
@@ -1,51 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guarani" format="2">
-  <advance width="2096.0"/>
+  <advance width="2176.0"/>
   <unicode hex="20B2"/>
   <outline>
     <contour>
-      <point x="1244.0" y="2304.0" type="line"/>
-      <point x="908.0" y="2304.0" type="line"/>
-      <point x="908.0" y="-256.0" type="line"/>
-      <point x="1244.0" y="-256.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1964.0" y="1128.0" type="line"/>
-      <point x="1040.0" y="1128.0" type="line"/>
-      <point x="1040.0" y="740.0" type="line"/>
-      <point x="1964.0" y="740.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1960.0" y="1448.0" type="line"/>
-      <point x="1815.0" y="1876.0"/>
-      <point x="1455.0" y="2076.0"/>
-      <point x="1064.0" y="2076.0" type="curve" smooth="yes"/>
-      <point x="527.0" y="2076.0"/>
-      <point x="123.0" y="1704.0"/>
-      <point x="124.0" y="1020.0" type="curve"/>
-      <point x="123.0" y="336.0"/>
-      <point x="535.0" y="-28.0"/>
-      <point x="1072.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="1559.0" y="-28.0"/>
-      <point x="1963.0" y="284.0"/>
-      <point x="1964.0" y="740.0" type="curve"/>
-      <point x="1424.0" y="740.0" type="line"/>
-      <point x="1423.0" y="556.0"/>
-      <point x="1263.0" y="460.0"/>
-      <point x="1072.0" y="460.0" type="curve" smooth="yes"/>
-      <point x="851.0" y="460.0"/>
-      <point x="687.0" y="588.0"/>
-      <point x="688.0" y="1020.0" type="curve"/>
-      <point x="687.0" y="1444.0"/>
-      <point x="843.0" y="1588.0"/>
-      <point x="1064.0" y="1588.0" type="curve" smooth="yes"/>
-      <point x="1211.0" y="1588.0"/>
-      <point x="1347.0" y="1528.0"/>
-      <point x="1400.0" y="1356.0" type="curve"/>
+      <point x="1256.0" y="2304.0" type="line"/>
+      <point x="920.0" y="2304.0" type="line"/>
+      <point x="920.0" y="-256.0" type="line"/>
+      <point x="1256.0" y="-256.0" type="line"/>
     </contour>
+    <component base="G"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>G</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>G</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/lira.glif b/src/Inter-UI-Black.ufo/glyphs/lira.glif
index 1dd27b789..5826e4ecd 100644
--- a/src/Inter-UI-Black.ufo/glyphs/lira.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/lira.glif
@@ -1,53 +1,57 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lira" format="2">
-  <advance width="1968.0"/>
+  <advance width="1952.0"/>
   <unicode hex="20A4"/>
   <outline>
     <contour>
-      <point x="1760.0" y="0.0" type="line"/>
-      <point x="1760.0" y="428.0" type="line"/>
-      <point x="212.0" y="428.0" type="line"/>
-      <point x="212.0" y="0.0" type="line"/>
+      <point x="1752.0" y="0.0" type="line"/>
+      <point x="1752.0" y="428.0" type="line"/>
+      <point x="204.0" y="428.0" type="line"/>
+      <point x="204.0" y="0.0" type="line"/>
     </contour>
     <contour>
-      <point x="968.0" y="1476.0" type="line"/>
-      <point x="967.0" y="1600.0"/>
-      <point x="1011.0" y="1648.0"/>
-      <point x="1092.0" y="1648.0" type="curve" smooth="yes"/>
-      <point x="1191.0" y="1648.0"/>
-      <point x="1259.0" y="1608.0"/>
-      <point x="1260.0" y="1468.0" type="curve"/>
-      <point x="1776.0" y="1468.0" type="line"/>
-      <point x="1775.0" y="1832.0"/>
-      <point x="1523.0" y="2076.0"/>
-      <point x="1080.0" y="2076.0" type="curve" smooth="yes"/>
-      <point x="659.0" y="2076.0"/>
-      <point x="411.0" y="1844.0"/>
-      <point x="424.0" y="1476.0" type="curve" smooth="yes"/>
-      <point x="448.0" y="600.0" type="line" smooth="yes"/>
-      <point x="451.0" y="504.0"/>
-      <point x="447.0" y="448.0"/>
-      <point x="364.0" y="428.0" type="curve"/>
-      <point x="652.0" y="268.0" type="line"/>
-      <point x="915.0" y="364.0"/>
-      <point x="1015.0" y="448.0"/>
-      <point x="1008.0" y="640.0" type="curve" smooth="yes"/>
+      <point x="960.0" y="1476.0" type="line"/>
+      <point x="959.0" y="1600.0"/>
+      <point x="1003.0" y="1648.0"/>
+      <point x="1084.0" y="1648.0" type="curve" smooth="yes"/>
+      <point x="1183.0" y="1648.0"/>
+      <point x="1251.0" y="1608.0"/>
+      <point x="1252.0" y="1468.0" type="curve"/>
+      <point x="1768.0" y="1468.0" type="line"/>
+      <point x="1767.0" y="1832.0"/>
+      <point x="1515.0" y="2076.0"/>
+      <point x="1072.0" y="2076.0" type="curve" smooth="yes"/>
+      <point x="651.0" y="2076.0"/>
+      <point x="403.0" y="1844.0"/>
+      <point x="416.0" y="1476.0" type="curve" smooth="yes"/>
+      <point x="440.0" y="600.0" type="line" smooth="yes"/>
+      <point x="443.0" y="504.0"/>
+      <point x="439.0" y="448.0"/>
+      <point x="356.0" y="428.0" type="curve"/>
+      <point x="644.0" y="268.0" type="line"/>
+      <point x="907.0" y="364.0"/>
+      <point x="1007.0" y="448.0"/>
+      <point x="1000.0" y="640.0" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="1324.0" y="1280.0" type="line"/>
-      <point x="216.0" y="1280.0" type="line"/>
-      <point x="216.0" y="1028.0" type="line"/>
-      <point x="1324.0" y="1028.0" type="line"/>
+      <point x="1316.0" y="1280.0" type="line"/>
+      <point x="208.0" y="1280.0" type="line"/>
+      <point x="208.0" y="1028.0" type="line"/>
+      <point x="1316.0" y="1028.0" type="line"/>
     </contour>
     <contour>
-      <point x="1324.0" y="896.0" type="line"/>
-      <point x="216.0" y="896.0" type="line"/>
-      <point x="216.0" y="644.0" type="line"/>
-      <point x="1324.0" y="644.0" type="line"/>
+      <point x="1316.0" y="896.0" type="line"/>
+      <point x="208.0" y="896.0" type="line"/>
+      <point x="208.0" y="644.0" type="line"/>
+      <point x="1316.0" y="644.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>sterling</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>sterling</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/onethird.glif b/src/Inter-UI-Black.ufo/glyphs/onethird.glif
new file mode 100644
index 000000000..3a885c4ec
--- /dev/null
+++ b/src/Inter-UI-Black.ufo/glyphs/onethird.glif
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="onethird" format="2">
+  <advance width="2740.0"/>
+  <unicode hex="2153"/>
+  <outline>
+    <component base="one.numr"/>
+    <component base="fraction" xOffset="832.0"/>
+    <component base="three.dnomf" xOffset="1600.0"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>one.numr</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>three.dnomf</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>0</integer>
+        <integer>0</integer>
+        <integer>1</integer>
+      </array>
+      <key>public.markColor</key>
+      <string>0.97,1,0,1</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/openbullet.glif b/src/Inter-UI-Black.ufo/glyphs/openbullet.glif
index fddb86ea5..254bc7ebd 100644
--- a/src/Inter-UI-Black.ufo/glyphs/openbullet.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/openbullet.glif
@@ -36,6 +36,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>bullet</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/semicolon.glif b/src/Inter-UI-Black.ufo/glyphs/semicolon.glif
index f89f8f88d..0548ada8b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/semicolon.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/semicolon.glif
@@ -5,7 +5,7 @@
   <guideline x="460.0" y="700.0" angle="90.0"/>
   <outline>
     <component base="comma"/>
-    <component base="period" xOffset="36.0" yOffset="1084.0"/>
+    <component base="period" xOffset="36.0" yOffset="1032.0"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni20B_D_.glif b/src/Inter-UI-Black.ufo/glyphs/uni20B_D_.glif
index 2811f5738..cde864e96 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni20B_D_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni20B_D_.glif
@@ -1,7 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uni20BD" format="2">
-  <advance width="2240.0"/>
+  <advance width="2188.0"/>
   <unicode hex="20BD"/>
+  <note>
+line up with Yen
+</note>
   <outline>
     <contour>
       <point x="1272.0" y="680.0" type="line"/>
@@ -34,6 +37,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>P</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni214D_.glif b/src/Inter-UI-Black.ufo/glyphs/uni214D_.glif
index 3c6e916bc..239f06947 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni214D_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni214D_.glif
@@ -1,77 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uni214D" format="2">
-  <advance width="3020.0"/>
+  <advance width="2872.0"/>
   <unicode hex="214D"/>
+  <guideline x="668.0" y="2096.0" angle="90.0"/>
   <outline>
     <contour>
-      <point x="700.0" y="1984.0" type="line"/>
-      <point x="768.0" y="2300.0" type="line"/>
-      <point x="564.0" y="2300.0" type="line"/>
-      <point x="100.0" y="1100.0" type="line"/>
-      <point x="396.0" y="1100.0" type="line"/>
+      <point x="960.0" y="1440.0" type="line"/>
+      <point x="376.0" y="1440.0" type="line"/>
+      <point x="376.0" y="1216.0" type="line"/>
+      <point x="960.0" y="1216.0" type="line"/>
     </contour>
     <contour>
-      <point x="1004.0" y="1100.0" type="line"/>
-      <point x="1300.0" y="1100.0" type="line"/>
-      <point x="840.0" y="2300.0" type="line"/>
-      <point x="632.0" y="2300.0" type="line"/>
-      <point x="692.0" y="1984.0" type="line"/>
+      <point x="944.0" y="1024.0" type="line"/>
+      <point x="1296.0" y="1024.0" type="line"/>
+      <point x="856.0" y="2048.0" type="line"/>
+      <point x="480.0" y="2048.0" type="line"/>
+      <point x="44.0" y="1024.0" type="line"/>
+      <point x="396.0" y="1024.0" type="line"/>
+      <point x="728.0" y="1848.0" type="line"/>
+      <point x="608.0" y="1848.0" type="line"/>
     </contour>
-    <contour>
-      <point x="964.0" y="1548.0" type="line"/>
-      <point x="320.0" y="1548.0" type="line"/>
-      <point x="320.0" y="1320.0" type="line"/>
-      <point x="964.0" y="1320.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="2612.0" y="324.0" type="curve" smooth="yes"/>
-      <point x="2613.0" y="264.0"/>
-      <point x="2573.0" y="204.0"/>
-      <point x="2448.0" y="204.0" type="curve" smooth="yes"/>
-      <point x="2293.0" y="204.0"/>
-      <point x="2213.0" y="252.0"/>
-      <point x="2220.0" y="388.0" type="curve"/>
-      <point x="1912.0" y="388.0" type="line"/>
-      <point x="1913.0" y="64.0"/>
-      <point x="2217.0" y="-28.0"/>
-      <point x="2448.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="2725.0" y="-28.0"/>
-      <point x="2921.0" y="84.0"/>
-      <point x="2920.0" y="320.0" type="curve" smooth="yes"/>
-      <point x="2921.0" y="560.0"/>
-      <point x="2765.0" y="660.0"/>
-      <point x="2508.0" y="736.0" type="curve" smooth="yes"/>
-      <point x="2317.0" y="792.0"/>
-      <point x="2261.0" y="824.0"/>
-      <point x="2260.0" y="888.0" type="curve" smooth="yes"/>
-      <point x="2261.0" y="952.0"/>
-      <point x="2321.0" y="1012.0"/>
-      <point x="2448.0" y="1012.0" type="curve" smooth="yes"/>
-      <point x="2569.0" y="1012.0"/>
-      <point x="2625.0" y="960.0"/>
-      <point x="2620.0" y="860.0" type="curve"/>
-      <point x="2928.0" y="860.0" type="line"/>
-      <point x="2937.0" y="1104.0"/>
-      <point x="2725.0" y="1244.0"/>
-      <point x="2452.0" y="1244.0" type="curve" smooth="yes"/>
-      <point x="2173.0" y="1244.0"/>
-      <point x="1953.0" y="1112.0"/>
-      <point x="1952.0" y="884.0" type="curve" smooth="yes"/>
-      <point x="1953.0" y="636.0"/>
-      <point x="2169.0" y="560.0"/>
-      <point x="2436.0" y="484.0" type="curve" smooth="yes"/>
-      <point x="2585.0" y="444.0"/>
-      <point x="2613.0" y="400.0"/>
-    </contour>
-    <component base="fraction" xOffset="1172.0"/>
+    <component base="fraction" xOffset="1236.0"/>
+    <component base="s.subs" xOffset="1776.0" yOffset="332.0"/>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.nodeUserData.0.4</key>
-      <dict>
-        <key>name</key>
-        <string>hr00</string>
-      </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>a.sups</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>s.subs</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>0</integer>
+        <integer>-1</integer>
+      </array>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -79,18 +41,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>3.0</real>
-            <real>9.0</real>
+            <real>-28.0</real>
+            <real>232.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>3.0</real>
-            <real>2.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -99,18 +56,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>3.0</real>
-            <real>21.0</real>
+            <real>1012.0</real>
+            <real>232.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>3.0</real>
-            <real>28.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -119,18 +71,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>0.0</real>
+            <real>1548.0</real>
+            <real>228.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>1.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -139,18 +86,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>3.0</real>
-            <real>31.0</real>
+            <real>1952.0</real>
+            <real>308.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>3.0</real>
-            <real>18.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -159,18 +101,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>3.0</real>
-            <real>37.0</real>
+            <real>2612.0</real>
+            <real>308.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>3.0</real>
-            <real>12.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -179,18 +116,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>3.0</real>
-            <real>9.0</real>
+            <real>-28.0</real>
+            <real>232.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>3.0</real>
-            <real>2.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -199,18 +131,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>3.0</real>
-            <real>21.0</real>
+            <real>1012.0</real>
+            <real>232.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>3.0</real>
-            <real>28.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -219,18 +146,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>0.0</real>
+            <real>1548.0</real>
+            <real>228.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>1.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/yen.glif b/src/Inter-UI-Black.ufo/glyphs/yen.glif
index 6185d2e6f..5ea95623c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/yen.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/yen.glif
@@ -2,39 +2,40 @@
 <glyph name="yen" format="2">
   <advance width="1656.0"/>
   <unicode hex="00A5"/>
+  <note>
+line up with uni20BD
+</note>
   <outline>
     <contour>
-      <point x="1468.0" y="1080.0" type="line"/>
-      <point x="116.0" y="1080.0" type="line"/>
-      <point x="116.0" y="788.0" type="line"/>
-      <point x="1468.0" y="788.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1468.0" y="684.0" type="line"/>
-      <point x="116.0" y="684.0" type="line"/>
-      <point x="116.0" y="392.0" type="line"/>
-      <point x="1468.0" y="392.0" type="line"/>
+      <point x="596.0" y="2048.0" type="line"/>
+      <point x="40.0" y="2048.0" type="line"/>
+      <point x="592.0" y="772.0" type="line"/>
+      <point x="952.0" y="1088.0" type="line"/>
     </contour>
     <contour>
       <point x="712.0" y="1104.0" type="line"/>
-      <point x="776.0" y="772.0" type="line"/>
       <point x="1060.0" y="772.0" type="line"/>
       <point x="1616.0" y="2048.0" type="line"/>
       <point x="1060.0" y="2048.0" type="line"/>
     </contour>
     <contour>
-      <point x="596.0" y="2048.0" type="line"/>
-      <point x="40.0" y="2048.0" type="line"/>
-      <point x="592.0" y="772.0" type="line"/>
-      <point x="876.0" y="772.0" type="line"/>
-      <point x="952.0" y="1088.0" type="line"/>
-    </contour>
-    <contour>
       <point x="1092.0" y="1080.0" type="line"/>
       <point x="544.0" y="1080.0" type="line"/>
       <point x="544.0" y="0.0" type="line"/>
       <point x="1092.0" y="0.0" type="line"/>
     </contour>
+    <contour>
+      <point x="1468.0" y="1080.0" type="line"/>
+      <point x="116.0" y="1080.0" type="line"/>
+      <point x="116.0" y="788.0" type="line"/>
+      <point x="1468.0" y="788.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="1468.0" y="684.0" type="line"/>
+      <point x="116.0" y="684.0" type="line"/>
+      <point x="116.0" y="392.0" type="line"/>
+      <point x="1468.0" y="392.0" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
@@ -45,10 +46,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>4.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -65,18 +66,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>392.0</real>
+            <real>380.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>0.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -94,7 +90,7 @@
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>0.0</real>
+            <real>2.0</real>
             <real>0.0</real>
           </array>
           <key>type</key>
@@ -105,10 +101,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>3.0</real>
-            <real>0.0</real>
+            <real>2048.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -130,13 +126,13 @@
           <key>origin</key>
           <array>
             <real>3.0</real>
-            <real>0.0</real>
+            <real>1.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>2.0</real>
+            <real>3.0</real>
             <real>2.0</real>
           </array>
           <key>type</key>
@@ -149,7 +145,7 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>4.0</real>
+            <real>0.0</real>
             <real>1.0</real>
           </array>
           <key>stem</key>
@@ -162,18 +158,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>392.0</real>
+            <real>380.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>0.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -191,7 +182,7 @@
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>0.0</real>
+            <real>2.0</real>
             <real>0.0</real>
           </array>
           <key>type</key>
@@ -204,8 +195,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>3.0</real>
             <real>0.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>