more work on the light master

24 files changed, 419 insertions, 578 deletions

diff --git a/src/Inter-UI-Regular.ufo/glyphs/J_.glif b/src/Inter-UI-Regular.ufo/glyphs/J_.glif
index 138c39985..7437637dc 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/J_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/J_.glif
@@ -80,26 +80,6 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>6.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>
-        <dict>
-          <key>horizontal</key>
-          <false/>
-          <key>options</key>
-          <integer>0</integer>
-          <key>origin</key>
-          <array>
-            <real>0.0</real>
             <real>15.0</real>
           </array>
           <key>stem</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/U_psilonhooksymbol.glif b/src/Inter-UI-Regular.ufo/glyphs/U_psilonhooksymbol.glif
index fe876a8fc..b108f3f7b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/U_psilonhooksymbol.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/U_psilonhooksymbol.glif
@@ -119,26 +119,6 @@
           <key>type</key>
           <string>Anchor</string>
         </dict>
-        <dict>
-          <key>horizontal</key>
-          <true/>
-          <key>options</key>
-          <integer>4</integer>
-          <key>origin</key>
-          <array>
-            <real>0.0</real>
-            <real>3.0</real>
-          </array>
-          <key>stem</key>
-          <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>29.0</real>
-          </array>
-          <key>type</key>
-          <string>TTStem</string>
-        </dict>
       </array>
     </dict>
   </lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/_part.f_base.glif b/src/Inter-UI-Regular.ufo/glyphs/_part.f_base.glif
new file mode 100644
index 000000000..b51ed25c9
--- /dev/null
+++ b/src/Inter-UI-Regular.ufo/glyphs/_part.f_base.glif
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="_part.f_base" format="2">
+  <advance width="1016.0"/>
+  <outline>
+    <contour>
+      <point x="320.0" y="0.0" type="line"/>
+      <point x="556.0" y="0.0" type="line"/>
+      <point x="556.0" y="1692.0" type="line" smooth="yes"/>
+      <point x="556.0" y="1844.0"/>
+      <point x="620.0" y="1924.0"/>
+      <point x="776.0" y="1924.0" type="curve" smooth="yes"/>
+      <point x="844.0" y="1924.0"/>
+      <point x="884.0" y="1908.0"/>
+      <point x="908.0" y="1900.0" type="curve"/>
+      <point x="976.0" y="2104.0" type="line"/>
+      <point x="940.0" y="2120.0"/>
+      <point x="868.0" y="2144.0"/>
+      <point x="752.0" y="2144.0" type="curve" smooth="yes"/>
+      <point x="532.0" y="2144.0"/>
+      <point x="320.0" y="2012.0"/>
+      <point x="320.0" y="1748.0" type="curve" smooth="yes"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.Export</key>
+      <false/>
+      <key>public.markColor</key>
+      <string>0.04,0.57,0.04,1</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/_part.t_base.glif b/src/Inter-UI-Regular.ufo/glyphs/_part.t_base.glif
new file mode 100644
index 000000000..f8acc0289
--- /dev/null
+++ b/src/Inter-UI-Regular.ufo/glyphs/_part.t_base.glif
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="_part.t_base" format="2">
+  <advance width="1040.0"/>
+  <outline>
+    <contour>
+      <point x="320.0" y="1904.0" type="line"/>
+      <point x="320.0" y="376.0" type="line" smooth="yes"/>
+      <point x="320.0" y="108.0"/>
+      <point x="536.0" y="-20.0"/>
+      <point x="736.0" y="-20.0" type="curve" smooth="yes"/>
+      <point x="824.0" y="-20.0"/>
+      <point x="880.0" y="-4.0"/>
+      <point x="912.0" y="8.0" type="curve"/>
+      <point x="864.0" y="220.0" type="line"/>
+      <point x="844.0" y="216.0"/>
+      <point x="812.0" y="208.0"/>
+      <point x="760.0" y="208.0" type="curve" smooth="yes"/>
+      <point x="656.0" y="208.0"/>
+      <point x="556.0" y="240.0"/>
+      <point x="556.0" y="440.0" type="curve" smooth="yes"/>
+      <point x="556.0" y="1904.0" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.Export</key>
+      <false/>
+      <key>public.markColor</key>
+      <string>0.04,0.57,0.04,1</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/afii10044.glif b/src/Inter-UI-Regular.ufo/glyphs/afii10044.glif
index 149702de0..a7e233239 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/afii10044.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/afii10044.glif
@@ -74,26 +74,6 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
-          <array>
-            <real>0.0</real>
-            <real>0.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>
-        <dict>
-          <key>horizontal</key>
-          <false/>
-          <key>options</key>
-          <integer>0</integer>
           <key>place</key>
           <array>
             <real>1724.0</real>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/afii10058.glif b/src/Inter-UI-Regular.ufo/glyphs/afii10058.glif
index a67f10900..6d9d41b6a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/afii10058.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/afii10058.glif
@@ -92,26 +92,6 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
-          <array>
-            <real>0.0</real>
-            <real>5.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>
-        <dict>
-          <key>horizontal</key>
-          <false/>
-          <key>options</key>
-          <integer>0</integer>
           <key>place</key>
           <array>
             <real>2620.0</real>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/bracketleft_quill.glif b/src/Inter-UI-Regular.ufo/glyphs/bracketleft_quill.glif
index 53fea2213..2ee632df2 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/bracketleft_quill.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/bracketleft_quill.glif
@@ -71,26 +71,6 @@
         </dict>
         <dict>
           <key>horizontal</key>
-          <false/>
-          <key>options</key>
-          <integer>0</integer>
-          <key>origin</key>
-          <array>
-            <real>0.0</real>
-            <real>1.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>
-        <dict>
-          <key>horizontal</key>
           <true/>
           <key>options</key>
           <integer>4</integer>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/contents.plist b/src/Inter-UI-Regular.ufo/glyphs/contents.plist
index 90958a364..37dd8deee 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/contents.plist
+++ b/src/Inter-UI-Regular.ufo/glyphs/contents.plist
@@ -912,6 +912,10 @@
     <string>Z_hedieresiscyrillic.glif</string>
     <key>Zlinebelow</key>
     <string>Z_linebelow.glif</string>
+    <key>_part.f_base</key>
+    <string>_part.f_base.glif</string>
+    <key>_part.t_base</key>
+    <string>_part.t_base.glif</string>
     <key>a</key>
     <string>a.glif</string>
     <key>a.subs</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/enghecyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/enghecyrillic.glif
index 89f322a5b..adc78a1bd 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/enghecyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/enghecyrillic.glif
@@ -91,26 +91,6 @@
         </dict>
         <dict>
           <key>horizontal</key>
-          <false/>
-          <key>options</key>
-          <integer>0</integer>
-          <key>origin</key>
-          <array>
-            <real>0.0</real>
-            <real>1.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>
-        <dict>
-          <key>horizontal</key>
           <true/>
           <key>options</key>
           <integer>4</integer>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ezhcurl.glif b/src/Inter-UI-Regular.ufo/glyphs/ezhcurl.glif
index ad3938fa0..dfab65e1f 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ezhcurl.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ezhcurl.glif
@@ -290,26 +290,6 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>0.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>
-        <dict>
-          <key>horizontal</key>
-          <false/>
-          <key>options</key>
-          <integer>0</integer>
-          <key>origin</key>
-          <array>
-            <real>0.0</real>
             <real>1.0</real>
           </array>
           <key>stem</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/f.glif b/src/Inter-UI-Regular.ufo/glyphs/f.glif
index 13d5a5167..be0f58dc7 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/f.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/f.glif
@@ -9,24 +9,7 @@
       <point x="72.0" y="1336.0" type="line"/>
       <point x="900.0" y="1336.0" type="line"/>
     </contour>
-    <contour>
-      <point x="320.0" y="0.0" type="line"/>
-      <point x="556.0" y="0.0" type="line"/>
-      <point x="556.0" y="1692.0" type="line" smooth="yes"/>
-      <point x="556.0" y="1844.0"/>
-      <point x="620.0" y="1924.0"/>
-      <point x="776.0" y="1924.0" type="curve" smooth="yes"/>
-      <point x="844.0" y="1924.0"/>
-      <point x="884.0" y="1908.0"/>
-      <point x="908.0" y="1900.0" type="curve"/>
-      <point x="976.0" y="2104.0" type="line"/>
-      <point x="940.0" y="2120.0"/>
-      <point x="868.0" y="2144.0"/>
-      <point x="752.0" y="2144.0" type="curve" smooth="yes"/>
-      <point x="532.0" y="2144.0"/>
-      <point x="320.0" y="2012.0"/>
-      <point x="320.0" y="1748.0" type="curve" smooth="yes"/>
-    </contour>
+    <component base="_part.f_base"/>
   </outline>
   <lib>
     <dict>
@@ -77,18 +60,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>4.0</real>
+            <real>1924.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>11.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -126,8 +104,8 @@
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
             <real>0.0</real>
+            <real>1.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -179,11 +157,6 @@
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>11.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ghemiddlehookcyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/ghemiddlehookcyrillic.glif
index bccd3ac42..bde0923a9 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ghemiddlehookcyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ghemiddlehookcyrillic.glif
@@ -92,26 +92,6 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>15.0</real>
-          </array>
-          <key>stem</key>
-          <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>15.0</real>
-          </array>
-          <key>type</key>
-          <string>Stem</string>
-        </dict>
-        <dict>
-          <key>horizontal</key>
-          <false/>
-          <key>options</key>
-          <integer>0</integer>
-          <key>origin</key>
-          <array>
-            <real>0.0</real>
             <real>3.0</real>
           </array>
           <key>stem</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/kabashkircyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/kabashkircyrillic.glif
index 9e9c953d6..a72b290ae 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/kabashkircyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/kabashkircyrillic.glif
@@ -74,26 +74,6 @@
         </dict>
         <dict>
           <key>horizontal</key>
-          <false/>
-          <key>options</key>
-          <integer>0</integer>
-          <key>origin</key>
-          <array>
-            <real>0.0</real>
-            <real>2.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>
-        <dict>
-          <key>horizontal</key>
           <true/>
           <key>options</key>
           <integer>4</integer>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/kahookcyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/kahookcyrillic.glif
index eaea3fadc..4a58908eb 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/kahookcyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/kahookcyrillic.glif
@@ -90,26 +90,6 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>15.0</real>
-          </array>
-          <key>stem</key>
-          <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>15.0</real>
-          </array>
-          <key>type</key>
-          <string>Stem</string>
-        </dict>
-        <dict>
-          <key>horizontal</key>
-          <false/>
-          <key>options</key>
-          <integer>0</integer>
-          <key>origin</key>
-          <array>
-            <real>0.0</real>
             <real>3.0</real>
           </array>
           <key>stem</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/lyogh.glif b/src/Inter-UI-Regular.ufo/glyphs/lyogh.glif
index a06495a4c..5f12a13df 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/lyogh.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/lyogh.glif
@@ -126,26 +126,6 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
-          <array>
-            <real>0.0</real>
-            <real>1.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>
-        <dict>
-          <key>horizontal</key>
-          <false/>
-          <key>options</key>
-          <integer>0</integer>
           <key>place</key>
           <array>
             <real>1280.0</real>
@@ -364,26 +344,6 @@
           <key>origin</key>
           <array>
             <real>1.0</real>
-            <real>14.0</real>
-          </array>
-          <key>stem</key>
-          <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>14.0</real>
-          </array>
-          <key>type</key>
-          <string>Stem</string>
-        </dict>
-        <dict>
-          <key>horizontal</key>
-          <false/>
-          <key>options</key>
-          <integer>0</integer>
-          <key>origin</key>
-          <array>
-            <real>1.0</real>
             <real>15.0</real>
           </array>
           <key>stem</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/njecyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/njecyrillic.glif
index 458f527d2..1ec04b7cd 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/njecyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/njecyrillic.glif
@@ -241,26 +241,6 @@
         </dict>
         <dict>
           <key>horizontal</key>
-          <false/>
-          <key>options</key>
-          <integer>0</integer>
-          <key>origin</key>
-          <array>
-            <real>0.0</real>
-            <real>2.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>
-        <dict>
-          <key>horizontal</key>
           <true/>
           <key>options</key>
           <integer>4</integer>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/pemiddlehookcyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/pemiddlehookcyrillic.glif
index c5a17ddd4..99a1e3b38 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/pemiddlehookcyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/pemiddlehookcyrillic.glif
@@ -109,26 +109,6 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>15.0</real>
-          </array>
-          <key>stem</key>
-          <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>15.0</real>
-          </array>
-          <key>type</key>
-          <string>Stem</string>
-        </dict>
-        <dict>
-          <key>horizontal</key>
-          <false/>
-          <key>options</key>
-          <integer>0</integer>
-          <key>origin</key>
-          <array>
-            <real>0.0</real>
             <real>3.0</real>
           </array>
           <key>stem</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/slongdotaccent.glif b/src/Inter-UI-Regular.ufo/glyphs/slongdotaccent.glif
index 981a3e21f..6d9e6567a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/slongdotaccent.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/slongdotaccent.glif
@@ -1,27 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="slongdotaccent" format="2">
-  <advance width="864.0"/>
+  <advance width="1016.0"/>
   <unicode hex="1E9B"/>
   <outline>
-    <contour>
-      <point x="168.0" y="0.0" type="line"/>
-      <point x="404.0" y="0.0" type="line"/>
-      <point x="404.0" y="1692.0" type="line" smooth="yes"/>
-      <point x="404.0" y="1844.0"/>
-      <point x="468.0" y="1924.0"/>
-      <point x="624.0" y="1924.0" type="curve" smooth="yes"/>
-      <point x="692.0" y="1924.0"/>
-      <point x="732.0" y="1908.0"/>
-      <point x="756.0" y="1900.0" type="curve"/>
-      <point x="824.0" y="2104.0" type="line"/>
-      <point x="788.0" y="2120.0"/>
-      <point x="716.0" y="2144.0"/>
-      <point x="600.0" y="2144.0" type="curve" smooth="yes"/>
-      <point x="380.0" y="2144.0"/>
-      <point x="168.0" y="2012.0"/>
-      <point x="168.0" y="1748.0" type="curve" smooth="yes"/>
-    </contour>
-    <component base="dotaccent" xOffset="56.0" yOffset="512.0"/>
+    <component base="_part.f_base"/>
+    <component base="dotaccent" xOffset="208.0" yOffset="512.0"/>
   </outline>
   <lib>
     <dict>
@@ -29,6 +12,11 @@
       <string>i</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>f</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>1</integer>
+        <integer>1</integer>
+      </array>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -36,10 +24,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
             <real>0.0</real>
-            <real>15.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -56,10 +44,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>8.0</real>
+            <real>2104.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -76,18 +64,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>4.0</real>
+            <real>1924.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>11.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -96,18 +79,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>15.0</real>
+            <real>168.0</real>
+            <real>236.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>
@@ -116,10 +94,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
             <real>0.0</real>
-            <real>15.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -131,10 +109,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>8.0</real>
+            <real>2104.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -146,18 +124,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>4.0</real>
+            <real>1924.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>11.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/slongstroke.glif b/src/Inter-UI-Regular.ufo/glyphs/slongstroke.glif
index 7e3512f0e..70a6a5214 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/slongstroke.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/slongstroke.glif
@@ -1,32 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="slongstroke" format="2">
-  <advance width="988.0"/>
+  <advance width="948.0"/>
   <unicode hex="1E9C"/>
+  <guideline x="372.0" y="-44.0" angle="90.0"/>
   <outline>
     <contour>
-      <point x="292.0" y="0.0" type="line"/>
-      <point x="528.0" y="0.0" type="line"/>
-      <point x="528.0" y="1692.0" type="line"/>
-      <point x="528.0" y="1844.0"/>
-      <point x="592.0" y="1924.0"/>
-      <point x="748.0" y="1924.0" type="curve" smooth="yes"/>
-      <point x="816.0" y="1924.0"/>
-      <point x="856.0" y="1908.0"/>
-      <point x="880.0" y="1900.0" type="curve"/>
-      <point x="948.0" y="2104.0" type="line"/>
-      <point x="912.0" y="2120.0"/>
-      <point x="840.0" y="2144.0"/>
-      <point x="724.0" y="2144.0" type="curve" smooth="yes"/>
-      <point x="504.0" y="2144.0"/>
-      <point x="292.0" y="2012.0"/>
-      <point x="292.0" y="1748.0" type="curve"/>
-    </contour>
-    <contour>
-      <point x="72.0" y="796.0" type="line"/>
-      <point x="748.0" y="1052.0" type="line"/>
-      <point x="748.0" y="1288.0" type="line"/>
-      <point x="72.0" y="1032.0" type="line"/>
+      <point x="72.0" y="1044.0" type="line"/>
+      <point x="748.0" y="1300.0" type="line"/>
+      <point x="748.0" y="1536.0" type="line"/>
+      <point x="72.0" y="1280.0" type="line"/>
     </contour>
+    <component base="_part.f_base" xOffset="-68.0"/>
   </outline>
   <lib>
     <dict>
@@ -41,10 +25,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
             <real>0.0</real>
-            <real>15.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -61,18 +45,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>4.0</real>
+            <real>1924.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>11.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -81,10 +60,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>8.0</real>
+            <real>2104.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -104,7 +83,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>15.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -124,7 +103,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>15.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -136,18 +115,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>4.0</real>
+            <real>1924.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>11.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -159,7 +133,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>8.0</real>
+            <real>1.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/t.glif b/src/Inter-UI-Regular.ufo/glyphs/t.glif
index 3d059665b..18370cb4a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/t.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/t.glif
@@ -11,24 +11,7 @@
       <point x="88.0" y="1336.0" type="line"/>
       <point x="884.0" y="1336.0" type="line"/>
     </contour>
-    <contour>
-      <point x="320.0" y="1904.0" type="line"/>
-      <point x="320.0" y="376.0" type="line"/>
-      <point x="320.0" y="108.0"/>
-      <point x="536.0" y="-20.0"/>
-      <point x="736.0" y="-20.0" type="curve" smooth="yes"/>
-      <point x="824.0" y="-20.0"/>
-      <point x="880.0" y="-4.0"/>
-      <point x="912.0" y="8.0" type="curve"/>
-      <point x="864.0" y="220.0" type="line"/>
-      <point x="844.0" y="216.0"/>
-      <point x="812.0" y="208.0"/>
-      <point x="760.0" y="208.0" type="curve" smooth="yes"/>
-      <point x="656.0" y="208.0"/>
-      <point x="556.0" y="240.0"/>
-      <point x="556.0" y="440.0" type="curve"/>
-      <point x="556.0" y="1904.0" type="line"/>
-    </contour>
+    <component base="_part.t_base"/>
   </outline>
   <lib>
     <dict>
@@ -68,8 +51,8 @@
           <integer>-2</integer>
           <key>target</key>
           <array>
+            <real>0.0</real>
             <real>1.0</real>
-            <real>13.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -86,11 +69,6 @@
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>10.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/tccurl.glif b/src/Inter-UI-Regular.ufo/glyphs/tccurl.glif
index 33f6deba1..7fc36f8bd 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/tccurl.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/tccurl.glif
@@ -1,63 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="tccurl" format="2">
-  <advance width="2260.0"/>
+  <advance width="2296.0"/>
   <unicode hex="02A8"/>
   <outline>
     <contour>
-      <point x="648.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="1152.0" y="-28.0"/>
-      <point x="1416.0" y="552.0"/>
-      <point x="1760.0" y="552.0" type="curve" smooth="yes"/>
-      <point x="1836.0" y="552.0"/>
-      <point x="1896.0" y="512.0"/>
-      <point x="1896.0" y="420.0" type="curve" smooth="yes"/>
-      <point x="1896.0" y="284.0"/>
-      <point x="1700.0" y="188.0"/>
-      <point x="1520.0" y="188.0" type="curve" smooth="yes"/>
-      <point x="1208.0" y="188.0"/>
-      <point x="1088.0" y="484.0"/>
-      <point x="1088.0" y="736.0" type="curve" smooth="yes"/>
-      <point x="1088.0" y="792.0" type="line" smooth="yes"/>
-      <point x="1088.0" y="1048.0"/>
-      <point x="1224.0" y="1336.0"/>
-      <point x="1520.0" y="1336.0" type="curve" smooth="yes"/>
-      <point x="1740.0" y="1336.0"/>
-      <point x="1860.0" y="1176.0"/>
-      <point x="1872.0" y="1016.0" type="curve"/>
-      <point x="2116.0" y="1016.0" type="line"/>
-      <point x="2100.0" y="1316.0"/>
-      <point x="1872.0" y="1556.0"/>
-      <point x="1520.0" y="1556.0" type="curve" smooth="yes"/>
-      <point x="1084.0" y="1556.0"/>
-      <point x="852.0" y="1188.0"/>
-      <point x="852.0" y="792.0" type="curve" smooth="yes"/>
-      <point x="852.0" y="736.0" type="line" smooth="yes"/>
-      <point x="852.0" y="340.0"/>
-      <point x="1064.0" y="-28.0"/>
-      <point x="1520.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="1836.0" y="-28.0"/>
-      <point x="2116.0" y="160.0"/>
-      <point x="2116.0" y="436.0" type="curve" smooth="yes"/>
-      <point x="2116.0" y="620.0"/>
-      <point x="1988.0" y="764.0"/>
-      <point x="1764.0" y="764.0" type="curve" smooth="yes"/>
-      <point x="1320.0" y="764.0"/>
-      <point x="1000.0" y="196.0"/>
+      <point x="884.0" y="1536.0" type="line"/>
+      <point x="88.0" y="1536.0" type="line"/>
+      <point x="88.0" y="1336.0" type="line"/>
+      <point x="884.0" y="1336.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="320.0" y="1904.0" type="line"/>
+      <point x="320.0" y="412.0" type="line" smooth="yes"/>
+      <point x="320.0" y="120.0"/>
+      <point x="502.0" y="-22.0"/>
+      <point x="728.0" y="-20.0" type="curve" smooth="yes"/>
+      <point x="947.0" y="-18.0"/>
+      <point x="1145.0" y="118.0"/>
+      <point x="1292.0" y="288.0" type="curve" smooth="yes"/>
+      <point x="1444.0" y="464.0"/>
+      <point x="1568.0" y="552.0"/>
+      <point x="1732.0" y="552.0" type="curve" smooth="yes"/>
+      <point x="1850.0" y="552.0"/>
+      <point x="1896.0" y="507.0"/>
+      <point x="1896.0" y="424.0" type="curve" smooth="yes"/>
+      <point x="1896.0" y="267.0"/>
+      <point x="1728.0" y="180.0"/>
+      <point x="1548.0" y="180.0" type="curve" smooth="yes"/>
+      <point x="1268.0" y="180.0"/>
+      <point x="1088.0" y="412.0"/>
+      <point x="1088.0" y="768.0" type="curve" smooth="yes"/>
+      <point x="1088.0" y="1116.0"/>
+      <point x="1272.0" y="1344.0"/>
+      <point x="1548.0" y="1344.0" type="curve" smooth="yes"/>
+      <point x="1756.0" y="1344.0"/>
+      <point x="1880.0" y="1216.0"/>
+      <point x="1916.0" y="1076.0" type="curve"/>
+      <point x="2152.0" y="1076.0" type="line"/>
+      <point x="2112.0" y="1364.0"/>
+      <point x="1868.0" y="1556.0"/>
+      <point x="1544.0" y="1556.0" type="curve" smooth="yes"/>
+      <point x="1128.0" y="1556.0"/>
+      <point x="852.0" y="1228.0"/>
+      <point x="852.0" y="760.0" type="curve" smooth="yes"/>
+      <point x="852.0" y="300.0"/>
+      <point x="1116.0" y="-32.0"/>
+      <point x="1548.0" y="-32.0" type="curve" smooth="yes"/>
+      <point x="1864.0" y="-32.0"/>
+      <point x="2116.0" y="150.0"/>
+      <point x="2116.0" y="420.0" type="curve" smooth="yes"/>
+      <point x="2116.0" y="614.0"/>
+      <point x="1989.0" y="764.0"/>
+      <point x="1740.0" y="764.0" type="curve" smooth="yes"/>
+      <point x="1489.0" y="764.0"/>
+      <point x="1300.0" y="623.0"/>
+      <point x="1112.0" y="424.0" type="curve" smooth="yes"/>
+      <point x="986.0" y="290.0"/>
+      <point x="844.0" y="196.0"/>
       <point x="728.0" y="196.0" type="curve" smooth="yes"/>
-      <point x="648.0" y="196.0"/>
+      <point x="642.0" y="196.0"/>
       <point x="556.0" y="248.0"/>
       <point x="556.0" y="412.0" type="curve" smooth="yes"/>
       <point x="556.0" y="1904.0" type="line"/>
-      <point x="320.0" y="1904.0" type="line"/>
-      <point x="320.0" y="412.0" type="line" smooth="yes"/>
-      <point x="320.0" y="116.0"/>
-      <point x="460.0" y="-28.0"/>
-    </contour>
-    <contour>
-      <point x="88.0" y="1336.0" type="line"/>
-      <point x="884.0" y="1336.0" type="line"/>
-      <point x="884.0" y="1536.0" type="line"/>
-      <point x="88.0" y="1536.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -75,15 +79,15 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>0.0</real>
-            <real>47.0</real>
+            <real>1.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>0.0</real>
-            <real>8.0</real>
+            <real>1.0</real>
+            <real>15.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -95,15 +99,15 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>0.0</real>
-            <real>2.0</real>
+            <real>1.0</real>
+            <real>9.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>0.0</real>
-            <real>35.0</real>
+            <real>1.0</real>
+            <real>40.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -115,15 +119,15 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>2.0</real>
+            <real>0.0</real>
+            <real>0.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
+            <real>0.0</real>
             <real>1.0</real>
-            <real>3.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -135,15 +139,15 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>0.0</real>
-            <real>47.0</real>
+            <real>1.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>0.0</real>
-            <real>38.0</real>
+            <real>1.0</real>
+            <real>46.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -155,15 +159,15 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>0.0</real>
-            <real>22.0</real>
+            <real>1.0</real>
+            <real>28.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
+            <real>0.0</real>
             <real>1.0</real>
-            <real>3.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -175,15 +179,15 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
+            <real>1.0</real>
             <real>0.0</real>
-            <real>44.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>0.0</real>
-            <real>41.0</real>
+            <real>1.0</real>
+            <real>49.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -195,15 +199,15 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>0.0</real>
-            <real>26.0</real>
+            <real>1.0</real>
+            <real>31.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>0.0</real>
-            <real>11.0</real>
+            <real>1.0</real>
+            <real>18.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -215,15 +219,15 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>0.0</real>
-            <real>5.0</real>
+            <real>1.0</real>
+            <real>12.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>0.0</real>
-            <real>32.0</real>
+            <real>1.0</real>
+            <real>37.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -235,15 +239,35 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>0.0</real>
-            <real>47.0</real>
+            <real>1.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>0.0</real>
-            <real>8.0</real>
+            <real>1.0</real>
+            <real>15.0</real>
+          </array>
+          <key>type</key>
+          <string>TTStem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>4</integer>
+          <key>origin</key>
+          <array>
+            <real>1.0</real>
+            <real>9.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>target</key>
+          <array>
+            <real>1.0</real>
+            <real>40.0</real>
           </array>
           <key>type</key>
           <string>TTStem</string>
@@ -256,14 +280,14 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>2.0</real>
+            <real>0.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
             <real>0.0</real>
-            <real>35.0</real>
+            <real>1.0</real>
           </array>
           <key>type</key>
           <string>TTStem</string>
@@ -276,14 +300,14 @@
           <key>origin</key>
           <array>
             <real>1.0</real>
-            <real>2.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
             <real>1.0</real>
-            <real>3.0</real>
+            <real>46.0</real>
           </array>
           <key>type</key>
           <string>TTStem</string>
@@ -295,15 +319,90 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>0.0</real>
-            <real>47.0</real>
+            <real>1.0</real>
+            <real>28.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
             <real>0.0</real>
-            <real>38.0</real>
+            <real>1.0</real>
+          </array>
+          <key>type</key>
+          <string>TTStem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>origin</key>
+          <array>
+            <real>1.0</real>
+            <real>34.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>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>origin</key>
+          <array>
+            <real>1.0</real>
+            <real>28.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>target</key>
+          <array>
+            <real>1.0</real>
+            <real>21.0</real>
+          </array>
+          <key>type</key>
+          <string>Stem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <false/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>place</key>
+          <array>
+            <real>2452.0</real>
+            <real>236.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>Stem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>4</integer>
+          <key>origin</key>
+          <array>
+            <real>1.0</real>
+            <real>34.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>
@@ -315,15 +414,15 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>0.0</real>
-            <real>22.0</real>
+            <real>1.0</real>
+            <real>28.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
             <real>1.0</real>
-            <real>3.0</real>
+            <real>21.0</real>
           </array>
           <key>type</key>
           <string>TTStem</string>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/tcurl.glif b/src/Inter-UI-Regular.ufo/glyphs/tcurl.glif
index 2a1c4105b..4fa7cb861 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/tcurl.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/tcurl.glif
@@ -2,37 +2,38 @@
 <glyph name="tcurl" format="2">
   <advance width="1364.0"/>
   <unicode hex="0236"/>
+  <note>
+recipe: offset curve 32, no auto
+</note>
   <outline>
     <contour>
       <point x="400.0" y="1904.0" type="line"/>
-      <point x="400.0" y="400.0" type="line"/>
+      <point x="400.0" y="400.0" type="line" smooth="yes"/>
       <point x="400.0" y="196.0"/>
       <point x="516.0" y="-32.0"/>
       <point x="824.0" y="-32.0" type="curve" smooth="yes"/>
-      <point x="1072.0" y="-32.0"/>
-      <point x="1236.0" y="116.0"/>
-      <point x="1236.0" y="332.0" type="curve" smooth="yes"/>
-      <point x="1236.0" y="552.0"/>
-      <point x="1064.0" y="696.0"/>
+      <point x="1078.0" y="-32.0"/>
+      <point x="1236.0" y="123.0"/>
+      <point x="1236.0" y="344.0" type="curve" smooth="yes"/>
+      <point x="1236.0" y="544.0"/>
+      <point x="1102.0" y="696.0"/>
       <point x="844.0" y="696.0" type="curve" smooth="yes"/>
-      <point x="696.0" y="696.0"/>
-      <point x="528.0" y="628.0"/>
-      <point x="400.0" y="496.0" type="curve" smooth="yes"/>
-      <point x="88.0" y="176.0" type="line"/>
+      <point x="587.0" y="696.0"/>
+      <point x="432.0" y="544.0"/>
+      <point x="88.0" y="176.0" type="curve"/>
       <point x="240.0" y="20.0" type="line"/>
-      <point x="520.0" y="312.0" type="line" smooth="yes"/>
-      <point x="604.0" y="400.0"/>
-      <point x="684.0" y="484.0"/>
+      <point x="564.0" y="364.0"/>
+      <point x="707.0" y="484.0"/>
       <point x="812.0" y="484.0" type="curve" smooth="yes"/>
-      <point x="916.0" y="484.0"/>
-      <point x="992.0" y="428.0"/>
+      <point x="950.0" y="484.0"/>
+      <point x="992.0" y="413.0"/>
       <point x="992.0" y="332.0" type="curve" smooth="yes"/>
-      <point x="992.0" y="240.0"/>
-      <point x="920.0" y="172.0"/>
+      <point x="992.0" y="225.0"/>
+      <point x="913.0" y="172.0"/>
       <point x="824.0" y="172.0" type="curve" smooth="yes"/>
-      <point x="724.0" y="172.0"/>
+      <point x="717.0" y="172.0"/>
       <point x="636.0" y="248.0"/>
-      <point x="636.0" y="340.0" type="curve"/>
+      <point x="636.0" y="340.0" type="curve" smooth="yes"/>
       <point x="636.0" y="1904.0" type="line"/>
     </contour>
     <contour>
@@ -65,7 +66,7 @@
           <key>target</key>
           <array>
             <real>0.0</real>
-            <real>24.0</real>
+            <real>22.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -78,7 +79,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>18.0</real>
+            <real>16.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -125,7 +126,7 @@
           <key>target</key>
           <array>
             <real>0.0</real>
-            <real>27.0</real>
+            <real>25.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -138,7 +139,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>21.0</real>
+            <real>19.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -165,7 +166,7 @@
           <key>target</key>
           <array>
             <real>0.0</real>
-            <real>24.0</real>
+            <real>22.0</real>
           </array>
           <key>type</key>
           <string>TTStem</string>
@@ -178,7 +179,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>18.0</real>
+            <real>16.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/trthook.glif b/src/Inter-UI-Regular.ufo/glyphs/trthook.glif
index 3885d61e8..f0991e565 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/trthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/trthook.glif
@@ -11,7 +11,7 @@
     </contour>
     <contour>
       <point x="320.0" y="1904.0" type="line"/>
-      <point x="320.0" y="-212.0" type="line"/>
+      <point x="320.0" y="-212.0" type="line" smooth="yes"/>
       <point x="320.0" y="-480.0"/>
       <point x="536.0" y="-608.0"/>
       <point x="736.0" y="-608.0" type="curve" smooth="yes"/>
@@ -24,7 +24,7 @@
       <point x="760.0" y="-380.0" type="curve" smooth="yes"/>
       <point x="656.0" y="-380.0"/>
       <point x="556.0" y="-348.0"/>
-      <point x="556.0" y="-148.0" type="curve"/>
+      <point x="556.0" y="-148.0" type="curve" smooth="yes"/>
       <point x="556.0" y="1904.0" type="line"/>
     </contour>
   </outline>
@@ -111,6 +111,81 @@
           <key>type</key>
           <string>TTStem</string>
         </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>origin</key>
+          <array>
+            <real>0.0</real>
+            <real>0.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>
+        <dict>
+          <key>horizontal</key>
+          <false/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>origin</key>
+          <array>
+            <real>1.0</real>
+            <real>0.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>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>4</integer>
+          <key>origin</key>
+          <array>
+            <real>1.0</real>
+            <real>3.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>TTStem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>4</integer>
+          <key>origin</key>
+          <array>
+            <real>0.0</real>
+            <real>0.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>TTStem</string>
+        </dict>
       </array>
     </dict>
   </lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni2C_7F_.glif b/src/Inter-UI-Regular.ufo/glyphs/uni2C_7F_.glif
index 8cc49cebf..e200b51b1 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni2C_7F_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni2C_7F_.glif
@@ -126,26 +126,6 @@
           <key>type</key>
           <string>Anchor</string>
         </dict>
-        <dict>
-          <key>horizontal</key>
-          <true/>
-          <key>options</key>
-          <integer>4</integer>
-          <key>origin</key>
-          <array>
-            <real>0.0</real>
-            <real>19.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>
       </array>
     </dict>
   </lib>