cyrillic

15 files changed, 409 insertions, 436 deletions

diff --git a/src/Inter-UI-Regular.ufo/glyphs/decyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/decyrillic.glif
index 3c48603fe..4d9b5868b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/decyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/decyrillic.glif
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="decyrillic" format="2">
-  <advance width="1776.0"/>
+  <advance width="1828.0"/>
   <unicode hex="0434"/>
   <outline>
     <contour>
-      <point x="500.0" y="1488.0" type="line"/>
-      <point x="476.0" y="928.0" type="line" smooth="yes"/>
-      <point x="456.0" y="496.0"/>
-      <point x="348.0" y="368.0"/>
-      <point x="224.0" y="220.0" type="curve"/>
-      <point x="168.0" y="220.0" type="line"/>
-      <point x="160.0" y="0.0" type="line"/>
-      <point x="296.0" y="0.0" type="line"/>
-      <point x="556.0" y="152.0"/>
-      <point x="732.0" y="416.0"/>
-      <point x="752.0" y="928.0" type="curve" smooth="yes"/>
-      <point x="772.0" y="1488.0" type="line"/>
+      <point x="524.0" y="1536.0" type="line"/>
+      <point x="500.0" y="928.0" type="line" smooth="yes"/>
+      <point x="483.0" y="496.0"/>
+      <point x="372.0" y="368.0"/>
+      <point x="248.0" y="220.0" type="curve"/>
+      <point x="192.0" y="220.0" type="line"/>
+      <point x="184.0" y="0.0" type="line"/>
+      <point x="320.0" y="0.0" type="line"/>
+      <point x="580.0" y="152.0"/>
+      <point x="719.0" y="416.0"/>
+      <point x="736.0" y="928.0" type="curve" smooth="yes"/>
+      <point x="756.0" y="1536.0" type="line"/>
     </contour>
     <contour>
-      <point x="564.0" y="1488.0" type="line"/>
-      <point x="564.0" y="1240.0" type="line"/>
-      <point x="1200.0" y="1240.0" type="line"/>
-      <point x="1200.0" y="0.0" type="line"/>
-      <point x="1476.0" y="0.0" type="line"/>
-      <point x="1476.0" y="1488.0" type="line"/>
+      <point x="588.0" y="1536.0" type="line"/>
+      <point x="588.0" y="1316.0" type="line"/>
+      <point x="1264.0" y="1316.0" type="line"/>
+      <point x="1264.0" y="0.0" type="line"/>
+      <point x="1500.0" y="0.0" type="line"/>
+      <point x="1500.0" y="1536.0" type="line"/>
     </contour>
     <contour>
-      <point x="104.0" y="220.0" type="line"/>
-      <point x="104.0" y="-440.0" type="line"/>
-      <point x="380.0" y="-440.0" type="line"/>
-      <point x="380.0" y="0.0" type="line"/>
-      <point x="1400.0" y="0.0" type="line"/>
-      <point x="1400.0" y="-440.0" type="line"/>
-      <point x="1676.0" y="-440.0" type="line"/>
-      <point x="1676.0" y="220.0" type="line"/>
+      <point x="128.0" y="220.0" type="line"/>
+      <point x="128.0" y="-440.0" type="line"/>
+      <point x="364.0" y="-440.0" type="line"/>
+      <point x="364.0" y="0.0" type="line"/>
+      <point x="1464.0" y="0.0" type="line"/>
+      <point x="1464.0" y="-440.0" type="line"/>
+      <point x="1700.0" y="-440.0" type="line"/>
+      <point x="1700.0" y="220.0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/elcyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/elcyrillic.glif
index 5eb745204..d5d9b597b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/elcyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/elcyrillic.glif
@@ -1,37 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="elcyrillic" format="2">
-  <advance width="1520.0"/>
+  <advance width="1660.0"/>
   <unicode hex="043B"/>
   <outline>
     <contour>
-      <point x="1196.0" y="1488.0" type="line"/>
-      <point x="488.0" y="1488.0" type="line"/>
-      <point x="488.0" y="1268.0" type="line"/>
-      <point x="1196.0" y="1268.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1444.0" y="1488.0" type="line"/>
-      <point x="1168.0" y="1488.0" type="line"/>
-      <point x="1168.0" y="0.0" type="line"/>
-      <point x="1444.0" y="0.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="420.0" y="1488.0" type="line"/>
-      <point x="392.0" y="856.0" type="line" smooth="yes"/>
-      <point x="372.0" y="364.0"/>
-      <point x="300.0" y="256.0"/>
-      <point x="136.0" y="244.0" type="curve" smooth="yes"/>
-      <point x="80.0" y="240.0" type="line"/>
       <point x="80.0" y="0.0" type="line"/>
       <point x="160.0" y="0.0" type="line" smooth="yes"/>
-      <point x="516.0" y="0.0"/>
-      <point x="628.0" y="244.0"/>
-      <point x="656.0" y="768.0" type="curve" smooth="yes"/>
-      <point x="696.0" y="1488.0" type="line"/>
+      <point x="500.0" y="0.0"/>
+      <point x="596.0" y="264.0"/>
+      <point x="620.0" y="768.0" type="curve" smooth="yes"/>
+      <point x="648.0" y="1316.0" type="line"/>
+      <point x="1208.0" y="1316.0" type="line"/>
+      <point x="1208.0" y="0.0" type="line"/>
+      <point x="1444.0" y="0.0" type="line"/>
+      <point x="1444.0" y="1536.0" type="line"/>
+      <point x="420.0" y="1536.0" type="line"/>
+      <point x="392.0" y="856.0" type="line" smooth="yes"/>
+      <point x="372.0" y="340.0"/>
+      <point x="320.0" y="220.0"/>
+      <point x="136.0" y="220.0" type="curve" smooth="yes"/>
+      <point x="80.0" y="220.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>a</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -41,8 +35,8 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
-            <real>5.0</real>
+            <real>0.0</real>
+            <real>15.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -62,14 +56,14 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>1.0</real>
+            <real>4.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>2.0</real>
-            <real>11.0</real>
+            <real>0.0</real>
+            <real>9.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -81,15 +75,15 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>6.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
-            <real>2.0</real>
+            <real>0.0</real>
+            <real>7.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -101,8 +95,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
-            <real>5.0</real>
+            <real>0.0</real>
+            <real>15.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -117,14 +111,14 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>1.0</real>
+            <real>4.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>2.0</real>
-            <real>11.0</real>
+            <real>0.0</real>
+            <real>9.0</real>
           </array>
           <key>type</key>
           <string>TTStem</string>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/encyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/encyrillic.glif
index cf0f50c70..b37f9e03d 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/encyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/encyrillic.glif
@@ -4,21 +4,21 @@
   <unicode hex="043D"/>
   <outline>
     <contour>
-      <point x="1204.0" y="876.0" type="line"/>
-      <point x="436.0" y="876.0" type="line"/>
-      <point x="436.0" y="656.0" type="line"/>
-      <point x="1204.0" y="656.0" type="line"/>
+      <point x="1244.0" y="876.0" type="line"/>
+      <point x="396.0" y="876.0" type="line"/>
+      <point x="396.0" y="656.0" type="line"/>
+      <point x="1244.0" y="656.0" type="line"/>
     </contour>
     <contour>
-      <point x="492.0" y="1536.0" type="line"/>
+      <point x="452.0" y="1536.0" type="line"/>
       <point x="216.0" y="1536.0" type="line"/>
       <point x="216.0" y="0.0" type="line"/>
-      <point x="492.0" y="0.0" type="line"/>
+      <point x="452.0" y="0.0" type="line"/>
     </contour>
     <contour>
       <point x="1424.0" y="1536.0" type="line"/>
-      <point x="1148.0" y="1536.0" type="line"/>
-      <point x="1148.0" y="0.0" type="line"/>
+      <point x="1188.0" y="1536.0" type="line"/>
+      <point x="1188.0" y="0.0" type="line"/>
       <point x="1424.0" y="0.0" type="line"/>
     </contour>
   </outline>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/enhookcyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/enhookcyrillic.glif
index a74cdad00..19fb81930 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/enhookcyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/enhookcyrillic.glif
@@ -5,9 +5,9 @@
   <outline>
     <contour>
       <point x="1424.0" y="0.0" type="line"/>
-      <point x="1148.0" y="0.0" type="line"/>
-      <point x="1148.0" y="-124.0" type="line" smooth="yes"/>
-      <point x="1148.0" y="-284.0"/>
+      <point x="1188.0" y="0.0" type="line"/>
+      <point x="1188.0" y="-124.0" type="line" smooth="yes"/>
+      <point x="1188.0" y="-284.0"/>
       <point x="1084.0" y="-380.0"/>
       <point x="976.0" y="-380.0" type="curve" smooth="yes"/>
       <point x="952.0" y="-380.0"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/iacyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/iacyrillic.glif
index dbe3c0ada..ae7b0e055 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/iacyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/iacyrillic.glif
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="iacyrillic" format="2">
-  <advance width="1720.0"/>
+  <advance width="1640.0"/>
   <unicode hex="044F"/>
   <outline>
     <contour>
-      <point x="652.0" y="764.0" type="line"/>
-      <point x="216.0" y="0.0" type="line"/>
-      <point x="512.0" y="0.0" type="line"/>
-      <point x="948.0" y="764.0" type="line"/>
+      <point x="1188.0" y="0.0" type="line"/>
+      <point x="1424.0" y="0.0" type="line"/>
+      <point x="1424.0" y="1536.0" type="line"/>
+      <point x="832.0" y="1536.0" type="line"/>
+      <point x="501.0" y="1536.0"/>
+      <point x="300.0" y="1363.0"/>
+      <point x="300.0" y="1080.0" type="curve"/>
+      <point x="300.0" y="797.0"/>
+      <point x="491.0" y="624.0"/>
+      <point x="804.0" y="624.0" type="curve"/>
+      <point x="1260.0" y="624.0" type="line"/>
+      <point x="1260.0" y="844.0" type="line"/>
+      <point x="804.0" y="844.0" type="line"/>
+      <point x="637.0" y="844.0"/>
+      <point x="536.0" y="933.0"/>
+      <point x="536.0" y="1080.0" type="curve"/>
+      <point x="536.0" y="1229.0"/>
+      <point x="648.0" y="1320.0"/>
+      <point x="832.0" y="1320.0" type="curve"/>
+      <point x="1188.0" y="1320.0" type="line"/>
     </contour>
     <contour>
-      <point x="872.0" y="1536.0" type="line"/>
-      <point x="512.0" y="1536.0"/>
-      <point x="300.0" y="1344.0"/>
-      <point x="300.0" y="1080.0" type="curve"/>
-      <point x="300.0" y="820.0"/>
-      <point x="500.0" y="624.0"/>
-      <point x="844.0" y="624.0" type="curve"/>
-      <point x="1300.0" y="624.0" type="line"/>
-      <point x="1300.0" y="844.0" type="line"/>
-      <point x="844.0" y="844.0" type="line"/>
-      <point x="656.0" y="844.0"/>
-      <point x="576.0" y="964.0"/>
-      <point x="576.0" y="1080.0" type="curve"/>
-      <point x="576.0" y="1196.0"/>
-      <point x="664.0" y="1320.0"/>
-      <point x="872.0" y="1320.0" type="curve"/>
-      <point x="1228.0" y="1320.0" type="line"/>
-      <point x="1228.0" y="0.0" type="line"/>
-      <point x="1504.0" y="0.0" type="line"/>
-      <point x="1504.0" y="1536.0" type="line"/>
+      <point x="216.0" y="0.0" type="line"/>
+      <point x="472.0" y="0.0" type="line"/>
+      <point x="908.0" y="764.0" type="line"/>
+      <point x="652.0" y="764.0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/kabashkircyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/kabashkircyrillic.glif
index 07d1e36da..9e9c953d6 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/kabashkircyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/kabashkircyrillic.glif
@@ -1,37 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="kabashkircyrillic" format="2">
-  <advance width="2032.0"/>
+  <advance width="1976.0"/>
   <unicode hex="04A1"/>
   <outline>
     <contour>
-      <point x="800.0" y="1488.0" type="line"/>
-      <point x="84.0" y="1488.0" type="line"/>
-      <point x="84.0" y="1268.0" type="line"/>
-      <point x="800.0" y="1268.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="912.0" y="1488.0" type="line"/>
-      <point x="636.0" y="1488.0" type="line"/>
-      <point x="636.0" y="0.0" type="line"/>
-      <point x="912.0" y="0.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1888.0" y="1488.0" type="line"/>
-      <point x="1556.0" y="1488.0" type="line"/>
-      <point x="1068.0" y="864.0" type="line"/>
-      <point x="776.0" y="864.0" type="line"/>
-      <point x="820.0" y="628.0" type="line"/>
-      <point x="1180.0" y="628.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1588.0" y="0.0" type="line"/>
-      <point x="1932.0" y="0.0" type="line"/>
-      <point x="1232.0" y="864.0" type="line"/>
-      <point x="1056.0" y="668.0" type="line"/>
+      <point x="844.0" y="1536.0" type="line"/>
+      <point x="128.0" y="1536.0" type="line"/>
+      <point x="128.0" y="1316.0" type="line"/>
+      <point x="844.0" y="1316.0" type="line"/>
     </contour>
+    <component base="kacyrillic" xOffset="464.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>k</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -39,10 +22,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>-4.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -59,18 +42,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>3.0</real>
+            <real>624.0</real>
+            <real>236.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>2.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -101,14 +79,14 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>2.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
+            <real>0.0</real>
             <real>2.0</real>
           </array>
           <key>type</key>
@@ -121,8 +99,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>2.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -134,18 +112,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>3.0</real>
+            <real>624.0</real>
+            <real>236.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>2.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/kadescendercyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/kadescendercyrillic.glif
index 5f48b2d28..f85bb6b89 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/kadescendercyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/kadescendercyrillic.glif
@@ -1,9 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="kadescendercyrillic" format="2">
-  <advance width="1512.0"/>
+  <advance width="1652.0"/>
   <unicode hex="049B"/>
   <outline>
     <component base="kacyrillic"/>
     <component base="cyrillictic.cn" xOffset="1156.0"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>m</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>t</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>-1</integer>
+        <integer>0</integer>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/kahookcyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/kahookcyrillic.glif
index 9c6b784a7..eaea3fadc 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/kahookcyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/kahookcyrillic.glif
@@ -1,43 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="kahookcyrillic" format="2">
-  <advance width="1776.0"/>
+  <advance width="1640.0"/>
   <unicode hex="04C4"/>
   <outline>
     <contour>
-      <point x="540.0" y="1488.0" type="line"/>
-      <point x="264.0" y="1488.0" type="line"/>
-      <point x="264.0" y="0.0" type="line"/>
-      <point x="540.0" y="0.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1512.0" y="1488.0" type="line"/>
-      <point x="1184.0" y="1488.0" type="line"/>
-      <point x="652.0" y="864.0" type="line"/>
-      <point x="404.0" y="864.0" type="line"/>
-      <point x="448.0" y="628.0" type="line"/>
-      <point x="764.0" y="628.0" type="line"/>
+      <point x="384.0" y="648.0" type="line"/>
+      <point x="768.0" y="648.0" type="line" smooth="yes"/>
+      <point x="1059.0" y="648.0"/>
+      <point x="1264.0" y="482.0"/>
+      <point x="1264.0" y="248.0" type="curve" smooth="yes"/>
+      <point x="1264.0" y="63.0"/>
+      <point x="1117.0" y="-105.0"/>
+      <point x="908.0" y="-156.0" type="curve"/>
+      <point x="968.0" y="-352.0" type="line"/>
+      <point x="1277.0" y="-301.0"/>
+      <point x="1496.0" y="-52.0"/>
+      <point x="1496.0" y="248.0" type="curve" smooth="yes"/>
+      <point x="1496.0" y="611.0"/>
+      <point x="1194.0" y="868.0"/>
+      <point x="768.0" y="868.0" type="curve" smooth="yes"/>
+      <point x="384.0" y="868.0" type="line"/>
     </contour>
     <contour>
-      <point x="384.0" y="628.0" type="line"/>
-      <point x="768.0" y="628.0" type="line" smooth="yes"/>
-      <point x="1036.0" y="628.0"/>
-      <point x="1224.0" y="516.0"/>
-      <point x="1224.0" y="248.0" type="curve" smooth="yes"/>
-      <point x="1224.0" y="64.0"/>
-      <point x="1140.0" y="-80.0"/>
-      <point x="896.0" y="-140.0" type="curve"/>
-      <point x="968.0" y="-352.0" type="line"/>
-      <point x="1356.0" y="-288.0"/>
-      <point x="1496.0" y="52.0"/>
-      <point x="1496.0" y="248.0" type="curve"/>
-      <point x="1496.0" y="656.0"/>
-      <point x="1192.0" y="860.0"/>
-      <point x="768.0" y="860.0" type="curve" smooth="yes"/>
-      <point x="384.0" y="860.0" type="line"/>
+      <point x="216.0" y="0.0" type="line"/>
+      <point x="452.0" y="0.0" type="line"/>
+      <point x="452.0" y="648.0" type="line"/>
+      <point x="724.0" y="648.0" type="line"/>
+      <point x="1464.0" y="1536.0" type="line"/>
+      <point x="1160.0" y="1536.0" type="line"/>
+      <point x="608.0" y="868.0" type="line"/>
+      <point x="452.0" y="868.0" type="line"/>
+      <point x="452.0" y="1536.0" type="line"/>
+      <point x="216.0" y="1536.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>m</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>b</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -45,10 +47,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
             <real>0.0</real>
-            <real>1.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -67,15 +69,15 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
+            <real>0.0</real>
             <real>15.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
-            <real>2.0</real>
+            <real>0.0</real>
+            <real>14.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -88,14 +90,14 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>1.0</real>
+            <real>15.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
             <real>0.0</real>
-            <real>2.0</real>
+            <real>15.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -107,14 +109,14 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
+            <real>0.0</real>
             <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>2.0</real>
+            <real>0.0</real>
             <real>10.0</real>
           </array>
           <key>type</key>
@@ -128,7 +130,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>1.0</real>
+            <real>6.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -142,15 +144,15 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
+            <real>0.0</real>
             <real>15.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
-            <real>2.0</real>
+            <real>0.0</real>
+            <real>14.0</real>
           </array>
           <key>type</key>
           <string>TTStem</string>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/kaverticalstrokecyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/kaverticalstrokecyrillic.glif
index 97aae59f2..d7526e9db 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/kaverticalstrokecyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/kaverticalstrokecyrillic.glif
@@ -1,37 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="kaverticalstrokecyrillic" format="2">
-  <advance width="1776.0"/>
+  <advance width="1632.0"/>
   <unicode hex="049D"/>
   <outline>
     <contour>
-      <point x="192.0" y="1488.0" type="line"/>
-      <point x="192.0" y="0.0" type="line"/>
-      <point x="468.0" y="0.0" type="line"/>
-      <point x="468.0" y="1488.0" type="line"/>
+      <point x="216.0" y="0.0" type="line"/>
+      <point x="452.0" y="0.0" type="line"/>
+      <point x="452.0" y="648.0" type="line"/>
+      <point x="916.0" y="648.0" type="line"/>
+      <point x="1320.0" y="0.0" type="line"/>
+      <point x="1592.0" y="0.0" type="line"/>
+      <point x="1084.0" y="796.0" type="line"/>
+      <point x="1584.0" y="1536.0" type="line"/>
+      <point x="1312.0" y="1536.0" type="line"/>
+      <point x="868.0" y="868.0" type="line"/>
+      <point x="452.0" y="868.0" type="line"/>
+      <point x="452.0" y="1536.0" type="line"/>
+      <point x="216.0" y="1536.0" type="line"/>
     </contour>
     <contour>
-      <point x="596.0" y="1152.0" type="line"/>
-      <point x="596.0" y="372.0" type="line"/>
-      <point x="816.0" y="372.0" type="line"/>
-      <point x="816.0" y="1152.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1208.0" y="1488.0" type="line"/>
-      <point x="860.0" y="864.0" type="line"/>
-      <point x="332.0" y="864.0" type="line"/>
-      <point x="376.0" y="628.0" type="line"/>
-      <point x="972.0" y="628.0" type="line"/>
-      <point x="1540.0" y="1488.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="848.0" y="668.0" type="line"/>
-      <point x="1240.0" y="0.0" type="line"/>
-      <point x="1584.0" y="0.0" type="line"/>
-      <point x="1024.0" y="864.0" type="line"/>
+      <point x="596.0" y="1148.0" type="line"/>
+      <point x="596.0" y="368.0" type="line"/>
+      <point x="816.0" y="368.0" type="line"/>
+      <point x="816.0" y="1148.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>kacyrillic</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>kacyrillic</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -39,10 +38,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
             <real>0.0</real>
-            <real>0.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -59,18 +58,28 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>2.0</real>
+            <real>628.0</real>
+            <real>236.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
+          <key>type</key>
+          <string>Stem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <false/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>1.0</real>
+            <real>192.0</real>
+            <real>404.0</real>
           </array>
+          <key>stem</key>
+          <integer>-2</integer>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -79,18 +88,83 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
+          <key>place</key>
+          <array>
+            <real>596.0</real>
+            <real>220.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>place</key>
+          <array>
+            <real>372.0</real>
+            <real>-2147483648.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>Anchor</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>4</integer>
+          <key>place</key>
+          <array>
+            <real>628.0</real>
+            <real>236.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>0</integer>
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>0.0</real>
+            <real>12.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
+            <string>u</string>
+            <string>p</string>
+          </array>
+          <key>type</key>
+          <string>BottomGhost</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <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>9.0</real>
+          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -101,15 +175,15 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
             <real>0.0</real>
+            <real>12.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>0.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -122,7 +196,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>0.0</real>
+            <real>12.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -136,15 +210,15 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
-            <real>2.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>1.0</real>
+            <real>0.0</real>
+            <real>9.0</real>
           </array>
           <key>type</key>
           <string>TTStem</string>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni048B_.glif b/src/Inter-UI-Regular.ufo/glyphs/uni048B_.glif
index 685734181..65ca9738f 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni048B_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni048B_.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni048B" format="2">
-  <advance width="1680.0"/>
+  <advance width="1848.0"/>
   <unicode hex="048B"/>
   <outline>
     <component base="iicyrillic"/>
@@ -9,9 +9,13 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>m</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>t</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
-        <integer>0</integer>
+        <integer>-1</integer>
         <integer>0</integer>
         <integer>1</integer>
       </array>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni04C_6.glif b/src/Inter-UI-Regular.ufo/glyphs/uni04C_6.glif
index 2013467c7..7c923f73d 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni04C_6.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni04C_6.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni04C6" format="2">
-  <advance width="1520.0"/>
+  <advance width="1828.0"/>
   <unicode hex="04C6"/>
   <outline>
     <component base="elcyrillic"/>
@@ -8,9 +8,13 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>elcyrillic</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>t</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
-        <integer>0</integer>
+        <integer>-1</integer>
         <integer>1</integer>
       </array>
     </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni052F_.glif b/src/Inter-UI-Regular.ufo/glyphs/uni052F_.glif
index 58140f2de..438c679c5 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni052F_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni052F_.glif
@@ -1,33 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni052F" format="2">
-  <advance width="1776.0"/>
+  <advance width="1808.0"/>
   <unicode hex="052F"/>
   <outline>
-    <contour>
-      <point x="428.0" y="1488.0" type="line"/>
-      <point x="400.0" y="856.0" type="line" smooth="yes"/>
-      <point x="380.0" y="364.0"/>
-      <point x="308.0" y="256.0"/>
-      <point x="144.0" y="244.0" type="curve" smooth="yes"/>
-      <point x="88.0" y="240.0" type="line"/>
-      <point x="88.0" y="0.0" type="line"/>
-      <point x="172.0" y="0.0" type="line" smooth="yes"/>
-      <point x="520.0" y="0.0"/>
-      <point x="636.0" y="232.0"/>
-      <point x="664.0" y="768.0" type="curve" smooth="yes"/>
-      <point x="692.0" y="1268.0" type="line"/>
-      <point x="1176.0" y="1268.0" type="line"/>
-      <point x="1176.0" y="0.0" type="line"/>
-      <point x="1416.0" y="0.0" type="line"/>
-      <point x="1416.0" y="-496.0" type="line"/>
-      <point x="1692.0" y="-496.0" type="line"/>
-      <point x="1692.0" y="220.0" type="line"/>
-      <point x="1452.0" y="220.0" type="line"/>
-      <point x="1452.0" y="1488.0" type="line"/>
-    </contour>
+    <component base="elcyrillic"/>
+    <component base="cyrillictic.cn" xOffset="1312.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>elcyrillic</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>t</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>-1</integer>
+        <integer>0</integer>
+      </array>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -35,18 +24,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
             <real>0.0</real>
-            <real>5.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>17.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -55,18 +39,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>10.0</real>
+            <real>1268.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>19.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -75,18 +54,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>12.0</real>
+            <real>1176.0</real>
+            <real>276.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>17.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -95,18 +69,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>14.0</real>
+            <real>1416.0</real>
+            <real>276.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>
@@ -115,18 +84,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
             <real>0.0</real>
-            <real>5.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>17.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -135,18 +99,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>10.0</real>
+            <real>1268.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>19.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/zecyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/zecyrillic.glif
index 768ee321c..caff96128 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/zecyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/zecyrillic.glif
@@ -1,59 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="zecyrillic" format="2">
-  <advance width="1520.0"/>
+  <advance width="1356.0"/>
   <unicode hex="0437"/>
   <outline>
     <contour>
-      <point x="808.0" y="712.0" type="line"/>
-      <point x="1124.0" y="712.0"/>
-      <point x="1324.0" y="876.0"/>
-      <point x="1324.0" y="1080.0" type="curve"/>
-      <point x="1324.0" y="1364.0"/>
-      <point x="1112.0" y="1516.0"/>
-      <point x="768.0" y="1516.0" type="curve" smooth="yes"/>
-      <point x="456.0" y="1516.0"/>
-      <point x="196.0" y="1344.0"/>
-      <point x="196.0" y="1072.0" type="curve"/>
-      <point x="468.0" y="1072.0" type="line"/>
-      <point x="468.0" y="1196.0"/>
-      <point x="600.0" y="1296.0"/>
-      <point x="768.0" y="1296.0" type="curve" smooth="yes"/>
-      <point x="972.0" y="1296.0"/>
-      <point x="1048.0" y="1188.0"/>
-      <point x="1048.0" y="1080.0" type="curve"/>
-      <point x="1048.0" y="956.0"/>
-      <point x="984.0" y="872.0"/>
-      <point x="784.0" y="872.0" type="curve" smooth="yes"/>
-      <point x="524.0" y="872.0" type="line"/>
-      <point x="524.0" y="712.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="524.0" y="808.0" type="line"/>
-      <point x="524.0" y="648.0" type="line"/>
-      <point x="784.0" y="648.0" type="line" smooth="yes"/>
-      <point x="984.0" y="648.0"/>
-      <point x="1072.0" y="580.0"/>
-      <point x="1072.0" y="420.0" type="curve" smooth="yes"/>
-      <point x="1072.0" y="300.0"/>
-      <point x="972.0" y="188.0"/>
-      <point x="768.0" y="188.0" type="curve" smooth="yes"/>
-      <point x="572.0" y="188.0"/>
-      <point x="444.0" y="312.0"/>
-      <point x="444.0" y="444.0" type="curve"/>
-      <point x="172.0" y="444.0" type="line"/>
-      <point x="172.0" y="116.0"/>
-      <point x="476.0" y="-28.0"/>
-      <point x="768.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="1112.0" y="-28.0"/>
-      <point x="1352.0" y="140.0"/>
-      <point x="1352.0" y="420.0" type="curve" smooth="yes"/>
-      <point x="1352.0" y="672.0"/>
-      <point x="1160.0" y="808.0"/>
-      <point x="808.0" y="808.0" type="curve" smooth="yes"/>
+      <point x="124.0" y="392.0" type="line"/>
+      <point x="132.0" y="140.0"/>
+      <point x="392.0" y="-32.0"/>
+      <point x="700.0" y="-32.0" type="curve" smooth="yes"/>
+      <point x="1024.0" y="-32.0"/>
+      <point x="1240.0" y="160.0"/>
+      <point x="1240.0" y="404.0" type="curve" smooth="yes"/>
+      <point x="1240.0" y="583.0"/>
+      <point x="1128.0" y="724.0"/>
+      <point x="976.0" y="760.0" type="curve"/>
+      <point x="976.0" y="776.0" type="line"/>
+      <point x="1122.0" y="812.0"/>
+      <point x="1232.0" y="944.0"/>
+      <point x="1232.0" y="1120.0" type="curve" smooth="yes"/>
+      <point x="1232.0" y="1369.0"/>
+      <point x="1008.0" y="1556.0"/>
+      <point x="684.0" y="1556.0" type="curve" smooth="yes"/>
+      <point x="364.0" y="1556.0"/>
+      <point x="132.0" y="1380.0"/>
+      <point x="124.0" y="1132.0" type="curve"/>
+      <point x="376.0" y="1132.0" type="line"/>
+      <point x="383.0" y="1259.0"/>
+      <point x="516.0" y="1348.0"/>
+      <point x="696.0" y="1348.0" type="curve" smooth="yes"/>
+      <point x="875.0" y="1348.0"/>
+      <point x="992.0" y="1257.0"/>
+      <point x="992.0" y="1120.0" type="curve" smooth="yes"/>
+      <point x="992.0" y="983.0"/>
+      <point x="879.0" y="884.0"/>
+      <point x="700.0" y="884.0" type="curve" smooth="yes"/>
+      <point x="436.0" y="884.0" type="line"/>
+      <point x="436.0" y="664.0" type="line"/>
+      <point x="700.0" y="664.0" type="line" smooth="yes"/>
+      <point x="879.0" y="664.0"/>
+      <point x="1000.0" y="544.0"/>
+      <point x="1000.0" y="404.0" type="curve" smooth="yes"/>
+      <point x="1000.0" y="259.0"/>
+      <point x="873.0" y="180.0"/>
+      <point x="696.0" y="180.0" type="curve" smooth="yes"/>
+      <point x="527.0" y="180.0"/>
+      <point x="384.0" y="256.0"/>
+      <point x="376.0" y="392.0" type="curve"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>three.subs</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>three.subs</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -61,18 +61,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>14.0</real>
+            <real>-28.0</real>
+            <real>216.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>7.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -81,18 +76,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>0.0</real>
+            <real>648.0</real>
+            <real>224.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>19.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -101,18 +91,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>12.0</real>
+            <real>1296.0</real>
+            <real>220.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>
@@ -121,18 +106,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>11.0</real>
+            <real>172.0</real>
+            <real>272.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>10.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -141,18 +121,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>4.0</real>
+            <real>1072.0</real>
+            <real>280.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>17.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -161,18 +136,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>8.0</real>
+            <real>196.0</real>
+            <real>272.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>
@@ -181,18 +151,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>15.0</real>
+            <real>1048.0</real>
+            <real>276.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>
@@ -201,18 +166,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>14.0</real>
+            <real>-28.0</real>
+            <real>216.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>7.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -221,18 +181,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>0.0</real>
+            <real>648.0</real>
+            <real>224.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>19.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -241,18 +196,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>12.0</real>
+            <real>1296.0</real>
+            <real>220.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>TTStem</string>
         </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/zedescendercyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/zedescendercyrillic.glif
index 2d9d32a82..16aff699b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/zedescendercyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/zedescendercyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="zedescendercyrillic" format="2">
-  <advance width="1520.0"/>
+  <advance width="1356.0"/>
   <unicode hex="0499"/>
   <outline>
     <component base="zecyrillic"/>
-    <component base="cedilla" xOffset="384.0" yOffset="-12.0"/>
+    <component base="cedilla" xOffset="316.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/zedieresiscyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/zedieresiscyrillic.glif
index dd41799b3..dfaaf2f35 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/zedieresiscyrillic.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/zedieresiscyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="zedieresiscyrillic" format="2">
-  <advance width="1520.0"/>
+  <advance width="1356.0"/>
   <unicode hex="04DF"/>
   <outline>
     <component base="zecyrillic"/>
-    <component base="dieresis" xOffset="-56.0" yOffset="-20.0"/>
+    <component base="dieresis" xOffset="-136.0"/>
   </outline>
 </glyph>