From fc108da6db18880c2abbd8c2163d157b8f984fd9 Mon Sep 17 00:00:00 2001
From: Rasmus Andersson <rasmus@notion.se>
Date: Sat, 30 Sep 2017 17:24:50 -0700
Subject: [PATCH] Adjusts loops of b, d, g, p, and q to match c and o

Also improves on alpha, dollar, dcroat, rho, thorn and uni048F
---
 src/Inter-UI-Black.ufo/glyphs/b.glif          |   4 +-
 src/Inter-UI-Black.ufo/glyphs/d.glif          |  32 ++--
 src/Inter-UI-Black.ufo/glyphs/dollar.glif     |  57 +------
 src/Inter-UI-Black.ufo/glyphs/g.glif          | 126 ++++++++-------
 .../glyphs/leftloop.cn.glif                   | 143 ++++++++++++++----
 src/Inter-UI-Black.ufo/glyphs/p.glif          |   4 +-
 src/Inter-UI-Black.ufo/glyphs/q.glif          |  32 ++--
 src/Inter-UI-Black.ufo/glyphs/rho.glif        |  68 ++++-----
 .../glyphs/rightloop.cn.glif                  |  72 +++++----
 src/Inter-UI-Black.ufo/glyphs/thorn.glif      |   4 +-
 src/Inter-UI-Black.ufo/lib.plist              |   8 +-
 src/Inter-UI-Regular.ufo/glyphs/S_.glif       |  30 ++--
 src/Inter-UI-Regular.ufo/glyphs/alpha.glif    |   8 +-
 src/Inter-UI-Regular.ufo/glyphs/b.glif        |  16 +-
 src/Inter-UI-Regular.ufo/glyphs/d.glif        |  30 ++--
 src/Inter-UI-Regular.ufo/glyphs/dcroat.glif   |   2 +-
 src/Inter-UI-Regular.ufo/glyphs/dollar.glif   |  59 +-------
 src/Inter-UI-Regular.ufo/glyphs/g.glif        | 126 ++++++++-------
 .../glyphs/leftloop.cn.glif                   | 112 ++++++++++----
 src/Inter-UI-Regular.ufo/glyphs/p.glif        |   6 +-
 src/Inter-UI-Regular.ufo/glyphs/q.glif        |  18 +--
 src/Inter-UI-Regular.ufo/glyphs/rho.glif      |  32 ++--
 .../glyphs/rightloop.cn.glif                  |  72 +++++----
 src/Inter-UI-Regular.ufo/glyphs/thorn.glif    |   4 +-
 src/Inter-UI-Regular.ufo/glyphs/uni048F_.glif |  12 +-
 src/Inter-UI-Regular.ufo/groups.plist         |   2 +
 src/Inter-UI-Regular.ufo/lib.plist            |  12 +-
 src/glyphorder.txt                            |   6 +-
 28 files changed, 600 insertions(+), 497 deletions(-)

diff --git a/src/Inter-UI-Black.ufo/glyphs/b.glif b/src/Inter-UI-Black.ufo/glyphs/b.glif
index 83da02e61..6e2cd6f52 100644
--- a/src/Inter-UI-Black.ufo/glyphs/b.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/b.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="b" format="1">
-  <advance width="1572"/>
+  <advance width="1620"/>
   <unicode hex="0062"/>
   <outline>
     <contour>
@@ -12,7 +12,7 @@
       <point x="588" y="1272" type="line"/>
       <point x="588" y="2048" type="line"/>
     </contour>
-    <component base="rightloop.cn" xOffset="-84"/>
+    <component base="rightloop.cn" xOffset="-36"/>
     <contour>
       <point x="1048" y="2200" type="move" name="top"/>
     </contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/d.glif b/src/Inter-UI-Black.ufo/glyphs/d.glif
index 36b3fb1ac..99ff0cca6 100644
--- a/src/Inter-UI-Black.ufo/glyphs/d.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/d.glif
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="d" format="1">
-  <advance width="1576"/>
+  <advance width="1620"/>
   <unicode hex="0064"/>
   <outline>
     <contour>
-      <point x="992" y="308" type="line"/>
-      <point x="1032" y="0" type="line"/>
-      <point x="1448" y="0" type="line"/>
-      <point x="1448" y="2048" type="line"/>
-      <point x="988" y="2048" type="line"/>
-      <point x="988" y="1256" type="line"/>
-      <point x="1144" y="732" type="line"/>
+      <point x="1036" y="308" type="line"/>
+      <point x="1076" y="0" type="line"/>
+      <point x="1492" y="0" type="line"/>
+      <point x="1492" y="2048" type="line"/>
+      <point x="1032" y="2048" type="line"/>
+      <point x="1032" y="1256" type="line"/>
+      <point x="1188" y="732" type="line"/>
     </contour>
-    <component base="leftloop.cn" xOffset="-4"/>
+    <component base="leftloop.cn"/>
     <contour>
-      <point x="1612" y="2112" type="move" name="caron"/>
+      <point x="1680.0" y="2112.0" type="move" name="caron"/>
     </contour>
     <contour>
-      <point x="1144" y="1796" type="move" name="cross"/>
+      <point x="1212.0" y="1796.0" type="move" name="cross"/>
     </contour>
     <contour>
-      <point x="672" y="0" type="move" name="bottom"/>
+      <point x="740.0" y="0.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="664" y="2200" type="move" name="top"/>
+      <point x="732.0" y="2200.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1588" y="2200" type="move" name="top_dd"/>
+      <point x="1656.0" y="2200.0" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1588" y="-560" type="move" name="bottom_dd"/>
+      <point x="1656.0" y="-560.0" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1588" y="2200" type="move" name="top0315"/>
+      <point x="1656.0" y="2200.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dollar.glif b/src/Inter-UI-Black.ufo/glyphs/dollar.glif
index cca98cf70..8a8d559d0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dollar.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dollar.glif
@@ -4,59 +4,12 @@
   <unicode hex="0024"/>
   <outline>
     <contour>
-      <point x="1584" y="552" type="curve"/>
-      <point x="1584" y="912"/>
-      <point x="1348" y="1052"/>
-      <point x="1016" y="1200" type="curve"/>
-      <point x="1024" y="1700" type="line"/>
-      <point x="1100" y="1660"/>
-      <point x="1148" y="1572"/>
-      <point x="1148" y="1416" type="curve"/>
-      <point x="1592" y="1416" type="line"/>
-      <point x="1592" y="1796"/>
-      <point x="1368" y="2036"/>
-      <point x="1028" y="2072" type="curve"/>
-      <point x="1032" y="2360" type="line"/>
-      <point x="848" y="2360" type="line"/>
-      <point x="844" y="2072" type="line"/>
-      <point x="504" y="2040"/>
-      <point x="276" y="1824"/>
-      <point x="276" y="1504" type="curve"/>
-      <point x="276" y="1144"/>
-      <point x="504" y="1004"/>
-      <point x="832" y="860" type="curve"/>
-      <point x="828" y="348" type="line"/>
-      <point x="724" y="380"/>
-      <point x="644" y="468"/>
-      <point x="644" y="664" type="curve"/>
-      <point x="200" y="664" type="line"/>
-      <point x="200" y="196"/>
-      <point x="508" y="12"/>
-      <point x="824" y="-20" type="curve"/>
-      <point x="820" y="-260" type="line"/>
-      <point x="1000" y="-260" type="line"/>
-      <point x="1004" y="-20" type="line"/>
-      <point x="1352" y="4"/>
-      <point x="1584" y="208"/>
-    </contour>
-    <contour>
-      <point x="720" y="1504" type="curve"/>
-      <point x="720" y="1596"/>
-      <point x="756" y="1672"/>
-      <point x="840" y="1708" type="curve"/>
-      <point x="836" y="1292" type="line"/>
-      <point x="748" y="1352"/>
-      <point x="720" y="1412"/>
-    </contour>
-    <contour>
-      <point x="1144" y="548" type="curve"/>
-      <point x="1144" y="452"/>
-      <point x="1100" y="376"/>
-      <point x="1008" y="348" type="curve"/>
-      <point x="1012" y="776" type="line"/>
-      <point x="1104" y="724"/>
-      <point x="1144" y="656"/>
+      <point x="800" y="-260" type="line"/>
+      <point x="984" y="-260" type="line"/>
+      <point x="1016" y="2304" type="line"/>
+      <point x="832" y="2304" type="line"/>
     </contour>
+    <component base="S"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/g.glif b/src/Inter-UI-Black.ufo/glyphs/g.glif
index a49bdb4de..d34b9b79f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/g.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/g.glif
@@ -1,78 +1,92 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="g" format="1">
-  <advance width="1600"/>
+  <advance width="1620"/>
   <unicode hex="0067"/>
   <outline>
     <contour>
-      <point x="1056" y="1528" type="line"/>
-      <point x="1020" y="1240" type="line"/>
-      <point x="1196" y="740" type="line"/>
-      <point x="976" y="148" type="line"/>
-      <point x="1024" y="108" type="line"/>
-      <point x="1024" y="92" type="line"/>
-      <point x="1024" y="-140"/>
-      <point x="916" y="-232"/>
-      <point x="712" y="-232" type="curve" smooth="yes"/>
-      <point x="552" y="-232"/>
-      <point x="424" y="-172"/>
-      <point x="328" y="-100" type="curve"/>
-      <point x="136" y="-396" type="line"/>
-      <point x="220" y="-480"/>
-      <point x="452" y="-588"/>
-      <point x="728" y="-588" type="curve" smooth="yes"/>
-      <point x="1172" y="-588"/>
-      <point x="1472" y="-356"/>
-      <point x="1472" y="68" type="curve" smooth="yes"/>
-      <point x="1472" y="1528" type="line"/>
+      <point x="1076" y="1528" type="line"/>
+      <point x="1040" y="1240" type="line"/>
+      <point x="1216" y="740" type="line"/>
+      <point x="996" y="148" type="line"/>
+      <point x="1044" y="108" type="line"/>
+      <point x="1044" y="92" type="line"/>
+      <point x="1044" y="-140"/>
+      <point x="936" y="-232"/>
+      <point x="732" y="-232" type="curve" smooth="yes"/>
+      <point x="572" y="-232"/>
+      <point x="444" y="-172"/>
+      <point x="348" y="-100" type="curve"/>
+      <point x="156" y="-396" type="line"/>
+      <point x="240" y="-480"/>
+      <point x="472" y="-588"/>
+      <point x="748" y="-588" type="curve" smooth="yes"/>
+      <point x="1192" y="-588"/>
+      <point x="1492" y="-356"/>
+      <point x="1492" y="68" type="curve" smooth="yes"/>
+      <point x="1492" y="1528" type="line"/>
     </contour>
     <contour>
-      <point x="80" y="752" type="line"/>
-      <point x="80" y="304"/>
-      <point x="312" y="-20"/>
-      <point x="684" y="-20" type="curve" smooth="yes"/>
-      <point x="1044" y="-20"/>
-      <point x="1192" y="328"/>
-      <point x="1252" y="740" type="curve"/>
-      <point x="1252" y="772" type="line"/>
-      <point x="1192" y="1212"/>
-      <point x="1088" y="1556"/>
-      <point x="688" y="1556" type="curve" smooth="yes"/>
-      <point x="312" y="1556"/>
-      <point x="80" y="1240"/>
-      <point x="80" y="780" type="curve" smooth="yes"/>
+      <point x="1236" y="1040" type="line"/>
+      <point x="1188" y="1320"/>
+      <point x="1060" y="1556"/>
+      <point x="736" y="1556" type="curve" smooth="yes"/>
+      <point x="356" y="1556"/>
+      <point x="80" y="1228"/>
+      <point x="80" y="784" type="curve"/>
+      <point x="80" y="332"/>
+      <point x="356" y="12"/>
+      <point x="740" y="12" type="curve"/>
+      <point x="1060" y="12"/>
+      <point x="1196" y="236"/>
+      <point x="1236" y="500" type="curve"/>
+      <point x="1256" y="804" type="line"/>
+      <point x="1084" y="804" type="line"/>
+      <point x="1084" y="740"/>
+      <point x="1076" y="636"/>
+      <point x="1060" y="572" type="curve"/>
+      <point x="1040" y="488"/>
+      <point x="968" y="368"/>
+      <point x="796" y="368" type="curve" smooth="yes"/>
+      <point x="588" y="368"/>
+      <point x="516" y="544"/>
+      <point x="516" y="784" type="curve"/>
+      <point x="516" y="1016"/>
+      <point x="588" y="1200"/>
+      <point x="792" y="1200" type="curve"/>
+      <point x="992" y="1200"/>
+      <point x="1048" y="1032"/>
+      <point x="1064" y="964" type="curve"/>
+      <point x="1080" y="904"/>
+      <point x="1084" y="836"/>
+      <point x="1084" y="772" type="curve"/>
+      <point x="1256" y="772" type="line"/>
     </contour>
     <contour>
-      <point x="520" y="780" type="line"/>
-      <point x="520" y="1016"/>
-      <point x="604" y="1192"/>
-      <point x="800" y="1192" type="curve" smooth="yes"/>
-      <point x="976" y="1192"/>
-      <point x="1084" y="1056"/>
-      <point x="1084" y="812" type="curve"/>
-      <point x="1084" y="784"/>
-      <point x="1084" y="728"/>
-      <point x="1084" y="700" type="curve"/>
-      <point x="1084" y="484"/>
-      <point x="964" y="348"/>
-      <point x="796" y="348" type="curve" smooth="yes"/>
-      <point x="604" y="348"/>
-      <point x="520" y="524"/>
-      <point x="520" y="752" type="curve" smooth="yes"/>
+      <point x="1004" y="96" type="line"/>
+      <point x="1148" y="96" type="line"/>
+      <point x="1148" y="312" type="line"/>
+      <point x="1004" y="312" type="line"/>
     </contour>
     <contour>
-      <point x="760" y="1776" type="move" name="top"/>
+      <point x="1028" y="1192" type="line"/>
+      <point x="1176" y="1192" type="line"/>
+      <point x="1176" y="1440" type="line"/>
+      <point x="1028" y="1440" type="line"/>
     </contour>
     <contour>
-      <point x="780" y="-568" type="move" name="bottom"/>
+      <point x="760.0" y="1776.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1612" y="2200" type="move" name="top_dd"/>
+      <point x="780.0" y="-568.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1612" y="-560" type="move" name="bottom_dd"/>
+      <point x="1612.0" y="2200.0" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1612" y="1776" type="move" name="top0315"/>
+      <point x="1612.0" y="-560.0" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1612.0" y="1776.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/leftloop.cn.glif b/src/Inter-UI-Black.ufo/glyphs/leftloop.cn.glif
index 8d7aa1fce..cb570fc2b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/leftloop.cn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/leftloop.cn.glif
@@ -1,42 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="leftloop.cn" format="1">
-  <advance width="1408"/>
+  <advance width="1526"/>
   <outline>
     <contour>
-      <point x="84" y="776" type="curve" smooth="yes"/>
-      <point x="84" y="300"/>
-      <point x="288" y="-28"/>
-      <point x="664" y="-28" type="curve" smooth="yes"/>
-      <point x="1008" y="-28"/>
-      <point x="1172" y="320"/>
-      <point x="1228" y="736" type="curve"/>
-      <point x="1228" y="768" type="line"/>
-      <point x="1172" y="1212"/>
-      <point x="1008" y="1556"/>
-      <point x="668" y="1556" type="curve" smooth="yes"/>
-      <point x="288" y="1556"/>
-      <point x="84" y="1240"/>
+      <point x="1236" y="1024" type="line"/>
+      <point x="1188" y="1316"/>
+      <point x="1060" y="1556"/>
+      <point x="736" y="1556" type="curve" smooth="yes"/>
+      <point x="356" y="1556"/>
+      <point x="80.0" y="1220.0"/>
+      <point x="80.0" y="764.0" type="curve"/>
+      <point x="80.0" y="304.0"/>
+      <point x="356" y="-28"/>
+      <point x="740" y="-28" type="curve"/>
+      <point x="1060" y="-28"/>
+      <point x="1196" y="200"/>
+      <point x="1236" y="476" type="curve"/>
+      <point x="1256" y="784" type="line"/>
+      <point x="1068" y="784" type="line"/>
+      <point x="1068" y="720"/>
+      <point x="1056" y="612"/>
+      <point x="1044.0" y="548.0" type="curve"/>
+      <point x="1024.0" y="464.0"/>
+      <point x="968.0" y="340.0"/>
+      <point x="796.0" y="340.0" type="curve" smooth="yes"/>
+      <point x="588.0" y="340.0"/>
+      <point x="516.0" y="520.0"/>
+      <point x="516.0" y="764.0" type="curve"/>
+      <point x="516.0" y="1000.0"/>
+      <point x="588.0" y="1192.0"/>
+      <point x="792.0" y="1192.0" type="curve"/>
+      <point x="992.0" y="1192.0"/>
+      <point x="1036" y="1004"/>
+      <point x="1048" y="948" type="curve"/>
+      <point x="1060" y="888"/>
+      <point x="1068" y="816"/>
+      <point x="1068" y="752" type="curve"/>
+      <point x="1256" y="752" type="line"/>
     </contour>
     <contour>
-      <point x="528" y="776" type="curve" smooth="yes"/>
-      <point x="528" y="1016"/>
-      <point x="596" y="1192"/>
-      <point x="780" y="1192" type="curve" smooth="yes"/>
-      <point x="964" y="1192"/>
-      <point x="1052" y="1056"/>
-      <point x="1052" y="808" type="curve" smooth="yes"/>
-      <point x="1052" y="780"/>
-      <point x="1052" y="728"/>
-      <point x="1052" y="700" type="curve"/>
-      <point x="1052" y="480"/>
-      <point x="960" y="340"/>
-      <point x="776" y="340" type="curve" smooth="yes"/>
-      <point x="588" y="340"/>
-      <point x="528" y="516"/>
+      <point x="1044" y="96" type="line"/>
+      <point x="1188" y="96" type="line"/>
+      <point x="1188" y="312" type="line"/>
+      <point x="1044" y="312" type="line"/>
+    </contour>
+    <contour>
+      <point x="1052" y="1168" type="line"/>
+      <point x="1200" y="1168" type="line"/>
+      <point x="1200" y="1416" type="line"/>
+      <point x="1052" y="1416" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>356</integer>
+          <key>y</key>
+          <integer>1492</integer>
+        </dict>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>1060</integer>
+          <key>y</key>
+          <integer>1332</integer>
+        </dict>
+      </array>
+      <key>com.typemytype.robofont.layerData</key>
+      <dict>
+        <key>reference</key>
+        <dict>
+          <key>anchors</key>
+          <array>
+          </array>
+          <key>components</key>
+          <array>
+            <dict>
+              <key>baseGlyph</key>
+              <string>c</string>
+              <key>transformation</key>
+              <array>
+                <integer>1</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+                <integer>1</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+              </array>
+            </dict>
+          </array>
+          <key>contours</key>
+          <array>
+          </array>
+          <key>lib</key>
+          <dict>
+          </dict>
+          <key>name</key>
+          <string>leftloop.cn</string>
+          <key>unicodes</key>
+          <array>
+          </array>
+          <key>width</key>
+          <integer>1526</integer>
+        </dict>
+      </dict>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.77</real>
diff --git a/src/Inter-UI-Black.ufo/glyphs/p.glif b/src/Inter-UI-Black.ufo/glyphs/p.glif
index bbcb79fd0..c54d2abc7 100644
--- a/src/Inter-UI-Black.ufo/glyphs/p.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/p.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="p" format="1">
-  <advance width="1572"/>
+  <advance width="1620"/>
   <unicode hex="0070"/>
   <outline>
     <contour>
@@ -13,7 +13,7 @@
       <point x="544" y="1536" type="line"/>
       <point x="128" y="1536" type="line"/>
     </contour>
-    <component base="rightloop.cn" xOffset="-84"/>
+    <component base="rightloop.cn" xOffset="-36"/>
     <contour>
       <point x="1044" y="1760" type="move" name="top"/>
     </contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/q.glif b/src/Inter-UI-Black.ufo/glyphs/q.glif
index 32bc28daa..56a7ab0e6 100644
--- a/src/Inter-UI-Black.ufo/glyphs/q.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/q.glif
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="q" format="1">
-  <advance width="1576"/>
+  <advance width="1620"/>
   <unicode hex="0071"/>
   <outline>
     <contour>
-      <point x="1448" y="1536" type="line"/>
-      <point x="1032" y="1536" type="line"/>
-      <point x="1012" y="1264" type="line"/>
-      <point x="1008" y="1196" type="line"/>
-      <point x="1140" y="748" type="line"/>
-      <point x="988" y="276" type="line"/>
-      <point x="988" y="-576" type="line"/>
-      <point x="1448" y="-576" type="line"/>
+      <point x="1492" y="1536" type="line"/>
+      <point x="1076" y="1536" type="line"/>
+      <point x="1056" y="1264" type="line"/>
+      <point x="1052" y="1196" type="line"/>
+      <point x="1184" y="748" type="line"/>
+      <point x="1032" y="276" type="line"/>
+      <point x="1032" y="-576" type="line"/>
+      <point x="1492" y="-576" type="line"/>
     </contour>
-    <component base="leftloop.cn" xOffset="-4"/>
+    <component base="leftloop.cn"/>
     <contour>
-      <point x="740" y="1776" type="move" name="top"/>
+      <point x="744" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1220" y="-560" type="move" name="bottom"/>
+      <point x="1224" y="-560" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="740" y="1776" type="move" name="marktop"/>
+      <point x="744" y="1776" type="move" name="marktop"/>
     </contour>
     <contour>
-      <point x="1588" y="2200" type="move" name="top_dd"/>
+      <point x="1592" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1588" y="-560" type="move" name="bottom_dd"/>
+      <point x="1592" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1588" y="1776" type="move" name="top0315"/>
+      <point x="1592" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/rho.glif b/src/Inter-UI-Black.ufo/glyphs/rho.glif
index bed6f9735..5c6234904 100644
--- a/src/Inter-UI-Black.ufo/glyphs/rho.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/rho.glif
@@ -1,47 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="rho" format="1">
-  <advance width="1792"/>
+  <advance width="1586"/>
   <unicode hex="03C1"/>
   <outline>
     <contour>
-      <point x="908" y="1760" type="move" name="top"/>
+      <point x="128" y="-572" type="line"/>
+      <point x="572" y="-572" type="line"/>
+      <point x="572" y="768" type="line" smooth="yes"/>
+      <point x="572" y="1016"/>
+      <point x="640" y="1180"/>
+      <point x="804" y="1180" type="curve" smooth="yes"/>
+      <point x="988" y="1180"/>
+      <point x="1052" y="996"/>
+      <point x="1052" y="760" type="curve" smooth="yes"/>
+      <point x="1052" y="732" type="line" smooth="yes"/>
+      <point x="1052" y="504"/>
+      <point x="992" y="336"/>
+      <point x="808" y="336" type="curve" smooth="yes"/>
+      <point x="608" y="336"/>
+      <point x="572" y="548"/>
+      <point x="572" y="736" type="curve"/>
+      <point x="380" y="688" type="line"/>
+      <point x="436" y="272"/>
+      <point x="572" y="-28"/>
+      <point x="916" y="-28" type="curve" smooth="yes"/>
+      <point x="1292" y="-28"/>
+      <point x="1496" y="288"/>
+      <point x="1496" y="732" type="curve" smooth="yes"/>
+      <point x="1496" y="760" type="line" smooth="yes"/>
+      <point x="1496" y="1228"/>
+      <point x="1264" y="1556"/>
+      <point x="832" y="1556" type="curve" smooth="yes"/>
+      <point x="380" y="1556"/>
+      <point x="128" y="1232"/>
+      <point x="128" y="816" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="1660" y="1760" type="move" name="top0315"/>
+      <point x="824" y="1760" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="212" y="-572" type="line"/>
-      <point x="656" y="-572" type="line"/>
-      <point x="656" y="768" type="line" smooth="yes"/>
-      <point x="656" y="1016"/>
-      <point x="724" y="1192"/>
-      <point x="888" y="1192" type="curve" smooth="yes"/>
-      <point x="1072" y="1192"/>
-      <point x="1136" y="996"/>
-      <point x="1136" y="760" type="curve" smooth="yes"/>
-      <point x="1136" y="732" type="line" smooth="yes"/>
-      <point x="1136" y="504"/>
-      <point x="1076" y="336"/>
-      <point x="892" y="336" type="curve" smooth="yes"/>
-      <point x="684" y="336"/>
-      <point x="600" y="464"/>
-      <point x="600" y="676" type="curve"/>
-      <point x="596" y="676"/>
-      <point x="476" y="712"/>
-      <point x="464" y="720" type="curve"/>
-      <point x="520" y="304"/>
-      <point x="656" y="-28"/>
-      <point x="1000" y="-28" type="curve" smooth="yes"/>
-      <point x="1376" y="-28"/>
-      <point x="1580" y="288"/>
-      <point x="1580" y="732" type="curve" smooth="yes"/>
-      <point x="1580" y="760" type="line" smooth="yes"/>
-      <point x="1580" y="1228"/>
-      <point x="1348" y="1556"/>
-      <point x="916" y="1556" type="curve" smooth="yes"/>
-      <point x="464" y="1556"/>
-      <point x="212" y="1232"/>
-      <point x="212" y="816" type="curve" smooth="yes"/>
+      <point x="1576" y="1760" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/rightloop.cn.glif b/src/Inter-UI-Black.ufo/glyphs/rightloop.cn.glif
index a1f29cab1..1e0e81574 100644
--- a/src/Inter-UI-Black.ufo/glyphs/rightloop.cn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/rightloop.cn.glif
@@ -3,36 +3,52 @@
   <advance width="1792"/>
   <outline>
     <contour>
-      <point x="1576" y="784" type="curve" smooth="yes"/>
-      <point x="1576" y="1252"/>
-      <point x="1360" y="1556"/>
-      <point x="996" y="1556" type="curve" smooth="yes"/>
-      <point x="632" y="1556"/>
-      <point x="492" y="1220"/>
-      <point x="436" y="776" type="curve"/>
-      <point x="436" y="736" type="line"/>
-      <point x="492" y="328"/>
-      <point x="636" y="-28"/>
-      <point x="1000" y="-28" type="curve" smooth="yes"/>
-      <point x="1360" y="-28"/>
-      <point x="1576" y="300"/>
+      <point x="420" y="1024" type="curve"/>
+      <point x="400" y="752" type="line"/>
+      <point x="588" y="752" type="line"/>
+      <point x="588" y="816"/>
+      <point x="596" y="888"/>
+      <point x="608" y="948" type="curve"/>
+      <point x="620" y="1004"/>
+      <point x="664" y="1192"/>
+      <point x="864" y="1192" type="curve"/>
+      <point x="1068" y="1192"/>
+      <point x="1140" y="1000"/>
+      <point x="1140" y="764" type="curve"/>
+      <point x="1140" y="520"/>
+      <point x="1068" y="340"/>
+      <point x="860" y="340" type="curve" smooth="yes"/>
+      <point x="688" y="340"/>
+      <point x="632" y="464"/>
+      <point x="612" y="548" type="curve"/>
+      <point x="600" y="612"/>
+      <point x="588" y="720"/>
+      <point x="588" y="784" type="curve"/>
+      <point x="400" y="784" type="line"/>
+      <point x="420" y="476" type="line"/>
+      <point x="460" y="200"/>
+      <point x="596" y="-28"/>
+      <point x="916" y="-28" type="curve"/>
+      <point x="1300" y="-28"/>
+      <point x="1576" y="304"/>
+      <point x="1576" y="764" type="curve"/>
+      <point x="1576" y="1220"/>
+      <point x="1300" y="1556"/>
+      <point x="920" y="1556" type="curve" smooth="yes"/>
+      <point x="596" y="1556"/>
+      <point x="468" y="1316"/>
     </contour>
     <contour>
-      <point x="1136" y="784" type="curve" smooth="yes"/>
-      <point x="1136" y="524"/>
-      <point x="1072" y="340"/>
-      <point x="888" y="340" type="curve" smooth="yes"/>
-      <point x="724" y="340"/>
-      <point x="612" y="484"/>
-      <point x="612" y="696" type="curve"/>
-      <point x="612" y="716"/>
-      <point x="612" y="784"/>
-      <point x="612" y="812" type="curve"/>
-      <point x="612" y="1064"/>
-      <point x="720" y="1192"/>
-      <point x="884" y="1192" type="curve" smooth="yes"/>
-      <point x="1072" y="1192"/>
-      <point x="1136" y="1020"/>
+      <point x="612" y="96" type="line"/>
+      <point x="612" y="312" type="line"/>
+      <point x="468" y="312" type="line"/>
+      <point x="468" y="96" type="line"/>
+    </contour>
+    <contour>
+      <point x="604" y="1168" type="line"/>
+      <point x="604" y="1416" type="line"/>
+      <point x="456" y="1416" type="line"/>
+      <point x="456" y="1168" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/thorn.glif b/src/Inter-UI-Black.ufo/glyphs/thorn.glif
index fa044ad34..d6dea9667 100644
--- a/src/Inter-UI-Black.ufo/glyphs/thorn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/thorn.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="thorn" format="1">
-  <advance width="1572"/>
+  <advance width="1620"/>
   <unicode hex="00FE"/>
   <outline>
     <contour>
@@ -12,7 +12,7 @@
       <point x="588" y="1272" type="line"/>
       <point x="588" y="2048" type="line"/>
     </contour>
-    <component base="rightloop.cn" xOffset="-84"/>
+    <component base="rightloop.cn" xOffset="-36"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/lib.plist b/src/Inter-UI-Black.ufo/lib.plist
index be868994e..dd5b8f4e9 100644
--- a/src/Inter-UI-Black.ufo/lib.plist
+++ b/src/Inter-UI-Black.ufo/lib.plist
@@ -308,6 +308,8 @@
 				<string>a</string>
 				<string>a_uni02DE</string>
 				<string>ae</string>
+				<string>leftloop.cn</string>
+				<string>rightloop.cn</string>
 				<string>b</string>
 				<string>c</string>
 				<string>d</string>
@@ -1647,8 +1649,6 @@
 				<string>ezhcaron</string>
 				<string>Ezhcaron</string>
 				<string>tildeacutecomb</string>
-				<string>leftloop.cn</string>
-				<string>rightloop.cn</string>
 				<string>diamondwhite_x</string>
 				<string>diamondwhite</string>
 				<string>diamondblack_x</string>
@@ -1774,6 +1774,8 @@
 		<string>a</string>
 		<string>a_uni02DE</string>
 		<string>ae</string>
+		<string>leftloop.cn</string>
+		<string>rightloop.cn</string>
 		<string>b</string>
 		<string>c</string>
 		<string>d</string>
@@ -3113,8 +3115,6 @@
 		<string>ezhcaron</string>
 		<string>Ezhcaron</string>
 		<string>tildeacutecomb</string>
-		<string>leftloop.cn</string>
-		<string>rightloop.cn</string>
 		<string>diamondwhite_x</string>
 		<string>diamondwhite</string>
 		<string>diamondblack_x</string>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/S_.glif b/src/Inter-UI-Regular.ufo/glyphs/S_.glif
index 71abd9f24..14d5df06d 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/S_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/S_.glif
@@ -3,21 +3,6 @@
   <advance width="1796"/>
   <unicode hex="0053"/>
   <outline>
-    <contour>
-      <point x="896" y="2304" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="896" y="-36" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1656.0" y="2200.0" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1656.0" y="-560.0" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1656.0" y="2200.0" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1360" y="1520" type="curve"/>
       <point x="1608" y="1520" type="line"/>
@@ -60,6 +45,21 @@
       <point x="1156" y="1848"/>
       <point x="1324" y="1724"/>
     </contour>
+    <contour>
+      <point x="896" y="2304" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="896" y="-36" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1656.0" y="2200.0" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1656.0" y="-560.0" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1656.0" y="2200.0" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/alpha.glif b/src/Inter-UI-Regular.ufo/glyphs/alpha.glif
index de8c7d7f6..6df7f2ca8 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/alpha.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/alpha.glif
@@ -20,8 +20,8 @@
       <point x="132" y="716" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="376" y="716" type="line"/>
-      <point x="376" y="1040"/>
+      <point x="364" y="716" type="line"/>
+      <point x="364" y="1040"/>
       <point x="512" y="1296"/>
       <point x="784" y="1296" type="curve" smooth="yes"/>
       <point x="1076" y="1296"/>
@@ -32,8 +32,8 @@
       <point x="1072" y="192"/>
       <point x="780" y="192" type="curve" smooth="yes"/>
       <point x="520" y="192"/>
-      <point x="376" y="404"/>
-      <point x="376" y="688" type="curve" smooth="yes"/>
+      <point x="364" y="404"/>
+      <point x="364" y="688" type="curve" smooth="yes"/>
     </contour>
     <contour>
       <point x="1156" y="1488" type="line"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/b.glif b/src/Inter-UI-Regular.ufo/glyphs/b.glif
index a62f2eb89..f606e1715 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/b.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/b.glif
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="b" format="1">
-  <advance width="1604"/>
+  <advance width="1684"/>
   <unicode hex="0062"/>
   <outline>
     <contour>
       <point x="200" y="2048" type="line"/>
       <point x="200" y="0" type="line"/>
-      <point x="404" y="0" type="line"/>
+      <point x="416" y="0" type="line"/>
       <point x="436" y="288" type="line"/>
       <point x="344" y="784" type="line"/>
       <point x="436" y="1172" type="line"/>
       <point x="436" y="2048" type="line"/>
     </contour>
-    <component base="rightloop.cn" xOffset="-40"/>
+    <component base="rightloop.cn" xOffset="44"/>
     <contour>
-      <point x="872" y="2304" type="move" name="top"/>
+      <point x="884" y="2304" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="868" y="-28" type="move" name="bottom"/>
+      <point x="880" y="-28" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1672" y="2200" type="move" name="top_dd"/>
+      <point x="1684" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1672" y="-560" type="move" name="bottom_dd"/>
+      <point x="1684" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1672" y="2216" type="move" name="top0315"/>
+      <point x="1684" y="2216" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/d.glif b/src/Inter-UI-Regular.ufo/glyphs/d.glif
index d639d6f17..79c222b31 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/d.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/d.glif
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="d" format="1">
-  <advance width="1644"/>
+  <advance width="1684"/>
   <unicode hex="0064"/>
   <outline>
     <contour>
-      <point x="1208" y="344" type="line"/>
-      <point x="1228" y="0" type="line"/>
-      <point x="1444" y="0" type="line"/>
-      <point x="1444" y="2048" type="line"/>
-      <point x="1208" y="2048" type="line"/>
-      <point x="1208" y="1156" type="line"/>
-      <point x="1280" y="748" type="line"/>
+      <point x="1248" y="344" type="line"/>
+      <point x="1268" y="0" type="line"/>
+      <point x="1484" y="0" type="line"/>
+      <point x="1484" y="2048" type="line"/>
+      <point x="1248" y="2048" type="line"/>
+      <point x="1248" y="1156" type="line"/>
+      <point x="1320" y="748" type="line"/>
     </contour>
     <component base="leftloop.cn"/>
     <contour>
-      <point x="1536" y="2112" type="move" name="caron"/>
+      <point x="1544" y="2112" type="move" name="caron"/>
     </contour>
     <contour>
-      <point x="1212" y="1796" type="move" name="cross"/>
+      <point x="1220" y="1796" type="move" name="cross"/>
     </contour>
     <contour>
-      <point x="724" y="-28" type="move" name="bottom"/>
+      <point x="732" y="-28" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="744" y="2304" type="move" name="top"/>
+      <point x="752" y="2304" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1596" y="2200" type="move" name="top_dd"/>
+      <point x="1604" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1596" y="-560" type="move" name="bottom_dd"/>
+      <point x="1604" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1596" y="2216" type="move" name="top0315"/>
+      <point x="1604" y="2216" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dcroat.glif b/src/Inter-UI-Regular.ufo/glyphs/dcroat.glif
index c94a61c49..6b0283f7b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dcroat.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dcroat.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="dcroat" format="1">
-  <advance width="1664"/>
+  <advance width="1684"/>
   <unicode hex="0111"/>
   <outline>
     <contour>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dollar.glif b/src/Inter-UI-Regular.ufo/glyphs/dollar.glif
index a8cb7d7ca..b93948386 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dollar.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dollar.glif
@@ -1,62 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="dollar" format="1">
-  <advance width="1632"/>
+  <advance width="1796"/>
   <unicode hex="0024"/>
   <outline>
     <contour>
-      <point x="1456" y="528" type="curve" smooth="yes"/>
-      <point x="1456" y="816"/>
-      <point x="1308" y="988"/>
-      <point x="904" y="1112" type="curve"/>
-      <point x="916" y="1840" type="line"/>
-      <point x="1140" y="1804"/>
-      <point x="1244" y="1660"/>
-      <point x="1244" y="1488" type="curve"/>
-      <point x="1480" y="1488" type="line"/>
-      <point x="1480" y="1748"/>
-      <point x="1284" y="1996"/>
-      <point x="916" y="2040" type="curve"/>
-      <point x="920" y="2308" type="line"/>
-      <point x="736" y="2308" type="line"/>
-      <point x="732" y="2044" type="line"/>
-      <point x="372" y="2020"/>
-      <point x="176" y="1796"/>
-      <point x="176" y="1512" type="curve" smooth="yes"/>
-      <point x="176" y="1224"/>
-      <point x="368" y="1064"/>
-      <point x="720" y="956" type="curve"/>
-      <point x="712" y="188" type="line"/>
-      <point x="484" y="212"/>
-      <point x="300" y="328"/>
-      <point x="300" y="496" type="curve"/>
-      <point x="68" y="496" type="line"/>
-      <point x="68" y="188"/>
-      <point x="384" y="24"/>
-      <point x="712" y="-4" type="curve"/>
-      <point x="708" y="-260" type="line"/>
-      <point x="888" y="-260" type="line"/>
-      <point x="892" y="-8" type="line"/>
-      <point x="1256" y="20"/>
-      <point x="1452" y="232"/>
-    </contour>
-    <contour>
-      <point x="388" y="1516" type="curve" smooth="yes"/>
-      <point x="388" y="1692"/>
-      <point x="492" y="1824"/>
-      <point x="732" y="1848" type="curve"/>
-      <point x="724" y="1172" type="line"/>
-      <point x="484" y="1256"/>
-      <point x="388" y="1372"/>
-    </contour>
-    <contour>
-      <point x="1244" y="524" type="curve" smooth="yes"/>
-      <point x="1244" y="348"/>
-      <point x="1124" y="212"/>
-      <point x="892" y="188" type="curve"/>
-      <point x="904" y="896" type="line"/>
-      <point x="1176" y="796"/>
-      <point x="1244" y="692"/>
+      <point x="808" y="-260" type="line"/>
+      <point x="992" y="-260" type="line"/>
+      <point x="1024" y="2304" type="line"/>
+      <point x="840" y="2304" type="line"/>
     </contour>
+    <component base="S"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/g.glif b/src/Inter-UI-Regular.ufo/glyphs/g.glif
index 6cc5a5aca..b7d430ff0 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/g.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/g.glif
@@ -1,78 +1,92 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="g" format="1">
-  <advance width="1628"/>
+  <advance width="1684"/>
   <unicode hex="0067"/>
   <outline>
     <contour>
-      <point x="1192" y="1528" type="line"/>
-      <point x="1192" y="1200" type="line"/>
-      <point x="1276" y="768" type="line"/>
-      <point x="1120" y="256" type="line"/>
-      <point x="1192" y="216" type="line"/>
-      <point x="1192" y="20" type="line"/>
-      <point x="1188" y="-248"/>
-      <point x="1012" y="-364"/>
-      <point x="756" y="-364" type="curve" smooth="yes"/>
-      <point x="500" y="-364"/>
-      <point x="396" y="-224"/>
-      <point x="340" y="-160" type="curve"/>
-      <point x="164" y="-300" type="line"/>
-      <point x="260" y="-436"/>
-      <point x="436" y="-576"/>
-      <point x="756" y="-576" type="curve" smooth="yes"/>
-      <point x="1128" y="-576"/>
-      <point x="1428" y="-376"/>
-      <point x="1428" y="-32" type="curve" smooth="yes"/>
-      <point x="1428" y="1528" type="line"/>
+      <point x="1248" y="1528" type="line"/>
+      <point x="1248" y="1200" type="line"/>
+      <point x="1332" y="768" type="line"/>
+      <point x="1176" y="256" type="line"/>
+      <point x="1248" y="216" type="line"/>
+      <point x="1248" y="20" type="line"/>
+      <point x="1244" y="-248"/>
+      <point x="1068" y="-364"/>
+      <point x="812" y="-364" type="curve" smooth="yes"/>
+      <point x="556" y="-364"/>
+      <point x="452" y="-224"/>
+      <point x="396" y="-160" type="curve"/>
+      <point x="220" y="-300" type="line"/>
+      <point x="316" y="-436"/>
+      <point x="492" y="-576"/>
+      <point x="812" y="-576" type="curve" smooth="yes"/>
+      <point x="1184" y="-576"/>
+      <point x="1484" y="-376"/>
+      <point x="1484" y="-32" type="curve" smooth="yes"/>
+      <point x="1484" y="1528" type="line"/>
     </contour>
     <contour>
-      <point x="132" y="752" type="line"/>
-      <point x="132" y="320"/>
-      <point x="380" y="24"/>
-      <point x="728" y="24" type="curve" smooth="yes"/>
-      <point x="1144" y="24"/>
-      <point x="1292" y="316"/>
-      <point x="1344" y="700" type="curve"/>
-      <point x="1344" y="812" type="line"/>
-      <point x="1292" y="1196"/>
-      <point x="1144" y="1556"/>
-      <point x="732" y="1556" type="curve" smooth="yes"/>
-      <point x="376" y="1556"/>
-      <point x="132" y="1232"/>
-      <point x="132" y="780" type="curve" smooth="yes"/>
+      <point x="1328" y="1088" type="line"/>
+      <point x="1296" y="1284"/>
+      <point x="1184" y="1556"/>
+      <point x="808" y="1556" type="curve" smooth="yes"/>
+      <point x="392" y="1556"/>
+      <point x="128" y="1236"/>
+      <point x="128" y="788" type="curve" smooth="yes"/>
+      <point x="128" y="328"/>
+      <point x="396" y="8"/>
+      <point x="808" y="8" type="curve" smooth="yes"/>
+      <point x="1168" y="8"/>
+      <point x="1296" y="276"/>
+      <point x="1328" y="476" type="curve"/>
+      <point x="1372" y="796" type="line"/>
+      <point x="1264" y="796" type="line"/>
+      <point x="1264" y="768"/>
+      <point x="1264" y="640"/>
+      <point x="1236" y="540" type="curve"/>
+      <point x="1188" y="344"/>
+      <point x="1000" y="216"/>
+      <point x="808" y="216" type="curve" smooth="yes"/>
+      <point x="552" y="216"/>
+      <point x="364" y="448"/>
+      <point x="364" y="788" type="curve" smooth="yes"/>
+      <point x="364" y="1116"/>
+      <point x="544" y="1348"/>
+      <point x="812" y="1348" type="curve" smooth="yes"/>
+      <point x="1012" y="1348"/>
+      <point x="1176" y="1220"/>
+      <point x="1232" y="1040" type="curve"/>
+      <point x="1264" y="928"/>
+      <point x="1264" y="808"/>
+      <point x="1264" y="780" type="curve"/>
+      <point x="1372" y="780" type="line"/>
     </contour>
     <contour>
-      <point x="376" y="780" type="line"/>
-      <point x="376" y="1068"/>
-      <point x="512" y="1328"/>
-      <point x="804" y="1328" type="curve" smooth="yes"/>
-      <point x="1044" y="1328"/>
-      <point x="1160" y="1072"/>
-      <point x="1180" y="924" type="curve"/>
-      <point x="1200" y="828"/>
-      <point x="1200" y="676"/>
-      <point x="1180" y="588" type="curve"/>
-      <point x="1152" y="440"/>
-      <point x="1024" y="236"/>
-      <point x="788" y="236" type="curve" smooth="yes"/>
-      <point x="524" y="236"/>
-      <point x="376" y="464"/>
-      <point x="376" y="752" type="curve" smooth="yes"/>
+      <point x="1212" y="204" type="line"/>
+      <point x="1296" y="204" type="line"/>
+      <point x="1296" y="396" type="line"/>
+      <point x="1212" y="396" type="line"/>
     </contour>
     <contour>
-      <point x="812" y="1792" type="move" name="top"/>
+      <point x="1212" y="1164" type="line"/>
+      <point x="1296" y="1164" type="line"/>
+      <point x="1296" y="1356" type="line"/>
+      <point x="1212" y="1356" type="line"/>
     </contour>
     <contour>
-      <point x="748" y="-616" type="move" name="bottom"/>
+      <point x="872" y="1792" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1568" y="2200" type="move" name="top_dd"/>
+      <point x="808" y="-616" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1568" y="-560" type="move" name="bottom_dd"/>
+      <point x="1628" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1568" y="1776" type="move" name="top0315"/>
+      <point x="1628" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1628" y="1776" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/leftloop.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/leftloop.cn.glif
index a3be21def..80653dda8 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/leftloop.cn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/leftloop.cn.glif
@@ -1,42 +1,96 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="leftloop.cn" format="1">
-  <advance width="1376"/>
+  <advance width="1548"/>
   <outline>
     <contour>
-      <point x="132" y="772" type="curve" smooth="yes"/>
-      <point x="132" y="312"/>
-      <point x="380" y="-28"/>
-      <point x="728" y="-28" type="curve" smooth="yes"/>
-      <point x="1144" y="-28"/>
-      <point x="1292" y="316"/>
-      <point x="1344" y="700" type="curve"/>
-      <point x="1344" y="812" type="line"/>
-      <point x="1292" y="1196"/>
-      <point x="1144" y="1556"/>
-      <point x="732" y="1556" type="curve" smooth="yes"/>
-      <point x="376" y="1556"/>
-      <point x="132" y="1228"/>
+      <point x="1328" y="1076" type="line"/>
+      <point x="1296" y="1276"/>
+      <point x="1184" y="1556"/>
+      <point x="808" y="1556" type="curve" smooth="yes"/>
+      <point x="392" y="1556"/>
+      <point x="128" y="1228"/>
+      <point x="128" y="768" type="curve" smooth="yes"/>
+      <point x="128" y="296"/>
+      <point x="396" y="-32"/>
+      <point x="808" y="-32" type="curve" smooth="yes"/>
+      <point x="1168" y="-32"/>
+      <point x="1296" y="240"/>
+      <point x="1328" y="448" type="curve"/>
+      <point x="1372" y="776" type="line"/>
+      <point x="1264" y="776" type="line"/>
+      <point x="1264" y="748"/>
+      <point x="1264" y="616"/>
+      <point x="1236" y="512" type="curve"/>
+      <point x="1188" y="312"/>
+      <point x="1000" y="180"/>
+      <point x="808" y="180" type="curve" smooth="yes"/>
+      <point x="552" y="180"/>
+      <point x="364" y="416"/>
+      <point x="364" y="768" type="curve" smooth="yes"/>
+      <point x="364" y="1104"/>
+      <point x="544" y="1344"/>
+      <point x="812" y="1344" type="curve" smooth="yes"/>
+      <point x="1012" y="1344"/>
+      <point x="1176" y="1212"/>
+      <point x="1232" y="1024" type="curve"/>
+      <point x="1264" y="912"/>
+      <point x="1264" y="788"/>
+      <point x="1264" y="760" type="curve"/>
+      <point x="1372" y="760" type="line"/>
     </contour>
     <contour>
-      <point x="376" y="772" type="curve" smooth="yes"/>
-      <point x="376" y="1064"/>
-      <point x="512" y="1328"/>
-      <point x="804" y="1328" type="curve" smooth="yes"/>
-      <point x="1044" y="1328"/>
-      <point x="1160" y="1072"/>
-      <point x="1180" y="924" type="curve"/>
-      <point x="1200" y="828"/>
-      <point x="1200" y="676"/>
-      <point x="1180" y="588" type="curve"/>
-      <point x="1152" y="440"/>
-      <point x="1024" y="184"/>
-      <point x="788" y="184" type="curve" smooth="yes"/>
-      <point x="524" y="184"/>
-      <point x="376" y="456"/>
+      <point x="1212" y="188" type="line"/>
+      <point x="1296" y="188" type="line"/>
+      <point x="1296" y="380" type="line"/>
+      <point x="1212" y="380" type="line"/>
+    </contour>
+    <contour>
+      <point x="1212" y="1152" type="line"/>
+      <point x="1296" y="1152" type="line"/>
+      <point x="1296" y="1344" type="line"/>
+      <point x="1212" y="1344" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.layerData</key>
+      <dict>
+        <key>reference</key>
+        <dict>
+          <key>anchors</key>
+          <array>
+          </array>
+          <key>components</key>
+          <array>
+            <dict>
+              <key>baseGlyph</key>
+              <string>c</string>
+              <key>transformation</key>
+              <array>
+                <integer>1</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+                <integer>1</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+              </array>
+            </dict>
+          </array>
+          <key>contours</key>
+          <array>
+          </array>
+          <key>lib</key>
+          <dict>
+          </dict>
+          <key>name</key>
+          <string>leftloop.cn</string>
+          <key>unicodes</key>
+          <array>
+          </array>
+          <key>width</key>
+          <integer>1548</integer>
+        </dict>
+      </dict>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.77</real>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/p.glif b/src/Inter-UI-Regular.ufo/glyphs/p.glif
index 92b7c5064..b949b7e10 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/p.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/p.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="p" format="1">
-  <advance width="1604"/>
+  <advance width="1684"/>
   <unicode hex="0070"/>
   <outline>
     <contour>
@@ -10,10 +10,10 @@
       <point x="336" y="728" type="line"/>
       <point x="440" y="1148" type="line"/>
       <point x="440" y="1244" type="line"/>
-      <point x="412" y="1536" type="line"/>
+      <point x="416" y="1536" type="line"/>
       <point x="200" y="1536" type="line"/>
     </contour>
-    <component base="rightloop.cn" xOffset="-40"/>
+    <component base="rightloop.cn" xOffset="44"/>
     <contour>
       <point x="856" y="1792" type="move" name="top"/>
     </contour>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/q.glif b/src/Inter-UI-Regular.ufo/glyphs/q.glif
index 6c8b2a444..46ee948d2 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/q.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/q.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="q" format="1">
-  <advance width="1644"/>
+  <advance width="1684"/>
   <unicode hex="0071"/>
   <outline>
     <contour>
-      <point x="1444" y="1536" type="line"/>
-      <point x="1228" y="1536" type="line"/>
-      <point x="1204" y="1244" type="line"/>
-      <point x="1204" y="1148" type="line"/>
-      <point x="1304" y="728" type="line"/>
-      <point x="1208" y="392" type="line"/>
-      <point x="1208" y="-576" type="line"/>
-      <point x="1444" y="-576" type="line"/>
+      <point x="1484" y="1536" type="line"/>
+      <point x="1268" y="1536" type="line"/>
+      <point x="1244" y="1244" type="line"/>
+      <point x="1244" y="1148" type="line"/>
+      <point x="1344" y="728" type="line"/>
+      <point x="1248" y="392" type="line"/>
+      <point x="1248" y="-576" type="line"/>
+      <point x="1484" y="-576" type="line"/>
     </contour>
     <component base="leftloop.cn"/>
     <contour>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rho.glif b/src/Inter-UI-Regular.ufo/glyphs/rho.glif
index 2e9fdbf56..e6bfb8d8b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rho.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rho.glif
@@ -6,34 +6,32 @@
     <contour>
       <point x="180" y="-572" type="line"/>
       <point x="416" y="-572" type="line"/>
-      <point x="416" y="788" type="line" smooth="yes"/>
-      <point x="416" y="1008"/>
-      <point x="556" y="1296"/>
+      <point x="408" y="792" type="line" smooth="yes"/>
+      <point x="408" y="1012"/>
+      <point x="520" y="1296"/>
       <point x="800" y="1296" type="curve" smooth="yes"/>
-      <point x="1072" y="1296"/>
+      <point x="1076" y="1296"/>
       <point x="1200" y="1028"/>
       <point x="1200" y="716" type="curve" smooth="yes"/>
       <point x="1200" y="688" type="line" smooth="yes"/>
       <point x="1200" y="416"/>
-      <point x="1060" y="184"/>
-      <point x="792" y="184" type="curve" smooth="yes"/>
-      <point x="548" y="184"/>
-      <point x="416" y="476"/>
-      <point x="416" y="668" type="curve"/>
-      <point x="416" y="668"/>
-      <point x="256" y="540"/>
-      <point x="252" y="544" type="curve"/>
+      <point x="1076" y="184"/>
+      <point x="808" y="184" type="curve" smooth="yes"/>
+      <point x="504" y="184"/>
+      <point x="408" y="484"/>
+      <point x="408" y="676" type="curve"/>
+      <point x="252" y="544" type="line"/>
       <point x="360" y="232"/>
-      <point x="488" y="-28"/>
-      <point x="872" y="-28" type="curve" smooth="yes"/>
-      <point x="1244" y="-28"/>
+      <point x="464" y="-28"/>
+      <point x="820" y="-28" type="curve" smooth="yes"/>
+      <point x="1204" y="-28"/>
       <point x="1444" y="272"/>
       <point x="1444" y="688" type="curve" smooth="yes"/>
       <point x="1444" y="716" type="line" smooth="yes"/>
       <point x="1444" y="1184"/>
-      <point x="1232" y="1516"/>
+      <point x="1204" y="1516"/>
       <point x="800" y="1516" type="curve" smooth="yes"/>
-      <point x="464" y="1516"/>
+      <point x="452" y="1516"/>
       <point x="180" y="1264"/>
       <point x="180" y="788" type="curve" smooth="yes"/>
     </contour>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rightloop.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/rightloop.cn.glif
index 751e21adf..d47bb7c6e 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rightloop.cn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rightloop.cn.glif
@@ -3,36 +3,52 @@
   <advance width="1632"/>
   <outline>
     <contour>
-      <point x="1512" y="772" type="curve" smooth="yes"/>
-      <point x="1512" y="1224"/>
-      <point x="1268" y="1556"/>
-      <point x="912" y="1556" type="curve" smooth="yes"/>
-      <point x="500" y="1556"/>
-      <point x="352" y="1196"/>
-      <point x="300" y="812" type="curve"/>
-      <point x="300" y="700" type="line"/>
-      <point x="352" y="316"/>
-      <point x="500" y="-28"/>
-      <point x="916" y="-28" type="curve" smooth="yes"/>
-      <point x="1264" y="-28"/>
-      <point x="1512" y="312"/>
+      <point x="312" y="1076" type="curve"/>
+      <point x="268" y="760" type="line"/>
+      <point x="376" y="760" type="line"/>
+      <point x="376" y="788"/>
+      <point x="376" y="912"/>
+      <point x="408" y="1024" type="curve"/>
+      <point x="464" y="1212"/>
+      <point x="628" y="1344"/>
+      <point x="828" y="1344" type="curve" smooth="yes"/>
+      <point x="1096" y="1344"/>
+      <point x="1276" y="1104"/>
+      <point x="1276" y="768" type="curve" smooth="yes"/>
+      <point x="1276" y="416"/>
+      <point x="1088" y="180"/>
+      <point x="832" y="180" type="curve" smooth="yes"/>
+      <point x="640" y="180"/>
+      <point x="452" y="312"/>
+      <point x="404" y="512" type="curve"/>
+      <point x="376" y="616"/>
+      <point x="376" y="748"/>
+      <point x="376" y="776" type="curve"/>
+      <point x="268" y="776" type="line"/>
+      <point x="312" y="448" type="line"/>
+      <point x="344" y="240"/>
+      <point x="472" y="-32"/>
+      <point x="832" y="-32" type="curve" smooth="yes"/>
+      <point x="1244" y="-32"/>
+      <point x="1512" y="296"/>
+      <point x="1512" y="768" type="curve" smooth="yes"/>
+      <point x="1512" y="1228"/>
+      <point x="1248" y="1556"/>
+      <point x="832" y="1556" type="curve" smooth="yes"/>
+      <point x="456" y="1556"/>
+      <point x="344" y="1276"/>
     </contour>
     <contour>
-      <point x="1268" y="772" type="curve" smooth="yes"/>
-      <point x="1268" y="456"/>
-      <point x="1120" y="184"/>
-      <point x="856" y="184" type="curve" smooth="yes"/>
-      <point x="620" y="184"/>
-      <point x="492" y="440"/>
-      <point x="464" y="588" type="curve"/>
-      <point x="444" y="676"/>
-      <point x="444" y="828"/>
-      <point x="464" y="924" type="curve"/>
-      <point x="484" y="1072"/>
-      <point x="600" y="1328"/>
-      <point x="840" y="1328" type="curve" smooth="yes"/>
-      <point x="1132" y="1328"/>
-      <point x="1268" y="1060"/>
+      <point x="428" y="188" type="line"/>
+      <point x="428" y="380" type="line"/>
+      <point x="344" y="380" type="line"/>
+      <point x="344" y="188" type="line"/>
+    </contour>
+    <contour>
+      <point x="428" y="1152" type="line"/>
+      <point x="428" y="1344" type="line"/>
+      <point x="344" y="1344" type="line"/>
+      <point x="344" y="1152" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/thorn.glif b/src/Inter-UI-Regular.ufo/glyphs/thorn.glif
index ef9e81593..921edcc55 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/thorn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/thorn.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="thorn" format="1">
-  <advance width="1604"/>
+  <advance width="1684"/>
   <unicode hex="00FE"/>
   <outline>
     <contour>
@@ -12,7 +12,7 @@
       <point x="436" y="1172" type="line"/>
       <point x="436" y="2048" type="line"/>
     </contour>
-    <component base="rightloop.cn" xOffset="-40"/>
+    <component base="rightloop.cn" xOffset="44"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni048F_.glif b/src/Inter-UI-Regular.ufo/glyphs/uni048F_.glif
index 5f7570dff..de4eca9d7 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni048F_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni048F_.glif
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni048F" format="1">
-  <advance width="1760"/>
+  <advance width="1684"/>
   <unicode hex="048F"/>
   <outline>
     <contour>
-      <point x="980" y="548" type="line"/>
-      <point x="820" y="396" type="line"/>
-      <point x="1284" y="-120" type="line"/>
-      <point x="1444" y="32" type="line"/>
+      <point x="1060" y="536" type="line"/>
+      <point x="900" y="384" type="line"/>
+      <point x="1364" y="-132" type="line"/>
+      <point x="1524" y="20" type="line"/>
     </contour>
-    <component base="p" xOffset="-28"/>
+    <component base="p"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/groups.plist b/src/Inter-UI-Regular.ufo/groups.plist
index f63ea471e..de63d1d0f 100644
--- a/src/Inter-UI-Regular.ufo/groups.plist
+++ b/src/Inter-UI-Regular.ufo/groups.plist
@@ -205,6 +205,7 @@
 		<string>Scedilla</string>
 		<string>Scaron</string>
 		<string>Germandbls</string>
+		<string>dollar</string>
 	</array>
 	<key>@KERN_LEFT_T</key>
 	<array>
@@ -803,6 +804,7 @@
 		<string>Scircumflex</string>
 		<string>Scedilla</string>
 		<string>Scaron</string>
+		<string>dollar</string>
 	</array>
 	<key>@KERN_RIGHT_T</key>
 	<array>
diff --git a/src/Inter-UI-Regular.ufo/lib.plist b/src/Inter-UI-Regular.ufo/lib.plist
index dc6c72f2c..dfe900b04 100644
--- a/src/Inter-UI-Regular.ufo/lib.plist
+++ b/src/Inter-UI-Regular.ufo/lib.plist
@@ -412,6 +412,8 @@
 				<string>a</string>
 				<string>a_uni02DE</string>
 				<string>ae</string>
+				<string>leftloop.cn</string>
+				<string>rightloop.cn</string>
 				<string>b</string>
 				<string>c</string>
 				<string>d</string>
@@ -437,6 +439,7 @@
 				<string>ohorn</string>
 				<string>oe</string>
 				<string>p</string>
+				<string>uni048F</string>
 				<string>q</string>
 				<string>r</string>
 				<string>s</string>
@@ -500,7 +503,6 @@
 				<string>uni04CA</string>
 				<string>fitacyrillic</string>
 				<string>pecyrillic</string>
-				<string>uni048F</string>
 				<string>tecyrillic</string>
 				<string>efcyrillic</string>
 				<string>uni04FD</string>
@@ -1742,8 +1744,6 @@
 				<string>ezhcaron</string>
 				<string>Ezhcaron</string>
 				<string>tildeacutecomb</string>
-				<string>leftloop.cn</string>
-				<string>rightloop.cn</string>
 				<string>placeofinterestsign.specz.medium</string>
 				<string>uniE001</string>
 				<string>circleblack</string>
@@ -1874,6 +1874,8 @@
 		<string>a</string>
 		<string>a_uni02DE</string>
 		<string>ae</string>
+		<string>leftloop.cn</string>
+		<string>rightloop.cn</string>
 		<string>b</string>
 		<string>c</string>
 		<string>d</string>
@@ -1899,6 +1901,7 @@
 		<string>ohorn</string>
 		<string>oe</string>
 		<string>p</string>
+		<string>uni048F</string>
 		<string>q</string>
 		<string>r</string>
 		<string>s</string>
@@ -1962,7 +1965,6 @@
 		<string>uni04CA</string>
 		<string>fitacyrillic</string>
 		<string>pecyrillic</string>
-		<string>uni048F</string>
 		<string>tecyrillic</string>
 		<string>efcyrillic</string>
 		<string>uni04FD</string>
@@ -3204,8 +3206,6 @@
 		<string>ezhcaron</string>
 		<string>Ezhcaron</string>
 		<string>tildeacutecomb</string>
-		<string>leftloop.cn</string>
-		<string>rightloop.cn</string>
 		<string>placeofinterestsign.specz.medium</string>
 		<string>uniE001</string>
 		<string>circleblack</string>
diff --git a/src/glyphorder.txt b/src/glyphorder.txt
index 5e36cbf3e..9f1ea9f2f 100644
--- a/src/glyphorder.txt
+++ b/src/glyphorder.txt
@@ -110,6 +110,8 @@ afii10051
 a
 a_uni02DE
 ae
+leftloop.cn
+rightloop.cn
 b
 c
 d
@@ -140,6 +142,7 @@ r
 s
 germandbls
 t
+uni048F
 u
 uhorn
 v
@@ -198,7 +201,6 @@ enhookcyrillic
 uni04CA
 fitacyrillic
 pecyrillic
-uni048F
 tecyrillic
 efcyrillic
 uni04FD
@@ -1446,8 +1448,6 @@ hooksubpalatnosp
 ezhcaron
 Ezhcaron
 tildeacutecomb
-leftloop.cn
-rightloop.cn
 placeofinterestsign.specz.medium
 circleblack
 circlewhite