Fixes master compatibility for sunWithRays

20 files changed, 674 insertions, 716 deletions

diff --git a/src/Inter-UI-Black.ufo/fontinfo.plist b/src/Inter-UI-Black.ufo/fontinfo.plist
index 38eea741d..f1dfd37cf 100644
--- a/src/Inter-UI-Black.ufo/fontinfo.plist
+++ b/src/Inter-UI-Black.ufo/fontinfo.plist
@@ -97,9 +97,9 @@
     <key>openTypeNameSampleText</key>
     <string></string>
     <key>openTypeNameUniqueID</key>
-    <string>Inter UI Black:2018:61b0aaa4a</string>
+    <string>Inter UI Black:2018:a9bbc2f5d</string>
     <key>openTypeNameVersion</key>
-    <string>3.0;61b0aaa4a</string>
+    <string>3.0;a9bbc2f5d</string>
     <key>openTypeOS2CodePageRanges</key>
     <array>
       <integer>0</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/blackS_unW_ithR_ays.glif b/src/Inter-UI-Black.ufo/glyphs/blackS_unW_ithR_ays.glif
index fe5b9f86a..3d2287796 100644
--- a/src/Inter-UI-Black.ufo/glyphs/blackS_unW_ithR_ays.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/blackS_unW_ithR_ays.glif
@@ -6,35 +6,35 @@
   <outline>
     <contour>
       <point x="1332.0" y="604.0" type="curve" smooth="yes"/>
-      <point x="1580.0" y="604.0"/>
-      <point x="1784.0" y="808.0"/>
+      <point x="1579.0" y="604.0"/>
+      <point x="1782.0" y="807.0"/>
       <point x="1784.0" y="1056.0" type="curve" smooth="yes"/>
-      <point x="1784.0" y="1304.0"/>
-      <point x="1580.0" y="1508.0"/>
+      <point x="1782.0" y="1305.0"/>
+      <point x="1579.0" y="1508.0"/>
       <point x="1332.0" y="1508.0" type="curve" smooth="yes"/>
-      <point x="1080.0" y="1508.0"/>
-      <point x="880.0" y="1304.0"/>
+      <point x="1081.0" y="1508.0"/>
+      <point x="878.0" y="1305.0"/>
       <point x="880.0" y="1056.0" type="curve" smooth="yes"/>
-      <point x="880.0" y="808.0"/>
-      <point x="1080.0" y="604.0"/>
+      <point x="878.0" y="807.0"/>
+      <point x="1081.0" y="604.0"/>
     </contour>
     <contour>
-      <point x="528.0" y="76.0" type="line"/>
-      <point x="960.0" y="508.0" type="line"/>
-      <point x="784.0" y="684.0" type="line"/>
-      <point x="352.0" y="252.0" type="line"/>
+      <point x="1208.0" y="1708.0" type="line"/>
+      <point x="1456.0" y="1708.0" type="line"/>
+      <point x="1456.0" y="2316.0" type="line"/>
+      <point x="1208.0" y="2316.0" type="line"/>
     </contour>
     <contour>
-      <point x="72.0" y="932.0" type="line"/>
-      <point x="680.0" y="932.0" type="line"/>
-      <point x="680.0" y="1180.0" type="line"/>
-      <point x="72.0" y="1180.0" type="line"/>
+      <point x="1880.0" y="1428.0" type="line"/>
+      <point x="2312.0" y="1860.0" type="line"/>
+      <point x="2136.0" y="2036.0" type="line"/>
+      <point x="1704.0" y="1604.0" type="line"/>
     </contour>
     <contour>
-      <point x="1208.0" y="-204.0" type="line"/>
-      <point x="1456.0" y="-204.0" type="line"/>
-      <point x="1456.0" y="404.0" type="line"/>
-      <point x="1208.0" y="404.0" type="line"/>
+      <point x="1984.0" y="932.0" type="line"/>
+      <point x="2592.0" y="932.0" type="line"/>
+      <point x="2592.0" y="1180.0" type="line"/>
+      <point x="1984.0" y="1180.0" type="line"/>
     </contour>
     <contour>
       <point x="2136.0" y="76.0" type="line"/>
@@ -43,28 +43,28 @@
       <point x="1704.0" y="508.0" type="line"/>
     </contour>
     <contour>
-      <point x="784.0" y="1428.0" type="line"/>
-      <point x="960.0" y="1604.0" type="line"/>
-      <point x="528.0" y="2036.0" type="line"/>
-      <point x="352.0" y="1860.0" type="line"/>
+      <point x="1208.0" y="-204.0" type="line"/>
+      <point x="1456.0" y="-204.0" type="line"/>
+      <point x="1456.0" y="404.0" type="line"/>
+      <point x="1208.0" y="404.0" type="line"/>
     </contour>
     <contour>
-      <point x="1984.0" y="932.0" type="line"/>
-      <point x="2592.0" y="932.0" type="line"/>
-      <point x="2592.0" y="1180.0" type="line"/>
-      <point x="1984.0" y="1180.0" type="line"/>
+      <point x="528.0" y="76.0" type="line"/>
+      <point x="960.0" y="508.0" type="line"/>
+      <point x="784.0" y="684.0" type="line"/>
+      <point x="352.0" y="252.0" type="line"/>
     </contour>
     <contour>
-      <point x="1208.0" y="1708.0" type="line"/>
-      <point x="1456.0" y="1708.0" type="line"/>
-      <point x="1456.0" y="2316.0" type="line"/>
-      <point x="1208.0" y="2316.0" type="line"/>
+      <point x="72.0" y="932.0" type="line"/>
+      <point x="680.0" y="932.0" type="line"/>
+      <point x="680.0" y="1180.0" type="line"/>
+      <point x="72.0" y="1180.0" type="line"/>
     </contour>
     <contour>
-      <point x="1880.0" y="1428.0" type="line"/>
-      <point x="2312.0" y="1860.0" type="line"/>
-      <point x="2136.0" y="2036.0" type="line"/>
-      <point x="1704.0" y="1604.0" type="line"/>
+      <point x="784.0" y="1428.0" type="line"/>
+      <point x="960.0" y="1604.0" type="line"/>
+      <point x="528.0" y="2036.0" type="line"/>
+      <point x="352.0" y="1860.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -80,18 +80,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>3.0</real>
+            <real>932.0</real>
+            <real>248.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>
@@ -100,18 +95,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>3.0</real>
-            <real>3.0</real>
+            <real>1208.0</real>
+            <real>248.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>3.0</real>
-            <real>0.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -120,18 +110,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>3.0</real>
+            <real>932.0</real>
+            <real>248.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-Black.ufo/glyphs/sunW_ithR_ays.glif b/src/Inter-UI-Black.ufo/glyphs/sunW_ithR_ays.glif
index 4db66185a..e1ed74dd9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/sunW_ithR_ays.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/sunW_ithR_ays.glif
@@ -20,24 +20,6 @@
       <point x="1081.0" y="604.0"/>
     </contour>
     <contour>
-      <point x="528.0" y="76.0" type="line"/>
-      <point x="960.0" y="508.0" type="line"/>
-      <point x="784.0" y="684.0" type="line"/>
-      <point x="352.0" y="252.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="72.0" y="932.0" type="line"/>
-      <point x="680.0" y="932.0" type="line"/>
-      <point x="680.0" y="1180.0" type="line"/>
-      <point x="72.0" y="1180.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1208.0" y="-204.0" type="line"/>
-      <point x="1456.0" y="-204.0" type="line"/>
-      <point x="1456.0" y="404.0" type="line"/>
-      <point x="1208.0" y="404.0" type="line"/>
-    </contour>
-    <contour>
       <point x="1332.0" y="872.0" type="curve" smooth="yes"/>
       <point x="1228.0" y="872.0"/>
       <point x="1146.0" y="954.0"/>
@@ -52,16 +34,16 @@
       <point x="1432.0" y="872.0"/>
     </contour>
     <contour>
-      <point x="2136.0" y="76.0" type="line"/>
-      <point x="2312.0" y="252.0" type="line"/>
-      <point x="1880.0" y="684.0" type="line"/>
-      <point x="1704.0" y="508.0" type="line"/>
+      <point x="1208.0" y="1708.0" type="line"/>
+      <point x="1456.0" y="1708.0" type="line"/>
+      <point x="1456.0" y="2316.0" type="line"/>
+      <point x="1208.0" y="2316.0" type="line"/>
     </contour>
     <contour>
-      <point x="784.0" y="1428.0" type="line"/>
-      <point x="960.0" y="1604.0" type="line"/>
-      <point x="528.0" y="2036.0" type="line"/>
-      <point x="352.0" y="1860.0" type="line"/>
+      <point x="1880.0" y="1428.0" type="line"/>
+      <point x="2312.0" y="1860.0" type="line"/>
+      <point x="2136.0" y="2036.0" type="line"/>
+      <point x="1704.0" y="1604.0" type="line"/>
     </contour>
     <contour>
       <point x="1984.0" y="932.0" type="line"/>
@@ -70,16 +52,34 @@
       <point x="1984.0" y="1180.0" type="line"/>
     </contour>
     <contour>
-      <point x="1208.0" y="1708.0" type="line"/>
-      <point x="1456.0" y="1708.0" type="line"/>
-      <point x="1456.0" y="2316.0" type="line"/>
-      <point x="1208.0" y="2316.0" type="line"/>
+      <point x="2136.0" y="76.0" type="line"/>
+      <point x="2312.0" y="252.0" type="line"/>
+      <point x="1880.0" y="684.0" type="line"/>
+      <point x="1704.0" y="508.0" type="line"/>
     </contour>
     <contour>
-      <point x="1880.0" y="1428.0" type="line"/>
-      <point x="2312.0" y="1860.0" type="line"/>
-      <point x="2136.0" y="2036.0" type="line"/>
-      <point x="1704.0" y="1604.0" type="line"/>
+      <point x="1208.0" y="-204.0" type="line"/>
+      <point x="1456.0" y="-204.0" type="line"/>
+      <point x="1456.0" y="404.0" type="line"/>
+      <point x="1208.0" y="404.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="528.0" y="76.0" type="line"/>
+      <point x="960.0" y="508.0" type="line"/>
+      <point x="784.0" y="684.0" type="line"/>
+      <point x="352.0" y="252.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="72.0" y="932.0" type="line"/>
+      <point x="680.0" y="932.0" type="line"/>
+      <point x="680.0" y="1180.0" type="line"/>
+      <point x="72.0" y="1180.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="784.0" y="1428.0" type="line"/>
+      <point x="960.0" y="1604.0" type="line"/>
+      <point x="528.0" y="2036.0" type="line"/>
+      <point x="352.0" y="1860.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -93,14 +93,14 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>0.0</real>
+            <real>5.0</real>
+            <real>2.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
+            <real>5.0</real>
             <real>3.0</real>
           </array>
           <key>type</key>
@@ -113,14 +113,14 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
+            <real>7.0</real>
             <real>1.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>2.0</real>
+            <real>7.0</real>
             <real>2.0</real>
           </array>
           <key>type</key>
@@ -133,14 +133,14 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>0.0</real>
+            <real>5.0</real>
+            <real>2.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
+            <real>5.0</real>
             <real>3.0</real>
           </array>
           <key>type</key>
diff --git a/src/Inter-UI-BlackItalic.ufo/fontinfo.plist b/src/Inter-UI-BlackItalic.ufo/fontinfo.plist
index 8f9687aac..590d17202 100644
--- a/src/Inter-UI-BlackItalic.ufo/fontinfo.plist
+++ b/src/Inter-UI-BlackItalic.ufo/fontinfo.plist
@@ -105,9 +105,9 @@
     <key>openTypeNameSampleText</key>
     <string></string>
     <key>openTypeNameUniqueID</key>
-    <string>Inter UI Black Italic:2018:61b0aaa4a</string>
+    <string>Inter UI Black Italic:2018:a9bbc2f5d</string>
     <key>openTypeNameVersion</key>
-    <string>3.0;61b0aaa4a</string>
+    <string>3.0;a9bbc2f5d</string>
     <key>openTypeOS2CodePageRanges</key>
     <array>
       <integer>0</integer>
diff --git a/src/Inter-UI-BlackItalic.ufo/glyphs/blackS_unW_ithR_ays.glif b/src/Inter-UI-BlackItalic.ufo/glyphs/blackS_unW_ithR_ays.glif
index d65c4bd04..9c9cb9537 100644
--- a/src/Inter-UI-BlackItalic.ufo/glyphs/blackS_unW_ithR_ays.glif
+++ b/src/Inter-UI-BlackItalic.ufo/glyphs/blackS_unW_ithR_ays.glif
@@ -6,34 +6,34 @@
     <contour>
       <point x="1304.0" y="604.0" type="curve" smooth="yes"/>
       <point x="1552.0" y="604.0"/>
-      <point x="1792.0" y="808.0"/>
+      <point x="1788.0" y="808.0"/>
       <point x="1832.0" y="1056.0" type="curve" smooth="yes"/>
       <point x="1872.0" y="1304.0"/>
-      <point x="1704.0" y="1508.0"/>
+      <point x="1700.0" y="1508.0"/>
       <point x="1456.0" y="1508.0" type="curve" smooth="yes"/>
       <point x="1204.0" y="1508.0"/>
       <point x="968.0" y="1304.0"/>
       <point x="928.0" y="1056.0" type="curve" smooth="yes"/>
-      <point x="888.0" y="808.0"/>
-      <point x="1056.0" y="604.0"/>
+      <point x="884.0" y="808.0"/>
+      <point x="1052.0" y="604.0"/>
     </contour>
     <contour>
-      <point x="412.0" y="76.0" type="line"/>
-      <point x="916.0" y="508.0" type="line"/>
-      <point x="772.0" y="684.0" type="line"/>
-      <point x="268.0" y="252.0" type="line"/>
+      <point x="1364.0" y="1708.0" type="line"/>
+      <point x="1612.0" y="1708.0" type="line"/>
+      <point x="1712.0" y="2316.0" type="line"/>
+      <point x="1464.0" y="2316.0" type="line"/>
     </contour>
     <contour>
-      <point x="1048.0" y="-204.0" type="line"/>
-      <point x="1296.0" y="-204.0" type="line"/>
-      <point x="1396.0" y="404.0" type="line"/>
-      <point x="1148.0" y="404.0" type="line"/>
+      <point x="1988.0" y="1428.0" type="line"/>
+      <point x="2492.0" y="1860.0" type="line"/>
+      <point x="2344.0" y="2036.0" type="line"/>
+      <point x="1844.0" y="1604.0" type="line"/>
     </contour>
     <contour>
-      <point x="100.0" y="932.0" type="line"/>
-      <point x="708.0" y="932.0" type="line"/>
-      <point x="748.0" y="1180.0" type="line"/>
-      <point x="140.0" y="1180.0" type="line"/>
+      <point x="2012.0" y="932.0" type="line"/>
+      <point x="2620.0" y="932.0" type="line"/>
+      <point x="2660.0" y="1180.0" type="line"/>
+      <point x="2052.0" y="1180.0" type="line"/>
     </contour>
     <contour>
       <point x="2020.0" y="76.0" type="line"/>
@@ -42,28 +42,28 @@
       <point x="1660.0" y="508.0" type="line"/>
     </contour>
     <contour>
-      <point x="892.0" y="1428.0" type="line"/>
-      <point x="1100.0" y="1604.0" type="line"/>
-      <point x="736.0" y="2036.0" type="line"/>
-      <point x="532.0" y="1860.0" type="line"/>
+      <point x="1048.0" y="-204.0" type="line"/>
+      <point x="1296.0" y="-204.0" type="line"/>
+      <point x="1396.0" y="404.0" type="line"/>
+      <point x="1148.0" y="404.0" type="line"/>
     </contour>
     <contour>
-      <point x="2012.0" y="932.0" type="line"/>
-      <point x="2620.0" y="932.0" type="line"/>
-      <point x="2660.0" y="1180.0" type="line"/>
-      <point x="2052.0" y="1180.0" type="line"/>
+      <point x="412.0" y="76.0" type="line"/>
+      <point x="916.0" y="508.0" type="line"/>
+      <point x="772.0" y="684.0" type="line"/>
+      <point x="268.0" y="252.0" type="line"/>
     </contour>
     <contour>
-      <point x="1364.0" y="1708.0" type="line"/>
-      <point x="1612.0" y="1708.0" type="line"/>
-      <point x="1712.0" y="2316.0" type="line"/>
-      <point x="1464.0" y="2316.0" type="line"/>
+      <point x="100.0" y="932.0" type="line"/>
+      <point x="708.0" y="932.0" type="line"/>
+      <point x="748.0" y="1180.0" type="line"/>
+      <point x="140.0" y="1180.0" type="line"/>
     </contour>
     <contour>
-      <point x="1988.0" y="1428.0" type="line"/>
-      <point x="2492.0" y="1860.0" type="line"/>
-      <point x="2344.0" y="2036.0" type="line"/>
-      <point x="1844.0" y="1604.0" type="line"/>
+      <point x="892.0" y="1428.0" type="line"/>
+      <point x="1100.0" y="1604.0" type="line"/>
+      <point x="736.0" y="2036.0" type="line"/>
+      <point x="532.0" y="1860.0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-BlackItalic.ufo/glyphs/sunW_ithR_ays.glif b/src/Inter-UI-BlackItalic.ufo/glyphs/sunW_ithR_ays.glif
index 4d1593092..61f21312f 100644
--- a/src/Inter-UI-BlackItalic.ufo/glyphs/sunW_ithR_ays.glif
+++ b/src/Inter-UI-BlackItalic.ufo/glyphs/sunW_ithR_ays.glif
@@ -5,35 +5,49 @@
   <outline>
     <contour>
       <point x="1304.0" y="604.0" type="curve" smooth="yes"/>
-      <point x="1550.0" y="604.0"/>
-      <point x="1790.0" y="808.0"/>
+      <point x="1552.0" y="604.0"/>
+      <point x="1788.0" y="808.0"/>
       <point x="1832.0" y="1056.0" type="curve" smooth="yes"/>
-      <point x="1870.0" y="1304.0"/>
-      <point x="1702.0" y="1508.0"/>
+      <point x="1872.0" y="1304.0"/>
+      <point x="1700.0" y="1508.0"/>
       <point x="1456.0" y="1508.0" type="curve" smooth="yes"/>
-      <point x="1202.0" y="1508.0"/>
-      <point x="966.0" y="1304.0"/>
+      <point x="1204.0" y="1508.0"/>
+      <point x="968.0" y="1304.0"/>
       <point x="928.0" y="1056.0" type="curve" smooth="yes"/>
-      <point x="886.0" y="808.0"/>
-      <point x="1054.0" y="604.0"/>
+      <point x="884.0" y="808.0"/>
+      <point x="1052.0" y="604.0"/>
     </contour>
     <contour>
-      <point x="412.0" y="76.0" type="line"/>
-      <point x="916.0" y="508.0" type="line"/>
-      <point x="772.0" y="684.0" type="line"/>
-      <point x="268.0" y="252.0" type="line"/>
+      <point x="1348.0" y="872.0" type="curve" smooth="yes"/>
+      <point x="1244.0" y="872.0"/>
+      <point x="1176.0" y="956.0"/>
+      <point x="1196.0" y="1056.0" type="curve" smooth="yes"/>
+      <point x="1212.0" y="1160.0"/>
+      <point x="1308.0" y="1240.0"/>
+      <point x="1412.0" y="1240.0" type="curve" smooth="yes"/>
+      <point x="1512.0" y="1240.0"/>
+      <point x="1580.0" y="1160.0"/>
+      <point x="1564.0" y="1056.0" type="curve" smooth="yes"/>
+      <point x="1544.0" y="956.0"/>
+      <point x="1448.0" y="872.0"/>
     </contour>
     <contour>
-      <point x="1048.0" y="-204.0" type="line"/>
-      <point x="1296.0" y="-204.0" type="line"/>
-      <point x="1396.0" y="404.0" type="line"/>
-      <point x="1148.0" y="404.0" type="line"/>
+      <point x="1364.0" y="1708.0" type="line"/>
+      <point x="1612.0" y="1708.0" type="line"/>
+      <point x="1712.0" y="2316.0" type="line"/>
+      <point x="1464.0" y="2316.0" type="line"/>
     </contour>
     <contour>
-      <point x="100.0" y="932.0" type="line"/>
-      <point x="708.0" y="932.0" type="line"/>
-      <point x="748.0" y="1180.0" type="line"/>
-      <point x="140.0" y="1180.0" type="line"/>
+      <point x="1988.0" y="1428.0" type="line"/>
+      <point x="2492.0" y="1860.0" type="line"/>
+      <point x="2344.0" y="2036.0" type="line"/>
+      <point x="1844.0" y="1604.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="2012.0" y="932.0" type="line"/>
+      <point x="2620.0" y="932.0" type="line"/>
+      <point x="2660.0" y="1180.0" type="line"/>
+      <point x="2052.0" y="1180.0" type="line"/>
     </contour>
     <contour>
       <point x="2020.0" y="76.0" type="line"/>
@@ -42,42 +56,28 @@
       <point x="1660.0" y="508.0" type="line"/>
     </contour>
     <contour>
-      <point x="1348.0" y="872.0" type="curve" smooth="yes"/>
-      <point x="1246.0" y="872.0"/>
-      <point x="1178.0" y="956.0"/>
-      <point x="1196.0" y="1056.0" type="curve" smooth="yes"/>
-      <point x="1210.0" y="1160.0"/>
-      <point x="1306.0" y="1240.0"/>
-      <point x="1412.0" y="1240.0" type="curve" smooth="yes"/>
-      <point x="1510.0" y="1240.0"/>
-      <point x="1578.0" y="1160.0"/>
-      <point x="1564.0" y="1056.0" type="curve" smooth="yes"/>
-      <point x="1546.0" y="956.0"/>
-      <point x="1450.0" y="872.0"/>
-    </contour>
-    <contour>
-      <point x="892.0" y="1428.0" type="line"/>
-      <point x="1100.0" y="1604.0" type="line"/>
-      <point x="736.0" y="2036.0" type="line"/>
-      <point x="532.0" y="1860.0" type="line"/>
+      <point x="1048.0" y="-204.0" type="line"/>
+      <point x="1296.0" y="-204.0" type="line"/>
+      <point x="1396.0" y="404.0" type="line"/>
+      <point x="1148.0" y="404.0" type="line"/>
     </contour>
     <contour>
-      <point x="2012.0" y="932.0" type="line"/>
-      <point x="2620.0" y="932.0" type="line"/>
-      <point x="2660.0" y="1180.0" type="line"/>
-      <point x="2052.0" y="1180.0" type="line"/>
+      <point x="412.0" y="76.0" type="line"/>
+      <point x="916.0" y="508.0" type="line"/>
+      <point x="772.0" y="684.0" type="line"/>
+      <point x="268.0" y="252.0" type="line"/>
     </contour>
     <contour>
-      <point x="1364.0" y="1708.0" type="line"/>
-      <point x="1612.0" y="1708.0" type="line"/>
-      <point x="1712.0" y="2316.0" type="line"/>
-      <point x="1464.0" y="2316.0" type="line"/>
+      <point x="100.0" y="932.0" type="line"/>
+      <point x="708.0" y="932.0" type="line"/>
+      <point x="748.0" y="1180.0" type="line"/>
+      <point x="140.0" y="1180.0" type="line"/>
     </contour>
     <contour>
-      <point x="1988.0" y="1428.0" type="line"/>
-      <point x="2492.0" y="1860.0" type="line"/>
-      <point x="2344.0" y="2036.0" type="line"/>
-      <point x="1844.0" y="1604.0" type="line"/>
+      <point x="892.0" y="1428.0" type="line"/>
+      <point x="1100.0" y="1604.0" type="line"/>
+      <point x="736.0" y="2036.0" type="line"/>
+      <point x="532.0" y="1860.0" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-BlackItalic.ufo/glyphs/tcircumflexbelow.glif b/src/Inter-UI-BlackItalic.ufo/glyphs/tcircumflexbelow.glif
index 387fe42aa..8cc7151a2 100644
--- a/src/Inter-UI-BlackItalic.ufo/glyphs/tcircumflexbelow.glif
+++ b/src/Inter-UI-BlackItalic.ufo/glyphs/tcircumflexbelow.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="tcircumflexbelow" format="2">
-  <advance width="1144.0"/>
+  <advance width="1140.0"/>
   <unicode hex="1E71"/>
   <outline>
     <component base="t"/>
diff --git a/src/Inter-UI-BlackItalic.ufo/glyphs/tdieresis.glif b/src/Inter-UI-BlackItalic.ufo/glyphs/tdieresis.glif
index b4db318b6..2905a9176 100644
--- a/src/Inter-UI-BlackItalic.ufo/glyphs/tdieresis.glif
+++ b/src/Inter-UI-BlackItalic.ufo/glyphs/tdieresis.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="tdieresis" format="2">
-  <advance width="1144.0"/>
+  <advance width="1140.0"/>
   <unicode hex="1E97"/>
   <outline>
     <component base="t"/>
diff --git a/src/Inter-UI-BlackItalic.ufo/glyphs/tdotaccent.glif b/src/Inter-UI-BlackItalic.ufo/glyphs/tdotaccent.glif
index b1b5d68d0..64c77cce0 100644
--- a/src/Inter-UI-BlackItalic.ufo/glyphs/tdotaccent.glif
+++ b/src/Inter-UI-BlackItalic.ufo/glyphs/tdotaccent.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="tdotaccent" format="2">
-  <advance width="1144.0"/>
+  <advance width="1140.0"/>
   <unicode hex="1E6B"/>
   <outline>
     <component base="t"/>
diff --git a/src/Inter-UI-BlackItalic.ufo/glyphs/tdotbelow.glif b/src/Inter-UI-BlackItalic.ufo/glyphs/tdotbelow.glif
index 84306d8c6..9f282da62 100644
--- a/src/Inter-UI-BlackItalic.ufo/glyphs/tdotbelow.glif
+++ b/src/Inter-UI-BlackItalic.ufo/glyphs/tdotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="tdotbelow" format="2">
-  <advance width="1144.0"/>
+  <advance width="1140.0"/>
   <unicode hex="1E6D"/>
   <outline>
     <component base="t"/>
diff --git a/src/Inter-UI-BlackItalic.ufo/glyphs/tlinebelow.glif b/src/Inter-UI-BlackItalic.ufo/glyphs/tlinebelow.glif
index 8a80ccccf..12b69bac6 100644
--- a/src/Inter-UI-BlackItalic.ufo/glyphs/tlinebelow.glif
+++ b/src/Inter-UI-BlackItalic.ufo/glyphs/tlinebelow.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="tlinebelow" format="2">
-  <advance width="1144.0"/>
+  <advance width="1140.0"/>
   <unicode hex="1E6F"/>
   <outline>
     <component base="t"/>
diff --git a/src/Inter-UI-BlackItalic.ufo/glyphs/uni021B_.glif b/src/Inter-UI-BlackItalic.ufo/glyphs/uni021B_.glif
index 7344b4cd5..e70b95908 100644
--- a/src/Inter-UI-BlackItalic.ufo/glyphs/uni021B_.glif
+++ b/src/Inter-UI-BlackItalic.ufo/glyphs/uni021B_.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni021B" format="2">
-  <advance width="1144.0"/>
+  <advance width="1140.0"/>
   <unicode hex="021B"/>
   <outline>
     <component base="t"/>
diff --git a/src/Inter-UI-Italic.ufo/fontinfo.plist b/src/Inter-UI-Italic.ufo/fontinfo.plist
index e5060edbb..4b2f005e8 100644
--- a/src/Inter-UI-Italic.ufo/fontinfo.plist
+++ b/src/Inter-UI-Italic.ufo/fontinfo.plist
@@ -105,9 +105,9 @@
     <key>openTypeNameSampleText</key>
     <string></string>
     <key>openTypeNameUniqueID</key>
-    <string>Inter UI Italic:2018:61b0aaa4a</string>
+    <string>Inter UI Italic:2018:a9bbc2f5d</string>
     <key>openTypeNameVersion</key>
-    <string>3.0;61b0aaa4a</string>
+    <string>3.0;a9bbc2f5d</string>
     <key>openTypeOS2CodePageRanges</key>
     <array>
       <integer>0</integer>
diff --git a/src/Inter-UI-Italic.ufo/glyphs/blackS_unW_ithR_ays.glif b/src/Inter-UI-Italic.ufo/glyphs/blackS_unW_ithR_ays.glif
index d2e846ea0..19da486bb 100644
--- a/src/Inter-UI-Italic.ufo/glyphs/blackS_unW_ithR_ays.glif
+++ b/src/Inter-UI-Italic.ufo/glyphs/blackS_unW_ithR_ays.glif
@@ -18,22 +18,22 @@
       <point x="1048.0" y="604.0"/>
     </contour>
     <contour>
-      <point x="388.0" y="96.0" type="line"/>
-      <point x="892.0" y="528.0" type="line"/>
-      <point x="780.0" y="664.0" type="line"/>
-      <point x="276.0" y="232.0" type="line"/>
+      <point x="1384.0" y="1708.0" type="line"/>
+      <point x="1576.0" y="1708.0" type="line"/>
+      <point x="1676.0" y="2316.0" type="line"/>
+      <point x="1484.0" y="2316.0" type="line"/>
     </contour>
     <contour>
-      <point x="1068.0" y="-204.0" type="line"/>
-      <point x="1260.0" y="-204.0" type="line"/>
-      <point x="1360.0" y="404.0" type="line"/>
-      <point x="1168.0" y="404.0" type="line"/>
+      <point x="1964.0" y="1448.0" type="line"/>
+      <point x="2468.0" y="1880.0" type="line"/>
+      <point x="2356.0" y="2016.0" type="line"/>
+      <point x="1852.0" y="1584.0" type="line"/>
     </contour>
     <contour>
-      <point x="96.0" y="960.0" type="line"/>
-      <point x="704.0" y="960.0" type="line"/>
-      <point x="736.0" y="1152.0" type="line"/>
-      <point x="128.0" y="1152.0" type="line"/>
+      <point x="2008.0" y="960.0" type="line"/>
+      <point x="2616.0" y="960.0" type="line"/>
+      <point x="2648.0" y="1152.0" type="line"/>
+      <point x="2040.0" y="1152.0" type="line"/>
     </contour>
     <contour>
       <point x="2036.0" y="96.0" type="line"/>
@@ -42,28 +42,28 @@
       <point x="1676.0" y="528.0" type="line"/>
     </contour>
     <contour>
-      <point x="908.0" y="1448.0" type="line"/>
-      <point x="1068.0" y="1584.0" type="line"/>
-      <point x="708.0" y="2016.0" type="line"/>
-      <point x="548.0" y="1880.0" type="line"/>
+      <point x="1068.0" y="-204.0" type="line"/>
+      <point x="1260.0" y="-204.0" type="line"/>
+      <point x="1360.0" y="404.0" type="line"/>
+      <point x="1168.0" y="404.0" type="line"/>
     </contour>
     <contour>
-      <point x="2008.0" y="960.0" type="line"/>
-      <point x="2616.0" y="960.0" type="line"/>
-      <point x="2648.0" y="1152.0" type="line"/>
-      <point x="2040.0" y="1152.0" type="line"/>
+      <point x="388.0" y="96.0" type="line"/>
+      <point x="892.0" y="528.0" type="line"/>
+      <point x="780.0" y="664.0" type="line"/>
+      <point x="276.0" y="232.0" type="line"/>
     </contour>
     <contour>
-      <point x="1384.0" y="1708.0" type="line"/>
-      <point x="1576.0" y="1708.0" type="line"/>
-      <point x="1676.0" y="2316.0" type="line"/>
-      <point x="1484.0" y="2316.0" type="line"/>
+      <point x="96.0" y="960.0" type="line"/>
+      <point x="704.0" y="960.0" type="line"/>
+      <point x="736.0" y="1152.0" type="line"/>
+      <point x="128.0" y="1152.0" type="line"/>
     </contour>
     <contour>
-      <point x="1964.0" y="1448.0" type="line"/>
-      <point x="2468.0" y="1880.0" type="line"/>
-      <point x="2356.0" y="2016.0" type="line"/>
-      <point x="1852.0" y="1584.0" type="line"/>
+      <point x="908.0" y="1448.0" type="line"/>
+      <point x="1068.0" y="1584.0" type="line"/>
+      <point x="708.0" y="2016.0" type="line"/>
+      <point x="548.0" y="1880.0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Italic.ufo/glyphs/sunW_ithR_ays.glif b/src/Inter-UI-Italic.ufo/glyphs/sunW_ithR_ays.glif
index cf7b76fa2..e89b7f5d1 100644
--- a/src/Inter-UI-Italic.ufo/glyphs/sunW_ithR_ays.glif
+++ b/src/Inter-UI-Italic.ufo/glyphs/sunW_ithR_ays.glif
@@ -18,30 +18,6 @@
       <point x="1048.0" y="604.0"/>
     </contour>
     <contour>
-      <point x="388.0" y="96.0" type="line"/>
-      <point x="892.0" y="528.0" type="line"/>
-      <point x="780.0" y="664.0" type="line"/>
-      <point x="276.0" y="232.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1068.0" y="-204.0" type="line"/>
-      <point x="1260.0" y="-204.0" type="line"/>
-      <point x="1360.0" y="404.0" type="line"/>
-      <point x="1168.0" y="404.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="96.0" y="960.0" type="line"/>
-      <point x="704.0" y="960.0" type="line"/>
-      <point x="736.0" y="1152.0" type="line"/>
-      <point x="128.0" y="1152.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="2036.0" y="96.0" type="line"/>
-      <point x="2196.0" y="232.0" type="line"/>
-      <point x="1836.0" y="664.0" type="line"/>
-      <point x="1676.0" y="528.0" type="line"/>
-    </contour>
-    <contour>
       <point x="1328.0" y="804.0" type="curve" smooth="yes"/>
       <point x="1192.0" y="804.0"/>
       <point x="1096.0" y="916.0"/>
@@ -56,18 +32,6 @@
       <point x="1468.0" y="804.0"/>
     </contour>
     <contour>
-      <point x="908.0" y="1448.0" type="line"/>
-      <point x="1068.0" y="1584.0" type="line"/>
-      <point x="708.0" y="2016.0" type="line"/>
-      <point x="548.0" y="1880.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="2008.0" y="960.0" type="line"/>
-      <point x="2616.0" y="960.0" type="line"/>
-      <point x="2648.0" y="1152.0" type="line"/>
-      <point x="2040.0" y="1152.0" type="line"/>
-    </contour>
-    <contour>
       <point x="1384.0" y="1708.0" type="line"/>
       <point x="1576.0" y="1708.0" type="line"/>
       <point x="1676.0" y="2316.0" type="line"/>
@@ -79,5 +43,41 @@
       <point x="2356.0" y="2016.0" type="line"/>
       <point x="1852.0" y="1584.0" type="line"/>
     </contour>
+    <contour>
+      <point x="2008.0" y="960.0" type="line"/>
+      <point x="2616.0" y="960.0" type="line"/>
+      <point x="2648.0" y="1152.0" type="line"/>
+      <point x="2040.0" y="1152.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="2036.0" y="96.0" type="line"/>
+      <point x="2196.0" y="232.0" type="line"/>
+      <point x="1836.0" y="664.0" type="line"/>
+      <point x="1676.0" y="528.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="1068.0" y="-204.0" type="line"/>
+      <point x="1260.0" y="-204.0" type="line"/>
+      <point x="1360.0" y="404.0" type="line"/>
+      <point x="1168.0" y="404.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="388.0" y="96.0" type="line"/>
+      <point x="892.0" y="528.0" type="line"/>
+      <point x="780.0" y="664.0" type="line"/>
+      <point x="276.0" y="232.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="96.0" y="960.0" type="line"/>
+      <point x="704.0" y="960.0" type="line"/>
+      <point x="736.0" y="1152.0" type="line"/>
+      <point x="128.0" y="1152.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="908.0" y="1448.0" type="line"/>
+      <point x="1068.0" y="1584.0" type="line"/>
+      <point x="708.0" y="2016.0" type="line"/>
+      <point x="548.0" y="1880.0" type="line"/>
+    </contour>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Regular.ufo/fontinfo.plist b/src/Inter-UI-Regular.ufo/fontinfo.plist
index b1f552617..fa11dc7ab 100644
--- a/src/Inter-UI-Regular.ufo/fontinfo.plist
+++ b/src/Inter-UI-Regular.ufo/fontinfo.plist
@@ -125,9 +125,9 @@
     <key>openTypeNameSampleText</key>
     <string></string>
     <key>openTypeNameUniqueID</key>
-    <string>Inter UI Regular:2018:61b0aaa4a</string>
+    <string>Inter UI Regular:2018:a9bbc2f5d</string>
     <key>openTypeNameVersion</key>
-    <string>3.0;61b0aaa4a</string>
+    <string>3.0;a9bbc2f5d</string>
     <key>openTypeOS2CodePageRanges</key>
     <array>
       <integer>0</integer>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/blackS_unW_ithR_ays.glif b/src/Inter-UI-Regular.ufo/glyphs/blackS_unW_ithR_ays.glif
index d9ecc7a72..728751d42 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/blackS_unW_ithR_ays.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/blackS_unW_ithR_ays.glif
@@ -6,35 +6,35 @@
   <outline>
     <contour>
       <point x="1324.0" y="604.0" type="curve" smooth="yes"/>
-      <point x="1572.0" y="604.0"/>
-      <point x="1776.0" y="808.0"/>
+      <point x="1573.0" y="604.0"/>
+      <point x="1776.0" y="807.0"/>
       <point x="1776.0" y="1056.0" type="curve" smooth="yes"/>
-      <point x="1776.0" y="1304.0"/>
-      <point x="1572.0" y="1508.0"/>
+      <point x="1776.0" y="1305.0"/>
+      <point x="1573.0" y="1508.0"/>
       <point x="1324.0" y="1508.0" type="curve" smooth="yes"/>
-      <point x="1076.0" y="1508.0"/>
-      <point x="872.0" y="1304.0"/>
+      <point x="1075.0" y="1508.0"/>
+      <point x="872.0" y="1305.0"/>
       <point x="872.0" y="1056.0" type="curve" smooth="yes"/>
-      <point x="872.0" y="808.0"/>
-      <point x="1076.0" y="604.0"/>
+      <point x="872.0" y="807.0"/>
+      <point x="1075.0" y="604.0"/>
     </contour>
     <contour>
-      <point x="500.0" y="96.0" type="line"/>
-      <point x="932.0" y="528.0" type="line"/>
-      <point x="796.0" y="664.0" type="line"/>
-      <point x="364.0" y="232.0" type="line"/>
+      <point x="1228.0" y="1708.0" type="line"/>
+      <point x="1420.0" y="1708.0" type="line"/>
+      <point x="1420.0" y="2316.0" type="line"/>
+      <point x="1228.0" y="2316.0" type="line"/>
     </contour>
     <contour>
-      <point x="64.0" y="960.0" type="line"/>
-      <point x="672.0" y="960.0" type="line"/>
-      <point x="672.0" y="1152.0" type="line"/>
-      <point x="64.0" y="1152.0" type="line"/>
+      <point x="1852.0" y="1448.0" type="line"/>
+      <point x="2284.0" y="1880.0" type="line"/>
+      <point x="2148.0" y="2016.0" type="line"/>
+      <point x="1716.0" y="1584.0" type="line"/>
     </contour>
     <contour>
-      <point x="1228.0" y="-204.0" type="line"/>
-      <point x="1420.0" y="-204.0" type="line"/>
-      <point x="1420.0" y="404.0" type="line"/>
-      <point x="1228.0" y="404.0" type="line"/>
+      <point x="1976.0" y="960.0" type="line"/>
+      <point x="2584.0" y="960.0" type="line"/>
+      <point x="2584.0" y="1152.0" type="line"/>
+      <point x="1976.0" y="1152.0" type="line"/>
     </contour>
     <contour>
       <point x="2148.0" y="96.0" type="line"/>
@@ -43,28 +43,28 @@
       <point x="1716.0" y="528.0" type="line"/>
     </contour>
     <contour>
-      <point x="796.0" y="1448.0" type="line"/>
-      <point x="932.0" y="1584.0" type="line"/>
-      <point x="500.0" y="2016.0" type="line"/>
-      <point x="364.0" y="1880.0" type="line"/>
+      <point x="1228.0" y="-204.0" type="line"/>
+      <point x="1420.0" y="-204.0" type="line"/>
+      <point x="1420.0" y="404.0" type="line"/>
+      <point x="1228.0" y="404.0" type="line"/>
     </contour>
     <contour>
-      <point x="1976.0" y="960.0" type="line"/>
-      <point x="2584.0" y="960.0" type="line"/>
-      <point x="2584.0" y="1152.0" type="line"/>
-      <point x="1976.0" y="1152.0" type="line"/>
+      <point x="500.0" y="96.0" type="line"/>
+      <point x="932.0" y="528.0" type="line"/>
+      <point x="796.0" y="664.0" type="line"/>
+      <point x="364.0" y="232.0" type="line"/>
     </contour>
     <contour>
-      <point x="1228.0" y="1708.0" type="line"/>
-      <point x="1420.0" y="1708.0" type="line"/>
-      <point x="1420.0" y="2316.0" type="line"/>
-      <point x="1228.0" y="2316.0" type="line"/>
+      <point x="64.0" y="960.0" type="line"/>
+      <point x="672.0" y="960.0" type="line"/>
+      <point x="672.0" y="1152.0" type="line"/>
+      <point x="64.0" y="1152.0" type="line"/>
     </contour>
     <contour>
-      <point x="1852.0" y="1448.0" type="line"/>
-      <point x="2284.0" y="1880.0" type="line"/>
-      <point x="2148.0" y="2016.0" type="line"/>
-      <point x="1716.0" y="1584.0" type="line"/>
+      <point x="796.0" y="1448.0" type="line"/>
+      <point x="932.0" y="1584.0" type="line"/>
+      <point x="500.0" y="2016.0" type="line"/>
+      <point x="364.0" y="1880.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -80,18 +80,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>3.0</real>
+            <real>960.0</real>
+            <real>192.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>
@@ -100,18 +95,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>3.0</real>
-            <real>3.0</real>
+            <real>1228.0</real>
+            <real>192.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>3.0</real>
-            <real>0.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -120,18 +110,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>3.0</real>
+            <real>960.0</real>
+            <real>192.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/qrthook.glif b/src/Inter-UI-Regular.ufo/glyphs/qrthook.glif
index 9efa6842c..a8e99fb18 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/qrthook.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/qrthook.glif
@@ -88,11 +88,6 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
-          <array>
-            <real>0.0</real>
-            <real>11.0</real>
-          </array>
           <key>place</key>
           <array>
             <real>-64.0</real>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/sunW_ithR_ays.glif b/src/Inter-UI-Regular.ufo/glyphs/sunW_ithR_ays.glif
index 86276a878..9afc19cc8 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/sunW_ithR_ays.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/sunW_ithR_ays.glif
@@ -20,24 +20,6 @@
       <point x="1075.0" y="604.0"/>
     </contour>
     <contour>
-      <point x="500.0" y="96.0" type="line"/>
-      <point x="932.0" y="528.0" type="line"/>
-      <point x="796.0" y="664.0" type="line"/>
-      <point x="364.0" y="232.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="64.0" y="960.0" type="line"/>
-      <point x="672.0" y="960.0" type="line"/>
-      <point x="672.0" y="1152.0" type="line"/>
-      <point x="64.0" y="1152.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1228.0" y="-204.0" type="line"/>
-      <point x="1420.0" y="-204.0" type="line"/>
-      <point x="1420.0" y="404.0" type="line"/>
-      <point x="1228.0" y="404.0" type="line"/>
-    </contour>
-    <contour>
       <point x="1324.0" y="804.0" type="curve" smooth="yes"/>
       <point x="1185.0" y="804.0"/>
       <point x="1072.0" y="917.0"/>
@@ -52,16 +34,16 @@
       <point x="1463.0" y="804.0"/>
     </contour>
     <contour>
-      <point x="2148.0" y="96.0" type="line"/>
-      <point x="2284.0" y="232.0" type="line"/>
-      <point x="1852.0" y="664.0" type="line"/>
-      <point x="1716.0" y="528.0" type="line"/>
+      <point x="1228.0" y="1708.0" type="line"/>
+      <point x="1420.0" y="1708.0" type="line"/>
+      <point x="1420.0" y="2316.0" type="line"/>
+      <point x="1228.0" y="2316.0" type="line"/>
     </contour>
     <contour>
-      <point x="796.0" y="1448.0" type="line"/>
-      <point x="932.0" y="1584.0" type="line"/>
-      <point x="500.0" y="2016.0" type="line"/>
-      <point x="364.0" y="1880.0" type="line"/>
+      <point x="1852.0" y="1448.0" type="line"/>
+      <point x="2284.0" y="1880.0" type="line"/>
+      <point x="2148.0" y="2016.0" type="line"/>
+      <point x="1716.0" y="1584.0" type="line"/>
     </contour>
     <contour>
       <point x="1976.0" y="960.0" type="line"/>
@@ -70,16 +52,34 @@
       <point x="1976.0" y="1152.0" type="line"/>
     </contour>
     <contour>
-      <point x="1228.0" y="1708.0" type="line"/>
-      <point x="1420.0" y="1708.0" type="line"/>
-      <point x="1420.0" y="2316.0" type="line"/>
-      <point x="1228.0" y="2316.0" type="line"/>
+      <point x="2148.0" y="96.0" type="line"/>
+      <point x="2284.0" y="232.0" type="line"/>
+      <point x="1852.0" y="664.0" type="line"/>
+      <point x="1716.0" y="528.0" type="line"/>
     </contour>
     <contour>
-      <point x="1852.0" y="1448.0" type="line"/>
-      <point x="2284.0" y="1880.0" type="line"/>
-      <point x="2148.0" y="2016.0" type="line"/>
-      <point x="1716.0" y="1584.0" type="line"/>
+      <point x="1228.0" y="-204.0" type="line"/>
+      <point x="1420.0" y="-204.0" type="line"/>
+      <point x="1420.0" y="404.0" type="line"/>
+      <point x="1228.0" y="404.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="500.0" y="96.0" type="line"/>
+      <point x="932.0" y="528.0" type="line"/>
+      <point x="796.0" y="664.0" type="line"/>
+      <point x="364.0" y="232.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="64.0" y="960.0" type="line"/>
+      <point x="672.0" y="960.0" type="line"/>
+      <point x="672.0" y="1152.0" type="line"/>
+      <point x="64.0" y="1152.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="796.0" y="1448.0" type="line"/>
+      <point x="932.0" y="1584.0" type="line"/>
+      <point x="500.0" y="2016.0" type="line"/>
+      <point x="364.0" y="1880.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -93,14 +93,14 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>0.0</real>
+            <real>5.0</real>
+            <real>2.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
+            <real>5.0</real>
             <real>3.0</real>
           </array>
           <key>type</key>
@@ -113,14 +113,14 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
+            <real>7.0</real>
             <real>1.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>2.0</real>
+            <real>7.0</real>
             <real>2.0</real>
           </array>
           <key>type</key>
@@ -133,14 +133,14 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>0.0</real>
+            <real>5.0</real>
+            <real>2.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
+            <real>5.0</real>
             <real>3.0</real>
           </array>
           <key>type</key>
diff --git a/src/Inter-UI.glyphs b/src/Inter-UI.glyphs
index 96c062754..7999fa413 100644
--- a/src/Inter-UI.glyphs
+++ b/src/Inter-UI.glyphs
@@ -120685,7 +120685,6 @@ type = Stem;
 },
 {
 horizontal = 1;
-origin = "{0, 11}";
 place = "{-64, 300}";
 type = Stem;
 },
@@ -128964,7 +128963,7 @@ unicode = 0165;
 },
 {
 glyphname = uni021B;
-lastChange = "2018-10-03 17:15:47 +0000";
+lastChange = "2018-10-04 17:12:45 +0000";
 layers = (
 {
 anchors = (
@@ -129120,14 +129119,14 @@ transform = "{1, 0, 0, 1, 180, -508}";
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-width = 1144;
+width = 1140;
 }
 );
 unicode = 021B;
 },
 {
 glyphname = tdotaccent;
-lastChange = "2018-10-03 17:15:47 +0000";
+lastChange = "2018-10-04 17:12:45 +0000";
 layers = (
 {
 components = (
@@ -129179,14 +129178,14 @@ transform = "{1, 0, 0, 1, 124, 496}";
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-width = 1144;
+width = 1140;
 }
 );
 unicode = 1E6B;
 },
 {
 glyphname = tdotbelow;
-lastChange = "2018-10-03 17:15:47 +0000";
+lastChange = "2018-10-04 17:12:45 +0000";
 layers = (
 {
 anchors = (
@@ -129342,14 +129341,14 @@ transform = "{1, 0, 0, 1, 1564, -164}";
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-width = 1144;
+width = 1140;
 }
 );
 unicode = 1E6D;
 },
 {
 glyphname = tlinebelow;
-lastChange = "2018-10-03 17:15:47 +0000";
+lastChange = "2018-10-04 17:12:45 +0000";
 layers = (
 {
 anchors = (
@@ -129505,14 +129504,14 @@ transform = "{1, 0, 0, 1, 1492, 0}";
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-width = 1144;
+width = 1140;
 }
 );
 unicode = 1E6F;
 },
 {
 glyphname = tcircumflexbelow;
-lastChange = "2018-10-03 17:15:47 +0000";
+lastChange = "2018-10-04 17:12:45 +0000";
 layers = (
 {
 anchors = (
@@ -129668,14 +129667,14 @@ transform = "{1, 0, 0, 1, 1592, 0}";
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-width = 1144;
+width = 1140;
 }
 );
 unicode = 1E71;
 },
 {
 glyphname = tdieresis;
-lastChange = "2018-10-03 17:15:47 +0000";
+lastChange = "2018-10-04 17:12:45 +0000";
 layers = (
 {
 anchors = (
@@ -129831,7 +129830,7 @@ transform = "{1, 0, 0, 1, -60, 456}";
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-width = 1144;
+width = 1140;
 }
 );
 unicode = 1E97;
@@ -374952,7 +374951,7 @@ userData = {
 },
 {
 glyphname = sunWithRays;
-lastChange = "2018-10-02 21:50:12 +0000";
+lastChange = "2018-10-04 17:11:34 +0000";
 layers = (
 {
 guideLines = (
@@ -374968,19 +374967,19 @@ position = "{1412, 1056}";
 hints = (
 {
 horizontal = 1;
-origin = "{1, 0}";
-target = "{1, 3}";
+origin = "{5, 2}";
+target = "{5, 3}";
 type = Stem;
 },
 {
-origin = "{2, 1}";
-target = "{2, 2}";
+origin = "{7, 1}";
+target = "{7, 2}";
 type = Stem;
 },
 {
 horizontal = 1;
-origin = "{1, 0}";
-target = "{1, 3}";
+origin = "{5, 2}";
+target = "{5, 3}";
 type = TTStem;
 options = 4;
 }
@@ -375007,45 +375006,45 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"932 528 LINE",
-"796 664 LINE",
-"364 232 LINE",
-"500 96 LINE"
+"1185 804 OFFCURVE",
+"1072 917 OFFCURVE",
+"1072 1056 CURVE SMOOTH",
+"1072 1195 OFFCURVE",
+"1185 1308 OFFCURVE",
+"1324 1308 CURVE SMOOTH",
+"1463 1308 OFFCURVE",
+"1576 1195 OFFCURVE",
+"1576 1056 CURVE SMOOTH",
+"1576 917 OFFCURVE",
+"1463 804 OFFCURVE",
+"1324 804 CURVE SMOOTH"
 );
 },
 {
 closed = 1;
 nodes = (
-"672 960 LINE",
-"672 1152 LINE",
-"64 1152 LINE",
-"64 960 LINE"
+"1420 1708 LINE",
+"1420 2316 LINE",
+"1228 2316 LINE",
+"1228 1708 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1420 -204 LINE",
-"1420 404 LINE",
-"1228 404 LINE",
-"1228 -204 LINE"
+"2284 1880 LINE",
+"2148 2016 LINE",
+"1716 1584 LINE",
+"1852 1448 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1185 804 OFFCURVE",
-"1072 917 OFFCURVE",
-"1072 1056 CURVE SMOOTH",
-"1072 1195 OFFCURVE",
-"1185 1308 OFFCURVE",
-"1324 1308 CURVE SMOOTH",
-"1463 1308 OFFCURVE",
-"1576 1195 OFFCURVE",
-"1576 1056 CURVE SMOOTH",
-"1576 917 OFFCURVE",
-"1463 804 OFFCURVE",
-"1324 804 CURVE SMOOTH"
+"2584 960 LINE",
+"2584 1152 LINE",
+"1976 1152 LINE",
+"1976 960 LINE"
 );
 },
 {
@@ -375060,37 +375059,37 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"932 1584 LINE",
-"500 2016 LINE",
-"364 1880 LINE",
-"796 1448 LINE"
+"1420 -204 LINE",
+"1420 404 LINE",
+"1228 404 LINE",
+"1228 -204 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"2584 960 LINE",
-"2584 1152 LINE",
-"1976 1152 LINE",
-"1976 960 LINE"
+"932 528 LINE",
+"796 664 LINE",
+"364 232 LINE",
+"500 96 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1420 1708 LINE",
-"1420 2316 LINE",
-"1228 2316 LINE",
-"1228 1708 LINE"
+"672 960 LINE",
+"672 1152 LINE",
+"64 1152 LINE",
+"64 960 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"2284 1880 LINE",
-"2148 2016 LINE",
-"1716 1584 LINE",
-"1852 1448 LINE"
+"932 1584 LINE",
+"500 2016 LINE",
+"364 1880 LINE",
+"796 1448 LINE"
 );
 }
 );
@@ -375119,90 +375118,90 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"892 528 LINE",
-"780 664 LINE",
-"276 232 LINE",
-"388 96 LINE"
+"1192 804 OFFCURVE",
+"1096 916 OFFCURVE",
+"1120 1056 CURVE SMOOTH",
+"1144 1196 OFFCURVE",
+"1276 1308 OFFCURVE",
+"1412 1308 CURVE SMOOTH",
+"1552 1308 OFFCURVE",
+"1648 1196 OFFCURVE",
+"1624 1056 CURVE SMOOTH",
+"1600 916 OFFCURVE",
+"1468 804 OFFCURVE",
+"1328 804 CURVE SMOOTH"
 );
 },
 {
 closed = 1;
 nodes = (
-"1260 -204 LINE",
-"1360 404 LINE",
-"1168 404 LINE",
-"1068 -204 LINE"
+"1576 1708 LINE",
+"1676 2316 LINE",
+"1484 2316 LINE",
+"1384 1708 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"704 960 LINE",
-"736 1152 LINE",
-"128 1152 LINE",
-"96 960 LINE"
+"2468 1880 LINE",
+"2356 2016 LINE",
+"1852 1584 LINE",
+"1964 1448 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"2196 232 LINE",
-"1836 664 LINE",
-"1676 528 LINE",
-"2036 96 LINE"
+"2616 960 LINE",
+"2648 1152 LINE",
+"2040 1152 LINE",
+"2008 960 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1192 804 OFFCURVE",
-"1096 916 OFFCURVE",
-"1120 1056 CURVE SMOOTH",
-"1144 1196 OFFCURVE",
-"1276 1308 OFFCURVE",
-"1412 1308 CURVE SMOOTH",
-"1552 1308 OFFCURVE",
-"1648 1196 OFFCURVE",
-"1624 1056 CURVE SMOOTH",
-"1600 916 OFFCURVE",
-"1468 804 OFFCURVE",
-"1328 804 CURVE SMOOTH"
+"2196 232 LINE",
+"1836 664 LINE",
+"1676 528 LINE",
+"2036 96 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1068 1584 LINE",
-"708 2016 LINE",
-"548 1880 LINE",
-"908 1448 LINE"
+"1260 -204 LINE",
+"1360 404 LINE",
+"1168 404 LINE",
+"1068 -204 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"2616 960 LINE",
-"2648 1152 LINE",
-"2040 1152 LINE",
-"2008 960 LINE"
+"892 528 LINE",
+"780 664 LINE",
+"276 232 LINE",
+"388 96 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1576 1708 LINE",
-"1676 2316 LINE",
-"1484 2316 LINE",
-"1384 1708 LINE"
+"704 960 LINE",
+"736 1152 LINE",
+"128 1152 LINE",
+"96 960 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"2468 1880 LINE",
-"2356 2016 LINE",
-"1852 1584 LINE",
-"1964 1448 LINE"
+"1068 1584 LINE",
+"708 2016 LINE",
+"548 1880 LINE",
+"908 1448 LINE"
 );
 }
 );
@@ -375222,19 +375221,19 @@ position = "{1420, 1056}";
 hints = (
 {
 horizontal = 1;
-origin = "{1, 0}";
-target = "{1, 3}";
+origin = "{5, 2}";
+target = "{5, 3}";
 type = Stem;
 },
 {
-origin = "{2, 1}";
-target = "{2, 2}";
+origin = "{7, 1}";
+target = "{7, 2}";
 type = Stem;
 },
 {
 horizontal = 1;
-origin = "{1, 0}";
-target = "{1, 3}";
+origin = "{5, 2}";
+target = "{5, 3}";
 type = TTStem;
 options = 4;
 }
@@ -375261,45 +375260,45 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"960 508 LINE",
-"784 684 LINE",
-"352 252 LINE",
-"528 76 LINE"
+"1228 872 OFFCURVE",
+"1146 954 OFFCURVE",
+"1148 1056 CURVE SMOOTH",
+"1146 1158 OFFCURVE",
+"1228 1240 OFFCURVE",
+"1332 1240 CURVE SMOOTH",
+"1432 1240 OFFCURVE",
+"1514 1158 OFFCURVE",
+"1516 1056 CURVE SMOOTH",
+"1514 954 OFFCURVE",
+"1432 872 OFFCURVE",
+"1332 872 CURVE SMOOTH"
 );
 },
 {
 closed = 1;
 nodes = (
-"680 932 LINE",
-"680 1180 LINE",
-"72 1180 LINE",
-"72 932 LINE"
+"1456 1708 LINE",
+"1456 2316 LINE",
+"1208 2316 LINE",
+"1208 1708 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1456 -204 LINE",
-"1456 404 LINE",
-"1208 404 LINE",
-"1208 -204 LINE"
+"2312 1860 LINE",
+"2136 2036 LINE",
+"1704 1604 LINE",
+"1880 1428 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1228 872 OFFCURVE",
-"1146 954 OFFCURVE",
-"1148 1056 CURVE SMOOTH",
-"1146 1158 OFFCURVE",
-"1228 1240 OFFCURVE",
-"1332 1240 CURVE SMOOTH",
-"1432 1240 OFFCURVE",
-"1514 1158 OFFCURVE",
-"1516 1056 CURVE SMOOTH",
-"1514 954 OFFCURVE",
-"1432 872 OFFCURVE",
-"1332 872 CURVE SMOOTH"
+"2592 932 LINE",
+"2592 1180 LINE",
+"1984 1180 LINE",
+"1984 932 LINE"
 );
 },
 {
@@ -375314,37 +375313,37 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"960 1604 LINE",
-"528 2036 LINE",
-"352 1860 LINE",
-"784 1428 LINE"
+"1456 -204 LINE",
+"1456 404 LINE",
+"1208 404 LINE",
+"1208 -204 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"2592 932 LINE",
-"2592 1180 LINE",
-"1984 1180 LINE",
-"1984 932 LINE"
+"960 508 LINE",
+"784 684 LINE",
+"352 252 LINE",
+"528 76 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1456 1708 LINE",
-"1456 2316 LINE",
-"1208 2316 LINE",
-"1208 1708 LINE"
+"680 932 LINE",
+"680 1180 LINE",
+"72 1180 LINE",
+"72 932 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"2312 1860 LINE",
-"2136 2036 LINE",
-"1704 1604 LINE",
-"1880 1428 LINE"
+"960 1604 LINE",
+"528 2036 LINE",
+"352 1860 LINE",
+"784 1428 LINE"
 );
 }
 );
@@ -375356,107 +375355,107 @@ paths = (
 {
 closed = 1;
 nodes = (
-"1550 604 OFFCURVE",
-"1790 808 OFFCURVE",
+"1552 604 OFFCURVE",
+"1788 808 OFFCURVE",
 "1832 1056 CURVE SMOOTH",
-"1870 1304 OFFCURVE",
-"1702 1508 OFFCURVE",
+"1872 1304 OFFCURVE",
+"1700 1508 OFFCURVE",
 "1456 1508 CURVE SMOOTH",
-"1202 1508 OFFCURVE",
-"966 1304 OFFCURVE",
+"1204 1508 OFFCURVE",
+"968 1304 OFFCURVE",
 "928 1056 CURVE SMOOTH",
-"886 808 OFFCURVE",
-"1054 604 OFFCURVE",
+"884 808 OFFCURVE",
+"1052 604 OFFCURVE",
 "1304 604 CURVE SMOOTH"
 );
 },
 {
 closed = 1;
 nodes = (
-"916 508 LINE",
-"772 684 LINE",
-"268 252 LINE",
-"412 76 LINE"
+"1244 872 OFFCURVE",
+"1176 956 OFFCURVE",
+"1196 1056 CURVE SMOOTH",
+"1212 1160 OFFCURVE",
+"1308 1240 OFFCURVE",
+"1412 1240 CURVE SMOOTH",
+"1512 1240 OFFCURVE",
+"1580 1160 OFFCURVE",
+"1564 1056 CURVE SMOOTH",
+"1544 956 OFFCURVE",
+"1448 872 OFFCURVE",
+"1348 872 CURVE SMOOTH"
 );
 },
 {
 closed = 1;
 nodes = (
-"1296 -204 LINE",
-"1396 404 LINE",
-"1148 404 LINE",
-"1048 -204 LINE"
+"1612 1708 LINE",
+"1712 2316 LINE",
+"1464 2316 LINE",
+"1364 1708 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"708 932 LINE",
-"748 1180 LINE",
-"140 1180 LINE",
-"100 932 LINE"
+"2492 1860 LINE",
+"2344 2036 LINE",
+"1844 1604 LINE",
+"1988 1428 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"2228 252 LINE",
-"1868 684 LINE",
-"1660 508 LINE",
-"2020 76 LINE"
+"2620 932 LINE",
+"2660 1180 LINE",
+"2052 1180 LINE",
+"2012 932 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1246 872 OFFCURVE",
-"1178 956 OFFCURVE",
-"1196 1056 CURVE SMOOTH",
-"1210 1160 OFFCURVE",
-"1306 1240 OFFCURVE",
-"1412 1240 CURVE SMOOTH",
-"1510 1240 OFFCURVE",
-"1578 1160 OFFCURVE",
-"1564 1056 CURVE SMOOTH",
-"1546 956 OFFCURVE",
-"1450 872 OFFCURVE",
-"1348 872 CURVE SMOOTH"
+"2228 252 LINE",
+"1868 684 LINE",
+"1660 508 LINE",
+"2020 76 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1100 1604 LINE",
-"736 2036 LINE",
-"532 1860 LINE",
-"892 1428 LINE"
+"1296 -204 LINE",
+"1396 404 LINE",
+"1148 404 LINE",
+"1048 -204 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"2620 932 LINE",
-"2660 1180 LINE",
-"2052 1180 LINE",
-"2012 932 LINE"
+"916 508 LINE",
+"772 684 LINE",
+"268 252 LINE",
+"412 76 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1612 1708 LINE",
-"1712 2316 LINE",
-"1464 2316 LINE",
-"1364 1708 LINE"
+"708 932 LINE",
+"748 1180 LINE",
+"140 1180 LINE",
+"100 932 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"2492 1860 LINE",
-"2344 2036 LINE",
-"1844 1604 LINE",
-"1988 1428 LINE"
+"1100 1604 LINE",
+"736 2036 LINE",
+"532 1860 LINE",
+"892 1428 LINE"
 );
 }
 );
@@ -375588,7 +375587,7 @@ unicode = 263C;
 },
 {
 glyphname = blackSunWithRays;
-lastChange = "2018-10-02 21:51:10 +0000";
+lastChange = "2018-10-04 17:12:19 +0000";
 layers = (
 {
 guideLines = (
@@ -375599,19 +375598,16 @@ position = "{1412, 1056}";
 hints = (
 {
 horizontal = 1;
-origin = "{2, 3}";
-target = "{2, 2}";
+place = "{960, 192}";
 type = Stem;
 },
 {
-origin = "{3, 3}";
-target = "{3, 0}";
+place = "{1228, 192}";
 type = Stem;
 },
 {
 horizontal = 1;
-origin = "{2, 3}";
-target = "{2, 2}";
+place = "{960, 192}";
 type = TTStem;
 options = 4;
 }
@@ -375621,45 +375617,45 @@ paths = (
 {
 closed = 1;
 nodes = (
-"1572 604 OFFCURVE",
-"1776 808 OFFCURVE",
+"1573 604 OFFCURVE",
+"1776 807 OFFCURVE",
 "1776 1056 CURVE SMOOTH",
-"1776 1304 OFFCURVE",
-"1572 1508 OFFCURVE",
+"1776 1305 OFFCURVE",
+"1573 1508 OFFCURVE",
 "1324 1508 CURVE SMOOTH",
-"1076 1508 OFFCURVE",
-"872 1304 OFFCURVE",
+"1075 1508 OFFCURVE",
+"872 1305 OFFCURVE",
 "872 1056 CURVE SMOOTH",
-"872 808 OFFCURVE",
-"1076 604 OFFCURVE",
+"872 807 OFFCURVE",
+"1075 604 OFFCURVE",
 "1324 604 CURVE SMOOTH"
 );
 },
 {
 closed = 1;
 nodes = (
-"932 528 LINE",
-"796 664 LINE",
-"364 232 LINE",
-"500 96 LINE"
+"1420 1708 LINE",
+"1420 2316 LINE",
+"1228 2316 LINE",
+"1228 1708 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"672 960 LINE",
-"672 1152 LINE",
-"64 1152 LINE",
-"64 960 LINE"
+"2284 1880 LINE",
+"2148 2016 LINE",
+"1716 1584 LINE",
+"1852 1448 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1420 -204 LINE",
-"1420 404 LINE",
-"1228 404 LINE",
-"1228 -204 LINE"
+"2584 960 LINE",
+"2584 1152 LINE",
+"1976 1152 LINE",
+"1976 960 LINE"
 );
 },
 {
@@ -375674,37 +375670,37 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"932 1584 LINE",
-"500 2016 LINE",
-"364 1880 LINE",
-"796 1448 LINE"
+"1420 -204 LINE",
+"1420 404 LINE",
+"1228 404 LINE",
+"1228 -204 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"2584 960 LINE",
-"2584 1152 LINE",
-"1976 1152 LINE",
-"1976 960 LINE"
+"932 528 LINE",
+"796 664 LINE",
+"364 232 LINE",
+"500 96 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1420 1708 LINE",
-"1420 2316 LINE",
-"1228 2316 LINE",
-"1228 1708 LINE"
+"672 960 LINE",
+"672 1152 LINE",
+"64 1152 LINE",
+"64 960 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"2284 1880 LINE",
-"2148 2016 LINE",
-"1716 1584 LINE",
-"1852 1448 LINE"
+"932 1584 LINE",
+"500 2016 LINE",
+"364 1880 LINE",
+"796 1448 LINE"
 );
 }
 );
@@ -375733,28 +375729,28 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"892 528 LINE",
-"780 664 LINE",
-"276 232 LINE",
-"388 96 LINE"
+"1576 1708 LINE",
+"1676 2316 LINE",
+"1484 2316 LINE",
+"1384 1708 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1260 -204 LINE",
-"1360 404 LINE",
-"1168 404 LINE",
-"1068 -204 LINE"
+"2468 1880 LINE",
+"2356 2016 LINE",
+"1852 1584 LINE",
+"1964 1448 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"704 960 LINE",
-"736 1152 LINE",
-"128 1152 LINE",
-"96 960 LINE"
+"2616 960 LINE",
+"2648 1152 LINE",
+"2040 1152 LINE",
+"2008 960 LINE"
 );
 },
 {
@@ -375769,37 +375765,37 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"1068 1584 LINE",
-"708 2016 LINE",
-"548 1880 LINE",
-"908 1448 LINE"
+"1260 -204 LINE",
+"1360 404 LINE",
+"1168 404 LINE",
+"1068 -204 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"2616 960 LINE",
-"2648 1152 LINE",
-"2040 1152 LINE",
-"2008 960 LINE"
+"892 528 LINE",
+"780 664 LINE",
+"276 232 LINE",
+"388 96 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1576 1708 LINE",
-"1676 2316 LINE",
-"1484 2316 LINE",
-"1384 1708 LINE"
+"704 960 LINE",
+"736 1152 LINE",
+"128 1152 LINE",
+"96 960 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"2468 1880 LINE",
-"2356 2016 LINE",
-"1852 1584 LINE",
-"1964 1448 LINE"
+"1068 1584 LINE",
+"708 2016 LINE",
+"548 1880 LINE",
+"908 1448 LINE"
 );
 }
 );
@@ -375814,19 +375810,16 @@ position = "{1412, 1056}";
 hints = (
 {
 horizontal = 1;
-origin = "{2, 3}";
-target = "{2, 2}";
+place = "{932, 248}";
 type = Stem;
 },
 {
-origin = "{3, 3}";
-target = "{3, 0}";
+place = "{1208, 248}";
 type = Stem;
 },
 {
 horizontal = 1;
-origin = "{2, 3}";
-target = "{2, 2}";
+place = "{932, 248}";
 type = TTStem;
 options = 4;
 }
@@ -375836,45 +375829,45 @@ paths = (
 {
 closed = 1;
 nodes = (
-"1580 604 OFFCURVE",
-"1784 808 OFFCURVE",
+"1579 604 OFFCURVE",
+"1782 807 OFFCURVE",
 "1784 1056 CURVE SMOOTH",
-"1784 1304 OFFCURVE",
-"1580 1508 OFFCURVE",
+"1782 1305 OFFCURVE",
+"1579 1508 OFFCURVE",
 "1332 1508 CURVE SMOOTH",
-"1080 1508 OFFCURVE",
-"880 1304 OFFCURVE",
+"1081 1508 OFFCURVE",
+"878 1305 OFFCURVE",
 "880 1056 CURVE SMOOTH",
-"880 808 OFFCURVE",
-"1080 604 OFFCURVE",
+"878 807 OFFCURVE",
+"1081 604 OFFCURVE",
 "1332 604 CURVE SMOOTH"
 );
 },
 {
 closed = 1;
 nodes = (
-"960 508 LINE",
-"784 684 LINE",
-"352 252 LINE",
-"528 76 LINE"
+"1456 1708 LINE",
+"1456 2316 LINE",
+"1208 2316 LINE",
+"1208 1708 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"680 932 LINE",
-"680 1180 LINE",
-"72 1180 LINE",
-"72 932 LINE"
+"2312 1860 LINE",
+"2136 2036 LINE",
+"1704 1604 LINE",
+"1880 1428 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1456 -204 LINE",
-"1456 404 LINE",
-"1208 404 LINE",
-"1208 -204 LINE"
+"2592 932 LINE",
+"2592 1180 LINE",
+"1984 1180 LINE",
+"1984 932 LINE"
 );
 },
 {
@@ -375889,37 +375882,37 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"960 1604 LINE",
-"528 2036 LINE",
-"352 1860 LINE",
-"784 1428 LINE"
+"1456 -204 LINE",
+"1456 404 LINE",
+"1208 404 LINE",
+"1208 -204 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"2592 932 LINE",
-"2592 1180 LINE",
-"1984 1180 LINE",
-"1984 932 LINE"
+"960 508 LINE",
+"784 684 LINE",
+"352 252 LINE",
+"528 76 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1456 1708 LINE",
-"1456 2316 LINE",
-"1208 2316 LINE",
-"1208 1708 LINE"
+"680 932 LINE",
+"680 1180 LINE",
+"72 1180 LINE",
+"72 932 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"2312 1860 LINE",
-"2136 2036 LINE",
-"1704 1604 LINE",
-"1880 1428 LINE"
+"960 1604 LINE",
+"528 2036 LINE",
+"352 1860 LINE",
+"784 1428 LINE"
 );
 }
 );
@@ -375932,44 +375925,44 @@ paths = (
 closed = 1;
 nodes = (
 "1552 604 OFFCURVE",
-"1792 808 OFFCURVE",
+"1788 808 OFFCURVE",
 "1832 1056 CURVE SMOOTH",
 "1872 1304 OFFCURVE",
-"1704 1508 OFFCURVE",
+"1700 1508 OFFCURVE",
 "1456 1508 CURVE SMOOTH",
 "1204 1508 OFFCURVE",
 "968 1304 OFFCURVE",
 "928 1056 CURVE SMOOTH",
-"888 808 OFFCURVE",
-"1056 604 OFFCURVE",
+"884 808 OFFCURVE",
+"1052 604 OFFCURVE",
 "1304 604 CURVE SMOOTH"
 );
 },
 {
 closed = 1;
 nodes = (
-"916 508 LINE",
-"772 684 LINE",
-"268 252 LINE",
-"412 76 LINE"
+"1612 1708 LINE",
+"1712 2316 LINE",
+"1464 2316 LINE",
+"1364 1708 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1296 -204 LINE",
-"1396 404 LINE",
-"1148 404 LINE",
-"1048 -204 LINE"
+"2492 1860 LINE",
+"2344 2036 LINE",
+"1844 1604 LINE",
+"1988 1428 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"708 932 LINE",
-"748 1180 LINE",
-"140 1180 LINE",
-"100 932 LINE"
+"2620 932 LINE",
+"2660 1180 LINE",
+"2052 1180 LINE",
+"2012 932 LINE"
 );
 },
 {
@@ -375984,37 +375977,37 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"1100 1604 LINE",
-"736 2036 LINE",
-"532 1860 LINE",
-"892 1428 LINE"
+"1296 -204 LINE",
+"1396 404 LINE",
+"1148 404 LINE",
+"1048 -204 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"2620 932 LINE",
-"2660 1180 LINE",
-"2052 1180 LINE",
-"2012 932 LINE"
+"916 508 LINE",
+"772 684 LINE",
+"268 252 LINE",
+"412 76 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1612 1708 LINE",
-"1712 2316 LINE",
-"1464 2316 LINE",
-"1364 1708 LINE"
+"708 932 LINE",
+"748 1180 LINE",
+"140 1180 LINE",
+"100 932 LINE"
 );
 },
 {
 closed = 1;
 nodes = (
-"2492 1860 LINE",
-"2344 2036 LINE",
-"1844 1604 LINE",
-"1988 1428 LINE"
+"1100 1604 LINE",
+"736 2036 LINE",
+"532 1860 LINE",
+"892 1428 LINE"
 );
 }
 );