From a0b30f7bacef2e931845a65e9311417b3768f23e Mon Sep 17 00:00:00 2001
From: Rasmus Andersson <rasmus@notion.se>
Date: Fri, 25 Aug 2017 02:36:02 -0700
Subject: [PATCH] Adds contextual alternates

---
 docs/lab/glyphinfo.json                       |  9 +-
 docs/lab/index.html                           | 17 +++-
 src/Interface-Bold.ufo/glyphs/AE__.glif       | 36 +++----
 src/Interface-Bold.ufo/glyphs/A_.glif         | 12 +--
 src/Interface-Bold.ufo/glyphs/B_.glif         | 96 +++++++++----------
 src/Interface-Bold.ufo/glyphs/C_.glif         | 46 ++++-----
 src/Interface-Bold.ufo/glyphs/D_.glif         | 52 +++++-----
 src/Interface-Bold.ufo/glyphs/E_.glif         | 20 ++--
 .../glyphs/Endescendercyrillic_.glif          |  4 +-
 src/Interface-Bold.ufo/glyphs/Esh_.glif       |  2 +-
 src/Interface-Bold.ufo/glyphs/Euro_.glif      | 62 ++++++------
 src/Interface-Bold.ufo/glyphs/F_.glif         | 20 ++--
 src/Interface-Bold.ufo/glyphs/G_.glif         | 52 +++++-----
 src/Interface-Bold.ufo/glyphs/Gbar_.glif      | 14 +--
 .../glyphs/Germandbls_.glif                   | 72 +++++++-------
 src/Interface-Bold.ufo/glyphs/H_.glif         | 36 +++----
 .../glyphs/Hadescendercyrillic_.glif          |  4 +-
 src/Interface-Bold.ufo/glyphs/Hbar_.glif      | 14 +--
 src/Interface-Bold.ufo/glyphs/I_.glif         | 12 +--
 src/Interface-Bold.ufo/glyphs/Ibar_.glif      |  4 +-
 .../glyphs/Idieresisacute_.glif               |  4 +-
 .../glyphs/Itildebelow_.glif                  |  4 +-
 src/Interface-Bold.ufo/glyphs/J_.glif         | 34 +++----
 src/Interface-Bold.ufo/glyphs/K_.glif         | 38 ++++----
 src/Interface-Bold.ufo/glyphs/L_.glif         | 24 ++---
 src/Interface-Bold.ufo/glyphs/Lambda_.glif    |  2 +-
 src/Interface-Bold.ufo/glyphs/Lslash_.glif    | 14 +--
 src/Interface-Bold.ufo/glyphs/M_.glif         | 36 +++----
 src/Interface-Bold.ufo/glyphs/N_.glif         | 28 +++---
 src/Interface-Bold.ufo/glyphs/OE__.glif       | 48 ++++------
 src/Interface-Bold.ufo/glyphs/O_.glif         | 56 +++++------
 src/Interface-Bold.ufo/glyphs/Ohorn_.glif     | 18 ++--
 src/Interface-Bold.ufo/glyphs/Oslash_.glif    | 14 +--
 src/Interface-Bold.ufo/glyphs/P_.glif         | 44 ++++-----
 src/Interface-Bold.ufo/glyphs/Pi_.glif        | 14 +--
 src/Interface-Bold.ufo/glyphs/Q_.glif         | 14 +--
 src/Interface-Bold.ufo/glyphs/R_.glif         | 52 +++++-----
 src/Interface-Bold.ufo/glyphs/S_.glif         | 84 ++++++++--------
 src/Interface-Bold.ufo/glyphs/Sigma_.glif     | 26 ++---
 src/Interface-Bold.ufo/glyphs/T_.glif         | 24 ++---
 src/Interface-Bold.ufo/glyphs/Thorn_.glif     | 40 ++++----
 src/Interface-Bold.ufo/glyphs/U_.glif         |  8 +-
 src/Interface-Bold.ufo/glyphs/V_.glif         | 20 ++--
 src/Interface-Bold.ufo/glyphs/W_.glif         | 36 +++----
 src/Interface-Bold.ufo/glyphs/X_.glif         | 56 +++++------
 src/Interface-Bold.ufo/glyphs/Y_.glif         | 14 +--
 src/Interface-Bold.ufo/glyphs/Z_.glif         | 40 ++++----
 src/Interface-Bold.ufo/glyphs/Zbar_.glif      | 14 +--
 src/Interface-Bold.ufo/glyphs/afii10026.glif  |  2 +-
 src/Interface-Bold.ufo/glyphs/afii10045.glif  |  4 +-
 src/Interface-Bold.ufo/glyphs/afii10048.glif  |  6 +-
 src/Interface-Bold.ufo/glyphs/afii10147.glif  | 12 +--
 src/Interface-Bold.ufo/glyphs/ampersand.glif  | 96 +++++++++----------
 .../glyphs/arrowdown.cap.glif                 | 20 ++++
 .../glyphs/arrowleft.cap.glif                 | 18 ++++
 .../glyphs/arrowright.cap.glif                | 18 ++++
 .../glyphs/arrowup.cap.glif                   | 20 ++++
 src/Interface-Bold.ufo/glyphs/at.cap.glif     | 20 ++++
 src/Interface-Bold.ufo/glyphs/b.glif          | 20 ++--
 src/Interface-Bold.ufo/glyphs/bbar.glif       |  4 +-
 src/Interface-Bold.ufo/glyphs/beta.glif       | 88 ++++++++---------
 src/Interface-Bold.ufo/glyphs/bullet.cap.glif | 33 +++++++
 src/Interface-Bold.ufo/glyphs/bullet.glif     | 24 ++---
 src/Interface-Bold.ufo/glyphs/bullseye.glif   | 18 ++--
 src/Interface-Bold.ufo/glyphs/contents.plist  | 32 +++++++
 src/Interface-Bold.ufo/glyphs/d.glif          |  4 +-
 src/Interface-Bold.ufo/glyphs/dcroat.glif     | 28 +++---
 src/Interface-Bold.ufo/glyphs/divide.cap.glif | 20 ++++
 src/Interface-Bold.ufo/glyphs/dollar.glif     | 92 +++++++++---------
 src/Interface-Bold.ufo/glyphs/eight.glif      | 90 ++++++++---------
 src/Interface-Bold.ufo/glyphs/emdash.cap.glif | 20 ++++
 src/Interface-Bold.ufo/glyphs/endash.cap.glif | 18 ++++
 src/Interface-Bold.ufo/glyphs/equal.cap.glif  | 20 ++++
 src/Interface-Bold.ufo/glyphs/exclam.glif     |  4 +-
 src/Interface-Bold.ufo/glyphs/f.glif          | 48 +++++-----
 .../glyphs/figuredash.cap.glif                | 20 ++++
 src/Interface-Bold.ufo/glyphs/finalkaf.glif   | 18 ++--
 src/Interface-Bold.ufo/glyphs/five.glif       | 32 +++----
 src/Interface-Bold.ufo/glyphs/four.1.glif     |  4 +-
 src/Interface-Bold.ufo/glyphs/four.glif       | 10 +-
 src/Interface-Bold.ufo/glyphs/h.glif          | 46 ++++-----
 src/Interface-Bold.ufo/glyphs/hyphen.cap.glif | 20 ++++
 src/Interface-Bold.ufo/glyphs/i.glif          | 40 ++++----
 src/Interface-Bold.ufo/glyphs/ibar.glif       |  4 +-
 .../glyphs/itildebelow.glif                   |  4 +-
 src/Interface-Bold.ufo/glyphs/j.glif          | 54 +++++------
 src/Interface-Bold.ufo/glyphs/jcrosstail.glif | 18 ++--
 src/Interface-Bold.ufo/glyphs/k.glif          | 38 ++++----
 src/Interface-Bold.ufo/glyphs/l.glif          | 12 +--
 src/Interface-Bold.ufo/glyphs/lbar.glif       |  4 +-
 src/Interface-Bold.ufo/glyphs/lbelt.glif      | 18 ++--
 src/Interface-Bold.ufo/glyphs/lmidtilde.glif  |  4 +-
 src/Interface-Bold.ufo/glyphs/lslash.glif     | 14 +--
 src/Interface-Bold.ufo/glyphs/lyogh.glif      | 18 ++--
 src/Interface-Bold.ufo/glyphs/minus.cap.glif  | 20 ++++
 .../glyphs/multiply.cap.glif                  | 20 ++++
 src/Interface-Bold.ufo/glyphs/nine.1.glif     |  2 +-
 src/Interface-Bold.ufo/glyphs/nine.glif       | 60 ++++++------
 .../glyphs/notequal.cap.glif                  | 20 ++++
 src/Interface-Bold.ufo/glyphs/notequal.glif   | 10 +-
 src/Interface-Bold.ufo/glyphs/one.glif        | 10 +-
 src/Interface-Bold.ufo/glyphs/plus.cap.glif   | 20 ++++
 src/Interface-Bold.ufo/glyphs/question.glif   | 32 +++----
 src/Interface-Bold.ufo/glyphs/seven.glif      | 10 +-
 src/Interface-Bold.ufo/glyphs/six.1.glif      |  4 +-
 src/Interface-Bold.ufo/glyphs/six.glif        | 20 ++--
 src/Interface-Bold.ufo/glyphs/sterling.glif   | 40 ++++----
 src/Interface-Bold.ufo/glyphs/three.glif      | 50 +++++-----
 src/Interface-Bold.ufo/glyphs/two.glif        | 46 ++++-----
 src/Interface-Bold.ufo/glyphs/uni023D_.glif   |  4 +-
 src/Interface-Bold.ufo/glyphs/uni0243.glif    |  4 +-
 src/Interface-Bold.ufo/glyphs/uni0248.glif    |  4 +-
 src/Interface-Bold.ufo/glyphs/uni0249.glif    |  4 +-
 src/Interface-Bold.ufo/glyphs/uni02AB__.glif  | 18 ++--
 src/Interface-Bold.ufo/glyphs/uni048A_.glif   |  6 +-
 src/Interface-Bold.ufo/glyphs/uni04C9_.glif   |  4 +-
 src/Interface-Bold.ufo/glyphs/uni04CD__.glif  |  4 +-
 src/Interface-Bold.ufo/glyphs/uni04FC__.glif  |  4 +-
 src/Interface-Bold.ufo/glyphs/uni1D7A__.glif  | 16 ++--
 src/Interface-Bold.ufo/glyphs/uni1D80_.glif   | 18 ++--
 src/Interface-Bold.ufo/glyphs/uni1D82_.glif   | 18 ++--
 src/Interface-Bold.ufo/glyphs/uni1D84_.glif   | 18 ++--
 src/Interface-Bold.ufo/glyphs/uni1D85_.glif   | 18 ++--
 src/Interface-Bold.ufo/glyphs/uni1D96_.glif   | 18 ++--
 src/Interface-Bold.ufo/glyphs/uni20BD__.glif  | 36 +++----
 src/Interface-Bold.ufo/glyphs/uni2C67_.glif   |  4 +-
 src/Interface-Bold.ufo/glyphs/uni2C68_.glif   |  4 +-
 src/Interface-Bold.ufo/glyphs/uniA790_.glif   |  4 +-
 src/Interface-Bold.ufo/glyphs/yen.glif        | 40 ++++----
 src/Interface-Bold.ufo/glyphs/zero.glif       | 50 +++++-----
 src/Interface-Bold.ufo/lib.plist              | 40 +++++++-
 src/Interface-Regular.ufo/glyphs/OE__.glif    | 48 ++++------
 .../glyphs/arrowdown.cap.glif                 | 22 +++++
 .../glyphs/arrowleft.cap.glif                 | 22 +++++
 .../glyphs/arrowright.cap.glif                | 22 +++++
 .../glyphs/arrowup.cap.glif                   | 24 +++++
 src/Interface-Regular.ufo/glyphs/at.cap.glif  | 22 +++++
 .../glyphs/bullet.cap.glif                    | 22 +++++
 .../glyphs/contents.plist                     | 32 +++++++
 .../glyphs/divide.cap.glif                    | 22 +++++
 .../glyphs/emdash.cap.glif                    | 18 ++++
 .../glyphs/endash.cap.glif                    | 18 ++++
 .../glyphs/equal.cap.glif                     | 24 +++++
 .../glyphs/figuredash.cap.glif                | 20 ++++
 .../glyphs/hyphen.cap.glif                    | 22 +++++
 .../glyphs/minus.cap.glif                     | 22 +++++
 .../glyphs/multiply.cap.glif                  | 22 +++++
 .../glyphs/notequal.cap.glif                  | 24 +++++
 .../glyphs/plus.cap.glif                      | 22 +++++
 src/Interface-Regular.ufo/lib.plist           | 32 +++++++
 src/features.fea                              | 63 +++++++++++-
 151 files changed, 2315 insertions(+), 1455 deletions(-)
 create mode 100644 src/Interface-Bold.ufo/glyphs/arrowdown.cap.glif
 create mode 100644 src/Interface-Bold.ufo/glyphs/arrowleft.cap.glif
 create mode 100644 src/Interface-Bold.ufo/glyphs/arrowright.cap.glif
 create mode 100644 src/Interface-Bold.ufo/glyphs/arrowup.cap.glif
 create mode 100644 src/Interface-Bold.ufo/glyphs/at.cap.glif
 create mode 100644 src/Interface-Bold.ufo/glyphs/bullet.cap.glif
 create mode 100644 src/Interface-Bold.ufo/glyphs/divide.cap.glif
 create mode 100644 src/Interface-Bold.ufo/glyphs/emdash.cap.glif
 create mode 100644 src/Interface-Bold.ufo/glyphs/endash.cap.glif
 create mode 100644 src/Interface-Bold.ufo/glyphs/equal.cap.glif
 create mode 100644 src/Interface-Bold.ufo/glyphs/figuredash.cap.glif
 create mode 100644 src/Interface-Bold.ufo/glyphs/hyphen.cap.glif
 create mode 100644 src/Interface-Bold.ufo/glyphs/minus.cap.glif
 create mode 100644 src/Interface-Bold.ufo/glyphs/multiply.cap.glif
 create mode 100644 src/Interface-Bold.ufo/glyphs/notequal.cap.glif
 create mode 100644 src/Interface-Bold.ufo/glyphs/plus.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/arrowdown.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/arrowleft.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/arrowright.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/arrowup.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/at.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/bullet.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/divide.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/emdash.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/endash.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/equal.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/figuredash.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/hyphen.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/minus.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/multiply.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/notequal.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/plus.cap.glif

diff --git a/docs/lab/glyphinfo.json b/docs/lab/glyphinfo.json
index 2495aa1cf..9bf069a57 100644
--- a/docs/lab/glyphinfo.json
+++ b/docs/lab/glyphinfo.json
@@ -233,7 +233,6 @@
 , ["dzeabkhasiancyrillic", 1249, "CYRILLIC SMALL LETTER ABKHASIAN DZE"]
 , ["izhitsacyrillic", 1141, "CYRILLIC SMALL LETTER IZHITSA"]
 , ["dz", 675, "LATIN SMALL LETTER DZ DIGRAPH", "<derived>"]
-, ["Dzcaron", 453, "LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON"]
 , ["dzcaron", 454, "LATIN SMALL LETTER DZ WITH CARON"]
 , ["germandbls", 223, "LATIN SMALL LETTER SHARP S"]
 , ["dotlessi", 305, "LATIN SMALL LETTER DOTLESS I"]
@@ -275,6 +274,13 @@
 , ["seven", 55, "DIGIT SEVEN", "#e2f4ea"]
 , ["eight", 56, "DIGIT EIGHT", "#e2f4ea"]
 , ["nine", 57, "DIGIT NINE", "#e2f4ea"]
+, ["zero.tnum", null, null, "#ebf6c8"]
+, ["one.tnum", null, null, "#ebf6c8"]
+, ["two.tnum", null, null, "#ebf6c8"]
+, ["three.tnum", null, null, "#ebf6c8"]
+, ["five.tnum", null, null, "#ebf6c8"]
+, ["six.tnum", null, null, "#ebf6c8"]
+, ["seven.tnum", null, null, "#ebf6c8"]
 , ["ampersand", 38, "AMPERSAND", "#efefef"]
 , ["exclam", 33, "EXCLAMATION MARK", "#efefef"]
 , ["exclamdown", 161, "INVERTED EXCLAMATION MARK", "#efefef"]
@@ -2173,7 +2179,6 @@
 , ["uniE002", 57346, "[private use E002]"]
 , ["uniE003", 57347, "[private use E003]"]
 , [".notdef", null, null, "#dddddd"]
-, ["DZcaron", 453, "LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON"]
 , ["Eth", 208, "LATIN CAPITAL LETTER ETH", "<derived>"]
 , ["hbar", 295, "LATIN SMALL LETTER H WITH STROKE", "<derived>"]
 , ["Tbar", 358, "LATIN CAPITAL LETTER T WITH STROKE", "<derived>"]
diff --git a/docs/lab/index.html b/docs/lab/index.html
index 9bf69b46e..42b17c59d 100644
--- a/docs/lab/index.html
+++ b/docs/lab/index.html
@@ -109,9 +109,18 @@ f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fA fB fC fD fE fF fa fb fc fd fe ff
 `)
 
 samples.set('Contextual alternates', `
-(m) (M) (6)
-[m] [M] [6]
-{m} {M} {6}
+(m) (M) (6) [m] [M] [6] {m} {M} {6}
+m@n M@N
+3x5 x5 8x  3×5 ×5 8×
+3-5 -5 8-  3+5 +5 8+
+3÷5 ÷5 8÷
+3=5 =5 8=  3≠5 ≠5 8≠
+B-O B–O B‒O B—O M•N
+b-o b–o b‒o b—o m•n
+X→Y X←Y X↑Y X↓Y
+x→y x←y x↑y x↓y
+A → B ← C ↑ D ↓ E
+a → b ← c ↑ d ↓ e
 `)
 
 // From http://justanotherfoundry.com/generator
@@ -1089,7 +1098,7 @@ document.head.appendChild(fontCSS)
       <!-- <label><input type="checkbox" class="featopt" name="feat:pnum"> Enable pnum</label> -->
       <label><input type="checkbox" class="featopt" name="feat:tnum"> Enable tnum *</label>
       <!-- <label><input type="checkbox" class="featopt" name="feat:lnum"> Enable lnum</label> -->
-      <label><input type="checkbox" class="featopt" name="feat:kern"> Enable kern</label>
+      <!-- <label><input type="checkbox" class="featopt" name="feat:kern"> Enable kern</label> -->
       <label><input type="checkbox" class="featopt" name="feat:case"> Enable case</label>
       <label><input type="checkbox" class="featopt" name="feat:calt=0"> <em>Disable</em> calt *</label>
       <label><input type="checkbox" class="featopt" name="feat:zero"> Enable (slashed) zero *</label>
diff --git a/src/Interface-Bold.ufo/glyphs/AE__.glif b/src/Interface-Bold.ufo/glyphs/AE__.glif
index 965cd5bd2..b1ce4f07f 100644
--- a/src/Interface-Bold.ufo/glyphs/AE__.glif
+++ b/src/Interface-Bold.ufo/glyphs/AE__.glif
@@ -4,18 +4,9 @@
   <unicode hex="00C6"/>
   <outline>
     <contour>
-      <point x="1408" y="2216" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="2772" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="2772" y="2216" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="1504" y="1784" type="line"/>
-      <point x="1452" y="2004" type="line"/>
-      <point x="1172" y="2004" type="line"/>
+      <point x="1504" y="1828" type="line"/>
+      <point x="1452" y="2048" type="line"/>
+      <point x="1172" y="2048" type="line"/>
       <point x="140" y="0" type="line"/>
       <point x="656" y="0" type="line"/>
     </contour>
@@ -32,8 +23,8 @@
       <point x="2676" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="1804" y="2004" type="line"/>
-      <point x="1360" y="2004" type="line"/>
+      <point x="1804" y="2048" type="line"/>
+      <point x="1360" y="2048" type="line"/>
       <point x="1444" y="0" type="line"/>
       <point x="1884" y="0" type="line"/>
     </contour>
@@ -44,10 +35,19 @@
       <point x="2480" y="844" type="line"/>
     </contour>
     <contour>
-      <point x="2592" y="2004" type="line"/>
-      <point x="1588" y="2004" type="line"/>
-      <point x="1588" y="1640" type="line"/>
-      <point x="2592" y="1640" type="line"/>
+      <point x="2592" y="2048" type="line"/>
+      <point x="1588" y="2048" type="line"/>
+      <point x="1588" y="1684" type="line"/>
+      <point x="2592" y="1684" type="line"/>
+    </contour>
+    <contour>
+      <point x="1408" y="2216" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="2772" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="2772" y="2216" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Interface-Bold.ufo/glyphs/A_.glif b/src/Interface-Bold.ufo/glyphs/A_.glif
index 68da2ad75..eb8191a2b 100644
--- a/src/Interface-Bold.ufo/glyphs/A_.glif
+++ b/src/Interface-Bold.ufo/glyphs/A_.glif
@@ -4,14 +4,14 @@
   <unicode hex="0041"/>
   <outline>
     <contour>
-      <point x="1468" y="748" type="line"/>
-      <point x="428" y="748" type="line"/>
-      <point x="428" y="376" type="line"/>
-      <point x="1468" y="376" type="line"/>
+      <point x="1544" y="792" type="line"/>
+      <point x="504" y="792" type="line"/>
+      <point x="504" y="420" type="line"/>
+      <point x="1544" y="420" type="line"/>
     </contour>
-    <component base="V" yScale="-1" yOffset="2004"/>
+    <component base="V" yScale="-1" yOffset="2048"/>
     <contour>
-      <point x="1024" y="2200" type="move" name="top"/>
+      <point x="1024.0" y="2200.0" type="move" name="top"/>
     </contour>
     <contour>
       <point x="1032.0" y="12.0" type="move" name="bottom"/>
diff --git a/src/Interface-Bold.ufo/glyphs/B_.glif b/src/Interface-Bold.ufo/glyphs/B_.glif
index 87db5df54..4e6f3946c 100644
--- a/src/Interface-Bold.ufo/glyphs/B_.glif
+++ b/src/Interface-Bold.ufo/glyphs/B_.glif
@@ -4,63 +4,63 @@
   <unicode hex="0042"/>
   <outline>
     <contour>
-      <point x="920" y="2216" type="move" name="top"/>
+      <point x="936" y="876" type="line"/>
+      <point x="1068" y="1000" type="line"/>
+      <point x="1472" y="1004"/>
+      <point x="1620" y="1232"/>
+      <point x="1620" y="1480" type="curve"/>
+      <point x="1620" y="1864"/>
+      <point x="1328" y="2048"/>
+      <point x="844" y="2048" type="curve"/>
+      <point x="132" y="2048" type="line"/>
+      <point x="132" y="8" type="line"/>
+      <point x="592" y="8" type="line"/>
+      <point x="592" y="1664" type="line"/>
+      <point x="844" y="1664" type="line"/>
+      <point x="1064" y="1664"/>
+      <point x="1160" y="1596"/>
+      <point x="1160" y="1424" type="curve"/>
+      <point x="1160" y="1272"/>
+      <point x="1068" y="1196"/>
+      <point x="844" y="1196" type="curve"/>
+      <point x="420" y="1196" type="line"/>
+      <point x="424" y="876" type="line"/>
     </contour>
     <contour>
-      <point x="916" y="16" type="move" name="bottom"/>
+      <point x="920" y="8" type="line"/>
+      <point x="1404" y="8"/>
+      <point x="1660" y="212"/>
+      <point x="1660" y="612" type="curve" smooth="yes"/>
+      <point x="1660" y="848"/>
+      <point x="1524" y="1084"/>
+      <point x="1132" y="1068" type="curve"/>
+      <point x="1028" y="1196" type="line"/>
+      <point x="536" y="1196" type="line"/>
+      <point x="536" y="876" type="line"/>
+      <point x="936" y="876" type="line" smooth="yes"/>
+      <point x="1128" y="876"/>
+      <point x="1204" y="776"/>
+      <point x="1204" y="620" type="curve" smooth="yes"/>
+      <point x="1204" y="488"/>
+      <point x="1120" y="388"/>
+      <point x="920" y="388" type="curve" smooth="yes"/>
+      <point x="472" y="388" type="line"/>
+      <point x="308" y="8" type="line"/>
     </contour>
     <contour>
-      <point x="1908" y="2200" type="move" name="top_dd"/>
+      <point x="860" y="2260" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="916" y="24" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1908" y="2244" type="move" name="top_dd"/>
     </contour>
     <contour>
       <point x="1908" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1908" y="2216" type="move" name="top0315"/>
-    </contour>
-    <contour>
-      <point x="936" y="852" type="line"/>
-      <point x="1068" y="976" type="line"/>
-      <point x="1472" y="980"/>
-      <point x="1620" y="1204"/>
-      <point x="1620" y="1448" type="curve"/>
-      <point x="1620" y="1824"/>
-      <point x="1328" y="2004"/>
-      <point x="844" y="2004" type="curve"/>
-      <point x="132" y="2004" type="line"/>
-      <point x="132" y="0" type="line"/>
-      <point x="592" y="0" type="line"/>
-      <point x="592" y="1628" type="line"/>
-      <point x="844" y="1628" type="line"/>
-      <point x="1064" y="1628"/>
-      <point x="1160" y="1560"/>
-      <point x="1160" y="1392" type="curve"/>
-      <point x="1160" y="1244"/>
-      <point x="1068" y="1168"/>
-      <point x="844" y="1168" type="curve"/>
-      <point x="420" y="1168" type="line"/>
-      <point x="424" y="852" type="line"/>
-    </contour>
-    <contour>
-      <point x="920" y="0" type="line"/>
-      <point x="1404" y="0"/>
-      <point x="1660" y="200"/>
-      <point x="1660" y="592" type="curve" smooth="yes"/>
-      <point x="1660" y="824"/>
-      <point x="1524" y="1056"/>
-      <point x="1132" y="1040" type="curve"/>
-      <point x="1028" y="1168" type="line"/>
-      <point x="536" y="1168" type="line"/>
-      <point x="536" y="852" type="line"/>
-      <point x="936" y="852" type="line" smooth="yes"/>
-      <point x="1128" y="852"/>
-      <point x="1204" y="756"/>
-      <point x="1204" y="600" type="curve" smooth="yes"/>
-      <point x="1204" y="472"/>
-      <point x="1120" y="372"/>
-      <point x="920" y="372" type="curve" smooth="yes"/>
-      <point x="472" y="372" type="line"/>
-      <point x="308" y="0" type="line"/>
+      <point x="1908" y="2260" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Interface-Bold.ufo/glyphs/C_.glif b/src/Interface-Bold.ufo/glyphs/C_.glif
index e73cf07a9..63a698245 100644
--- a/src/Interface-Bold.ufo/glyphs/C_.glif
+++ b/src/Interface-Bold.ufo/glyphs/C_.glif
@@ -4,32 +4,32 @@
   <unicode hex="0043"/>
   <outline>
     <contour>
-      <point x="1360" y="680" type="line"/>
-      <point x="1340" y="468"/>
-      <point x="1244" y="352"/>
-      <point x="1024" y="352" type="curve" smooth="yes"/>
-      <point x="756" y="352"/>
-      <point x="624" y="572"/>
-      <point x="624" y="1004" type="curve"/>
-      <point x="624" y="1436"/>
-      <point x="756" y="1652"/>
-      <point x="1024" y="1652" type="curve" smooth="yes"/>
-      <point x="1244" y="1652"/>
-      <point x="1344" y="1524"/>
-      <point x="1364" y="1312" type="curve"/>
-      <point x="1820" y="1312" type="line"/>
-      <point x="1784" y="1728"/>
-      <point x="1512" y="2032"/>
-      <point x="996" y="2032" type="curve" smooth="yes"/>
-      <point x="488" y="2032"/>
-      <point x="156" y="1656"/>
-      <point x="156" y="1004" type="curve"/>
-      <point x="156" y="344"/>
+      <point x="1360" y="696" type="line"/>
+      <point x="1340" y="480"/>
+      <point x="1244" y="360"/>
+      <point x="1024" y="360" type="curve" smooth="yes"/>
+      <point x="756" y="360"/>
+      <point x="624" y="584"/>
+      <point x="624" y="1028" type="curve"/>
+      <point x="624" y="1468"/>
+      <point x="756" y="1688"/>
+      <point x="1024" y="1688" type="curve" smooth="yes"/>
+      <point x="1244" y="1688"/>
+      <point x="1344" y="1556"/>
+      <point x="1364" y="1340" type="curve"/>
+      <point x="1820" y="1340" type="line"/>
+      <point x="1784" y="1764"/>
+      <point x="1512" y="2076"/>
+      <point x="996" y="2076" type="curve" smooth="yes"/>
+      <point x="488" y="2076"/>
+      <point x="156" y="1692"/>
+      <point x="156" y="1028" type="curve"/>
+      <point x="156" y="352"/>
       <point x="472" y="-28"/>
       <point x="1000" y="-28" type="curve" smooth="yes"/>
       <point x="1492" y="-28"/>
-      <point x="1796" y="260"/>
-      <point x="1820" y="680" type="curve"/>
+      <point x="1796" y="268"/>
+      <point x="1820" y="696" type="curve"/>
     </contour>
     <contour>
       <point x="1040.0" y="2200.0" type="move" name="top"/>
diff --git a/src/Interface-Bold.ufo/glyphs/D_.glif b/src/Interface-Bold.ufo/glyphs/D_.glif
index e1b42aead..7432bf285 100644
--- a/src/Interface-Bold.ufo/glyphs/D_.glif
+++ b/src/Interface-Bold.ufo/glyphs/D_.glif
@@ -3,6 +3,32 @@
   <advance width="1920"/>
   <unicode hex="0044"/>
   <outline>
+    <contour>
+      <point x="820" y="0" type="line"/>
+      <point x="1360" y="0"/>
+      <point x="1764" y="364"/>
+      <point x="1764" y="1044" type="curve"/>
+      <point x="1764" y="1620"/>
+      <point x="1364" y="2048"/>
+      <point x="820" y="2048" type="curve"/>
+      <point x="320" y="2048" type="line"/>
+      <point x="320" y="1648" type="line"/>
+      <point x="796" y="1648" type="line"/>
+      <point x="1084" y="1648"/>
+      <point x="1292" y="1436"/>
+      <point x="1292" y="1044" type="curve"/>
+      <point x="1292" y="548"/>
+      <point x="1084" y="400"/>
+      <point x="800" y="400" type="curve"/>
+      <point x="332" y="400" type="line"/>
+      <point x="328" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="592" y="2048" type="line"/>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="592" y="0" type="line"/>
+    </contour>
     <contour>
       <point x="768" y="2200" type="move" name="top"/>
     </contour>
@@ -21,32 +47,6 @@
     <contour>
       <point x="1908" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="820" y="0" type="line"/>
-      <point x="1360" y="0"/>
-      <point x="1764" y="356"/>
-      <point x="1764" y="1020" type="curve"/>
-      <point x="1764" y="1584"/>
-      <point x="1364" y="2004"/>
-      <point x="820" y="2004" type="curve"/>
-      <point x="320" y="2004" type="line"/>
-      <point x="320" y="1604" type="line"/>
-      <point x="796" y="1604" type="line"/>
-      <point x="1084" y="1604"/>
-      <point x="1292" y="1404"/>
-      <point x="1292" y="1020" type="curve"/>
-      <point x="1292" y="536"/>
-      <point x="1084" y="380"/>
-      <point x="800" y="380" type="curve"/>
-      <point x="332" y="380" type="line"/>
-      <point x="328" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="592" y="2004" type="line"/>
-      <point x="128" y="2004" type="line"/>
-      <point x="128" y="0" type="line"/>
-      <point x="592" y="0" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/E_.glif b/src/Interface-Bold.ufo/glyphs/E_.glif
index 376c59595..66c4ceb93 100644
--- a/src/Interface-Bold.ufo/glyphs/E_.glif
+++ b/src/Interface-Bold.ufo/glyphs/E_.glif
@@ -10,22 +10,22 @@
       <point x="1496" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="592" y="2004" type="line"/>
-      <point x="128" y="2004" type="line"/>
+      <point x="592" y="2048" type="line"/>
+      <point x="128" y="2048" type="line"/>
       <point x="128" y="0" type="line"/>
       <point x="592" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="1356" y="1208" type="line"/>
-      <point x="432" y="1208" type="line"/>
-      <point x="432" y="824" type="line"/>
-      <point x="1356" y="824" type="line"/>
+      <point x="1356" y="1216" type="line"/>
+      <point x="432" y="1216" type="line"/>
+      <point x="432" y="832" type="line"/>
+      <point x="1356" y="832" type="line"/>
     </contour>
     <contour>
-      <point x="1496" y="2004" type="line"/>
-      <point x="432" y="2004" type="line"/>
-      <point x="432" y="1620" type="line"/>
-      <point x="1496" y="1620" type="line"/>
+      <point x="1496" y="2048" type="line"/>
+      <point x="432" y="2048" type="line"/>
+      <point x="432" y="1664" type="line"/>
+      <point x="1496" y="1664" type="line"/>
     </contour>
     <contour>
       <point x="832" y="2200" type="move" name="top"/>
diff --git a/src/Interface-Bold.ufo/glyphs/Endescendercyrillic_.glif b/src/Interface-Bold.ufo/glyphs/Endescendercyrillic_.glif
index aa50e2678..59c665c28 100644
--- a/src/Interface-Bold.ufo/glyphs/Endescendercyrillic_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Endescendercyrillic_.glif
@@ -3,6 +3,8 @@
   <advance width="2304"/>
   <unicode hex="04A2"/>
   <outline>
+    <component base="H" xOffset="-20"/>
+    <component base="cyrillictic" xOffset="1564"/>
     <contour>
       <point x="1964" y="2200" type="move" name="top_dd"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="1964" y="2200" type="move" name="top0315"/>
     </contour>
-    <component base="H" xOffset="-20"/>
-    <component base="cyrillictic" xOffset="1564"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/Esh_.glif b/src/Interface-Bold.ufo/glyphs/Esh_.glif
index f82bceba0..a273391a9 100644
--- a/src/Interface-Bold.ufo/glyphs/Esh_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Esh_.glif
@@ -3,6 +3,7 @@
   <advance width="1792"/>
   <unicode hex="01A9"/>
   <outline>
+    <component base="Sigma"/>
     <contour>
       <point x="812" y="2200" type="move" name="top"/>
     </contour>
@@ -12,7 +13,6 @@
     <contour>
       <point x="812" y="16" type="move" name="bottom"/>
     </contour>
-    <component base="Sigma"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/Euro_.glif b/src/Interface-Bold.ufo/glyphs/Euro_.glif
index 91c4a3259..f4fadd9fa 100644
--- a/src/Interface-Bold.ufo/glyphs/Euro_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Euro_.glif
@@ -4,46 +4,46 @@
   <unicode hex="20AC"/>
   <outline>
     <contour>
-      <point x="1292" y="344" type="curve" smooth="yes"/>
-      <point x="1052" y="344"/>
-      <point x="888" y="420"/>
-      <point x="888" y="732" type="curve"/>
-      <point x="888" y="1216" type="line"/>
-      <point x="888" y="1536"/>
-      <point x="1040" y="1656"/>
-      <point x="1304" y="1656" type="curve" smooth="yes"/>
-      <point x="1384" y="1656"/>
-      <point x="1472" y="1640"/>
-      <point x="1540" y="1616" type="curve"/>
-      <point x="1596" y="1988" type="line"/>
-      <point x="1492" y="2012"/>
-      <point x="1384" y="2028"/>
-      <point x="1276" y="2028" type="curve" smooth="yes"/>
-      <point x="772" y="2028"/>
-      <point x="424" y="1748"/>
-      <point x="424" y="1212" type="curve"/>
-      <point x="424" y="732" type="line"/>
-      <point x="424" y="232"/>
+      <point x="1292" y="352" type="curve" smooth="yes"/>
+      <point x="1052" y="352"/>
+      <point x="888" y="432"/>
+      <point x="888" y="748" type="curve"/>
+      <point x="888" y="1244" type="line"/>
+      <point x="888" y="1572"/>
+      <point x="1040" y="1696"/>
+      <point x="1304" y="1696" type="curve" smooth="yes"/>
+      <point x="1384" y="1696"/>
+      <point x="1472" y="1680"/>
+      <point x="1540" y="1656" type="curve"/>
+      <point x="1596" y="2036" type="line"/>
+      <point x="1492" y="2060"/>
+      <point x="1384" y="2076"/>
+      <point x="1276" y="2076" type="curve" smooth="yes"/>
+      <point x="772" y="2076"/>
+      <point x="424" y="1788"/>
+      <point x="424" y="1240" type="curve"/>
+      <point x="424" y="748" type="line"/>
+      <point x="424" y="240"/>
       <point x="768" y="-28"/>
       <point x="1240" y="-28" type="curve" smooth="yes"/>
       <point x="1364" y="-28"/>
       <point x="1484" y="-12"/>
       <point x="1596" y="16" type="curve"/>
-      <point x="1540" y="384" type="line"/>
-      <point x="1464" y="356"/>
-      <point x="1380" y="344"/>
+      <point x="1540" y="392" type="line"/>
+      <point x="1464" y="364"/>
+      <point x="1380" y="352"/>
     </contour>
     <contour>
-      <point x="1324" y="1304" type="line"/>
-      <point x="196" y="1304" type="line"/>
-      <point x="196" y="1088" type="line"/>
-      <point x="1324" y="1088" type="line"/>
+      <point x="1324" y="1336" type="line"/>
+      <point x="196" y="1336" type="line"/>
+      <point x="196" y="1112" type="line"/>
+      <point x="1324" y="1112" type="line"/>
     </contour>
     <contour>
-      <point x="1324" y="920" type="line"/>
-      <point x="196" y="920" type="line"/>
-      <point x="196" y="700" type="line"/>
-      <point x="1324" y="700" type="line"/>
+      <point x="1324" y="944" type="line"/>
+      <point x="196" y="944" type="line"/>
+      <point x="196" y="716" type="line"/>
+      <point x="1324" y="716" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Interface-Bold.ufo/glyphs/F_.glif b/src/Interface-Bold.ufo/glyphs/F_.glif
index 8b338c935..0eb568764 100644
--- a/src/Interface-Bold.ufo/glyphs/F_.glif
+++ b/src/Interface-Bold.ufo/glyphs/F_.glif
@@ -4,22 +4,22 @@
   <unicode hex="0046"/>
   <outline>
     <contour>
-      <point x="592" y="2004" type="line"/>
-      <point x="128" y="2004" type="line"/>
+      <point x="592" y="2048" type="line"/>
+      <point x="128" y="2048" type="line"/>
       <point x="128" y="0" type="line"/>
       <point x="592" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="1356" y="1208" type="line"/>
-      <point x="444" y="1208" type="line"/>
-      <point x="444" y="824" type="line"/>
-      <point x="1356" y="824" type="line"/>
+      <point x="1356" y="1216" type="line"/>
+      <point x="444" y="1216" type="line"/>
+      <point x="444" y="832" type="line"/>
+      <point x="1356" y="832" type="line"/>
     </contour>
     <contour>
-      <point x="1496" y="2004" type="line"/>
-      <point x="460" y="2004" type="line"/>
-      <point x="460" y="1620" type="line"/>
-      <point x="1496" y="1620" type="line"/>
+      <point x="1496" y="2048" type="line"/>
+      <point x="460" y="2048" type="line"/>
+      <point x="460" y="1664" type="line"/>
+      <point x="1496" y="1664" type="line"/>
     </contour>
     <contour>
       <point x="524" y="400" type="move" name="cross"/>
diff --git a/src/Interface-Bold.ufo/glyphs/G_.glif b/src/Interface-Bold.ufo/glyphs/G_.glif
index 5c4f7bfa7..c77d5fd38 100644
--- a/src/Interface-Bold.ufo/glyphs/G_.glif
+++ b/src/Interface-Bold.ufo/glyphs/G_.glif
@@ -4,35 +4,35 @@
   <unicode hex="0047"/>
   <outline>
     <contour>
-      <point x="1800" y="1072" type="line"/>
-      <point x="992" y="1072" type="line"/>
-      <point x="992" y="740" type="line"/>
-      <point x="1356" y="740" type="line"/>
-      <point x="1356" y="460"/>
-      <point x="1248" y="344"/>
-      <point x="1044" y="344" type="curve" smooth="yes"/>
-      <point x="744" y="344"/>
-      <point x="604" y="544"/>
-      <point x="604" y="1000" type="curve"/>
-      <point x="604" y="1464"/>
-      <point x="756" y="1660"/>
-      <point x="1000" y="1660" type="curve" smooth="yes"/>
-      <point x="1232" y="1660"/>
-      <point x="1328" y="1548"/>
-      <point x="1356" y="1348" type="curve"/>
-      <point x="1800" y="1348" type="line"/>
-      <point x="1756" y="1748"/>
-      <point x="1528" y="2032"/>
-      <point x="988" y="2032" type="curve" smooth="yes"/>
-      <point x="488" y="2032"/>
-      <point x="136" y="1680"/>
-      <point x="136" y="1004" type="curve"/>
-      <point x="136" y="324"/>
+      <point x="1800" y="1096" type="line"/>
+      <point x="992" y="1096" type="line"/>
+      <point x="992" y="756" type="line"/>
+      <point x="1356" y="756" type="line"/>
+      <point x="1356" y="472"/>
+      <point x="1248" y="352"/>
+      <point x="1044" y="352" type="curve" smooth="yes"/>
+      <point x="744" y="352"/>
+      <point x="604" y="556"/>
+      <point x="604" y="1020" type="curve"/>
+      <point x="604" y="1496"/>
+      <point x="756" y="1696"/>
+      <point x="1000" y="1696" type="curve" smooth="yes"/>
+      <point x="1232" y="1696"/>
+      <point x="1328" y="1580"/>
+      <point x="1356" y="1376" type="curve"/>
+      <point x="1800" y="1376" type="line"/>
+      <point x="1756" y="1784"/>
+      <point x="1528" y="2076"/>
+      <point x="988" y="2076" type="curve" smooth="yes"/>
+      <point x="488" y="2076"/>
+      <point x="136" y="1716"/>
+      <point x="136" y="1024" type="curve"/>
+      <point x="136" y="332"/>
       <point x="488" y="-28"/>
       <point x="1016" y="-28" type="curve" smooth="yes"/>
       <point x="1448" y="-28"/>
-      <point x="1800" y="216"/>
-      <point x="1800" y="704" type="curve"/>
+      <point x="1800" y="220"/>
+      <point x="1800" y="720" type="curve"/>
     </contour>
     <contour>
       <point x="1044.0" y="2200.0" type="move" name="top"/>
diff --git a/src/Interface-Bold.ufo/glyphs/Gbar_.glif b/src/Interface-Bold.ufo/glyphs/Gbar_.glif
index 201844a31..cde799424 100644
--- a/src/Interface-Bold.ufo/glyphs/Gbar_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Gbar_.glif
@@ -3,6 +3,13 @@
   <advance width="2048"/>
   <unicode hex="01E4"/>
   <outline>
+    <contour>
+      <point x="1976" y="664" type="line"/>
+      <point x="984" y="664" type="line"/>
+      <point x="984" y="452" type="line"/>
+      <point x="1976" y="452" type="line"/>
+    </contour>
+    <component base="G" xOffset="-44"/>
     <contour>
       <point x="924" y="2200" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="1972" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1976" y="664" type="line"/>
-      <point x="984" y="664" type="line"/>
-      <point x="984" y="452" type="line"/>
-      <point x="1976" y="452" type="line"/>
-    </contour>
-    <component base="G" xOffset="-44"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/Germandbls_.glif b/src/Interface-Bold.ufo/glyphs/Germandbls_.glif
index 599393ee4..bc52bc4bd 100644
--- a/src/Interface-Bold.ufo/glyphs/Germandbls_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Germandbls_.glif
@@ -4,29 +4,29 @@
   <unicode hex="1E9E"/>
   <outline>
     <contour>
-      <point x="608" y="1316" type="line"/>
-      <point x="164" y="1316" type="line"/>
+      <point x="608" y="1344" type="line"/>
+      <point x="164" y="1344" type="line"/>
       <point x="164" y="0" type="line"/>
       <point x="608" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="608" y="1316" type="line"/>
-      <point x="608" y="1592"/>
-      <point x="728" y="1672"/>
-      <point x="888" y="1672" type="curve" smooth="yes"/>
-      <point x="1040" y="1672"/>
-      <point x="1152" y="1620"/>
-      <point x="1248" y="1552" type="curve"/>
-      <point x="896" y="1160" type="line"/>
-      <point x="896" y="988" type="line"/>
-      <point x="1200" y="988" type="line"/>
-      <point x="1800" y="1676" type="line"/>
-      <point x="1508" y="1900"/>
-      <point x="1236" y="2032"/>
-      <point x="888" y="2032" type="curve" smooth="yes"/>
-      <point x="404" y="2032"/>
-      <point x="164" y="1788"/>
-      <point x="164" y="1316" type="curve"/>
+      <point x="608" y="1344" type="line"/>
+      <point x="608" y="1624"/>
+      <point x="728" y="1708"/>
+      <point x="888" y="1708" type="curve" smooth="yes"/>
+      <point x="1040" y="1708"/>
+      <point x="1152" y="1656"/>
+      <point x="1248" y="1584" type="curve"/>
+      <point x="896" y="1184" type="line"/>
+      <point x="896" y="1008" type="line"/>
+      <point x="1200" y="1008" type="line"/>
+      <point x="1800" y="1712" type="line"/>
+      <point x="1508" y="1940"/>
+      <point x="1236" y="2076"/>
+      <point x="888" y="2076" type="curve" smooth="yes"/>
+      <point x="404" y="2076"/>
+      <point x="164" y="1828"/>
+      <point x="164" y="1344" type="curve"/>
     </contour>
     <contour>
       <point x="720" y="56" type="line"/>
@@ -34,23 +34,23 @@
       <point x="980" y="-28"/>
       <point x="1196" y="-28" type="curve" smooth="yes"/>
       <point x="1572" y="-28"/>
-      <point x="1884" y="172"/>
-      <point x="1884" y="584" type="curve" smooth="yes"/>
-      <point x="1884" y="976"/>
-      <point x="1612" y="1184"/>
-      <point x="1148" y="1184" type="curve"/>
-      <point x="896" y="1156" type="line"/>
-      <point x="896" y="896" type="line"/>
-      <point x="1076" y="896" type="line" smooth="yes"/>
-      <point x="1312" y="896"/>
-      <point x="1440" y="820"/>
-      <point x="1440" y="584" type="curve" smooth="yes"/>
-      <point x="1440" y="424"/>
-      <point x="1328" y="328"/>
-      <point x="1136" y="328" type="curve" smooth="yes"/>
-      <point x="1012" y="328"/>
-      <point x="900" y="368"/>
-      <point x="844" y="392" type="curve"/>
+      <point x="1884" y="176"/>
+      <point x="1884" y="596" type="curve" smooth="yes"/>
+      <point x="1884" y="996"/>
+      <point x="1612" y="1208"/>
+      <point x="1148" y="1208" type="curve"/>
+      <point x="896" y="1180" type="line"/>
+      <point x="896" y="916" type="line"/>
+      <point x="1076" y="916" type="line" smooth="yes"/>
+      <point x="1312" y="916"/>
+      <point x="1440" y="836"/>
+      <point x="1440" y="596" type="curve" smooth="yes"/>
+      <point x="1440" y="432"/>
+      <point x="1328" y="336"/>
+      <point x="1136" y="336" type="curve" smooth="yes"/>
+      <point x="1012" y="336"/>
+      <point x="900" y="376"/>
+      <point x="844" y="400" type="curve"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Interface-Bold.ufo/glyphs/H_.glif b/src/Interface-Bold.ufo/glyphs/H_.glif
index e2dcc8270..c997328d3 100644
--- a/src/Interface-Bold.ufo/glyphs/H_.glif
+++ b/src/Interface-Bold.ufo/glyphs/H_.glif
@@ -3,6 +3,24 @@
   <advance width="1920"/>
   <unicode hex="0048"/>
   <outline>
+    <contour>
+      <point x="1468" y="1216" type="line"/>
+      <point x="440" y="1216" type="line"/>
+      <point x="440" y="832" type="line"/>
+      <point x="1468" y="832" type="line"/>
+    </contour>
+    <contour>
+      <point x="592" y="2048" type="line"/>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="592" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="1792" y="2048" type="line"/>
+      <point x="1328" y="2048" type="line"/>
+      <point x="1328" y="0" type="line"/>
+      <point x="1792" y="0" type="line"/>
+    </contour>
     <contour>
       <point x="1032" y="2200" type="move" name="top"/>
     </contour>
@@ -24,24 +42,6 @@
     <contour>
       <point x="2016" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1468" y="1208" type="line"/>
-      <point x="440" y="1208" type="line"/>
-      <point x="440" y="824" type="line"/>
-      <point x="1468" y="824" type="line"/>
-    </contour>
-    <contour>
-      <point x="592" y="2004" type="line"/>
-      <point x="128" y="2004" type="line"/>
-      <point x="128" y="0" type="line"/>
-      <point x="592" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1792" y="2004" type="line"/>
-      <point x="1328" y="2004" type="line"/>
-      <point x="1328" y="0" type="line"/>
-      <point x="1792" y="0" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/Hadescendercyrillic_.glif b/src/Interface-Bold.ufo/glyphs/Hadescendercyrillic_.glif
index 9fb9456fb..ff0693396 100644
--- a/src/Interface-Bold.ufo/glyphs/Hadescendercyrillic_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Hadescendercyrillic_.glif
@@ -3,6 +3,8 @@
   <advance width="2048"/>
   <unicode hex="04B2"/>
   <outline>
+    <component base="X"/>
+    <component base="cyrillictic" xOffset="1324"/>
     <contour>
       <point x="1796" y="2200" type="move" name="top_dd"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="1796" y="2216" type="move" name="top0315"/>
     </contour>
-    <component base="X"/>
-    <component base="cyrillictic" xOffset="1324"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/Hbar_.glif b/src/Interface-Bold.ufo/glyphs/Hbar_.glif
index 4bda671fb..8b74e5aab 100644
--- a/src/Interface-Bold.ufo/glyphs/Hbar_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Hbar_.glif
@@ -3,6 +3,13 @@
   <advance width="2048"/>
   <unicode hex="0126"/>
   <outline>
+    <contour>
+      <point x="2008" y="1708" type="line"/>
+      <point x="40" y="1708" type="line"/>
+      <point x="40" y="1460" type="line"/>
+      <point x="2008" y="1460" type="line"/>
+    </contour>
+    <component base="H" xOffset="24"/>
     <contour>
       <point x="1024" y="2200" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="2040" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="2008" y="1708" type="line"/>
-      <point x="40" y="1708" type="line"/>
-      <point x="40" y="1460" type="line"/>
-      <point x="2008" y="1460" type="line"/>
-    </contour>
-    <component base="H" xOffset="24"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/I_.glif b/src/Interface-Bold.ufo/glyphs/I_.glif
index 2a1a249c2..19c5ca1f4 100644
--- a/src/Interface-Bold.ufo/glyphs/I_.glif
+++ b/src/Interface-Bold.ufo/glyphs/I_.glif
@@ -3,6 +3,12 @@
   <advance width="768"/>
   <unicode hex="0049"/>
   <outline>
+    <contour>
+      <point x="616" y="2048" type="line"/>
+      <point x="152" y="2048" type="line"/>
+      <point x="152" y="0" type="line"/>
+      <point x="616" y="0" type="line"/>
+    </contour>
     <contour>
       <point x="384" y="2200" type="move" name="top"/>
     </contour>
@@ -27,12 +33,6 @@
     <contour>
       <point x="808" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="616" y="2004" type="line"/>
-      <point x="152" y="2004" type="line"/>
-      <point x="152" y="0" type="line"/>
-      <point x="616" y="0" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/Ibar_.glif b/src/Interface-Bold.ufo/glyphs/Ibar_.glif
index 82914e215..9613bc6e0 100644
--- a/src/Interface-Bold.ufo/glyphs/Ibar_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Ibar_.glif
@@ -3,6 +3,8 @@
   <advance width="1280"/>
   <unicode hex="0197"/>
   <outline>
+    <component base="I" xOffset="268"/>
+    <component base="crossbar"/>
     <contour>
       <point x="688" y="2200" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="688" y="0" type="move" name="bottom"/>
     </contour>
-    <component base="I" xOffset="268"/>
-    <component base="crossbar"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/Idieresisacute_.glif b/src/Interface-Bold.ufo/glyphs/Idieresisacute_.glif
index 87ae839d2..a8c837966 100644
--- a/src/Interface-Bold.ufo/glyphs/Idieresisacute_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Idieresisacute_.glif
@@ -3,6 +3,8 @@
   <advance width="1024"/>
   <unicode hex="1E2E"/>
   <outline>
+    <component base="I" xOffset="94"/>
+    <component base="dieresisacutecomb" xOffset="1305" yOffset="463"/>
     <contour>
       <point x="733" y="0" type="move" name="right"/>
     </contour>
@@ -27,7 +29,5 @@
     <contour>
       <point x="935" y="-560" type="move" name="bottom_dd"/>
     </contour>
-    <component base="I" xOffset="94"/>
-    <component base="dieresisacutecomb" xOffset="1305" yOffset="463"/>
   </outline>
 </glyph>
diff --git a/src/Interface-Bold.ufo/glyphs/Itildebelow_.glif b/src/Interface-Bold.ufo/glyphs/Itildebelow_.glif
index bb2f3993b..8e6a250c7 100644
--- a/src/Interface-Bold.ufo/glyphs/Itildebelow_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Itildebelow_.glif
@@ -3,6 +3,8 @@
   <advance width="1280"/>
   <unicode hex="1E2C"/>
   <outline>
+    <component base="I" xOffset="264"/>
+    <component base="tilde" yOffset="-2284"/>
     <contour>
       <point x="904" y="0" type="move" name="right"/>
     </contour>
@@ -30,8 +32,6 @@
     <contour>
       <point x="1108" y="-560" type="move" name="bottom_dd"/>
     </contour>
-    <component base="I" xOffset="264"/>
-    <component base="tilde" yOffset="-2284"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/J_.glif b/src/Interface-Bold.ufo/glyphs/J_.glif
index 1f446e2b1..8353059a0 100644
--- a/src/Interface-Bold.ufo/glyphs/J_.glif
+++ b/src/Interface-Bold.ufo/glyphs/J_.glif
@@ -3,21 +3,6 @@
   <advance width="1536"/>
   <unicode hex="004A"/>
   <outline>
-    <contour>
-      <point x="1212" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="736" y="-16" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1612" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1612" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1612" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="992" y="628" type="line"/>
       <point x="992" y="452"/>
@@ -33,8 +18,23 @@
       <point x="1156" y="-28"/>
       <point x="1452" y="228"/>
       <point x="1452" y="628" type="curve"/>
-      <point x="1452" y="2004" type="line"/>
-      <point x="992" y="2004" type="line"/>
+      <point x="1452" y="2048" type="line"/>
+      <point x="992" y="2048" type="line"/>
+    </contour>
+    <contour>
+      <point x="1212" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="736" y="-16" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1612" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="1612" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="1612" y="2200" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Interface-Bold.ufo/glyphs/K_.glif b/src/Interface-Bold.ufo/glyphs/K_.glif
index 38f90c61d..e500a4040 100644
--- a/src/Interface-Bold.ufo/glyphs/K_.glif
+++ b/src/Interface-Bold.ufo/glyphs/K_.glif
@@ -3,6 +3,25 @@
   <advance width="1920"/>
   <unicode hex="004B"/>
   <outline>
+    <contour>
+      <point x="592" y="2048" type="line"/>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="592" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="1808" y="2048" type="line"/>
+      <point x="1240" y="2048" type="line"/>
+      <point x="760" y="1376" type="line"/>
+      <point x="464" y="936" type="line"/>
+      <point x="548" y="360" type="line"/>
+    </contour>
+    <contour>
+      <point x="1248" y="0" type="line"/>
+      <point x="1792" y="0" type="line"/>
+      <point x="1060" y="1180" type="line"/>
+      <point x="708" y="904" type="line"/>
+    </contour>
     <contour>
       <point x="924" y="72" type="move" name="bottom"/>
     </contour>
@@ -24,25 +43,6 @@
     <contour>
       <point x="1828" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="592" y="2004" type="line"/>
-      <point x="128" y="2004" type="line"/>
-      <point x="128" y="0" type="line"/>
-      <point x="592" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1784" y="2004" type="line"/>
-      <point x="1216" y="2004" type="line"/>
-      <point x="760" y="1376" type="line"/>
-      <point x="464" y="936" type="line"/>
-      <point x="548" y="360" type="line"/>
-    </contour>
-    <contour>
-      <point x="1248" y="0" type="line"/>
-      <point x="1792" y="0" type="line"/>
-      <point x="1060" y="1180" type="line"/>
-      <point x="708" y="904" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/L_.glif b/src/Interface-Bold.ufo/glyphs/L_.glif
index 09ee03977..326c4d321 100644
--- a/src/Interface-Bold.ufo/glyphs/L_.glif
+++ b/src/Interface-Bold.ufo/glyphs/L_.glif
@@ -3,6 +3,18 @@
   <advance width="1536"/>
   <unicode hex="004C"/>
   <outline>
+    <contour>
+      <point x="1420" y="384" type="line"/>
+      <point x="432" y="384" type="line"/>
+      <point x="432" y="0" type="line"/>
+      <point x="1420" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="592" y="2048" type="line"/>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="592" y="0" type="line"/>
+    </contour>
     <contour>
       <point x="356" y="2200" type="move" name="top"/>
     </contour>
@@ -24,18 +36,6 @@
     <contour>
       <point x="1476" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1420" y="384" type="line"/>
-      <point x="432" y="384" type="line"/>
-      <point x="432" y="0" type="line"/>
-      <point x="1420" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="592" y="2004" type="line"/>
-      <point x="128" y="2004" type="line"/>
-      <point x="128" y="0" type="line"/>
-      <point x="592" y="0" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/Lambda_.glif b/src/Interface-Bold.ufo/glyphs/Lambda_.glif
index a9c921ed3..9b28ae01e 100644
--- a/src/Interface-Bold.ufo/glyphs/Lambda_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Lambda_.glif
@@ -3,7 +3,7 @@
   <advance width="2048"/>
   <unicode hex="039B"/>
   <outline>
-    <component base="V" yScale="-1" yOffset="2004"/>
+    <component base="V" yScale="-1" yOffset="2048"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/Lslash_.glif b/src/Interface-Bold.ufo/glyphs/Lslash_.glif
index 86a772002..271088d9a 100644
--- a/src/Interface-Bold.ufo/glyphs/Lslash_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Lslash_.glif
@@ -3,6 +3,13 @@
   <advance width="1792"/>
   <unicode hex="0141"/>
   <outline>
+    <contour>
+      <point x="1072" y="1332" type="line"/>
+      <point x="148" y="1072" type="line"/>
+      <point x="148" y="828" type="line"/>
+      <point x="1072" y="1084" type="line"/>
+    </contour>
+    <component base="L" xOffset="172"/>
     <contour>
       <point x="556" y="2200" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="1700" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1072" y="1332" type="line"/>
-      <point x="148" y="1072" type="line"/>
-      <point x="148" y="828" type="line"/>
-      <point x="1072" y="1084" type="line"/>
-    </contour>
-    <component base="L" xOffset="172"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/M_.glif b/src/Interface-Bold.ufo/glyphs/M_.glif
index 3ead3fb16..118493fda 100644
--- a/src/Interface-Bold.ufo/glyphs/M_.glif
+++ b/src/Interface-Bold.ufo/glyphs/M_.glif
@@ -3,6 +3,24 @@
   <advance width="2432"/>
   <unicode hex="004D"/>
   <outline>
+    <contour>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="600" y="0" type="line"/>
+      <point x="600" y="1340" type="line"/>
+      <point x="608" y="1340" type="line"/>
+      <point x="1056" y="0" type="line"/>
+      <point x="1368" y="0" type="line"/>
+      <point x="1824" y="1332" type="line"/>
+      <point x="1836" y="1332" type="line"/>
+      <point x="1836" y="0" type="line"/>
+      <point x="2304" y="0" type="line"/>
+      <point x="2304" y="2048" type="line"/>
+      <point x="1692" y="2048" type="line"/>
+      <point x="1228" y="668" type="line"/>
+      <point x="1204" y="668" type="line"/>
+      <point x="740" y="2048" type="line"/>
+    </contour>
     <contour>
       <point x="1276" y="2200" type="move" name="top"/>
     </contour>
@@ -21,24 +39,6 @@
     <contour>
       <point x="2516" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="128" y="2004" type="line"/>
-      <point x="128" y="0" type="line"/>
-      <point x="600" y="0" type="line"/>
-      <point x="600" y="1296" type="line"/>
-      <point x="608" y="1296" type="line"/>
-      <point x="1056" y="0" type="line"/>
-      <point x="1368" y="0" type="line"/>
-      <point x="1824" y="1288" type="line"/>
-      <point x="1836" y="1288" type="line"/>
-      <point x="1836" y="0" type="line"/>
-      <point x="2304" y="0" type="line"/>
-      <point x="2304" y="2004" type="line"/>
-      <point x="1692" y="2004" type="line"/>
-      <point x="1228" y="668" type="line"/>
-      <point x="1204" y="668" type="line"/>
-      <point x="740" y="2004" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/N_.glif b/src/Interface-Bold.ufo/glyphs/N_.glif
index 077613044..3d96aefc9 100644
--- a/src/Interface-Bold.ufo/glyphs/N_.glif
+++ b/src/Interface-Bold.ufo/glyphs/N_.glif
@@ -3,6 +3,20 @@
   <advance width="1920"/>
   <unicode hex="004E"/>
   <outline>
+    <contour>
+      <point x="1792" y="2048" type="line"/>
+      <point x="1328" y="2048" type="line"/>
+      <point x="1328" y="788" type="line"/>
+      <point x="1312" y="788" type="line"/>
+      <point x="588" y="2048" type="line"/>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="592" y="0" type="line"/>
+      <point x="592" y="1260" type="line"/>
+      <point x="608" y="1260" type="line"/>
+      <point x="1336" y="0" type="line"/>
+      <point x="1792" y="0" type="line"/>
+    </contour>
     <contour>
       <point x="1032" y="2200" type="move" name="top"/>
     </contour>
@@ -21,20 +35,6 @@
     <contour>
       <point x="2016" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1792" y="2004" type="line"/>
-      <point x="1328" y="2004" type="line"/>
-      <point x="1328" y="788" type="line"/>
-      <point x="1312" y="788" type="line"/>
-      <point x="588" y="2004" type="line"/>
-      <point x="128" y="2004" type="line"/>
-      <point x="128" y="0" type="line"/>
-      <point x="592" y="0" type="line"/>
-      <point x="592" y="1216" type="line"/>
-      <point x="608" y="1216" type="line"/>
-      <point x="1336" y="0" type="line"/>
-      <point x="1792" y="0" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/OE__.glif b/src/Interface-Bold.ufo/glyphs/OE__.glif
index 098640986..357d7add1 100644
--- a/src/Interface-Bold.ufo/glyphs/OE__.glif
+++ b/src/Interface-Bold.ufo/glyphs/OE__.glif
@@ -4,34 +4,26 @@
   <unicode hex="0152"/>
   <outline>
     <contour>
-      <point x="992" y="2032" type="curve" smooth="yes"/>
-      <point x="484" y="2032"/>
-      <point x="136" y="1696"/>
-      <point x="136" y="1212" type="curve"/>
-      <point x="136" y="792" type="line"/>
-      <point x="136" y="308"/>
-      <point x="484" y="-28"/>
-      <point x="992" y="-28" type="curve" smooth="yes"/>
-      <point x="1132" y="-28"/>
-      <point x="1268" y="-16"/>
-      <point x="1388" y="0" type="curve"/>
-      <point x="1388" y="368" type="line"/>
-      <point x="1272" y="344"/>
-      <point x="1136" y="332"/>
-      <point x="992" y="332" type="curve" smooth="yes"/>
-      <point x="740" y="332"/>
-      <point x="580" y="484"/>
-      <point x="580" y="792" type="curve"/>
-      <point x="580" y="1212" type="line"/>
-      <point x="580" y="1520"/>
-      <point x="736" y="1672"/>
-      <point x="992" y="1672" type="curve" smooth="yes"/>
-      <point x="1132" y="1672"/>
-      <point x="1268" y="1656"/>
-      <point x="1388" y="1636" type="curve"/>
-      <point x="1388" y="2004" type="line"/>
-      <point x="1268" y="2016"/>
-      <point x="1128" y="2032"/>
+      <point x="992" y="2048" type="line" smooth="yes"/>
+      <point x="484" y="2048"/>
+      <point x="136" y="1720"/>
+      <point x="136" y="1236" type="curve"/>
+      <point x="136" y="816" type="line"/>
+      <point x="136" y="332"/>
+      <point x="484" y="0"/>
+      <point x="992" y="0" type="curve" smooth="yes"/>
+      <point x="1388" y="0" type="line"/>
+      <point x="1388" y="360" type="line"/>
+      <point x="992" y="360" type="line" smooth="yes"/>
+      <point x="740" y="360"/>
+      <point x="580" y="508"/>
+      <point x="580" y="816" type="curve"/>
+      <point x="580" y="1236" type="line"/>
+      <point x="580" y="1544"/>
+      <point x="736" y="1688"/>
+      <point x="992" y="1688" type="curve" smooth="yes"/>
+      <point x="1388" y="1688" type="line"/>
+      <point x="1388" y="2048" type="line"/>
     </contour>
     <component base="E" xOffset="1100"/>
     <contour>
diff --git a/src/Interface-Bold.ufo/glyphs/O_.glif b/src/Interface-Bold.ufo/glyphs/O_.glif
index 206dcb77f..f62a6cd5a 100644
--- a/src/Interface-Bold.ufo/glyphs/O_.glif
+++ b/src/Interface-Bold.ufo/glyphs/O_.glif
@@ -3,6 +3,34 @@
   <advance width="2048"/>
   <unicode hex="004F"/>
   <outline>
+    <contour>
+      <point x="1892" y="1020" type="curve"/>
+      <point x="1892" y="1688"/>
+      <point x="1532" y="2076"/>
+      <point x="1024" y="2076" type="curve" smooth="yes"/>
+      <point x="512" y="2076"/>
+      <point x="156" y="1688"/>
+      <point x="156" y="1020" type="curve"/>
+      <point x="156" y="356"/>
+      <point x="516" y="-28"/>
+      <point x="1028" y="-28" type="curve" smooth="yes"/>
+      <point x="1536" y="-28"/>
+      <point x="1892" y="356"/>
+    </contour>
+    <contour>
+      <point x="1424" y="1000" type="curve"/>
+      <point x="1424" y="568"/>
+      <point x="1284" y="348"/>
+      <point x="1028" y="348" type="curve" smooth="yes"/>
+      <point x="764" y="348"/>
+      <point x="624" y="568"/>
+      <point x="624" y="1000" type="curve"/>
+      <point x="624" y="1440"/>
+      <point x="760" y="1652"/>
+      <point x="1024" y="1652" type="curve" smooth="yes"/>
+      <point x="1280" y="1652"/>
+      <point x="1424" y="1440"/>
+    </contour>
     <contour>
       <point x="1024" y="2200" type="move" name="top"/>
     </contour>
@@ -21,34 +49,6 @@
     <contour>
       <point x="1996" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1892" y="1000" type="curve"/>
-      <point x="1892" y="1652"/>
-      <point x="1532" y="2032"/>
-      <point x="1024" y="2032" type="curve" smooth="yes"/>
-      <point x="512" y="2032"/>
-      <point x="156" y="1652"/>
-      <point x="156" y="1000" type="curve"/>
-      <point x="156" y="348"/>
-      <point x="516" y="-28"/>
-      <point x="1028" y="-28" type="curve" smooth="yes"/>
-      <point x="1536" y="-28"/>
-      <point x="1892" y="348"/>
-    </contour>
-    <contour>
-      <point x="1424" y="1000" type="curve"/>
-      <point x="1424" y="568"/>
-      <point x="1284" y="348"/>
-      <point x="1028" y="348" type="curve" smooth="yes"/>
-      <point x="764" y="348"/>
-      <point x="624" y="568"/>
-      <point x="624" y="1000" type="curve"/>
-      <point x="624" y="1440"/>
-      <point x="760" y="1652"/>
-      <point x="1024" y="1652" type="curve" smooth="yes"/>
-      <point x="1280" y="1652"/>
-      <point x="1424" y="1440"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/Ohorn_.glif b/src/Interface-Bold.ufo/glyphs/Ohorn_.glif
index b5e1d4ac2..702ef0038 100644
--- a/src/Interface-Bold.ufo/glyphs/Ohorn_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Ohorn_.glif
@@ -3,15 +3,6 @@
   <advance width="2048"/>
   <unicode hex="01A0"/>
   <outline>
-    <contour>
-      <point x="904" y="2212" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="864" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1920" y="2212" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1688" y="2140" type="line"/>
       <point x="1688" y="1888"/>
@@ -23,6 +14,15 @@
       <point x="1964" y="2140" type="curve"/>
     </contour>
     <component base="O" xOffset="-72"/>
+    <contour>
+      <point x="904" y="2212" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="864" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1920" y="2212" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/Oslash_.glif b/src/Interface-Bold.ufo/glyphs/Oslash_.glif
index 4845f9e97..5b1274632 100644
--- a/src/Interface-Bold.ufo/glyphs/Oslash_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Oslash_.glif
@@ -3,6 +3,13 @@
   <advance width="2048"/>
   <unicode hex="00D8"/>
   <outline>
+    <contour>
+      <point x="1744" y="2088" type="line"/>
+      <point x="1468" y="2088" type="line"/>
+      <point x="180" y="-132" type="line"/>
+      <point x="460" y="-132" type="line"/>
+    </contour>
+    <component base="O"/>
     <contour>
       <point x="972" y="2304" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="1924" y="2304" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1744" y="2088" type="line"/>
-      <point x="1468" y="2088" type="line"/>
-      <point x="180" y="-132" type="line"/>
-      <point x="460" y="-132" type="line"/>
-    </contour>
-    <component base="O"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/P_.glif b/src/Interface-Bold.ufo/glyphs/P_.glif
index 34d992923..aff8de122 100644
--- a/src/Interface-Bold.ufo/glyphs/P_.glif
+++ b/src/Interface-Bold.ufo/glyphs/P_.glif
@@ -3,6 +3,28 @@
   <advance width="1792"/>
   <unicode hex="0050"/>
   <outline>
+    <contour>
+      <point x="920" y="724" type="line"/>
+      <point x="1400" y="724"/>
+      <point x="1672" y="980"/>
+      <point x="1672" y="1368" type="curve"/>
+      <point x="1672" y="1760"/>
+      <point x="1400" y="2048"/>
+      <point x="920" y="2048" type="curve"/>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="592" y="0" type="line"/>
+      <point x="592" y="1664" type="line"/>
+      <point x="920" y="1664" type="line"/>
+      <point x="1128" y="1668"/>
+      <point x="1208" y="1536"/>
+      <point x="1208" y="1388" type="curve"/>
+      <point x="1208" y="1232"/>
+      <point x="1128" y="1108"/>
+      <point x="920" y="1104" type="curve"/>
+      <point x="420" y="1104" type="line"/>
+      <point x="420" y="724" type="line"/>
+    </contour>
     <contour>
       <point x="12.0" y="2000.0" type="move" name="tonos"/>
     </contour>
@@ -21,28 +43,6 @@
     <contour>
       <point x="1912.0" y="2216.0" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="920" y="680" type="line"/>
-      <point x="1400" y="680"/>
-      <point x="1672" y="936"/>
-      <point x="1672" y="1324" type="curve"/>
-      <point x="1672" y="1716"/>
-      <point x="1400" y="2004"/>
-      <point x="920" y="2004" type="curve"/>
-      <point x="128" y="2004" type="line"/>
-      <point x="128" y="0" type="line"/>
-      <point x="592" y="0" type="line"/>
-      <point x="592" y="1620" type="line"/>
-      <point x="920" y="1620" type="line"/>
-      <point x="1128" y="1624"/>
-      <point x="1208" y="1492"/>
-      <point x="1208" y="1344" type="curve"/>
-      <point x="1208" y="1188"/>
-      <point x="1128" y="1064"/>
-      <point x="920" y="1060" type="curve"/>
-      <point x="420" y="1060" type="line"/>
-      <point x="420" y="680" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/Pi_.glif b/src/Interface-Bold.ufo/glyphs/Pi_.glif
index cd6449dee..c33532110 100644
--- a/src/Interface-Bold.ufo/glyphs/Pi_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Pi_.glif
@@ -4,18 +4,18 @@
   <unicode hex="03A0"/>
   <outline>
     <contour>
-      <point x="1852" y="0" type="move" name="right"/>
-    </contour>
-    <contour>
-      <point x="1856" y="2004" type="line"/>
-      <point x="192" y="2004" type="line"/>
+      <point x="1856" y="2048" type="line"/>
+      <point x="192" y="2048" type="line"/>
       <point x="192" y="0" type="line"/>
       <point x="652" y="0" type="line"/>
-      <point x="652" y="1628" type="line"/>
-      <point x="1396" y="1628" type="line"/>
+      <point x="652" y="1672" type="line"/>
+      <point x="1396" y="1672" type="line"/>
       <point x="1396" y="0" type="line"/>
       <point x="1856" y="0" type="line"/>
     </contour>
+    <contour>
+      <point x="1852" y="0" type="move" name="right"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/Q_.glif b/src/Interface-Bold.ufo/glyphs/Q_.glif
index e25c1d3f8..6341d95d7 100644
--- a/src/Interface-Bold.ufo/glyphs/Q_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Q_.glif
@@ -3,6 +3,13 @@
   <advance width="2048"/>
   <unicode hex="0051"/>
   <outline>
+    <contour>
+      <point x="1276" y="764" type="line"/>
+      <point x="976" y="524" type="line"/>
+      <point x="1560" y="-340" type="line"/>
+      <point x="1872" y="-112" type="line"/>
+    </contour>
+    <component base="O"/>
     <contour>
       <point x="1016" y="2200" type="move" name="top"/>
     </contour>
@@ -18,13 +25,6 @@
     <contour>
       <point x="1996" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1276" y="764" type="line"/>
-      <point x="976" y="524" type="line"/>
-      <point x="1560" y="-340" type="line"/>
-      <point x="1872" y="-112" type="line"/>
-    </contour>
-    <component base="O"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/R_.glif b/src/Interface-Bold.ufo/glyphs/R_.glif
index 0216bcf90..005a5da53 100644
--- a/src/Interface-Bold.ufo/glyphs/R_.glif
+++ b/src/Interface-Bold.ufo/glyphs/R_.glif
@@ -4,49 +4,49 @@
   <unicode hex="0052"/>
   <outline>
     <contour>
-      <point x="128" y="2004" type="line" name="hr00"/>
+      <point x="128" y="2048" type="line" name="hr00"/>
       <point x="128" y="0" type="line"/>
       <point x="592" y="0" type="line"/>
-      <point x="592" y="1620" type="line"/>
-      <point x="900" y="1620" type="line" smooth="yes"/>
-      <point x="1092" y="1620"/>
-      <point x="1192" y="1524"/>
-      <point x="1192" y="1352" type="curve" smooth="yes"/>
-      <point x="1192" y="1184"/>
-      <point x="1096" y="1088"/>
-      <point x="900" y="1088" type="curve" smooth="yes"/>
-      <point x="416" y="1088" type="line"/>
-      <point x="420" y="708" type="line"/>
-      <point x="1072" y="708" type="line"/>
-      <point x="1224" y="796" type="line"/>
-      <point x="1480" y="892"/>
-      <point x="1652" y="1052"/>
-      <point x="1652" y="1396" type="curve" smooth="yes"/>
-      <point x="1652" y="1736"/>
-      <point x="1364" y="2004"/>
-      <point x="900" y="2004" type="curve" smooth="yes"/>
+      <point x="592" y="1664" type="line"/>
+      <point x="900" y="1664" type="line" smooth="yes"/>
+      <point x="1092" y="1664"/>
+      <point x="1192" y="1568"/>
+      <point x="1192" y="1396" type="curve" smooth="yes"/>
+      <point x="1192" y="1228"/>
+      <point x="1096" y="1132"/>
+      <point x="900" y="1132" type="curve" smooth="yes"/>
+      <point x="416" y="1132" type="line"/>
+      <point x="420" y="752" type="line"/>
+      <point x="1072" y="752" type="line"/>
+      <point x="1224" y="840" type="line"/>
+      <point x="1480" y="936"/>
+      <point x="1652" y="1096"/>
+      <point x="1652" y="1440" type="curve" smooth="yes"/>
+      <point x="1652" y="1780"/>
+      <point x="1364" y="2048"/>
+      <point x="900" y="2048" type="curve" smooth="yes"/>
     </contour>
     <contour>
       <point x="1228" y="0" type="line"/>
       <point x="1724" y="0" type="line"/>
       <point x="1724" y="20" type="line"/>
-      <point x="1272" y="888" type="line"/>
-      <point x="784" y="888" type="line"/>
+      <point x="1272" y="932" type="line"/>
+      <point x="784" y="932" type="line"/>
     </contour>
     <contour>
-      <point x="884" y="2200" type="move" name="top"/>
+      <point x="884.0" y="2200.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="908" y="16" type="move" name="bottom"/>
+      <point x="908.0" y="16.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1892" y="2200" type="move" name="top_dd"/>
+      <point x="1892.0" y="2200.0" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1892" y="-560" type="move" name="bottom_dd"/>
+      <point x="1892.0" y="-560.0" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1892" y="2200" type="move" name="top0315"/>
+      <point x="1892.0" y="2200.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Interface-Bold.ufo/glyphs/S_.glif b/src/Interface-Bold.ufo/glyphs/S_.glif
index 6330123b7..30f0c7b9b 100644
--- a/src/Interface-Bold.ufo/glyphs/S_.glif
+++ b/src/Interface-Bold.ufo/glyphs/S_.glif
@@ -3,6 +3,48 @@
   <advance width="1792"/>
   <unicode hex="0053"/>
   <outline>
+    <contour>
+      <point x="1204" y="1440" type="curve"/>
+      <point x="1664" y="1440" type="line"/>
+      <point x="1664" y="1828"/>
+      <point x="1360" y="2076"/>
+      <point x="920" y="2076" type="curve" smooth="yes"/>
+      <point x="480" y="2076"/>
+      <point x="160" y="1852"/>
+      <point x="160" y="1500" type="curve"/>
+      <point x="160" y="1132"/>
+      <point x="388" y="1004"/>
+      <point x="752" y="896" type="curve" smooth="yes"/>
+      <point x="792" y="884" type="line" smooth="yes"/>
+      <point x="1108" y="784"/>
+      <point x="1204" y="696"/>
+      <point x="1204" y="572" type="curve" smooth="yes" name="hr00"/>
+      <point x="1204" y="464"/>
+      <point x="1100" y="356"/>
+      <point x="908" y="356" type="curve" smooth="yes"/>
+      <point x="676" y="356"/>
+      <point x="568" y="464"/>
+      <point x="560" y="664" type="curve"/>
+      <point x="100" y="664" type="line"/>
+      <point x="100" y="180"/>
+      <point x="500" y="-28"/>
+      <point x="908" y="-28" type="curve" smooth="yes"/>
+      <point x="1352" y="-28"/>
+      <point x="1664" y="164"/>
+      <point x="1664" y="576" type="curve"/>
+      <point x="1664" y="904"/>
+      <point x="1436" y="1076"/>
+      <point x="1052" y="1212" type="curve" smooth="yes"/>
+      <point x="996" y="1236" type="line" smooth="yes"/>
+      <point x="776" y="1316"/>
+      <point x="620" y="1368"/>
+      <point x="620" y="1496" type="curve"/>
+      <point x="620" y="1612"/>
+      <point x="720" y="1688"/>
+      <point x="908" y="1688" type="curve" smooth="yes"/>
+      <point x="1100" y="1688"/>
+      <point x="1196" y="1592"/>
+    </contour>
     <contour>
       <point x="928" y="2200" type="move" name="top"/>
     </contour>
@@ -18,48 +60,6 @@
     <contour>
       <point x="1776" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1204" y="1408" type="curve"/>
-      <point x="1664.0" y="1408.0" type="line"/>
-      <point x="1664.0" y="1788.0"/>
-      <point x="1360.0" y="2032.0"/>
-      <point x="920.0" y="2032.0" type="curve" smooth="yes"/>
-      <point x="480.0" y="2032.0"/>
-      <point x="160.0" y="1812.0"/>
-      <point x="160.0" y="1468.0" type="curve"/>
-      <point x="160.0" y="1108.0"/>
-      <point x="388" y="984"/>
-      <point x="752" y="876" type="curve" smooth="yes"/>
-      <point x="792" y="864" type="line" smooth="yes"/>
-      <point x="1108" y="768"/>
-      <point x="1204.0" y="678.0"/>
-      <point x="1204.0" y="560.0" type="curve" smooth="yes" name="hr00"/>
-      <point x="1204.0" y="452.0"/>
-      <point x="1100.0" y="348.0"/>
-      <point x="908.0" y="348.0" type="curve" smooth="yes"/>
-      <point x="676.0" y="348.0"/>
-      <point x="568.0" y="452.0"/>
-      <point x="560.0" y="648.0" type="curve"/>
-      <point x="100.0" y="648.0" type="line"/>
-      <point x="100.0" y="176.0"/>
-      <point x="500.0" y="-28.0"/>
-      <point x="908.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="1352.0" y="-28.0"/>
-      <point x="1664.0" y="160.0"/>
-      <point x="1664.0" y="564.0" type="curve"/>
-      <point x="1664.0" y="885.0"/>
-      <point x="1436" y="1052"/>
-      <point x="1052" y="1188" type="curve" smooth="yes"/>
-      <point x="996" y="1208" type="line" smooth="yes"/>
-      <point x="776" y="1288"/>
-      <point x="620.0" y="1340.0"/>
-      <point x="620.0" y="1464.0" type="curve"/>
-      <point x="620.0" y="1576.0"/>
-      <point x="720.0" y="1652.0"/>
-      <point x="908.0" y="1652.0" type="curve" smooth="yes"/>
-      <point x="1100.0" y="1652.0"/>
-      <point x="1196" y="1560"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/Sigma_.glif b/src/Interface-Bold.ufo/glyphs/Sigma_.glif
index ab090ed7c..b47c09671 100644
--- a/src/Interface-Bold.ufo/glyphs/Sigma_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Sigma_.glif
@@ -4,27 +4,27 @@
   <unicode hex="03A3"/>
   <outline>
     <contour>
-      <point x="1608" y="372" type="line"/>
-      <point x="356" y="372" type="line"/>
+      <point x="1608" y="380" type="line"/>
+      <point x="356" y="380" type="line"/>
       <point x="356" y="0" type="line"/>
       <point x="1608" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="1588" y="2004" type="line"/>
-      <point x="424" y="2004" type="line"/>
-      <point x="424" y="1628" type="line"/>
-      <point x="1588" y="1628" type="line"/>
+      <point x="1588" y="2048" type="line"/>
+      <point x="424" y="2048" type="line"/>
+      <point x="424" y="1664" type="line"/>
+      <point x="1588" y="1664" type="line"/>
     </contour>
     <contour>
-      <point x="1256" y="1024" type="line"/>
-      <point x="560" y="2004" type="line"/>
-      <point x="184" y="2004" type="line"/>
-      <point x="184" y="1796" type="line"/>
-      <point x="772" y="1016" type="line"/>
-      <point x="184" y="208" type="line"/>
+      <point x="1256" y="1036" type="line"/>
+      <point x="560" y="2048" type="line"/>
+      <point x="184" y="2048" type="line"/>
+      <point x="184" y="1836" type="line"/>
+      <point x="772" y="1024" type="line"/>
+      <point x="184" y="212" type="line"/>
       <point x="184" y="0" type="line"/>
       <point x="560" y="0" type="line"/>
-      <point x="1256" y="1008" type="line"/>
+      <point x="1256" y="1016" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Interface-Bold.ufo/glyphs/T_.glif b/src/Interface-Bold.ufo/glyphs/T_.glif
index f7f212a49..1f043168c 100644
--- a/src/Interface-Bold.ufo/glyphs/T_.glif
+++ b/src/Interface-Bold.ufo/glyphs/T_.glif
@@ -3,6 +3,18 @@
   <advance width="1792"/>
   <unicode hex="0054"/>
   <outline>
+    <contour>
+      <point x="1128" y="2048" type="line"/>
+      <point x="664" y="2048" type="line"/>
+      <point x="664" y="0" type="line"/>
+      <point x="1128" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="1728" y="2048" type="line"/>
+      <point x="68" y="2048" type="line"/>
+      <point x="68" y="1664" type="line"/>
+      <point x="1728" y="1664" type="line"/>
+    </contour>
     <contour>
       <point x="888.0" y="2200.0" type="move" name="top"/>
     </contour>
@@ -24,18 +36,6 @@
     <contour>
       <point x="1780.0" y="2200.0" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1128" y="2004" type="line"/>
-      <point x="664" y="2004" type="line"/>
-      <point x="664" y="0" type="line"/>
-      <point x="1128" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1728" y="2004" type="line"/>
-      <point x="68" y="2004" type="line"/>
-      <point x="68" y="1620" type="line"/>
-      <point x="1728" y="1620" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/Thorn_.glif b/src/Interface-Bold.ufo/glyphs/Thorn_.glif
index 2f66acda4..809564f91 100644
--- a/src/Interface-Bold.ufo/glyphs/Thorn_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Thorn_.glif
@@ -4,30 +4,30 @@
   <unicode hex="00DE"/>
   <outline>
     <contour>
-      <point x="152" y="2004" type="line"/>
+      <point x="152" y="2048" type="line"/>
       <point x="152" y="0" type="line"/>
       <point x="596" y="0" type="line"/>
-      <point x="596" y="2004" type="line"/>
+      <point x="596" y="2048" type="line"/>
     </contour>
     <contour>
-      <point x="292" y="1648" type="line"/>
-      <point x="596" y="1292" type="line"/>
-      <point x="880" y="1292" type="line" smooth="yes"/>
-      <point x="1108" y="1292"/>
-      <point x="1196" y="1160"/>
-      <point x="1196" y="1012" type="curve" smooth="yes"/>
-      <point x="1196" y="868"/>
-      <point x="1108" y="740"/>
-      <point x="880" y="740" type="curve" smooth="yes"/>
-      <point x="540" y="740" type="line"/>
-      <point x="540" y="384" type="line"/>
-      <point x="880" y="384" type="line" smooth="yes"/>
-      <point x="1372" y="384"/>
-      <point x="1640" y="648"/>
-      <point x="1640" y="1016" type="curve" smooth="yes"/>
-      <point x="1640" y="1384"/>
-      <point x="1372" y="1648"/>
-      <point x="880" y="1648" type="curve" smooth="yes"/>
+      <point x="292" y="1660" type="line"/>
+      <point x="596" y="1304" type="line"/>
+      <point x="880" y="1304" type="line" smooth="yes"/>
+      <point x="1108" y="1304"/>
+      <point x="1196" y="1172"/>
+      <point x="1196" y="1024" type="curve" smooth="yes"/>
+      <point x="1196" y="880"/>
+      <point x="1108" y="752"/>
+      <point x="880" y="752" type="curve" smooth="yes"/>
+      <point x="540" y="752" type="line"/>
+      <point x="540" y="396" type="line"/>
+      <point x="880" y="396" type="line" smooth="yes"/>
+      <point x="1372" y="396"/>
+      <point x="1640" y="660"/>
+      <point x="1640" y="1028" type="curve" smooth="yes"/>
+      <point x="1640" y="1396"/>
+      <point x="1372" y="1660"/>
+      <point x="880" y="1660" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Interface-Bold.ufo/glyphs/U_.glif b/src/Interface-Bold.ufo/glyphs/U_.glif
index 3ec987d82..90aaadfe6 100644
--- a/src/Interface-Bold.ufo/glyphs/U_.glif
+++ b/src/Interface-Bold.ufo/glyphs/U_.glif
@@ -4,7 +4,7 @@
   <unicode hex="0055"/>
   <outline>
     <contour>
-      <point x="1328" y="2004" type="line"/>
+      <point x="1328" y="2048" type="line"/>
       <point x="1328" y="696" type="line" smooth="yes"/>
       <point x="1328" y="496"/>
       <point x="1180" y="372"/>
@@ -12,8 +12,8 @@
       <point x="744" y="372"/>
       <point x="592" y="496"/>
       <point x="592" y="696" type="curve" smooth="yes"/>
-      <point x="592" y="2004" type="line"/>
-      <point x="128" y="2004" type="line"/>
+      <point x="592" y="2048" type="line"/>
+      <point x="128" y="2048" type="line"/>
       <point x="128" y="696" type="line"/>
       <point x="128" y="228"/>
       <point x="468" y="-28"/>
@@ -21,7 +21,7 @@
       <point x="1456" y="-28"/>
       <point x="1792" y="228"/>
       <point x="1792" y="696" type="curve"/>
-      <point x="1792" y="2004" type="line"/>
+      <point x="1792" y="2048" type="line"/>
     </contour>
     <contour>
       <point x="960" y="2200" type="move" name="top"/>
diff --git a/src/Interface-Bold.ufo/glyphs/V_.glif b/src/Interface-Bold.ufo/glyphs/V_.glif
index 781a90d55..7546882ab 100644
--- a/src/Interface-Bold.ufo/glyphs/V_.glif
+++ b/src/Interface-Bold.ufo/glyphs/V_.glif
@@ -3,6 +3,16 @@
   <advance width="2048"/>
   <unicode hex="0056"/>
   <outline>
+    <contour>
+      <point x="600" y="2048" type="line"/>
+      <point x="1012" y="580" type="line"/>
+      <point x="1036" y="580" type="line"/>
+      <point x="1448" y="2048" type="line"/>
+      <point x="1956" y="2048" type="line"/>
+      <point x="1272" y="0" type="line"/>
+      <point x="776" y="0" type="line"/>
+      <point x="92" y="2048" type="line"/>
+    </contour>
     <contour>
       <point x="1020" y="2216" type="move" name="top"/>
     </contour>
@@ -18,16 +28,6 @@
     <contour>
       <point x="1952" y="2216" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="608" y="2004" type="line"/>
-      <point x="1012" y="580" type="line"/>
-      <point x="1036" y="580" type="line"/>
-      <point x="1440" y="2004" type="line"/>
-      <point x="1952" y="2004" type="line"/>
-      <point x="1272" y="0" type="line"/>
-      <point x="776" y="0" type="line"/>
-      <point x="96" y="2004" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/W_.glif b/src/Interface-Bold.ufo/glyphs/W_.glif
index 8964ad550..bd73decf7 100644
--- a/src/Interface-Bold.ufo/glyphs/W_.glif
+++ b/src/Interface-Bold.ufo/glyphs/W_.glif
@@ -3,6 +3,24 @@
   <advance width="2560"/>
   <unicode hex="0057"/>
   <outline>
+    <contour>
+      <point x="552" y="2048" type="line"/>
+      <point x="132" y="2048" type="line"/>
+      <point x="524" y="0" type="line"/>
+      <point x="996" y="0" type="line"/>
+      <point x="1272" y="1284" type="line"/>
+      <point x="1288" y="1284" type="line"/>
+      <point x="1568" y="0" type="line"/>
+      <point x="2040" y="0" type="line"/>
+      <point x="2428" y="2048" type="line"/>
+      <point x="2012" y="2048" type="line"/>
+      <point x="1796" y="668" type="line"/>
+      <point x="1780" y="668" type="line"/>
+      <point x="1484" y="2048" type="line"/>
+      <point x="1080" y="2048" type="line"/>
+      <point x="784" y="672" type="line"/>
+      <point x="768" y="672" type="line"/>
+    </contour>
     <contour>
       <point x="1288" y="2200" type="move" name="top"/>
     </contour>
@@ -18,24 +36,6 @@
     <contour>
       <point x="2508" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="552" y="2004" type="line"/>
-      <point x="132" y="2004" type="line"/>
-      <point x="524" y="0" type="line"/>
-      <point x="996" y="0" type="line"/>
-      <point x="1272" y="1240" type="line"/>
-      <point x="1288" y="1240" type="line"/>
-      <point x="1568" y="0" type="line"/>
-      <point x="2040" y="0" type="line"/>
-      <point x="2428" y="2004" type="line"/>
-      <point x="2012" y="2004" type="line"/>
-      <point x="1796" y="668" type="line"/>
-      <point x="1780" y="668" type="line"/>
-      <point x="1484" y="2004" type="line"/>
-      <point x="1080" y="2004" type="line"/>
-      <point x="784" y="672" type="line"/>
-      <point x="768" y="672" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/X_.glif b/src/Interface-Bold.ufo/glyphs/X_.glif
index 69310d986..e1558b573 100644
--- a/src/Interface-Bold.ufo/glyphs/X_.glif
+++ b/src/Interface-Bold.ufo/glyphs/X_.glif
@@ -3,6 +3,34 @@
   <advance width="2048"/>
   <unicode hex="0058"/>
   <outline>
+    <contour>
+      <point x="684" y="2076" type="line"/>
+      <point x="156" y="2076" type="line"/>
+      <point x="720" y="1044" type="line"/>
+      <point x="140" y="0" type="line"/>
+      <point x="672" y="0" type="line"/>
+      <point x="1012" y="672" type="line" smooth="yes"/>
+      <point x="1020" y="692"/>
+      <point x="1024" y="696"/>
+      <point x="1024" y="712" type="curve"/>
+      <point x="1032" y="712" type="line"/>
+      <point x="1032" y="696"/>
+      <point x="1032" y="692"/>
+      <point x="1040" y="672" type="curve" smooth="yes"/>
+      <point x="1376" y="0" type="line"/>
+      <point x="1908" y="0" type="line"/>
+      <point x="1328" y="1044" type="line"/>
+      <point x="1892" y="2076" type="line"/>
+      <point x="1368" y="2076" type="line"/>
+      <point x="1040" y="1412" type="line" smooth="yes"/>
+      <point x="1032" y="1396"/>
+      <point x="1032" y="1392"/>
+      <point x="1032" y="1376" type="curve"/>
+      <point x="1024" y="1376" type="line"/>
+      <point x="1024" y="1392"/>
+      <point x="1020" y="1396"/>
+      <point x="1012" y="1412" type="curve" smooth="yes"/>
+    </contour>
     <contour>
       <point x="1024" y="28" type="move" name="bottom"/>
     </contour>
@@ -24,34 +52,6 @@
     <contour>
       <point x="1924" y="2216" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="684" y="2004" type="line"/>
-      <point x="156" y="2004" type="line"/>
-      <point x="720" y="1008" type="line"/>
-      <point x="140" y="0" type="line"/>
-      <point x="672" y="0" type="line"/>
-      <point x="1012" y="652" type="line" smooth="yes"/>
-      <point x="1020" y="668"/>
-      <point x="1024" y="672"/>
-      <point x="1024" y="688" type="curve"/>
-      <point x="1032" y="688" type="line"/>
-      <point x="1032" y="672"/>
-      <point x="1032" y="668"/>
-      <point x="1040" y="652" type="curve" smooth="yes"/>
-      <point x="1376" y="0" type="line"/>
-      <point x="1908" y="0" type="line"/>
-      <point x="1328" y="1008" type="line"/>
-      <point x="1892" y="2004" type="line"/>
-      <point x="1368" y="2004" type="line"/>
-      <point x="1040" y="1364" type="line" smooth="yes"/>
-      <point x="1032" y="1348"/>
-      <point x="1032" y="1344"/>
-      <point x="1032" y="1328" type="curve"/>
-      <point x="1024" y="1328" type="line"/>
-      <point x="1024" y="1344"/>
-      <point x="1020" y="1348"/>
-      <point x="1012" y="1364" type="curve" smooth="yes"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/Y_.glif b/src/Interface-Bold.ufo/glyphs/Y_.glif
index abd792a61..348dbdbf2 100644
--- a/src/Interface-Bold.ufo/glyphs/Y_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Y_.glif
@@ -4,15 +4,15 @@
   <unicode hex="0059"/>
   <outline>
     <contour>
-      <point x="592" y="2004" type="line"/>
-      <point x="92" y="2004" type="line"/>
-      <point x="792" y="720" type="line"/>
+      <point x="592" y="2048" type="line"/>
+      <point x="92" y="2048" type="line"/>
+      <point x="792" y="764" type="line"/>
       <point x="792" y="0" type="line"/>
       <point x="1256" y="0" type="line"/>
-      <point x="1256" y="720" type="line"/>
-      <point x="1956" y="2004" type="line"/>
-      <point x="1456" y="2004" type="line"/>
-      <point x="1024" y="1132" type="line"/>
+      <point x="1256" y="764" type="line"/>
+      <point x="1956" y="2048" type="line"/>
+      <point x="1456" y="2048" type="line"/>
+      <point x="1024" y="1176" type="line"/>
     </contour>
     <contour>
       <point x="1024" y="2200" type="move" name="top"/>
diff --git a/src/Interface-Bold.ufo/glyphs/Z_.glif b/src/Interface-Bold.ufo/glyphs/Z_.glif
index 167cc6b8b..0a79eb708 100644
--- a/src/Interface-Bold.ufo/glyphs/Z_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Z_.glif
@@ -3,6 +3,26 @@
   <advance width="1792"/>
   <unicode hex="005A"/>
   <outline>
+    <contour>
+      <point x="1672" y="372" type="line"/>
+      <point x="236" y="372" type="line"/>
+      <point x="236" y="0" type="line"/>
+      <point x="1672" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="1660" y="1800" type="line"/>
+      <point x="1660" y="2048" type="line"/>
+      <point x="1340" y="2048" type="line"/>
+      <point x="124" y="256" type="line"/>
+      <point x="124" y="0" type="line"/>
+      <point x="456" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="1508" y="2048" type="line"/>
+      <point x="120" y="2048" type="line"/>
+      <point x="120" y="1672" type="line"/>
+      <point x="1508" y="1672" type="line"/>
+    </contour>
     <contour>
       <point x="900" y="2200" type="move" name="top"/>
     </contour>
@@ -18,26 +38,6 @@
     <contour>
       <point x="1744" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1672" y="372" type="line"/>
-      <point x="236" y="372" type="line"/>
-      <point x="236" y="0" type="line"/>
-      <point x="1672" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1660" y="1756" type="line"/>
-      <point x="1660" y="2004" type="line"/>
-      <point x="1340" y="2004" type="line"/>
-      <point x="124" y="256" type="line"/>
-      <point x="124" y="0" type="line"/>
-      <point x="456" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1508" y="2004" type="line"/>
-      <point x="120" y="2004" type="line"/>
-      <point x="120" y="1628" type="line"/>
-      <point x="1508" y="1628" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/Zbar_.glif b/src/Interface-Bold.ufo/glyphs/Zbar_.glif
index 33c2b9a70..6a9163bd9 100644
--- a/src/Interface-Bold.ufo/glyphs/Zbar_.glif
+++ b/src/Interface-Bold.ufo/glyphs/Zbar_.glif
@@ -3,6 +3,13 @@
   <advance width="1792"/>
   <unicode hex="01B5"/>
   <outline>
+    <contour>
+      <point x="1556" y="1160" type="line" name="hr00"/>
+      <point x="204" y="1160" type="line"/>
+      <point x="204" y="896" type="line"/>
+      <point x="1556" y="896" type="line"/>
+    </contour>
+    <component base="Z"/>
     <contour>
       <point x="872" y="2200" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="1716" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="1556" y="1160" type="line" name="hr00"/>
-      <point x="204" y="1160" type="line"/>
-      <point x="204" y="896" type="line"/>
-      <point x="1556" y="896" type="line"/>
-    </contour>
-    <component base="Z"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/afii10026.glif b/src/Interface-Bold.ufo/glyphs/afii10026.glif
index 23479dbc1..370a641e3 100644
--- a/src/Interface-Bold.ufo/glyphs/afii10026.glif
+++ b/src/Interface-Bold.ufo/glyphs/afii10026.glif
@@ -3,6 +3,7 @@
   <advance width="1920"/>
   <unicode hex="0418"/>
   <outline>
+    <component base="N" yScale="-1" yOffset="2004"/>
     <contour>
       <point x="1028" y="2200" type="move" name="top"/>
     </contour>
@@ -12,7 +13,6 @@
     <contour>
       <point x="2012" y="2200" type="move" name="top0315"/>
     </contour>
-    <component base="N" yScale="-1" yOffset="2004"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/afii10045.glif b/src/Interface-Bold.ufo/glyphs/afii10045.glif
index 9dae9b32f..4861c0bcd 100644
--- a/src/Interface-Bold.ufo/glyphs/afii10045.glif
+++ b/src/Interface-Bold.ufo/glyphs/afii10045.glif
@@ -3,14 +3,14 @@
   <advance width="2560"/>
   <unicode hex="042B"/>
   <outline>
+    <component base="afii10046" xOffset="80"/>
+    <component base="I" xOffset="1728"/>
     <contour>
       <point x="1324" y="2200" type="move" name="top"/>
     </contour>
     <contour>
       <point x="2536" y="2200" type="move" name="top0315"/>
     </contour>
-    <component base="afii10046" xOffset="80"/>
-    <component base="I" xOffset="1728"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/afii10048.glif b/src/Interface-Bold.ufo/glyphs/afii10048.glif
index 7eaaf344f..0afbb6f05 100644
--- a/src/Interface-Bold.ufo/glyphs/afii10048.glif
+++ b/src/Interface-Bold.ufo/glyphs/afii10048.glif
@@ -3,15 +3,15 @@
   <advance width="2816"/>
   <unicode hex="042E"/>
   <outline>
+    <component base="I" xOffset="-8"/>
+    <component base="hyphen" xScale="0.7" xOffset="300" yOffset="88"/>
+    <component base="O" xOffset="744"/>
     <contour>
       <point x="1264" y="2200" type="move" name="top"/>
     </contour>
     <contour>
       <point x="2716" y="2200" type="move" name="top0315"/>
     </contour>
-    <component base="I" xOffset="-8"/>
-    <component base="hyphen" xScale="0.7" xOffset="300" yOffset="88"/>
-    <component base="O" xOffset="744"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/afii10147.glif b/src/Interface-Bold.ufo/glyphs/afii10147.glif
index a278911c8..c0d2b06f1 100644
--- a/src/Interface-Bold.ufo/glyphs/afii10147.glif
+++ b/src/Interface-Bold.ufo/glyphs/afii10147.glif
@@ -3,12 +3,6 @@
   <advance width="2048"/>
   <unicode hex="0472"/>
   <outline>
-    <contour>
-      <point x="980" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1928" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1404" y="1144" type="line"/>
       <point x="468" y="1144" type="line"/>
@@ -16,6 +10,12 @@
       <point x="1404" y="880" type="line"/>
     </contour>
     <component base="O"/>
+    <contour>
+      <point x="980" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1928" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/ampersand.glif b/src/Interface-Bold.ufo/glyphs/ampersand.glif
index d7eafc6b0..b9ff5dbb7 100644
--- a/src/Interface-Bold.ufo/glyphs/ampersand.glif
+++ b/src/Interface-Bold.ufo/glyphs/ampersand.glif
@@ -4,60 +4,60 @@
   <unicode hex="0026"/>
   <outline>
     <contour>
-      <point x="504" y="1052" type="line"/>
-      <point x="292" y="904"/>
-      <point x="148" y="772"/>
-      <point x="148" y="540" type="curve"/>
-      <point x="148" y="208"/>
+      <point x="504" y="1076" type="line"/>
+      <point x="292" y="924"/>
+      <point x="148" y="788"/>
+      <point x="148" y="552" type="curve"/>
+      <point x="148" y="212"/>
       <point x="396" y="-28"/>
       <point x="800" y="-28" type="curve"/>
       <point x="1044" y="-28"/>
       <point x="1220" y="36"/>
-      <point x="1404" y="172" type="curve" smooth="yes"/>
-      <point x="1416" y="180"/>
-      <point x="1444" y="200"/>
-      <point x="1456" y="204" type="curve" smooth="yes"/>
-      <point x="1696" y="392"/>
-      <point x="1784" y="676"/>
-      <point x="1784" y="1000" type="curve"/>
-      <point x="1412" y="1000" type="line"/>
-      <point x="1412" y="604"/>
-      <point x="1124" y="328"/>
-      <point x="828" y="328" type="curve" smooth="yes"/>
-      <point x="696" y="328"/>
-      <point x="592" y="428"/>
-      <point x="592" y="568" type="curve"/>
-      <point x="592" y="652"/>
-      <point x="612" y="716"/>
-      <point x="684" y="788" type="curve"/>
-      <point x="1136" y="1108" type="line" smooth="yes"/>
-      <point x="1288" y="1216"/>
-      <point x="1400" y="1368"/>
-      <point x="1400" y="1552" type="curve"/>
-      <point x="1400" y="1812"/>
-      <point x="1200" y="2032"/>
-      <point x="884" y="2032" type="curve" smooth="yes"/>
-      <point x="544" y="2032"/>
-      <point x="324" y="1808"/>
-      <point x="324" y="1492" type="curve" smooth="yes"/>
-      <point x="324" y="1288"/>
-      <point x="448" y="1112"/>
-      <point x="640" y="872" type="curve" smooth="yes"/>
+      <point x="1404" y="176" type="curve" smooth="yes"/>
+      <point x="1416" y="184"/>
+      <point x="1444" y="204"/>
+      <point x="1456" y="208" type="curve" smooth="yes"/>
+      <point x="1696" y="400"/>
+      <point x="1784" y="692"/>
+      <point x="1784" y="1020" type="curve"/>
+      <point x="1412" y="1020" type="line"/>
+      <point x="1412" y="616"/>
+      <point x="1124" y="336"/>
+      <point x="828" y="336" type="curve" smooth="yes"/>
+      <point x="696" y="336"/>
+      <point x="592" y="436"/>
+      <point x="592" y="580" type="curve"/>
+      <point x="592" y="668"/>
+      <point x="612" y="732"/>
+      <point x="684" y="804" type="curve"/>
+      <point x="1136" y="1132" type="line" smooth="yes"/>
+      <point x="1288" y="1244"/>
+      <point x="1400" y="1396"/>
+      <point x="1400" y="1584" type="curve"/>
+      <point x="1400" y="1852"/>
+      <point x="1200" y="2076"/>
+      <point x="884" y="2076" type="curve" smooth="yes"/>
+      <point x="544" y="2076"/>
+      <point x="324" y="1848"/>
+      <point x="324" y="1524" type="curve" smooth="yes"/>
+      <point x="324" y="1316"/>
+      <point x="448" y="1136"/>
+      <point x="640" y="892" type="curve" smooth="yes"/>
       <point x="1404" y="0" type="line"/>
       <point x="1904" y="0" type="line"/>
-      <point x="960" y="1084" type="line"/>
-      <point x="820" y="1252"/>
-      <point x="708" y="1372"/>
-      <point x="708" y="1496" type="curve" smooth="yes"/>
-      <point x="708" y="1596"/>
-      <point x="768" y="1672"/>
-      <point x="880" y="1672" type="curve" smooth="yes"/>
-      <point x="984" y="1672"/>
-      <point x="1044" y="1592"/>
-      <point x="1044" y="1516" type="curve"/>
-      <point x="1044" y="1456"/>
-      <point x="1028" y="1392"/>
-      <point x="912" y="1316" type="curve" smooth="yes"/>
+      <point x="960" y="1108" type="line"/>
+      <point x="820" y="1280"/>
+      <point x="708" y="1400"/>
+      <point x="708" y="1528" type="curve" smooth="yes"/>
+      <point x="708" y="1632"/>
+      <point x="768" y="1708"/>
+      <point x="880" y="1708" type="curve" smooth="yes"/>
+      <point x="984" y="1708"/>
+      <point x="1044" y="1624"/>
+      <point x="1044" y="1548" type="curve"/>
+      <point x="1044" y="1488"/>
+      <point x="1028" y="1420"/>
+      <point x="912" y="1344" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Interface-Bold.ufo/glyphs/arrowdown.cap.glif b/src/Interface-Bold.ufo/glyphs/arrowdown.cap.glif
new file mode 100644
index 000000000..e810de37e
--- /dev/null
+++ b/src/Interface-Bold.ufo/glyphs/arrowdown.cap.glif
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="arrowdown.cap" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="arrowdown" yOffset="256"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8</real>
+        <real>0.94</real>
+        <real>0.95</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 950, 'leftMargin': 121, 'rightMargin': 97}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Bold.ufo/glyphs/arrowleft.cap.glif b/src/Interface-Bold.ufo/glyphs/arrowleft.cap.glif
new file mode 100644
index 000000000..4e47e2c68
--- /dev/null
+++ b/src/Interface-Bold.ufo/glyphs/arrowleft.cap.glif
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="arrowleft.cap" format="1">
+  <advance width="3072"/>
+  <outline>
+    <component base="arrowleft" yOffset="192"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8</real>
+        <real>0.94</real>
+        <real>0.95</real>
+        <real>1.0</real>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Bold.ufo/glyphs/arrowright.cap.glif b/src/Interface-Bold.ufo/glyphs/arrowright.cap.glif
new file mode 100644
index 000000000..6a425e5f1
--- /dev/null
+++ b/src/Interface-Bold.ufo/glyphs/arrowright.cap.glif
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="arrowright.cap" format="1">
+  <advance width="3072"/>
+  <outline>
+    <component base="arrowright" yOffset="192"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8</real>
+        <real>0.94</real>
+        <real>0.95</real>
+        <real>1.0</real>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Bold.ufo/glyphs/arrowup.cap.glif b/src/Interface-Bold.ufo/glyphs/arrowup.cap.glif
new file mode 100644
index 000000000..26d1be020
--- /dev/null
+++ b/src/Interface-Bold.ufo/glyphs/arrowup.cap.glif
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="arrowup.cap" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="arrowup" yOffset="256"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8</real>
+        <real>0.94</real>
+        <real>0.95</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 950, 'leftMargin': 121, 'rightMargin': 97}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Bold.ufo/glyphs/at.cap.glif b/src/Interface-Bold.ufo/glyphs/at.cap.glif
new file mode 100644
index 000000000..61dd4aba1
--- /dev/null
+++ b/src/Interface-Bold.ufo/glyphs/at.cap.glif
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="at.cap" format="1">
+  <advance width="2816"/>
+  <outline>
+    <component base="at" yOffset="284"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 2522, 'leftMargin': 183, 'rightMargin': 97}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Bold.ufo/glyphs/b.glif b/src/Interface-Bold.ufo/glyphs/b.glif
index 19c738f1f..1aa71e3ee 100644
--- a/src/Interface-Bold.ufo/glyphs/b.glif
+++ b/src/Interface-Bold.ufo/glyphs/b.glif
@@ -3,6 +3,16 @@
   <advance width="1536"/>
   <unicode hex="0062"/>
   <outline>
+    <contour>
+      <point x="84" y="2048" type="line"/>
+      <point x="84" y="0" type="line"/>
+      <point x="484" y="0" type="line"/>
+      <point x="508" y="304" type="line"/>
+      <point x="376" y="744" type="line"/>
+      <point x="528" y="1244" type="line"/>
+      <point x="528" y="2048" type="line"/>
+    </contour>
+    <component base="rightloop.cn" xOffset="-128"/>
     <contour>
       <point x="1004" y="2200" type="move" name="top"/>
     </contour>
@@ -18,16 +28,6 @@
     <contour>
       <point x="1660" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="84" y="2112" type="line"/>
-      <point x="84" y="0" type="line"/>
-      <point x="484" y="0" type="line"/>
-      <point x="508" y="304" type="line"/>
-      <point x="376" y="744" type="line"/>
-      <point x="528" y="1244" type="line"/>
-      <point x="528" y="2112" type="line"/>
-    </contour>
-    <component base="rightloop.cn" xOffset="-128"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/bbar.glif b/src/Interface-Bold.ufo/glyphs/bbar.glif
index 0af66c8e2..da84348cd 100644
--- a/src/Interface-Bold.ufo/glyphs/bbar.glif
+++ b/src/Interface-Bold.ufo/glyphs/bbar.glif
@@ -3,6 +3,8 @@
   <advance width="1792"/>
   <unicode hex="0180"/>
   <outline>
+    <component base="b" xOffset="176"/>
+    <component base="crossbar" xOffset="-108" yOffset="764"/>
     <contour>
       <point x="996" y="-16" type="move" name="markbottom"/>
     </contour>
@@ -18,8 +20,6 @@
     <contour>
       <point x="996" y="-16" type="move" name="bottom"/>
     </contour>
-    <component base="b" xOffset="176"/>
-    <component base="crossbar" xOffset="-108" yOffset="764"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/beta.glif b/src/Interface-Bold.ufo/glyphs/beta.glif
index 982631080..caed2df47 100644
--- a/src/Interface-Bold.ufo/glyphs/beta.glif
+++ b/src/Interface-Bold.ufo/glyphs/beta.glif
@@ -4,54 +4,54 @@
   <unicode hex="03B2"/>
   <outline>
     <contour>
-      <point x="776" y="1092" type="line" name="hr00"/>
-      <point x="776" y="860" type="line"/>
-      <point x="888" y="860" type="line" smooth="yes"/>
-      <point x="1072" y="860"/>
-      <point x="1172" y="776"/>
-      <point x="1172" y="572" type="curve" smooth="yes"/>
-      <point x="1172" y="436"/>
-      <point x="1068" y="332"/>
-      <point x="892" y="332" type="curve" smooth="yes"/>
-      <point x="660" y="332"/>
-      <point x="512" y="428"/>
-      <point x="512" y="556" type="curve"/>
-      <point x="348" y="556" type="line"/>
-      <point x="348" y="148"/>
-      <point x="712" y="-28"/>
-      <point x="1004" y="-28" type="curve" smooth="yes"/>
-      <point x="1388" y="-28"/>
-      <point x="1612" y="188"/>
-      <point x="1612" y="564" type="curve" smooth="yes"/>
-      <point x="1612" y="896"/>
-      <point x="1372" y="1092"/>
-      <point x="960" y="1092" type="curve" smooth="yes"/>
+      <point x="776" y="1120" type="line" name="hr00"/>
+      <point x="776" y="884" type="line"/>
+      <point x="888" y="884" type="line" smooth="yes"/>
+      <point x="1072" y="884"/>
+      <point x="1172" y="800"/>
+      <point x="1172" y="592" type="curve" smooth="yes"/>
+      <point x="1172" y="452"/>
+      <point x="1068" y="348"/>
+      <point x="892" y="348" type="curve" smooth="yes"/>
+      <point x="660" y="348"/>
+      <point x="512" y="444"/>
+      <point x="512" y="576" type="curve"/>
+      <point x="348" y="576" type="line"/>
+      <point x="348" y="160"/>
+      <point x="712" y="-20"/>
+      <point x="1004" y="-20" type="curve" smooth="yes"/>
+      <point x="1388" y="-20"/>
+      <point x="1612" y="200"/>
+      <point x="1612" y="584" type="curve" smooth="yes"/>
+      <point x="1612" y="920"/>
+      <point x="1372" y="1120"/>
+      <point x="960" y="1120" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="864" y="2032" type="curve" smooth="yes"/>
-      <point x="488" y="2032"/>
-      <point x="180" y="1792"/>
-      <point x="180" y="1400" type="curve"/>
+      <point x="864" y="2076" type="curve" smooth="yes"/>
+      <point x="488" y="2076"/>
+      <point x="180" y="1832"/>
+      <point x="180" y="1432" type="curve"/>
       <point x="180" y="-572" type="line"/>
       <point x="624" y="-572" type="line"/>
-      <point x="624" y="1400" type="line" smooth="yes"/>
-      <point x="624" y="1572"/>
-      <point x="724" y="1672"/>
-      <point x="864" y="1672" type="curve" smooth="yes"/>
-      <point x="1016" y="1672"/>
-      <point x="1084" y="1568"/>
-      <point x="1084" y="1444" type="curve" smooth="yes"/>
-      <point x="1084" y="1272"/>
-      <point x="1020" y="1180"/>
-      <point x="860" y="1180" type="curve" smooth="yes"/>
-      <point x="776" y="1180" type="line"/>
-      <point x="776" y="968" type="line"/>
-      <point x="932" y="968" type="line" smooth="yes"/>
-      <point x="1288" y="968"/>
-      <point x="1528" y="1196"/>
-      <point x="1528" y="1488" type="curve" smooth="yes"/>
-      <point x="1528" y="1844"/>
-      <point x="1264" y="2032"/>
+      <point x="624" y="1432" type="line" smooth="yes"/>
+      <point x="624" y="1608"/>
+      <point x="724" y="1708"/>
+      <point x="864" y="1708" type="curve" smooth="yes"/>
+      <point x="1016" y="1708"/>
+      <point x="1084" y="1604"/>
+      <point x="1084" y="1476" type="curve" smooth="yes"/>
+      <point x="1084" y="1304"/>
+      <point x="1020" y="1208"/>
+      <point x="860" y="1208" type="curve" smooth="yes"/>
+      <point x="776" y="1208" type="line"/>
+      <point x="776" y="992" type="line"/>
+      <point x="932" y="992" type="line" smooth="yes"/>
+      <point x="1288" y="992"/>
+      <point x="1528" y="1224"/>
+      <point x="1528" y="1524" type="curve" smooth="yes"/>
+      <point x="1528" y="1884"/>
+      <point x="1264" y="2076"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Interface-Bold.ufo/glyphs/bullet.cap.glif b/src/Interface-Bold.ufo/glyphs/bullet.cap.glif
new file mode 100644
index 000000000..a655c61c9
--- /dev/null
+++ b/src/Interface-Bold.ufo/glyphs/bullet.cap.glif
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="bullet.cap" format="1">
+  <advance width="1024"/>
+  <outline>
+    <component base="bullet" yOffset="128"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>0.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>x</key>
+          <real>0.0</real>
+          <key>y</key>
+          <real>2715.625</real>
+        </dict>
+      </array>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>1.0</real>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Bold.ufo/glyphs/bullet.glif b/src/Interface-Bold.ufo/glyphs/bullet.glif
index 2997c63ca..20b2a9d3e 100644
--- a/src/Interface-Bold.ufo/glyphs/bullet.glif
+++ b/src/Interface-Bold.ufo/glyphs/bullet.glif
@@ -4,18 +4,18 @@
   <unicode hex="2022"/>
   <outline>
     <contour>
-      <point x="896" y="1024" type="curve" smooth="yes"/>
-      <point x="896" y="1260"/>
-      <point x="748" y="1408"/>
-      <point x="512" y="1408" type="curve" smooth="yes"/>
-      <point x="276" y="1408"/>
-      <point x="128" y="1260"/>
-      <point x="128" y="1024" type="curve" smooth="yes"/>
-      <point x="128" y="788"/>
-      <point x="276" y="640"/>
-      <point x="512" y="640" type="curve" smooth="yes"/>
-      <point x="748" y="640"/>
-      <point x="896" y="788"/>
+      <point x="896" y="896" type="curve" smooth="yes"/>
+      <point x="896" y="1132"/>
+      <point x="748" y="1280"/>
+      <point x="512" y="1280" type="curve" smooth="yes"/>
+      <point x="276" y="1280"/>
+      <point x="128" y="1132"/>
+      <point x="128" y="896" type="curve" smooth="yes"/>
+      <point x="128" y="660"/>
+      <point x="276" y="512"/>
+      <point x="512" y="512" type="curve" smooth="yes"/>
+      <point x="748" y="512"/>
+      <point x="896" y="660"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Interface-Bold.ufo/glyphs/bullseye.glif b/src/Interface-Bold.ufo/glyphs/bullseye.glif
index bb8a10e24..93db1f887 100644
--- a/src/Interface-Bold.ufo/glyphs/bullseye.glif
+++ b/src/Interface-Bold.ufo/glyphs/bullseye.glif
@@ -3,15 +3,6 @@
   <advance width="2048"/>
   <unicode hex="0298"/>
   <outline>
-    <contour>
-      <point x="968" y="2244" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="968" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1944" y="2244" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="720" y="1008" type="curve" smooth="yes"/>
       <point x="720" y="876"/>
@@ -27,6 +18,15 @@
       <point x="720" y="1140"/>
     </contour>
     <component base="O"/>
+    <contour>
+      <point x="968" y="2244" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="968" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1944" y="2244" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/contents.plist b/src/Interface-Bold.ufo/glyphs/contents.plist
index 383e06bcb..9647887a1 100644
--- a/src/Interface-Bold.ufo/glyphs/contents.plist
+++ b/src/Interface-Bold.ufo/glyphs/contents.plist
@@ -398,6 +398,8 @@
 	<string>archdblsubnosp.glif</string>
 	<key>arrowdown</key>
 	<string>arrowdown.glif</string>
+	<key>arrowdown.cap</key>
+	<string>arrowdown.cap.glif</string>
 	<key>arrowheaddownmod</key>
 	<string>arrowheaddownmod.glif</string>
 	<key>arrowheadleftmod</key>
@@ -408,10 +410,16 @@
 	<string>arrowheadupmod.glif</string>
 	<key>arrowleft</key>
 	<string>arrowleft.glif</string>
+	<key>arrowleft.cap</key>
+	<string>arrowleft.cap.glif</string>
 	<key>arrowright</key>
 	<string>arrowright.glif</string>
+	<key>arrowright.cap</key>
+	<string>arrowright.cap.glif</string>
 	<key>arrowup</key>
 	<string>arrowup.glif</string>
+	<key>arrowup.cap</key>
+	<string>arrowup.cap.glif</string>
 	<key>asciicircum</key>
 	<string>asciicircum.glif</string>
 	<key>asciitilde</key>
@@ -430,6 +438,8 @@
 	<string>asterism.glif</string>
 	<key>at</key>
 	<string>at.glif</string>
+	<key>at.cap</key>
+	<string>at.cap.glif</string>
 	<key>aturn</key>
 	<string>aturn.glif</string>
 	<key>aturn_uni02DE</key>
@@ -514,6 +524,8 @@
 	<string>btopbar.glif</string>
 	<key>bullet</key>
 	<string>bullet.glif</string>
+	<key>bullet.cap</key>
+	<string>bullet.cap.glif</string>
 	<key>bullseye</key>
 	<string>bullseye.glif</string>
 	<key>c</key>
@@ -704,6 +716,8 @@
 	<string>digamma.glif</string>
 	<key>divide</key>
 	<string>divide.glif</string>
+	<key>divide.cap</key>
+	<string>divide.cap.glif</string>
 	<key>djecyrillic</key>
 	<string>djecyrillic.glif</string>
 	<key>dollar</key>
@@ -778,6 +792,8 @@
 	<string>emcyrillic.glif</string>
 	<key>emdash</key>
 	<string>emdash.glif</string>
+	<key>emdash.cap</key>
+	<string>emdash.cap.glif</string>
 	<key>emquad</key>
 	<string>emquad.glif</string>
 	<key>emspace</key>
@@ -786,6 +802,8 @@
 	<string>encyrillic.glif</string>
 	<key>endash</key>
 	<string>endash.glif</string>
+	<key>endash.cap</key>
+	<string>endash.cap.glif</string>
 	<key>endescendercyrillic</key>
 	<string>endescendercyrillic.glif</string>
 	<key>eng</key>
@@ -816,6 +834,8 @@
 	<string>epsilonclosed.glif</string>
 	<key>equal</key>
 	<string>equal.glif</string>
+	<key>equal.cap</key>
+	<string>equal.cap.glif</string>
 	<key>equalsub</key>
 	<string>equalsub.glif</string>
 	<key>equalsuperior</key>
@@ -860,6 +880,8 @@
 	<string>f.glif</string>
 	<key>figuredash</key>
 	<string>figuredash.glif</string>
+	<key>figuredash.cap</key>
+	<string>figuredash.cap.glif</string>
 	<key>figurespace</key>
 	<string>figurespace.glif</string>
 	<key>finalkaf</key>
@@ -1020,6 +1042,8 @@
 	<string>hv.glif</string>
 	<key>hyphen</key>
 	<string>hyphen.glif</string>
+	<key>hyphen.cap</key>
+	<string>hyphen.cap.glif</string>
 	<key>hyphen__</key>
 	<string>hyphen__.glif</string>
 	<key>hyphenbullet</key>
@@ -1190,6 +1214,8 @@
 	<string>mill.glif</string>
 	<key>minus</key>
 	<string>minus.glif</string>
+	<key>minus.cap</key>
+	<string>minus.cap.glif</string>
 	<key>minusmod</key>
 	<string>minusmod.glif</string>
 	<key>minussub</key>
@@ -1206,6 +1232,8 @@
 	<string>mu.glif</string>
 	<key>multiply</key>
 	<string>multiply.glif</string>
+	<key>multiply.cap</key>
+	<string>multiply.cap.glif</string>
 	<key>n</key>
 	<string>n.glif</string>
 	<key>naira</key>
@@ -1232,6 +1260,8 @@
 	<string>nlfthook.glif</string>
 	<key>notequal</key>
 	<string>notequal.glif</string>
+	<key>notequal.cap</key>
+	<string>notequal.cap.glif</string>
 	<key>nrthook</key>
 	<string>nrthook.glif</string>
 	<key>nsuperior</key>
@@ -1384,6 +1414,8 @@
 	<string>placeofinterestsign.glif</string>
 	<key>plus</key>
 	<string>plus.glif</string>
+	<key>plus.cap</key>
+	<string>plus.cap.glif</string>
 	<key>plusminus</key>
 	<string>plusminus.glif</string>
 	<key>plusmod</key>
diff --git a/src/Interface-Bold.ufo/glyphs/d.glif b/src/Interface-Bold.ufo/glyphs/d.glif
index 940e1216e..b7c103d4d 100644
--- a/src/Interface-Bold.ufo/glyphs/d.glif
+++ b/src/Interface-Bold.ufo/glyphs/d.glif
@@ -7,8 +7,8 @@
       <point x="1012" y="308" type="line"/>
       <point x="1052.0" y="0.0" type="line"/>
       <point x="1452.0" y="0.0" type="line"/>
-      <point x="1452.0" y="2112.0" type="line"/>
-      <point x="1008.0" y="2112.0" type="line"/>
+      <point x="1452" y="2048" type="line"/>
+      <point x="1008" y="2048" type="line"/>
       <point x="1008.0" y="1218.0" type="line"/>
       <point x="1148" y="732" type="line"/>
     </contour>
diff --git a/src/Interface-Bold.ufo/glyphs/dcroat.glif b/src/Interface-Bold.ufo/glyphs/dcroat.glif
index 935539102..0f8ac8782 100644
--- a/src/Interface-Bold.ufo/glyphs/dcroat.glif
+++ b/src/Interface-Bold.ufo/glyphs/dcroat.glif
@@ -3,6 +3,20 @@
   <advance width="1792"/>
   <unicode hex="0111"/>
   <outline>
+    <contour>
+      <point x="1036" y="340" type="line"/>
+      <point x="1080" y="0" type="line"/>
+      <point x="1480" y="0" type="line"/>
+      <point x="1480" y="2048" type="line"/>
+      <point x="1036" y="2048" type="line"/>
+    </contour>
+    <contour>
+      <point x="1684" y="1868" type="line"/>
+      <point x="692" y="1868" type="line"/>
+      <point x="692" y="1608" type="line"/>
+      <point x="1684" y="1608" type="line"/>
+    </contour>
+    <component base="leftloop.cn"/>
     <contour>
       <point x="1644" y="2112" type="move" name="caron"/>
     </contour>
@@ -27,20 +41,6 @@
     <contour>
       <point x="1188" y="1804" type="move" name="parenthesses.w2"/>
     </contour>
-    <contour>
-      <point x="1036" y="340" type="line"/>
-      <point x="1080" y="0" type="line"/>
-      <point x="1480" y="0" type="line"/>
-      <point x="1480" y="2112" type="line"/>
-      <point x="1036" y="2112" type="line"/>
-    </contour>
-    <contour>
-      <point x="1684" y="1932" type="line"/>
-      <point x="692" y="1932" type="line"/>
-      <point x="692" y="1672" type="line"/>
-      <point x="1684" y="1672" type="line"/>
-    </contour>
-    <component base="leftloop.cn"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/divide.cap.glif b/src/Interface-Bold.ufo/glyphs/divide.cap.glif
new file mode 100644
index 000000000..ff388f899
--- /dev/null
+++ b/src/Interface-Bold.ufo/glyphs/divide.cap.glif
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="divide.cap" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="divide" yOffset="80"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8</real>
+        <real>0.94</real>
+        <real>0.95</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1605, 'leftMargin': 84, 'rightMargin': 92}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Bold.ufo/glyphs/dollar.glif b/src/Interface-Bold.ufo/glyphs/dollar.glif
index 9a5c142aa..cca98cf70 100644
--- a/src/Interface-Bold.ufo/glyphs/dollar.glif
+++ b/src/Interface-Bold.ufo/glyphs/dollar.glif
@@ -4,58 +4,58 @@
   <unicode hex="0024"/>
   <outline>
     <contour>
-      <point x="1584" y="536" type="curve"/>
-      <point x="1584" y="888"/>
-      <point x="1348" y="1028"/>
-      <point x="1016" y="1172" type="curve"/>
-      <point x="1024" y="1660" type="line"/>
-      <point x="1100" y="1624"/>
-      <point x="1148" y="1536"/>
-      <point x="1148" y="1384" type="curve"/>
-      <point x="1592" y="1384" type="line"/>
-      <point x="1592" y="1756"/>
-      <point x="1368" y="1992"/>
-      <point x="1028" y="2028" type="curve"/>
-      <point x="1032" y="2308" type="line"/>
-      <point x="848" y="2308" type="line"/>
-      <point x="844" y="2028" type="line"/>
-      <point x="504" y="1996"/>
-      <point x="276" y="1784"/>
-      <point x="276" y="1468" type="curve"/>
-      <point x="276" y="1116"/>
-      <point x="504" y="980"/>
-      <point x="832" y="840" type="curve"/>
-      <point x="828" y="336" type="line"/>
-      <point x="724" y="368"/>
-      <point x="644" y="452"/>
-      <point x="644" y="644" type="curve"/>
-      <point x="200" y="644" type="line"/>
-      <point x="200" y="188"/>
-      <point x="508" y="8"/>
-      <point x="824" y="-24" type="curve"/>
+      <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="-24" type="line"/>
-      <point x="1352" y="0"/>
-      <point x="1584" y="200"/>
+      <point x="1004" y="-20" type="line"/>
+      <point x="1352" y="4"/>
+      <point x="1584" y="208"/>
     </contour>
     <contour>
-      <point x="720" y="1468" type="curve"/>
-      <point x="720" y="1560"/>
-      <point x="756" y="1636"/>
-      <point x="840" y="1668" type="curve"/>
-      <point x="836" y="1260" type="line"/>
-      <point x="748" y="1320"/>
-      <point x="720" y="1380"/>
+      <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="532" type="curve"/>
-      <point x="1144" y="440"/>
-      <point x="1100" y="364"/>
-      <point x="1008" y="336" type="curve"/>
-      <point x="1012" y="756" type="line"/>
-      <point x="1104" y="704"/>
-      <point x="1144" y="640"/>
+      <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"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Interface-Bold.ufo/glyphs/eight.glif b/src/Interface-Bold.ufo/glyphs/eight.glif
index 2e30953c4..223555c62 100644
--- a/src/Interface-Bold.ufo/glyphs/eight.glif
+++ b/src/Interface-Bold.ufo/glyphs/eight.glif
@@ -4,60 +4,60 @@
   <unicode hex="0038"/>
   <outline>
     <contour>
-      <point x="1588" y="552" type="curve" smooth="yes"/>
-      <point x="1588" y="900"/>
-      <point x="1296" y="1112"/>
-      <point x="896" y="1112" type="curve" smooth="yes"/>
-      <point x="504" y="1112"/>
-      <point x="204" y="900"/>
-      <point x="204" y="552" type="curve" smooth="yes"/>
-      <point x="204" y="168"/>
+      <point x="1588" y="564" type="curve" smooth="yes"/>
+      <point x="1588" y="920"/>
+      <point x="1296" y="1136"/>
+      <point x="896" y="1136" type="curve" smooth="yes"/>
+      <point x="504" y="1136"/>
+      <point x="204" y="920"/>
+      <point x="204" y="564" type="curve" smooth="yes"/>
+      <point x="204" y="172"/>
       <point x="504" y="-28"/>
       <point x="900" y="-28" type="curve" smooth="yes"/>
       <point x="1296" y="-28"/>
-      <point x="1588" y="168"/>
+      <point x="1588" y="172"/>
     </contour>
     <contour>
-      <point x="1144" y="588" type="curve" smooth="yes"/>
-      <point x="1144" y="428"/>
-      <point x="1048" y="332"/>
-      <point x="900" y="332" type="curve" smooth="yes"/>
-      <point x="752" y="332"/>
-      <point x="648" y="428"/>
-      <point x="648" y="588" type="curve" smooth="yes"/>
-      <point x="648" y="752"/>
-      <point x="752" y="848"/>
-      <point x="896" y="848" type="curve" smooth="yes"/>
-      <point x="1044" y="848"/>
-      <point x="1144" y="752"/>
+      <point x="1144" y="600" type="curve" smooth="yes"/>
+      <point x="1144" y="436"/>
+      <point x="1048" y="340"/>
+      <point x="900" y="340" type="curve" smooth="yes"/>
+      <point x="752" y="340"/>
+      <point x="648" y="436"/>
+      <point x="648" y="600" type="curve" smooth="yes"/>
+      <point x="648" y="768"/>
+      <point x="752" y="868"/>
+      <point x="896" y="868" type="curve" smooth="yes"/>
+      <point x="1044" y="868"/>
+      <point x="1144" y="768"/>
     </contour>
     <contour>
-      <point x="1548" y="1468" type="curve" smooth="yes"/>
-      <point x="1548" y="1836"/>
-      <point x="1280" y="2032"/>
-      <point x="896" y="2032" type="curve" smooth="yes"/>
-      <point x="520" y="2032"/>
-      <point x="248" y="1836"/>
-      <point x="248" y="1468" type="curve" smooth="yes"/>
-      <point x="248" y="1156"/>
-      <point x="520" y="944"/>
-      <point x="900" y="944" type="curve" smooth="yes"/>
-      <point x="1280" y="944"/>
-      <point x="1548" y="1156"/>
+      <point x="1548" y="1500" type="curve" smooth="yes"/>
+      <point x="1548" y="1876"/>
+      <point x="1280" y="2076"/>
+      <point x="896" y="2076" type="curve" smooth="yes"/>
+      <point x="520" y="2076"/>
+      <point x="248" y="1876"/>
+      <point x="248" y="1500" type="curve" smooth="yes"/>
+      <point x="248" y="1180"/>
+      <point x="520" y="964"/>
+      <point x="900" y="964" type="curve" smooth="yes"/>
+      <point x="1280" y="964"/>
+      <point x="1548" y="1180"/>
     </contour>
     <contour>
-      <point x="1104" y="1444" type="curve" smooth="yes"/>
-      <point x="1104" y="1300"/>
-      <point x="1036" y="1204"/>
-      <point x="900" y="1204" type="curve" smooth="yes"/>
-      <point x="764" y="1204"/>
-      <point x="692" y="1300"/>
-      <point x="692" y="1444" type="curve" smooth="yes"/>
-      <point x="692" y="1588"/>
-      <point x="764" y="1672"/>
-      <point x="896" y="1672" type="curve" smooth="yes"/>
-      <point x="1032" y="1672"/>
-      <point x="1104" y="1584"/>
+      <point x="1104" y="1476" type="curve" smooth="yes"/>
+      <point x="1104" y="1328"/>
+      <point x="1036" y="1232"/>
+      <point x="900" y="1232" type="curve" smooth="yes"/>
+      <point x="764" y="1232"/>
+      <point x="692" y="1328"/>
+      <point x="692" y="1476" type="curve" smooth="yes"/>
+      <point x="692" y="1624"/>
+      <point x="764" y="1708"/>
+      <point x="896" y="1708" type="curve" smooth="yes"/>
+      <point x="1032" y="1708"/>
+      <point x="1104" y="1620"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Interface-Bold.ufo/glyphs/emdash.cap.glif b/src/Interface-Bold.ufo/glyphs/emdash.cap.glif
new file mode 100644
index 000000000..d74d6ca0b
--- /dev/null
+++ b/src/Interface-Bold.ufo/glyphs/emdash.cap.glif
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="emdash.cap" format="1">
+  <advance width="2560"/>
+  <outline>
+    <component base="emdash" yOffset="160"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 2176, 'leftMargin': 128, 'rightMargin': 128}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Bold.ufo/glyphs/endash.cap.glif b/src/Interface-Bold.ufo/glyphs/endash.cap.glif
new file mode 100644
index 000000000..f66734d31
--- /dev/null
+++ b/src/Interface-Bold.ufo/glyphs/endash.cap.glif
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="endash.cap" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="endash" yOffset="160"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>1.0</real>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Bold.ufo/glyphs/equal.cap.glif b/src/Interface-Bold.ufo/glyphs/equal.cap.glif
new file mode 100644
index 000000000..1f7a12897
--- /dev/null
+++ b/src/Interface-Bold.ufo/glyphs/equal.cap.glif
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="equal.cap" format="1">
+  <advance width="1536"/>
+  <outline>
+    <component base="equal" yOffset="148"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8</real>
+        <real>0.94</real>
+        <real>0.95</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1638, 'leftMargin': 180, 'rightMargin': 198}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Bold.ufo/glyphs/exclam.glif b/src/Interface-Bold.ufo/glyphs/exclam.glif
index 37e3182c8..79a6af2ad 100644
--- a/src/Interface-Bold.ufo/glyphs/exclam.glif
+++ b/src/Interface-Bold.ufo/glyphs/exclam.glif
@@ -4,8 +4,8 @@
   <unicode hex="0021"/>
   <outline>
     <contour>
-      <point x="624" y="2004" type="line"/>
-      <point x="152" y="2004" type="line"/>
+      <point x="624" y="2048" type="line"/>
+      <point x="152" y="2048" type="line"/>
       <point x="208" y="636" type="line"/>
       <point x="568" y="636" type="line"/>
     </contour>
diff --git a/src/Interface-Bold.ufo/glyphs/f.glif b/src/Interface-Bold.ufo/glyphs/f.glif
index e2467b34c..c026a545e 100644
--- a/src/Interface-Bold.ufo/glyphs/f.glif
+++ b/src/Interface-Bold.ufo/glyphs/f.glif
@@ -3,6 +3,30 @@
   <advance width="1024"/>
   <unicode hex="0066"/>
   <outline>
+    <contour>
+      <point x="676" y="0" type="line" name="hr00"/>
+      <point x="676" y="1544" type="line"/>
+      <point x="676" y="1660"/>
+      <point x="756" y="1720"/>
+      <point x="892" y="1720" type="curve" smooth="yes"/>
+      <point x="940" y="1720"/>
+      <point x="976" y="1716"/>
+      <point x="1008" y="1708" type="curve"/>
+      <point x="1008" y="2048" type="line"/>
+      <point x="944" y="2064"/>
+      <point x="872" y="2076"/>
+      <point x="796" y="2076" type="curve" smooth="yes"/>
+      <point x="452" y="2076"/>
+      <point x="232" y="1892"/>
+      <point x="232" y="1544" type="curve"/>
+      <point x="232" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="968" y="1488" type="line"/>
+      <point x="16" y="1488" type="line"/>
+      <point x="16" y="1168" type="line"/>
+      <point x="968" y="1168" type="line"/>
+    </contour>
     <contour>
       <point x="604" y="2284" type="move" name="top"/>
     </contour>
@@ -18,30 +42,6 @@
     <contour>
       <point x="1008" y="2284" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="676" y="0" type="line" name="hr00"/>
-      <point x="676" y="1608" type="line"/>
-      <point x="676" y="1724"/>
-      <point x="756" y="1784"/>
-      <point x="892" y="1784" type="curve" smooth="yes"/>
-      <point x="940" y="1784"/>
-      <point x="976" y="1780"/>
-      <point x="1008" y="1772" type="curve"/>
-      <point x="1008" y="2112" type="line"/>
-      <point x="944" y="2128"/>
-      <point x="872" y="2140"/>
-      <point x="796" y="2140" type="curve" smooth="yes"/>
-      <point x="452" y="2140"/>
-      <point x="232" y="1956"/>
-      <point x="232" y="1608" type="curve"/>
-      <point x="232" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="968" y="1488" type="line"/>
-      <point x="16" y="1488" type="line"/>
-      <point x="16" y="1168" type="line"/>
-      <point x="968" y="1168" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/figuredash.cap.glif b/src/Interface-Bold.ufo/glyphs/figuredash.cap.glif
new file mode 100644
index 000000000..90a77a850
--- /dev/null
+++ b/src/Interface-Bold.ufo/glyphs/figuredash.cap.glif
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="figuredash.cap" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="figuredash" yOffset="160"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1548, 'leftMargin': 168, 'rightMargin': 180}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Bold.ufo/glyphs/finalkaf.glif b/src/Interface-Bold.ufo/glyphs/finalkaf.glif
index 3aa8a9b0e..b2eb92181 100644
--- a/src/Interface-Bold.ufo/glyphs/finalkaf.glif
+++ b/src/Interface-Bold.ufo/glyphs/finalkaf.glif
@@ -3,15 +3,6 @@
   <advance width="2048"/>
   <unicode hex="02AA"/>
   <outline>
-    <contour>
-      <point x="1260" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1260" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1992" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1472" y="420" type="curve" smooth="yes"/>
       <point x="1472" y="332"/>
@@ -53,6 +44,15 @@
       <point x="1472" y="500"/>
     </contour>
     <component base="l" xOffset="-16"/>
+    <contour>
+      <point x="1260" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1260" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1992" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/five.glif b/src/Interface-Bold.ufo/glyphs/five.glif
index 63118e25d..b0b4d1898 100644
--- a/src/Interface-Bold.ufo/glyphs/five.glif
+++ b/src/Interface-Bold.ufo/glyphs/five.glif
@@ -4,11 +4,11 @@
   <unicode hex="0035"/>
   <outline>
     <contour>
-      <point x="532" y="892" type="line"/>
-      <point x="572" y="940"/>
-      <point x="644" y="996"/>
-      <point x="780" y="996" type="curve" smooth="yes"/>
-      <point x="988" y="996"/>
+      <point x="532" y="916" type="line"/>
+      <point x="572" y="964"/>
+      <point x="644" y="1020"/>
+      <point x="780" y="1020" type="curve" smooth="yes"/>
+      <point x="988" y="1020"/>
       <point x="1080" y="872"/>
       <point x="1080" y="676" type="curve" smooth="yes"/>
       <point x="1080" y="492"/>
@@ -25,17 +25,17 @@
       <point x="1520" y="300"/>
       <point x="1520" y="644" type="curve" smooth="yes"/>
       <point x="1520" y="1076"/>
-      <point x="1260" y="1316"/>
-      <point x="924" y="1316" type="curve" smooth="yes"/>
-      <point x="748" y="1316"/>
-      <point x="656" y="1252"/>
-      <point x="620" y="1200" type="curve"/>
-      <point x="612" y="1200" type="line"/>
-      <point x="660" y="1620" type="line"/>
-      <point x="1456" y="1620" type="line"/>
-      <point x="1456" y="2004" type="line"/>
-      <point x="300" y="2004" type="line"/>
-      <point x="180" y="980" type="line"/>
+      <point x="1260" y="1340"/>
+      <point x="924" y="1340" type="curve" smooth="yes"/>
+      <point x="748" y="1340"/>
+      <point x="656" y="1276"/>
+      <point x="620" y="1224" type="curve"/>
+      <point x="612" y="1224" type="line"/>
+      <point x="660" y="1664" type="line"/>
+      <point x="1456" y="1664" type="line"/>
+      <point x="1456" y="2048" type="line"/>
+      <point x="300" y="2048" type="line"/>
+      <point x="180" y="1004" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Interface-Bold.ufo/glyphs/four.1.glif b/src/Interface-Bold.ufo/glyphs/four.1.glif
index bf61f0afb..3e0694c1a 100644
--- a/src/Interface-Bold.ufo/glyphs/four.1.glif
+++ b/src/Interface-Bold.ufo/glyphs/four.1.glif
@@ -5,8 +5,8 @@
     <contour>
       <point x="1664" y="784" type="line"/>
       <point x="544" y="784" type="line"/>
-      <point x="1192" y="2004" type="line"/>
-      <point x="772" y="2004" type="line"/>
+      <point x="1192" y="2048" type="line"/>
+      <point x="772" y="2048" type="line"/>
       <point x="84" y="708" type="line"/>
       <point x="84" y="400" type="line"/>
       <point x="1664" y="400" type="line"/>
diff --git a/src/Interface-Bold.ufo/glyphs/four.glif b/src/Interface-Bold.ufo/glyphs/four.glif
index b588e51b9..32994761c 100644
--- a/src/Interface-Bold.ufo/glyphs/four.glif
+++ b/src/Interface-Bold.ufo/glyphs/four.glif
@@ -6,16 +6,16 @@
     <contour>
       <point x="1664" y="784" type="line"/>
       <point x="544" y="784" type="line"/>
-      <point x="900" y="1352" type="line"/>
-      <point x="1280" y="2004" type="line"/>
-      <point x="900" y="2004" type="line"/>
+      <point x="900" y="1396" type="line"/>
+      <point x="1280" y="2048" type="line"/>
+      <point x="900" y="2048" type="line"/>
       <point x="84" y="708" type="line"/>
       <point x="84" y="400" type="line"/>
       <point x="1664" y="400" type="line"/>
     </contour>
     <contour>
-      <point x="1360" y="2004" type="line"/>
-      <point x="948" y="2004" type="line"/>
+      <point x="1360" y="2048" type="line"/>
+      <point x="948" y="2048" type="line"/>
       <point x="948" y="0" type="line"/>
       <point x="1360" y="0" type="line"/>
     </contour>
diff --git a/src/Interface-Bold.ufo/glyphs/h.glif b/src/Interface-Bold.ufo/glyphs/h.glif
index 562de092a..788f918cc 100644
--- a/src/Interface-Bold.ufo/glyphs/h.glif
+++ b/src/Interface-Bold.ufo/glyphs/h.glif
@@ -3,6 +3,29 @@
   <advance width="1536"/>
   <unicode hex="0068"/>
   <outline>
+    <contour>
+      <point x="552" y="796" type="line" smooth="yes"/>
+      <point x="552" y="1004"/>
+      <point x="616" y="1160"/>
+      <point x="768" y="1160" type="curve" smooth="yes"/>
+      <point x="908" y="1160"/>
+      <point x="988" y="1116"/>
+      <point x="988" y="940" type="curve" smooth="yes"/>
+      <point x="988" y="0" type="line"/>
+      <point x="1432" y="0" type="line"/>
+      <point x="1432" y="936" type="line" smooth="yes"/>
+      <point x="1432" y="1368"/>
+      <point x="1240" y="1516"/>
+      <point x="964" y="1516" type="curve" smooth="yes"/>
+      <point x="788" y="1516"/>
+      <point x="640" y="1448"/>
+      <point x="552" y="1336" type="curve"/>
+      <point x="536" y="1336" type="line"/>
+      <point x="536" y="2048" type="line"/>
+      <point x="108" y="2048" type="line"/>
+      <point x="108" y="0" type="line"/>
+      <point x="552" y="0" type="line"/>
+    </contour>
     <contour>
       <point x="712" y="2328" type="move" name="top"/>
     </contour>
@@ -24,29 +47,6 @@
     <contour>
       <point x="1564" y="2328" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="552" y="796" type="line" smooth="yes"/>
-      <point x="552" y="1004"/>
-      <point x="616" y="1160"/>
-      <point x="768" y="1160" type="curve" smooth="yes"/>
-      <point x="908" y="1160"/>
-      <point x="988" y="1116"/>
-      <point x="988" y="940" type="curve" smooth="yes"/>
-      <point x="988" y="0" type="line"/>
-      <point x="1432" y="0" type="line"/>
-      <point x="1432" y="936" type="line" smooth="yes"/>
-      <point x="1432" y="1368"/>
-      <point x="1240" y="1516"/>
-      <point x="964" y="1516" type="curve" smooth="yes"/>
-      <point x="788" y="1516"/>
-      <point x="640" y="1448"/>
-      <point x="552" y="1336" type="curve"/>
-      <point x="536" y="1336" type="line"/>
-      <point x="524" y="2112" type="line"/>
-      <point x="108" y="2112" type="line"/>
-      <point x="108" y="0" type="line"/>
-      <point x="552" y="0" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/hyphen.cap.glif b/src/Interface-Bold.ufo/glyphs/hyphen.cap.glif
new file mode 100644
index 000000000..85cf43a31
--- /dev/null
+++ b/src/Interface-Bold.ufo/glyphs/hyphen.cap.glif
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="hyphen.cap" format="1">
+  <advance width="1280"/>
+  <outline>
+    <component base="hyphen" yOffset="164"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1211, 'leftMargin': 191, 'rightMargin': 210}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Bold.ufo/glyphs/i.glif b/src/Interface-Bold.ufo/glyphs/i.glif
index 2b9b8de8b..aff5dddcb 100644
--- a/src/Interface-Bold.ufo/glyphs/i.glif
+++ b/src/Interface-Bold.ufo/glyphs/i.glif
@@ -3,6 +3,26 @@
   <advance width="768"/>
   <unicode hex="0069"/>
   <outline>
+    <contour>
+      <point x="608" y="1488" type="line"/>
+      <point x="164" y="1488" type="line"/>
+      <point x="164" y="0" type="line"/>
+      <point x="608" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="140" y="1860" type="curve" smooth="yes"/>
+      <point x="140" y="1728"/>
+      <point x="236" y="1636"/>
+      <point x="384" y="1636" type="curve" smooth="yes"/>
+      <point x="532" y="1636"/>
+      <point x="632" y="1728"/>
+      <point x="632" y="1860" type="curve" smooth="yes"/>
+      <point x="632" y="1992"/>
+      <point x="532" y="2084"/>
+      <point x="384" y="2084" type="curve" smooth="yes"/>
+      <point x="236" y="2084"/>
+      <point x="140" y="1992"/>
+    </contour>
     <contour>
       <point x="384" y="16" type="move" name="bottom"/>
     </contour>
@@ -24,26 +44,6 @@
     <contour>
       <point x="768" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="608" y="1488" type="line"/>
-      <point x="164" y="1488" type="line"/>
-      <point x="164" y="0" type="line"/>
-      <point x="608" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="140" y="1872" type="curve" smooth="yes"/>
-      <point x="140" y="1740"/>
-      <point x="236" y="1648"/>
-      <point x="384" y="1648" type="curve" smooth="yes"/>
-      <point x="532" y="1648"/>
-      <point x="632" y="1740"/>
-      <point x="632" y="1872" type="curve" smooth="yes"/>
-      <point x="632" y="2004"/>
-      <point x="532" y="2096"/>
-      <point x="384" y="2096" type="curve" smooth="yes"/>
-      <point x="236" y="2096"/>
-      <point x="140" y="2004"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/ibar.glif b/src/Interface-Bold.ufo/glyphs/ibar.glif
index b44e31356..a30286603 100644
--- a/src/Interface-Bold.ufo/glyphs/ibar.glif
+++ b/src/Interface-Bold.ufo/glyphs/ibar.glif
@@ -3,6 +3,8 @@
   <advance width="1280"/>
   <unicode hex="0268"/>
   <outline>
+    <component base="i" xOffset="308"/>
+    <component base="crossbar" yOffset="-244"/>
     <contour>
       <point x="688" y="2200" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="688" y="0" type="move" name="bottom"/>
     </contour>
-    <component base="i" xOffset="308"/>
-    <component base="crossbar" yOffset="-244"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/itildebelow.glif b/src/Interface-Bold.ufo/glyphs/itildebelow.glif
index cd3960e84..7eb1d4859 100644
--- a/src/Interface-Bold.ufo/glyphs/itildebelow.glif
+++ b/src/Interface-Bold.ufo/glyphs/itildebelow.glif
@@ -3,6 +3,8 @@
   <advance width="1280"/>
   <unicode hex="1E2D"/>
   <outline>
+    <component base="i" xOffset="304"/>
+    <component base="tilde" yOffset="-2268"/>
     <contour>
       <point x="684" y="16" type="move" name="bottom"/>
     </contour>
@@ -27,8 +29,6 @@
     <contour>
       <point x="1068" y="-560" type="move" name="bottom_dd"/>
     </contour>
-    <component base="i" xOffset="304"/>
-    <component base="tilde" yOffset="-2268"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/j.glif b/src/Interface-Bold.ufo/glyphs/j.glif
index dc35d1e57..c0c77fb2d 100644
--- a/src/Interface-Bold.ufo/glyphs/j.glif
+++ b/src/Interface-Bold.ufo/glyphs/j.glif
@@ -3,21 +3,6 @@
   <advance width="896"/>
   <unicode hex="006A"/>
   <outline>
-    <contour>
-      <point x="452" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="408" y="-632" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="900" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="900" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="900" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="324" y="1488" type="line"/>
       <point x="324" y="-40" type="line"/>
@@ -33,18 +18,33 @@
       <point x="768" y="1488" type="line"/>
     </contour>
     <contour>
-      <point x="288" y="1872" type="curve" smooth="yes"/>
-      <point x="288" y="1740"/>
-      <point x="388" y="1648"/>
-      <point x="536" y="1648" type="curve" smooth="yes"/>
-      <point x="684" y="1648"/>
-      <point x="780" y="1740"/>
-      <point x="780" y="1872" type="curve" smooth="yes"/>
-      <point x="780" y="2004"/>
-      <point x="684" y="2096"/>
-      <point x="536" y="2096" type="curve" smooth="yes"/>
-      <point x="388" y="2096"/>
-      <point x="288" y="2004"/>
+      <point x="288" y="1860" type="curve" smooth="yes"/>
+      <point x="288" y="1728"/>
+      <point x="388" y="1636"/>
+      <point x="536" y="1636" type="curve" smooth="yes"/>
+      <point x="684" y="1636"/>
+      <point x="780" y="1728"/>
+      <point x="780" y="1860" type="curve" smooth="yes"/>
+      <point x="780" y="1992"/>
+      <point x="684" y="2084"/>
+      <point x="536" y="2084" type="curve" smooth="yes"/>
+      <point x="388" y="2084"/>
+      <point x="288" y="1992"/>
+    </contour>
+    <contour>
+      <point x="452" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="408" y="-632" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="900" y="2200" type="move" name="top_dd"/>
+    </contour>
+    <contour>
+      <point x="900" y="-560" type="move" name="bottom_dd"/>
+    </contour>
+    <contour>
+      <point x="900" y="2200" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Interface-Bold.ufo/glyphs/jcrosstail.glif b/src/Interface-Bold.ufo/glyphs/jcrosstail.glif
index 1ab14eb1b..5d61ee3b1 100644
--- a/src/Interface-Bold.ufo/glyphs/jcrosstail.glif
+++ b/src/Interface-Bold.ufo/glyphs/jcrosstail.glif
@@ -3,15 +3,6 @@
   <advance width="1536"/>
   <unicode hex="029D"/>
   <outline>
-    <contour>
-      <point x="892" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="892" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1520" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1492" y="172" type="line"/>
       <point x="520" y="172" type="line" smooth="yes"/>
@@ -39,6 +30,15 @@
       <point x="1492" y="-124" type="line"/>
     </contour>
     <component base="i" xOffset="512"/>
+    <contour>
+      <point x="892" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="892" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1520" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/k.glif b/src/Interface-Bold.ufo/glyphs/k.glif
index 25d5bbf15..5270eb34a 100644
--- a/src/Interface-Bold.ufo/glyphs/k.glif
+++ b/src/Interface-Bold.ufo/glyphs/k.glif
@@ -3,6 +3,25 @@
   <advance width="1536"/>
   <unicode hex="006B"/>
   <outline>
+    <contour>
+      <point x="572" y="2048" type="line"/>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="572" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="1516" y="1488" type="line"/>
+      <point x="984" y="1488" type="line"/>
+      <point x="592" y="1004" type="line"/>
+      <point x="528" y="1004" type="line"/>
+      <point x="528" y="296" type="line"/>
+    </contour>
+    <contour>
+      <point x="1048" y="0" type="line"/>
+      <point x="1556" y="0" type="line"/>
+      <point x="956" y="920" type="line"/>
+      <point x="636" y="680" type="line"/>
+    </contour>
     <contour>
       <point x="708" y="44" type="move" name="bottom"/>
     </contour>
@@ -24,25 +43,6 @@
     <contour>
       <point x="1264" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="572" y="2112" type="line"/>
-      <point x="128" y="2112" type="line"/>
-      <point x="128" y="0" type="line"/>
-      <point x="572" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1516" y="1488" type="line"/>
-      <point x="984" y="1488" type="line"/>
-      <point x="592" y="1004" type="line"/>
-      <point x="528" y="1004" type="line"/>
-      <point x="528" y="296" type="line"/>
-    </contour>
-    <contour>
-      <point x="1048" y="0" type="line"/>
-      <point x="1556" y="0" type="line"/>
-      <point x="956" y="920" type="line"/>
-      <point x="636" y="680" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/l.glif b/src/Interface-Bold.ufo/glyphs/l.glif
index b74eca119..c653d15c1 100644
--- a/src/Interface-Bold.ufo/glyphs/l.glif
+++ b/src/Interface-Bold.ufo/glyphs/l.glif
@@ -3,6 +3,12 @@
   <advance width="768"/>
   <unicode hex="006C"/>
   <outline>
+    <contour>
+      <point x="604" y="2048" type="line"/>
+      <point x="160" y="2048" type="line"/>
+      <point x="160" y="0" type="line"/>
+      <point x="604" y="0" type="line"/>
+    </contour>
     <contour>
       <point x="384.0" y="2308.0" type="move" name="top"/>
     </contour>
@@ -27,12 +33,6 @@
     <contour>
       <point x="768.0" y="2308.0" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="604" y="2104" type="line"/>
-      <point x="160" y="2104" type="line"/>
-      <point x="160" y="0" type="line"/>
-      <point x="604" y="0" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/lbar.glif b/src/Interface-Bold.ufo/glyphs/lbar.glif
index 051ba672f..f23899ab7 100644
--- a/src/Interface-Bold.ufo/glyphs/lbar.glif
+++ b/src/Interface-Bold.ufo/glyphs/lbar.glif
@@ -3,6 +3,8 @@
   <advance width="1280"/>
   <unicode hex="019A"/>
   <outline>
+    <component base="l" xOffset="304"/>
+    <component base="crossbar" yOffset="112"/>
     <contour>
       <point x="688" y="2308" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="688" y="16" type="move" name="bottom"/>
     </contour>
-    <component base="l" xOffset="304"/>
-    <component base="crossbar" yOffset="112"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/lbelt.glif b/src/Interface-Bold.ufo/glyphs/lbelt.glif
index 995a90406..7cb7d18fb 100644
--- a/src/Interface-Bold.ufo/glyphs/lbelt.glif
+++ b/src/Interface-Bold.ufo/glyphs/lbelt.glif
@@ -3,15 +3,6 @@
   <advance width="1792"/>
   <unicode hex="026C"/>
   <outline>
-    <contour>
-      <point x="1028" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1028" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1672" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1244" y="968" type="line"/>
       <point x="1244" y="1272"/>
@@ -39,6 +30,15 @@
       <point x="1244" y="576" type="line"/>
     </contour>
     <component base="l" xOffset="640"/>
+    <contour>
+      <point x="1028" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1028" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1672" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/lmidtilde.glif b/src/Interface-Bold.ufo/glyphs/lmidtilde.glif
index 2542d68e3..2728bacad 100644
--- a/src/Interface-Bold.ufo/glyphs/lmidtilde.glif
+++ b/src/Interface-Bold.ufo/glyphs/lmidtilde.glif
@@ -3,6 +3,8 @@
   <advance width="1280"/>
   <unicode hex="026B"/>
   <outline>
+    <component base="l" xOffset="256"/>
+    <component base="tilde" xOffset="-44" yOffset="-756"/>
     <contour>
       <point x="636" y="2200" type="move" name="top"/>
     </contour>
@@ -15,8 +17,6 @@
     <contour>
       <point x="636" y="0" type="move" name="bottom"/>
     </contour>
-    <component base="l" xOffset="256"/>
-    <component base="tilde" xOffset="-44" yOffset="-756"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/lslash.glif b/src/Interface-Bold.ufo/glyphs/lslash.glif
index 51759a994..e8200df1e 100644
--- a/src/Interface-Bold.ufo/glyphs/lslash.glif
+++ b/src/Interface-Bold.ufo/glyphs/lslash.glif
@@ -3,6 +3,13 @@
   <advance width="1024"/>
   <unicode hex="0142"/>
   <outline>
+    <contour>
+      <point x="920" y="1332" type="line"/>
+      <point x="108" y="1072" type="line"/>
+      <point x="108" y="824" type="line"/>
+      <point x="920" y="1084" type="line"/>
+    </contour>
+    <component base="l" xOffset="124"/>
     <contour>
       <point x="512" y="2308" type="move" name="top"/>
     </contour>
@@ -12,13 +19,6 @@
     <contour>
       <point x="964" y="2308" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="920" y="1332" type="line"/>
-      <point x="108" y="1072" type="line"/>
-      <point x="108" y="824" type="line"/>
-      <point x="920" y="1084" type="line"/>
-    </contour>
-    <component base="l" xOffset="124"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/lyogh.glif b/src/Interface-Bold.ufo/glyphs/lyogh.glif
index d9e476700..6d9ee27d5 100644
--- a/src/Interface-Bold.ufo/glyphs/lyogh.glif
+++ b/src/Interface-Bold.ufo/glyphs/lyogh.glif
@@ -3,15 +3,6 @@
   <advance width="1792"/>
   <unicode hex="026E"/>
   <outline>
-    <contour>
-      <point x="884" y="1776" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="884" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1688" y="1776" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="260" y="1488" type="line"/>
       <point x="260" y="1132" type="line"/>
@@ -47,6 +38,15 @@
       <point x="892" y="652" type="curve"/>
     </contour>
     <component base="l" xOffset="4"/>
+    <contour>
+      <point x="884" y="1776" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="884" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1688" y="1776" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/minus.cap.glif b/src/Interface-Bold.ufo/glyphs/minus.cap.glif
new file mode 100644
index 000000000..ef9defa32
--- /dev/null
+++ b/src/Interface-Bold.ufo/glyphs/minus.cap.glif
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="minus.cap" format="1">
+  <advance width="1536"/>
+  <outline>
+    <component base="minus" yOffset="48"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8</real>
+        <real>0.94</real>
+        <real>0.95</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1548, 'leftMargin': 191, 'rightMargin': 155}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Bold.ufo/glyphs/multiply.cap.glif b/src/Interface-Bold.ufo/glyphs/multiply.cap.glif
new file mode 100644
index 000000000..bc3fb34c5
--- /dev/null
+++ b/src/Interface-Bold.ufo/glyphs/multiply.cap.glif
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="multiply.cap" format="1">
+  <advance width="1536"/>
+  <outline>
+    <component base="multiply" yOffset="80"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8</real>
+        <real>0.94</real>
+        <real>0.95</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1492, 'leftMargin': 78, 'rightMargin': 87}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Bold.ufo/glyphs/nine.1.glif b/src/Interface-Bold.ufo/glyphs/nine.1.glif
index 3d90f6937..c8a01bbc8 100644
--- a/src/Interface-Bold.ufo/glyphs/nine.1.glif
+++ b/src/Interface-Bold.ufo/glyphs/nine.1.glif
@@ -2,7 +2,7 @@
 <glyph name="nine.1" format="1">
   <advance width="1792"/>
   <outline>
-    <component base="six.1" xScale="-1" yScale="-1" xOffset="1716" yOffset="2004"/>
+    <component base="six.1" xScale="-1" yScale="-1" xOffset="1716" yOffset="2048"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/nine.glif b/src/Interface-Bold.ufo/glyphs/nine.glif
index fcce9c4a2..9f02be1f3 100644
--- a/src/Interface-Bold.ufo/glyphs/nine.glif
+++ b/src/Interface-Bold.ufo/glyphs/nine.glif
@@ -10,36 +10,36 @@
       <point x="471" y="-34"/>
       <point x="871" y="-34" type="curve"/>
       <point x="1425.97" y="-1.650000000000091"/>
-      <point x="1612.58" y="394.29999999999995"/>
-      <point x="1604" y="1053" type="curve" smooth="yes"/>
-      <point x="1604" y="1131" type="line" smooth="yes"/>
-      <point x="1604" y="1709"/>
-      <point x="1300" y="2029"/>
-      <point x="876" y="2029" type="curve" smooth="yes"/>
-      <point x="468" y="2029"/>
-      <point x="184" y="1729"/>
-      <point x="184" y="1337" type="curve" smooth="yes"/>
-      <point x="184" y="949"/>
-      <point x="384" y="649"/>
-      <point x="752" y="649" type="curve" smooth="yes"/>
-      <point x="1104" y="649"/>
-      <point x="1304" y="933"/>
-      <point x="1304" y="1153" type="curve"/>
-      <point x="1160" y="1265" type="line"/>
-      <point x="1160" y="1141"/>
-      <point x="1080" y="1005"/>
-      <point x="900" y="1005" type="curve" smooth="yes"/>
-      <point x="736" y="1005"/>
-      <point x="628" y="1133"/>
-      <point x="628" y="1337" type="curve" smooth="yes"/>
-      <point x="628" y="1529"/>
-      <point x="732" y="1669"/>
-      <point x="888" y="1669" type="curve" smooth="yes"/>
-      <point x="1060" y="1669"/>
-      <point x="1160" y="1549"/>
-      <point x="1160" y="1289" type="curve" smooth="yes"/>
-      <point x="1160" y="941" type="line" smooth="yes"/>
-      <point x="1164.914" y="554.5"/>
+      <point x="1604" y="444"/>
+      <point x="1604" y="1100" type="curve" smooth="yes"/>
+      <point x="1604" y="1180" type="line" smooth="yes"/>
+      <point x="1604" y="1756"/>
+      <point x="1300" y="2076"/>
+      <point x="876" y="2076" type="curve" smooth="yes"/>
+      <point x="468" y="2076"/>
+      <point x="184" y="1776"/>
+      <point x="184" y="1384" type="curve" smooth="yes"/>
+      <point x="184" y="996"/>
+      <point x="384" y="696"/>
+      <point x="752" y="696" type="curve" smooth="yes"/>
+      <point x="1104" y="696"/>
+      <point x="1304" y="980"/>
+      <point x="1304" y="1200" type="curve"/>
+      <point x="1160" y="1312" type="line"/>
+      <point x="1160" y="1188"/>
+      <point x="1080" y="1052"/>
+      <point x="900" y="1052" type="curve" smooth="yes"/>
+      <point x="736" y="1052"/>
+      <point x="628" y="1180"/>
+      <point x="628" y="1384" type="curve" smooth="yes"/>
+      <point x="628" y="1576"/>
+      <point x="732" y="1716"/>
+      <point x="888" y="1716" type="curve" smooth="yes"/>
+      <point x="1060" y="1716"/>
+      <point x="1160" y="1596"/>
+      <point x="1160" y="1336" type="curve" smooth="yes"/>
+      <point x="1160" y="988" type="line" smooth="yes"/>
+      <point x="1160" y="604"/>
       <point x="1064.989" y="334.99"/>
       <point x="878" y="333" type="curve" smooth="yes"/>
       <point x="731.978" y="331.45000000000005"/>
diff --git a/src/Interface-Bold.ufo/glyphs/notequal.cap.glif b/src/Interface-Bold.ufo/glyphs/notequal.cap.glif
new file mode 100644
index 000000000..99b7d2e83
--- /dev/null
+++ b/src/Interface-Bold.ufo/glyphs/notequal.cap.glif
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="notequal.cap" format="1">
+  <advance width="1536"/>
+  <outline>
+    <component base="notequal" yOffset="148"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8</real>
+        <real>0.94</real>
+        <real>0.95</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1638, 'leftMargin': 180, 'rightMargin': 198}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Bold.ufo/glyphs/notequal.glif b/src/Interface-Bold.ufo/glyphs/notequal.glif
index b6ca703b8..77f071017 100644
--- a/src/Interface-Bold.ufo/glyphs/notequal.glif
+++ b/src/Interface-Bold.ufo/glyphs/notequal.glif
@@ -4,12 +4,12 @@
   <unicode hex="2260"/>
   <outline>
     <contour>
-      <point x="1224" y="1532" type="line"/>
-      <point x="1048" y="1620" type="line"/>
-      <point x="304" y="192" type="line"/>
-      <point x="476" y="104" type="line"/>
+      <point x="1268" y="1532" type="line"/>
+      <point x="1092" y="1620" type="line"/>
+      <point x="348" y="192" type="line"/>
+      <point x="520" y="104" type="line"/>
     </contour>
-    <component base="equal" xOffset="-44"/>
+    <component base="equal"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/one.glif b/src/Interface-Bold.ufo/glyphs/one.glif
index 645a63cd1..07244ead7 100644
--- a/src/Interface-Bold.ufo/glyphs/one.glif
+++ b/src/Interface-Bold.ufo/glyphs/one.glif
@@ -4,11 +4,11 @@
   <unicode hex="0031"/>
   <outline>
     <contour>
-      <point x="1156" y="2004" type="line"/>
-      <point x="1116" y="2004" type="line"/>
-      <point x="124" y="1644" type="line"/>
-      <point x="124" y="1284" type="line"/>
-      <point x="692" y="1480" type="line"/>
+      <point x="1156" y="2068" type="line"/>
+      <point x="1116" y="2068" type="line"/>
+      <point x="124" y="1708" type="line"/>
+      <point x="124" y="1348" type="line"/>
+      <point x="692" y="1544" type="line"/>
       <point x="692" y="0" type="line"/>
       <point x="1156" y="0" type="line"/>
     </contour>
diff --git a/src/Interface-Bold.ufo/glyphs/plus.cap.glif b/src/Interface-Bold.ufo/glyphs/plus.cap.glif
new file mode 100644
index 000000000..a22642015
--- /dev/null
+++ b/src/Interface-Bold.ufo/glyphs/plus.cap.glif
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="plus.cap" format="1">
+  <advance width="1536"/>
+  <outline>
+    <component base="plus" yOffset="172"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8</real>
+        <real>0.94</real>
+        <real>0.95</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1515, 'leftMargin': 67, 'rightMargin': 75}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Bold.ufo/glyphs/question.glif b/src/Interface-Bold.ufo/glyphs/question.glif
index 610bd3b90..8f6f6f5b5 100644
--- a/src/Interface-Bold.ufo/glyphs/question.glif
+++ b/src/Interface-Bold.ufo/glyphs/question.glif
@@ -6,22 +6,22 @@
     <contour>
       <point x="936" y="636" type="line"/>
       <point x="947.0193917183321" y="1032.6981018599563"/>
-      <point x="1408" y="1048"/>
-      <point x="1408" y="1484" type="curve" smooth="yes"/>
-      <point x="1408" y="1840"/>
-      <point x="1168" y="2032"/>
-      <point x="772" y="2032" type="curve" smooth="yes"/>
-      <point x="416" y="2032"/>
-      <point x="136" y="1860"/>
-      <point x="132" y="1448" type="curve"/>
-      <point x="576" y="1448" type="line"/>
-      <point x="580" y="1608"/>
-      <point x="672" y="1672"/>
-      <point x="772" y="1672" type="curve" smooth="yes"/>
-      <point x="900" y="1672"/>
-      <point x="964" y="1608"/>
-      <point x="964" y="1464" type="curve" smooth="yes"/>
-      <point x="964" y="1180"/>
+      <point x="1408" y="1092"/>
+      <point x="1408" y="1528" type="curve" smooth="yes"/>
+      <point x="1408" y="1884"/>
+      <point x="1168" y="2076"/>
+      <point x="772" y="2076" type="curve" smooth="yes"/>
+      <point x="416" y="2076"/>
+      <point x="136" y="1904"/>
+      <point x="132" y="1492" type="curve"/>
+      <point x="576" y="1492" type="line"/>
+      <point x="580" y="1652"/>
+      <point x="672" y="1716"/>
+      <point x="772" y="1716" type="curve" smooth="yes"/>
+      <point x="900" y="1716"/>
+      <point x="964" y="1652"/>
+      <point x="964" y="1508" type="curve" smooth="yes"/>
+      <point x="964" y="1224"/>
       <point x="556" y="1228"/>
       <point x="556" y="636" type="curve"/>
     </contour>
diff --git a/src/Interface-Bold.ufo/glyphs/seven.glif b/src/Interface-Bold.ufo/glyphs/seven.glif
index 56a89dc94..ad5eb9c75 100644
--- a/src/Interface-Bold.ufo/glyphs/seven.glif
+++ b/src/Interface-Bold.ufo/glyphs/seven.glif
@@ -4,13 +4,13 @@
   <unicode hex="0037"/>
   <outline>
     <contour>
-      <point x="1536" y="2004" type="line"/>
-      <point x="128" y="2004" type="line"/>
-      <point x="128" y="1620" type="line"/>
-      <point x="1036" y="1620" type="line"/>
+      <point x="1536" y="2048" type="line"/>
+      <point x="128" y="2048" type="line"/>
+      <point x="128" y="1664" type="line"/>
+      <point x="1036" y="1664" type="line"/>
       <point x="336" y="0" type="line"/>
       <point x="804" y="0" type="line"/>
-      <point x="1536" y="1756" type="line"/>
+      <point x="1536" y="1800" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Interface-Bold.ufo/glyphs/six.1.glif b/src/Interface-Bold.ufo/glyphs/six.1.glif
index 5ecb8bd51..185030d71 100644
--- a/src/Interface-Bold.ufo/glyphs/six.1.glif
+++ b/src/Interface-Bold.ufo/glyphs/six.1.glif
@@ -3,7 +3,7 @@
   <advance width="1664"/>
   <outline>
     <contour>
-      <point x="816" y="2004" type="line"/>
+      <point x="832" y="2048" type="line"/>
       <point x="348" y="1300" type="line" smooth="yes"/>
       <point x="208" y="1088"/>
       <point x="128" y="944"/>
@@ -34,7 +34,7 @@
       <point x="556" y="452"/>
       <point x="556" y="712" type="curve"/>
       <point x="528" y="864" type="line" smooth="yes"/>
-      <point x="1300" y="2004" type="line"/>
+      <point x="1316" y="2048" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Interface-Bold.ufo/glyphs/six.glif b/src/Interface-Bold.ufo/glyphs/six.glif
index 3fbe691b1..6f6536908 100644
--- a/src/Interface-Bold.ufo/glyphs/six.glif
+++ b/src/Interface-Bold.ufo/glyphs/six.glif
@@ -4,12 +4,12 @@
   <unicode hex="0036"/>
   <outline>
     <contour>
-      <point x="1088" y="1456" type="curve"/>
-      <point x="1516" y="1456" type="line"/>
-      <point x="1448" y="1788"/>
-      <point x="1244" y="2036"/>
-      <point x="844" y="2036" type="curve"/>
-      <point x="284" y="2036"/>
+      <point x="1088" y="1496" type="curve"/>
+      <point x="1516" y="1496" type="line"/>
+      <point x="1448" y="1828"/>
+      <point x="1244" y="2076"/>
+      <point x="844" y="2076" type="curve"/>
+      <point x="284" y="2076"/>
       <point x="104" y="1608"/>
       <point x="112" y="948" type="curve" smooth="yes"/>
       <point x="112" y="872" type="line" smooth="yes"/>
@@ -40,10 +40,10 @@
       <point x="556" y="712" type="curve" smooth="yes"/>
       <point x="556" y="1060" type="line" smooth="yes"/>
       <point x="552" y="1448"/>
-      <point x="652" y="1668"/>
-      <point x="840" y="1668" type="curve" smooth="yes"/>
-      <point x="984" y="1668"/>
-      <point x="1040" y="1608"/>
+      <point x="652" y="1708"/>
+      <point x="840" y="1708" type="curve" smooth="yes"/>
+      <point x="984" y="1708"/>
+      <point x="1040" y="1648"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Interface-Bold.ufo/glyphs/sterling.glif b/src/Interface-Bold.ufo/glyphs/sterling.glif
index 9f14955d5..7592c4e68 100644
--- a/src/Interface-Bold.ufo/glyphs/sterling.glif
+++ b/src/Interface-Bold.ufo/glyphs/sterling.glif
@@ -10,33 +10,33 @@
       <point x="164" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="1260" y="772" type="line"/>
-      <point x="1260" y="1132" type="line"/>
-      <point x="160" y="1132" type="line"/>
-      <point x="160" y="772" type="line"/>
+      <point x="1260" y="820" type="line"/>
+      <point x="1260" y="1180" type="line"/>
+      <point x="160" y="1180" type="line"/>
+      <point x="160" y="820" type="line"/>
     </contour>
     <contour>
-      <point x="824" y="1428" type="line"/>
-      <point x="824" y="1584"/>
-      <point x="892" y="1656"/>
-      <point x="996" y="1656" type="curve" smooth="yes"/>
-      <point x="1108" y="1656"/>
-      <point x="1196" y="1604"/>
-      <point x="1196" y="1440" type="curve"/>
-      <point x="1632" y="1440" type="line"/>
-      <point x="1632" y="1792"/>
-      <point x="1404" y="2028"/>
-      <point x="988" y="2028" type="curve" smooth="yes"/>
-      <point x="612" y="2028"/>
-      <point x="364" y="1808"/>
-      <point x="364" y="1428" type="curve" smooth="yes"/>
+      <point x="824" y="1476" type="line"/>
+      <point x="824" y="1632"/>
+      <point x="892" y="1704"/>
+      <point x="996" y="1704" type="curve" smooth="yes"/>
+      <point x="1108" y="1704"/>
+      <point x="1196" y="1652"/>
+      <point x="1196" y="1488" type="curve"/>
+      <point x="1632" y="1488" type="line"/>
+      <point x="1632" y="1840"/>
+      <point x="1404" y="2076"/>
+      <point x="988" y="2076" type="curve" smooth="yes"/>
+      <point x="612" y="2076"/>
+      <point x="352" y="1856"/>
+      <point x="364" y="1476" type="curve" smooth="yes"/>
       <point x="392" y="588" type="line" smooth="yes"/>
-      <point x="392" y="484"/>
+      <point x="396" y="484"/>
       <point x="384" y="392"/>
       <point x="304" y="372" type="curve"/>
       <point x="572" y="236" type="line"/>
       <point x="784" y="324"/>
-      <point x="856" y="432"/>
+      <point x="864" y="432"/>
       <point x="856" y="616" type="curve" smooth="yes"/>
     </contour>
   </outline>
diff --git a/src/Interface-Bold.ufo/glyphs/three.glif b/src/Interface-Bold.ufo/glyphs/three.glif
index 3a0d5a729..58dfb53de 100644
--- a/src/Interface-Bold.ufo/glyphs/three.glif
+++ b/src/Interface-Bold.ufo/glyphs/three.glif
@@ -4,33 +4,33 @@
   <unicode hex="0033"/>
   <outline>
     <contour>
-      <point x="592" y="1208" type="line"/>
-      <point x="592" y="960" type="line"/>
-      <point x="884" y="960" type="line"/>
-      <point x="1260" y="960"/>
-      <point x="1520" y="1184"/>
-      <point x="1520" y="1460" type="curve"/>
-      <point x="1520" y="1832"/>
-      <point x="1236" y="2032"/>
-      <point x="816" y="2032" type="curve" smooth="yes"/>
-      <point x="456" y="2032"/>
-      <point x="148" y="1828"/>
-      <point x="148" y="1488" type="curve"/>
-      <point x="592" y="1488" type="line"/>
-      <point x="592" y="1604"/>
-      <point x="708" y="1672"/>
-      <point x="832" y="1672" type="curve" smooth="yes"/>
-      <point x="1000" y="1672"/>
-      <point x="1080" y="1568"/>
-      <point x="1080" y="1448" type="curve"/>
-      <point x="1080" y="1292"/>
-      <point x="992" y="1208"/>
-      <point x="812" y="1208" type="curve" smooth="yes"/>
+      <point x="592" y="1216" type="line"/>
+      <point x="592" y="968" type="line"/>
+      <point x="884" y="968" type="line"/>
+      <point x="1268" y="968"/>
+      <point x="1520" y="1228"/>
+      <point x="1520" y="1504" type="curve"/>
+      <point x="1520" y="1876"/>
+      <point x="1236" y="2076"/>
+      <point x="816" y="2076" type="curve" smooth="yes"/>
+      <point x="456" y="2076"/>
+      <point x="148" y="1872"/>
+      <point x="148" y="1532" type="curve"/>
+      <point x="592" y="1532" type="line"/>
+      <point x="592" y="1648"/>
+      <point x="708" y="1716"/>
+      <point x="832" y="1716" type="curve" smooth="yes"/>
+      <point x="1000" y="1716"/>
+      <point x="1080" y="1612"/>
+      <point x="1080" y="1492" type="curve"/>
+      <point x="1080" y="1336"/>
+      <point x="992" y="1216"/>
+      <point x="812" y="1216" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="592" y="824" type="line"/>
-      <point x="812" y="824" type="line" smooth="yes"/>
-      <point x="1000" y="824"/>
+      <point x="592" y="832" type="line"/>
+      <point x="812" y="832" type="line" smooth="yes"/>
+      <point x="1000" y="832"/>
       <point x="1112" y="776"/>
       <point x="1112" y="572" type="curve" smooth="yes"/>
       <point x="1112" y="436"/>
diff --git a/src/Interface-Bold.ufo/glyphs/two.glif b/src/Interface-Bold.ufo/glyphs/two.glif
index a201bd8fc..e7cd708d2 100644
--- a/src/Interface-Bold.ufo/glyphs/two.glif
+++ b/src/Interface-Bold.ufo/glyphs/two.glif
@@ -11,29 +11,29 @@
       <point x="732" y="368" type="curve"/>
       <point x="724" y="388" type="line"/>
       <point x="764" y="404"/>
-      <point x="776" y="416"/>
-      <point x="804" y="444" type="curve" smooth="yes"/>
-      <point x="1012" y="656" type="line" smooth="yes"/>
-      <point x="1300" y="948"/>
-      <point x="1480" y="1172"/>
-      <point x="1480" y="1452" type="curve" smooth="yes"/>
-      <point x="1480" y="1816"/>
-      <point x="1248" y="2032"/>
-      <point x="812" y="2032" type="curve" smooth="yes"/>
-      <point x="388" y="2032"/>
-      <point x="104" y="1728"/>
-      <point x="104" y="1360" type="curve"/>
-      <point x="548" y="1360" type="line"/>
-      <point x="548" y="1536"/>
-      <point x="644" y="1672"/>
-      <point x="804" y="1672" type="curve" smooth="yes"/>
-      <point x="952" y="1672"/>
-      <point x="1036" y="1580"/>
-      <point x="1036" y="1408" type="curve" smooth="yes"/>
-      <point x="1036" y="1308"/>
-      <point x="980" y="1168"/>
-      <point x="792" y="980" type="curve" smooth="yes"/>
-      <point x="128" y="328" type="line"/>
+      <point x="776" y="412"/>
+      <point x="804" y="440" type="curve" smooth="yes"/>
+      <point x="1012" y="664" type="line" smooth="yes"/>
+      <point x="1292" y="968"/>
+      <point x="1480" y="1192"/>
+      <point x="1480" y="1484" type="curve" smooth="yes"/>
+      <point x="1480" y="1856"/>
+      <point x="1248" y="2076"/>
+      <point x="812" y="2076" type="curve" smooth="yes"/>
+      <point x="388" y="2076"/>
+      <point x="104" y="1764"/>
+      <point x="104" y="1388" type="curve"/>
+      <point x="548" y="1388" type="line"/>
+      <point x="548" y="1568"/>
+      <point x="644" y="1712"/>
+      <point x="804" y="1712" type="curve" smooth="yes"/>
+      <point x="952" y="1712"/>
+      <point x="1036" y="1616"/>
+      <point x="1036" y="1440" type="curve" smooth="yes"/>
+      <point x="1036" y="1336"/>
+      <point x="980" y="1192"/>
+      <point x="792" y="1000" type="curve" smooth="yes"/>
+      <point x="128" y="336" type="line"/>
       <point x="128" y="0" type="line"/>
       <point x="1536" y="0" type="line"/>
     </contour>
diff --git a/src/Interface-Bold.ufo/glyphs/uni023D_.glif b/src/Interface-Bold.ufo/glyphs/uni023D_.glif
index bdbd126bb..6628bcd7c 100644
--- a/src/Interface-Bold.ufo/glyphs/uni023D_.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni023D_.glif
@@ -3,6 +3,8 @@
   <advance width="1792"/>
   <unicode hex="023D"/>
   <outline>
+    <component base="L" xOffset="232"/>
+    <component base="crossbar" xOffset="-60"/>
     <contour>
       <point x="608" y="2200" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="924" y="16" type="move" name="bottom"/>
     </contour>
-    <component base="L" xOffset="232"/>
-    <component base="crossbar" xOffset="-60"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/uni0243.glif b/src/Interface-Bold.ufo/glyphs/uni0243.glif
index 7dc608153..987776c47 100644
--- a/src/Interface-Bold.ufo/glyphs/uni0243.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni0243.glif
@@ -3,6 +3,8 @@
   <advance width="2048"/>
   <unicode hex="0243"/>
   <outline>
+    <component base="B" xOffset="208"/>
+    <component base="crossbar" xOffset="-92" yOffset="-416"/>
     <contour>
       <point x="1000" y="2216" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="1000" y="16" type="move" name="bottom"/>
     </contour>
-    <component base="B" xOffset="208"/>
-    <component base="crossbar" xOffset="-92" yOffset="-416"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/uni0248.glif b/src/Interface-Bold.ufo/glyphs/uni0248.glif
index ca755596d..ce40a4cc4 100644
--- a/src/Interface-Bold.ufo/glyphs/uni0248.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni0248.glif
@@ -3,6 +3,8 @@
   <advance width="1792"/>
   <unicode hex="0248"/>
   <outline>
+    <component base="J" xOffset="60"/>
+    <component base="crossbar" xOffset="548"/>
     <contour>
       <point x="1240" y="2200" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="764" y="-16" type="move" name="bottom"/>
     </contour>
-    <component base="J" xOffset="60"/>
-    <component base="crossbar" xOffset="548"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/uni0249.glif b/src/Interface-Bold.ufo/glyphs/uni0249.glif
index 5de442d9f..2f8ea1a59 100644
--- a/src/Interface-Bold.ufo/glyphs/uni0249.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni0249.glif
@@ -3,6 +3,8 @@
   <advance width="1280"/>
   <unicode hex="0249"/>
   <outline>
+    <component base="j" xOffset="308"/>
+    <component base="crossbar" yOffset="-244"/>
     <contour>
       <point x="692" y="2200" type="move" name="top"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="644" y="-632" type="move" name="bottom"/>
     </contour>
-    <component base="j" xOffset="308"/>
-    <component base="crossbar" yOffset="-244"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/uni02AB__.glif b/src/Interface-Bold.ufo/glyphs/uni02AB__.glif
index 256020aad..f886f7e9e 100644
--- a/src/Interface-Bold.ufo/glyphs/uni02AB__.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni02AB__.glif
@@ -3,15 +3,6 @@
   <advance width="2048"/>
   <unicode hex="02AB"/>
   <outline>
-    <contour>
-      <point x="1156" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1156" y="0" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1968" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1872" y="360" type="line"/>
       <point x="716" y="360" type="line"/>
@@ -33,6 +24,15 @@
       <point x="1708" y="1132" type="line"/>
     </contour>
     <component base="l" xOffset="16"/>
+    <contour>
+      <point x="1156" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1156" y="0" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1968" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/uni048A_.glif b/src/Interface-Bold.ufo/glyphs/uni048A_.glif
index b6edbb49a..23c74922b 100644
--- a/src/Interface-Bold.ufo/glyphs/uni048A_.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni048A_.glif
@@ -3,15 +3,15 @@
   <advance width="2304"/>
   <unicode hex="048A"/>
   <outline>
+    <component base="afii10026" xOffset="-44"/>
+    <component base="breve" xOffset="300" yOffset="428"/>
+    <component base="comma" xOffset="1520" yOffset="-48"/>
     <contour>
       <point x="932" y="2632" type="move" name="top"/>
     </contour>
     <contour>
       <point x="1916" y="2200" type="move" name="top0315"/>
     </contour>
-    <component base="afii10026" xOffset="-44"/>
-    <component base="breve" xOffset="300" yOffset="428"/>
-    <component base="comma" xOffset="1520" yOffset="-48"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/uni04C9_.glif b/src/Interface-Bold.ufo/glyphs/uni04C9_.glif
index e406ca34d..dd56c93b1 100644
--- a/src/Interface-Bold.ufo/glyphs/uni04C9_.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni04C9_.glif
@@ -3,6 +3,8 @@
   <advance width="2304"/>
   <unicode hex="04C9"/>
   <outline>
+    <component base="H"/>
+    <component base="comma" xOffset="1580" yOffset="-48"/>
     <contour>
       <point x="1984" y="2200" type="move" name="top_dd"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="1984" y="2200" type="move" name="top0315"/>
     </contour>
-    <component base="H"/>
-    <component base="comma" xOffset="1580" yOffset="-48"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/uni04CD__.glif b/src/Interface-Bold.ufo/glyphs/uni04CD__.glif
index 949f49eb1..7b1142d74 100644
--- a/src/Interface-Bold.ufo/glyphs/uni04CD__.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni04CD__.glif
@@ -3,6 +3,8 @@
   <advance width="2816"/>
   <unicode hex="04CD"/>
   <outline>
+    <component base="M" xOffset="16"/>
+    <component base="comma" xOffset="2080" yOffset="-48"/>
     <contour>
       <point x="2484" y="2200" type="move" name="top_dd"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="2484" y="2200" type="move" name="top0315"/>
     </contour>
-    <component base="M" xOffset="16"/>
-    <component base="comma" xOffset="2080" yOffset="-48"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/uni04FC__.glif b/src/Interface-Bold.ufo/glyphs/uni04FC__.glif
index 3ffc85b2c..48fb27eda 100644
--- a/src/Interface-Bold.ufo/glyphs/uni04FC__.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni04FC__.glif
@@ -3,6 +3,8 @@
   <advance width="2048"/>
   <unicode hex="04FC"/>
   <outline>
+    <component base="X" xOffset="-128"/>
+    <component base="cyrillichook" xOffset="1268"/>
     <contour>
       <point x="1668" y="2200" type="move" name="top_dd"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="1668" y="2216" type="move" name="top0315"/>
     </contour>
-    <component base="X" xOffset="-128"/>
-    <component base="cyrillichook" xOffset="1268"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/uni1D7A__.glif b/src/Interface-Bold.ufo/glyphs/uni1D7A__.glif
index e7d99ceda..12c691ec4 100644
--- a/src/Interface-Bold.ufo/glyphs/uni1D7A__.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni1D7A__.glif
@@ -3,6 +3,14 @@
   <advance width="2560"/>
   <unicode hex="1D7A"/>
   <outline>
+    <contour>
+      <point x="2396" y="2004" type="line"/>
+      <point x="1980" y="2004" type="line"/>
+      <point x="112" y="-172" type="line"/>
+      <point x="524" y="-172" type="line"/>
+    </contour>
+    <component base="t" xOffset="184"/>
+    <component base="h" xOffset="1020"/>
     <contour>
       <point x="1836" y="2200" type="move" name="top"/>
     </contour>
@@ -12,14 +20,6 @@
     <contour>
       <point x="2612" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="2396" y="2004" type="line"/>
-      <point x="1980" y="2004" type="line"/>
-      <point x="112" y="-172" type="line"/>
-      <point x="524" y="-172" type="line"/>
-    </contour>
-    <component base="t" xOffset="184"/>
-    <component base="h" xOffset="1020"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/uni1D80_.glif b/src/Interface-Bold.ufo/glyphs/uni1D80_.glif
index 66a0dde3b..df608fc65 100644
--- a/src/Interface-Bold.ufo/glyphs/uni1D80_.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni1D80_.glif
@@ -3,15 +3,6 @@
   <advance width="1792"/>
   <unicode hex="1D80"/>
   <outline>
-    <contour>
-      <point x="1004" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="1004" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1660" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1188" y="360" type="line"/>
       <point x="1188" y="-80" type="line" smooth="yes"/>
@@ -31,6 +22,15 @@
       <point x="1492" y="360" type="line"/>
     </contour>
     <component base="b" xOffset="72"/>
+    <contour>
+      <point x="1004" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="1004" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1660" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/uni1D82_.glif b/src/Interface-Bold.ufo/glyphs/uni1D82_.glif
index e41106996..e360f92d0 100644
--- a/src/Interface-Bold.ufo/glyphs/uni1D82_.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni1D82_.glif
@@ -3,15 +3,6 @@
   <advance width="1024"/>
   <unicode hex="1D82"/>
   <outline>
-    <contour>
-      <point x="604" y="2340" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="472" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1008" y="2340" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="596" y="360" type="line"/>
       <point x="596" y="-80" type="line" smooth="yes"/>
@@ -31,6 +22,15 @@
       <point x="900" y="360" type="line"/>
     </contour>
     <component base="f" xOffset="-8"/>
+    <contour>
+      <point x="604" y="2340" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="472" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1008" y="2340" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/uni1D84_.glif b/src/Interface-Bold.ufo/glyphs/uni1D84_.glif
index 5e553db7f..102d7a85d 100644
--- a/src/Interface-Bold.ufo/glyphs/uni1D84_.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni1D84_.glif
@@ -3,15 +3,6 @@
   <advance width="1792"/>
   <unicode hex="1D84"/>
   <outline>
-    <contour>
-      <point x="1024" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="868" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1700" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="1356" y="360" type="line"/>
       <point x="1356" y="-80" type="line" smooth="yes"/>
@@ -31,6 +22,15 @@
       <point x="1660" y="360" type="line"/>
     </contour>
     <component base="k" xOffset="76"/>
+    <contour>
+      <point x="1024" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="868" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1700" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/uni1D85_.glif b/src/Interface-Bold.ufo/glyphs/uni1D85_.glif
index 9748f5b70..6766db790 100644
--- a/src/Interface-Bold.ufo/glyphs/uni1D85_.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni1D85_.glif
@@ -3,15 +3,6 @@
   <advance width="1024"/>
   <unicode hex="1D85"/>
   <outline>
-    <contour>
-      <point x="408" y="2340" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="408" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="900" y="2340" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="540" y="360" type="line"/>
       <point x="540" y="-80" type="line" smooth="yes"/>
@@ -31,6 +22,15 @@
       <point x="844" y="360" type="line"/>
     </contour>
     <component base="l" xOffset="16"/>
+    <contour>
+      <point x="408" y="2340" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="408" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="900" y="2340" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/uni1D96_.glif b/src/Interface-Bold.ufo/glyphs/uni1D96_.glif
index c7894b571..beb294c59 100644
--- a/src/Interface-Bold.ufo/glyphs/uni1D96_.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni1D96_.glif
@@ -3,15 +3,6 @@
   <advance width="1280"/>
   <unicode hex="1D96"/>
   <outline>
-    <contour>
-      <point x="388" y="2200" type="move" name="top"/>
-    </contour>
-    <contour>
-      <point x="388" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1044" y="2200" type="move" name="top0315"/>
-    </contour>
     <contour>
       <point x="492" y="440" type="line"/>
       <point x="492" y="-80" type="line" smooth="yes"/>
@@ -31,6 +22,15 @@
       <point x="796" y="440" type="line"/>
     </contour>
     <component base="i" xOffset="4"/>
+    <contour>
+      <point x="388" y="2200" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="388" y="-616" type="move" name="bottom"/>
+    </contour>
+    <contour>
+      <point x="1044" y="2200" type="move" name="top0315"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/uni20BD__.glif b/src/Interface-Bold.ufo/glyphs/uni20BD__.glif
index a55cb0572..d169e8c17 100644
--- a/src/Interface-Bold.ufo/glyphs/uni20BD__.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni20BD__.glif
@@ -4,26 +4,26 @@
   <unicode hex="20BD"/>
   <outline>
     <contour>
-      <point x="1172" y="680" type="line"/>
-      <point x="1636" y="680"/>
-      <point x="1944" y="924"/>
-      <point x="1944" y="1332" type="curve" smooth="yes"/>
-      <point x="1944" y="1720"/>
-      <point x="1648" y="2004"/>
-      <point x="1172" y="2004" type="curve" smooth="yes"/>
-      <point x="380" y="2004" type="line"/>
+      <point x="1172" y="724" type="line"/>
+      <point x="1636" y="724"/>
+      <point x="1944" y="968"/>
+      <point x="1944" y="1376" type="curve" smooth="yes"/>
+      <point x="1944" y="1764"/>
+      <point x="1648" y="2048"/>
+      <point x="1172" y="2048" type="curve" smooth="yes"/>
+      <point x="380" y="2048" type="line"/>
       <point x="380" y="0" type="line"/>
       <point x="840" y="0" type="line"/>
-      <point x="840" y="1628" type="line"/>
-      <point x="1172" y="1628" type="line" smooth="yes"/>
-      <point x="1376" y="1628"/>
-      <point x="1476" y="1496"/>
-      <point x="1476" y="1328" type="curve" smooth="yes"/>
-      <point x="1476" y="1168"/>
-      <point x="1396" y="1052"/>
-      <point x="1156" y="1052" type="curve" smooth="yes"/>
-      <point x="108" y="1052" type="line"/>
-      <point x="108" y="680" type="line"/>
+      <point x="840" y="1672" type="line"/>
+      <point x="1172" y="1672" type="line" smooth="yes"/>
+      <point x="1376" y="1672"/>
+      <point x="1476" y="1540"/>
+      <point x="1476" y="1372" type="curve" smooth="yes"/>
+      <point x="1476" y="1212"/>
+      <point x="1396" y="1096"/>
+      <point x="1156" y="1096" type="curve" smooth="yes"/>
+      <point x="108" y="1096" type="line"/>
+      <point x="108" y="724" type="line"/>
     </contour>
     <contour>
       <point x="1272" y="604" type="line"/>
diff --git a/src/Interface-Bold.ufo/glyphs/uni2C67_.glif b/src/Interface-Bold.ufo/glyphs/uni2C67_.glif
index aa2192115..6519213e7 100644
--- a/src/Interface-Bold.ufo/glyphs/uni2C67_.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni2C67_.glif
@@ -3,6 +3,8 @@
   <advance width="2304"/>
   <unicode hex="2C67"/>
   <outline>
+    <component base="H"/>
+    <component base="cyrillictic" xOffset="1580"/>
     <contour>
       <point x="1984" y="2200" type="move" name="top_dd"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="1984" y="2200" type="move" name="top0315"/>
     </contour>
-    <component base="H"/>
-    <component base="cyrillictic" xOffset="1580"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/uni2C68_.glif b/src/Interface-Bold.ufo/glyphs/uni2C68_.glif
index e2811a86d..ba1445034 100644
--- a/src/Interface-Bold.ufo/glyphs/uni2C68_.glif
+++ b/src/Interface-Bold.ufo/glyphs/uni2C68_.glif
@@ -3,6 +3,8 @@
   <advance width="2048"/>
   <unicode hex="2C68"/>
   <outline>
+    <component base="h" xOffset="80"/>
+    <component base="cyrillictic" xOffset="1296"/>
     <contour>
       <point x="1668" y="2200" type="move" name="top_dd"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="1668" y="2328" type="move" name="top0315"/>
     </contour>
-    <component base="h" xOffset="80"/>
-    <component base="cyrillictic" xOffset="1296"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/uniA790_.glif b/src/Interface-Bold.ufo/glyphs/uniA790_.glif
index 33f1b8569..4e5b51331 100644
--- a/src/Interface-Bold.ufo/glyphs/uniA790_.glif
+++ b/src/Interface-Bold.ufo/glyphs/uniA790_.glif
@@ -3,6 +3,8 @@
   <advance width="2304"/>
   <unicode hex="A790"/>
   <outline>
+    <component base="N"/>
+    <component base="cyrillictic" xOffset="1580"/>
     <contour>
       <point x="1980" y="2200" type="move" name="top_dd"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="1980" y="2200" type="move" name="top0315"/>
     </contour>
-    <component base="N"/>
-    <component base="cyrillictic" xOffset="1580"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Interface-Bold.ufo/glyphs/yen.glif b/src/Interface-Bold.ufo/glyphs/yen.glif
index 77a4ce753..d6403c882 100644
--- a/src/Interface-Bold.ufo/glyphs/yen.glif
+++ b/src/Interface-Bold.ufo/glyphs/yen.glif
@@ -4,34 +4,34 @@
   <unicode hex="00A5"/>
   <outline>
     <contour>
-      <point x="1372" y="1020" type="line"/>
-      <point x="116" y="1020" type="line"/>
-      <point x="116" y="760" type="line"/>
-      <point x="1372" y="760" type="line"/>
+      <point x="1372" y="1064" type="line"/>
+      <point x="116" y="1064" type="line"/>
+      <point x="116" y="804" type="line"/>
+      <point x="1372" y="804" type="line"/>
     </contour>
     <contour>
-      <point x="1372" y="624" type="line"/>
-      <point x="116" y="624" type="line"/>
-      <point x="116" y="364" type="line"/>
-      <point x="1372" y="364" type="line"/>
+      <point x="1372" y="668" type="line"/>
+      <point x="116" y="668" type="line"/>
+      <point x="116" y="408" type="line"/>
+      <point x="1372" y="408" type="line"/>
     </contour>
     <contour>
-      <point x="668" y="1004" type="line"/>
-      <point x="724" y="744" type="line"/>
-      <point x="968" y="744" type="line"/>
-      <point x="1516" y="2004" type="line"/>
-      <point x="1044" y="2004" type="line"/>
+      <point x="668" y="1048" type="line"/>
+      <point x="724" y="788" type="line"/>
+      <point x="968" y="788" type="line"/>
+      <point x="1516" y="2048" type="line"/>
+      <point x="1044" y="2048" type="line"/>
     </contour>
     <contour>
-      <point x="496" y="2004" type="line"/>
-      <point x="24" y="2004" type="line"/>
-      <point x="568" y="744" type="line"/>
-      <point x="816" y="744" type="line"/>
-      <point x="876" y="992" type="line"/>
+      <point x="496" y="2048" type="line"/>
+      <point x="24" y="2048" type="line"/>
+      <point x="568" y="788" type="line"/>
+      <point x="816" y="788" type="line"/>
+      <point x="876" y="1036" type="line"/>
     </contour>
     <contour>
-      <point x="992" y="1036" type="line"/>
-      <point x="532" y="1036" type="line"/>
+      <point x="992" y="1080" type="line"/>
+      <point x="532" y="1080" type="line"/>
       <point x="532" y="0" type="line"/>
       <point x="992" y="0" type="line"/>
     </contour>
diff --git a/src/Interface-Bold.ufo/glyphs/zero.glif b/src/Interface-Bold.ufo/glyphs/zero.glif
index f3fae777a..1acc84372 100644
--- a/src/Interface-Bold.ufo/glyphs/zero.glif
+++ b/src/Interface-Bold.ufo/glyphs/zero.glif
@@ -4,36 +4,36 @@
   <unicode hex="0030"/>
   <outline>
     <contour>
-      <point x="1560" y="1180" type="line" smooth="yes"/>
-      <point x="1560" y="1740"/>
-      <point x="1248" y="2036"/>
-      <point x="832" y="2036" type="curve" smooth="yes"/>
-      <point x="416" y="2036"/>
-      <point x="104" y="1740"/>
-      <point x="104" y="1180" type="curve" smooth="yes"/>
-      <point x="104" y="848" type="line" smooth="yes"/>
-      <point x="104" y="256"/>
+      <point x="1560" y="1204" type="line" smooth="yes"/>
+      <point x="1560" y="1776"/>
+      <point x="1248" y="2076"/>
+      <point x="832" y="2076" type="curve" smooth="yes"/>
+      <point x="416" y="2076"/>
+      <point x="104" y="1776"/>
+      <point x="104" y="1204" type="curve" smooth="yes"/>
+      <point x="104" y="864" type="line" smooth="yes"/>
+      <point x="104" y="260"/>
       <point x="412" y="-28"/>
       <point x="832" y="-28" type="curve" smooth="yes"/>
       <point x="1248" y="-28"/>
-      <point x="1560" y="256"/>
-      <point x="1560" y="848" type="curve" smooth="yes"/>
+      <point x="1560" y="260"/>
+      <point x="1560" y="864" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="1108" y="788" type="line" smooth="yes"/>
-      <point x="1108" y="456"/>
-      <point x="988" y="344"/>
-      <point x="832" y="344" type="curve" smooth="yes"/>
-      <point x="672" y="344"/>
-      <point x="556" y="456"/>
-      <point x="556" y="788" type="curve" smooth="yes"/>
-      <point x="556" y="1240" type="line" smooth="yes"/>
-      <point x="556" y="1540"/>
-      <point x="672" y="1668"/>
-      <point x="832" y="1668" type="curve" smooth="yes"/>
-      <point x="992" y="1668"/>
-      <point x="1108" y="1540"/>
-      <point x="1108" y="1240" type="curve" smooth="yes"/>
+      <point x="1108" y="804" type="line" smooth="yes"/>
+      <point x="1108" y="464"/>
+      <point x="988" y="352"/>
+      <point x="832" y="352" type="curve" smooth="yes"/>
+      <point x="672" y="352"/>
+      <point x="556" y="464"/>
+      <point x="556" y="804" type="curve" smooth="yes"/>
+      <point x="556" y="1264" type="line" smooth="yes"/>
+      <point x="556" y="1572"/>
+      <point x="672" y="1700"/>
+      <point x="832" y="1700" type="curve" smooth="yes"/>
+      <point x="992" y="1700"/>
+      <point x="1108" y="1572"/>
+      <point x="1108" y="1264" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Interface-Bold.ufo/lib.plist b/src/Interface-Bold.ufo/lib.plist
index fd11f94ae..ed9627445 100644
--- a/src/Interface-Bold.ufo/lib.plist
+++ b/src/Interface-Bold.ufo/lib.plist
@@ -158,9 +158,9 @@
 			<key>name</key>
 			<string></string>
 			<key>x</key>
-			<integer>1324</integer>
+			<integer>1512</integer>
 			<key>y</key>
-			<integer>1208</integer>
+			<integer>1216</integer>
 		</dict>
 		<dict>
 			<key>angle</key>
@@ -172,9 +172,9 @@
 			<key>name</key>
 			<string></string>
 			<key>x</key>
-			<integer>1356</integer>
+			<integer>1396</integer>
 			<key>y</key>
-			<integer>824</integer>
+			<integer>832</integer>
 		</dict>
 		<dict>
 			<key>angle</key>
@@ -520,6 +520,7 @@
 				<string>braceright</string>
 				<string>braceright.cap</string>
 				<string>at</string>
+				<string>at.cap</string>
 				<string>numbersign</string>
 				<string>currency</string>
 				<string>slash</string>
@@ -528,10 +529,15 @@
 				<string>backslash</string>
 				<string>hyphenbullet</string>
 				<string>hyphen</string>
+				<string>hyphen.cap</string>
 				<string>endash</string>
+				<string>endash.cap</string>
 				<string>figuredash</string>
+				<string>figuredash.cap</string>
 				<string>emdash</string>
+				<string>emdash.cap</string>
 				<string>bullet</string>
+				<string>bullet.cap</string>
 				<string>quoteleft</string>
 				<string>quoteright</string>
 				<string>primetripl1</string>
@@ -555,11 +561,17 @@
 				<string>lessequal</string>
 				<string>greaterequal</string>
 				<string>equal</string>
+				<string>equal.cap</string>
 				<string>notequal</string>
+				<string>notequal.cap</string>
 				<string>plus</string>
+				<string>plus.cap</string>
 				<string>minus</string>
+				<string>minus.cap</string>
 				<string>multiply</string>
+				<string>multiply.cap</string>
 				<string>divide</string>
+				<string>divide.cap</string>
 				<string>plusminus</string>
 				<string>approxequal</string>
 				<string>asciitilde</string>
@@ -680,9 +692,13 @@
 				<string>hairspace</string>
 				<string>zerowidthspace</string>
 				<string>arrowleft</string>
+				<string>arrowleft.cap</string>
 				<string>arrowup</string>
+				<string>arrowup.cap</string>
 				<string>arrowright</string>
+				<string>arrowright.cap</string>
 				<string>arrowdown</string>
+				<string>arrowdown.cap</string>
 				<string>triagrt</string>
 				<string>triagdn</string>
 				<string>triagup</string>
@@ -2723,6 +2739,7 @@
 		<string>braceright</string>
 		<string>braceright.cap</string>
 		<string>at</string>
+		<string>at.cap</string>
 		<string>numbersign</string>
 		<string>currency</string>
 		<string>slash</string>
@@ -2731,10 +2748,15 @@
 		<string>backslash</string>
 		<string>hyphenbullet</string>
 		<string>hyphen</string>
+		<string>hyphen.cap</string>
 		<string>endash</string>
+		<string>endash.cap</string>
 		<string>figuredash</string>
+		<string>figuredash.cap</string>
 		<string>emdash</string>
+		<string>emdash.cap</string>
 		<string>bullet</string>
+		<string>bullet.cap</string>
 		<string>quoteleft</string>
 		<string>quoteright</string>
 		<string>primetripl1</string>
@@ -2758,11 +2780,17 @@
 		<string>lessequal</string>
 		<string>greaterequal</string>
 		<string>equal</string>
+		<string>equal.cap</string>
 		<string>notequal</string>
+		<string>notequal.cap</string>
 		<string>plus</string>
+		<string>plus.cap</string>
 		<string>minus</string>
+		<string>minus.cap</string>
 		<string>multiply</string>
+		<string>multiply.cap</string>
 		<string>divide</string>
+		<string>divide.cap</string>
 		<string>plusminus</string>
 		<string>approxequal</string>
 		<string>asciitilde</string>
@@ -2883,9 +2911,13 @@
 		<string>hairspace</string>
 		<string>zerowidthspace</string>
 		<string>arrowleft</string>
+		<string>arrowleft.cap</string>
 		<string>arrowup</string>
+		<string>arrowup.cap</string>
 		<string>arrowright</string>
+		<string>arrowright.cap</string>
 		<string>arrowdown</string>
+		<string>arrowdown.cap</string>
 		<string>triagrt</string>
 		<string>triagdn</string>
 		<string>triagup</string>
diff --git a/src/Interface-Regular.ufo/glyphs/OE__.glif b/src/Interface-Regular.ufo/glyphs/OE__.glif
index 53f35bf35..bd30d4a21 100644
--- a/src/Interface-Regular.ufo/glyphs/OE__.glif
+++ b/src/Interface-Regular.ufo/glyphs/OE__.glif
@@ -4,34 +4,26 @@
   <unicode hex="0152"/>
   <outline>
     <contour>
-      <point x="944" y="2032" type="curve" smooth="yes"/>
-      <point x="484" y="2032"/>
-      <point x="176" y="1696"/>
-      <point x="176" y="1212" type="curve"/>
-      <point x="176" y="792" type="line"/>
-      <point x="176" y="308"/>
-      <point x="488" y="-28"/>
-      <point x="944" y="-28" type="curve" smooth="yes"/>
-      <point x="1084" y="-28"/>
-      <point x="1220" y="-16"/>
-      <point x="1340" y="0" type="curve"/>
-      <point x="1340" y="232" type="line"/>
-      <point x="1224" y="208"/>
-      <point x="1088" y="192"/>
-      <point x="944" y="192" type="curve" smooth="yes"/>
-      <point x="644" y="192"/>
-      <point x="448" y="396"/>
-      <point x="448" y="792" type="curve"/>
-      <point x="448" y="1212" type="line"/>
-      <point x="448" y="1608"/>
-      <point x="640" y="1812"/>
-      <point x="944" y="1812" type="curve" smooth="yes"/>
-      <point x="1088" y="1812"/>
-      <point x="1224" y="1796"/>
-      <point x="1340" y="1772" type="curve"/>
-      <point x="1340" y="2004" type="line"/>
-      <point x="1220" y="2016"/>
-      <point x="1084" y="2032"/>
+      <point x="944" y="2048" type="line"/>
+      <point x="484" y="2048"/>
+      <point x="176" y="1720"/>
+      <point x="176" y="1236" type="curve"/>
+      <point x="176" y="816" type="line"/>
+      <point x="176" y="332"/>
+      <point x="488" y="0"/>
+      <point x="944" y="0" type="curve" smooth="yes"/>
+      <point x="1340" y="0" type="line"/>
+      <point x="1340" y="220" type="line"/>
+      <point x="944" y="220" type="line" smooth="yes"/>
+      <point x="644" y="220"/>
+      <point x="448" y="420"/>
+      <point x="448" y="816" type="curve"/>
+      <point x="448" y="1236" type="line"/>
+      <point x="448" y="1632"/>
+      <point x="640" y="1828"/>
+      <point x="944" y="1828" type="curve"/>
+      <point x="1340" y="1828" type="line"/>
+      <point x="1340" y="2048" type="line"/>
     </contour>
     <component base="E" xOffset="1004"/>
     <contour>
diff --git a/src/Interface-Regular.ufo/glyphs/arrowdown.cap.glif b/src/Interface-Regular.ufo/glyphs/arrowdown.cap.glif
new file mode 100644
index 000000000..1135c16e1
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/arrowdown.cap.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="arrowdown.cap" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="arrowdown" yOffset="256"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8</real>
+        <real>0.94</real>
+        <real>0.95</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.width-adjustments</key>
+      <array>
+        <integer>-16</integer>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/arrowleft.cap.glif b/src/Interface-Regular.ufo/glyphs/arrowleft.cap.glif
new file mode 100644
index 000000000..5df173709
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/arrowleft.cap.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="arrowleft.cap" format="1">
+  <advance width="3072"/>
+  <outline>
+    <component base="arrowleft" yOffset="128"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8</real>
+        <real>0.94</real>
+        <real>0.95</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.width-adjustments</key>
+      <array>
+        <integer>-16</integer>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/arrowright.cap.glif b/src/Interface-Regular.ufo/glyphs/arrowright.cap.glif
new file mode 100644
index 000000000..5371d1042
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/arrowright.cap.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="arrowright.cap" format="1">
+  <advance width="3072.0"/>
+  <outline>
+    <component base="arrowright" yOffset="128"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8</real>
+        <real>0.94</real>
+        <real>0.95</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.width-adjustments</key>
+      <array>
+        <integer>-16</integer>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/arrowup.cap.glif b/src/Interface-Regular.ufo/glyphs/arrowup.cap.glif
new file mode 100644
index 000000000..8e8a3743b
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/arrowup.cap.glif
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="arrowup.cap" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="arrowup" yOffset="256"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8</real>
+        <real>0.94</real>
+        <real>0.95</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1800, 'leftMargin': 296, 'rightMargin': 304}</string>
+      <key>interface.width-adjustments</key>
+      <array>
+        <integer>-16</integer>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/at.cap.glif b/src/Interface-Regular.ufo/glyphs/at.cap.glif
new file mode 100644
index 000000000..d77a33166
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/at.cap.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="at.cap" format="1">
+  <advance width="2560"/>
+  <outline>
+    <component base="at" yOffset="300"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.width-adjustments</key>
+      <array>
+        <integer>-16</integer>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/bullet.cap.glif b/src/Interface-Regular.ufo/glyphs/bullet.cap.glif
new file mode 100644
index 000000000..bb066b3f0
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/bullet.cap.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="bullet.cap" format="1">
+  <advance width="1280"/>
+  <outline>
+    <component base="bullet" yOffset="124"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.width-adjustments</key>
+      <array>
+        <integer>-16</integer>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/contents.plist b/src/Interface-Regular.ufo/glyphs/contents.plist
index af81fdc79..6e217c256 100644
--- a/src/Interface-Regular.ufo/glyphs/contents.plist
+++ b/src/Interface-Regular.ufo/glyphs/contents.plist
@@ -398,6 +398,8 @@
 	<string>archdblsubnosp.glif</string>
 	<key>arrowdown</key>
 	<string>arrowdown.glif</string>
+	<key>arrowdown.cap</key>
+	<string>arrowdown.cap.glif</string>
 	<key>arrowheaddownmod</key>
 	<string>arrowheaddownmod.glif</string>
 	<key>arrowheadleftmod</key>
@@ -408,10 +410,16 @@
 	<string>arrowheadupmod.glif</string>
 	<key>arrowleft</key>
 	<string>arrowleft.glif</string>
+	<key>arrowleft.cap</key>
+	<string>arrowleft.cap.glif</string>
 	<key>arrowright</key>
 	<string>arrowright.glif</string>
+	<key>arrowright.cap</key>
+	<string>arrowright.cap.glif</string>
 	<key>arrowup</key>
 	<string>arrowup.glif</string>
+	<key>arrowup.cap</key>
+	<string>arrowup.cap.glif</string>
 	<key>asciicircum</key>
 	<string>asciicircum.glif</string>
 	<key>asciitilde</key>
@@ -430,6 +438,8 @@
 	<string>asterism.glif</string>
 	<key>at</key>
 	<string>at.glif</string>
+	<key>at.cap</key>
+	<string>at.cap.glif</string>
 	<key>aturn</key>
 	<string>aturn.glif</string>
 	<key>aturn_uni02DE</key>
@@ -514,6 +524,8 @@
 	<string>btopbar.glif</string>
 	<key>bullet</key>
 	<string>bullet.glif</string>
+	<key>bullet.cap</key>
+	<string>bullet.cap.glif</string>
 	<key>bullseye</key>
 	<string>bullseye.glif</string>
 	<key>c</key>
@@ -704,6 +716,8 @@
 	<string>digamma.glif</string>
 	<key>divide</key>
 	<string>divide.glif</string>
+	<key>divide.cap</key>
+	<string>divide.cap.glif</string>
 	<key>djecyrillic</key>
 	<string>djecyrillic.glif</string>
 	<key>dollar</key>
@@ -778,6 +792,8 @@
 	<string>emcyrillic.glif</string>
 	<key>emdash</key>
 	<string>emdash.glif</string>
+	<key>emdash.cap</key>
+	<string>emdash.cap.glif</string>
 	<key>emquad</key>
 	<string>emquad.glif</string>
 	<key>emspace</key>
@@ -786,6 +802,8 @@
 	<string>encyrillic.glif</string>
 	<key>endash</key>
 	<string>endash.glif</string>
+	<key>endash.cap</key>
+	<string>endash.cap.glif</string>
 	<key>endescendercyrillic</key>
 	<string>endescendercyrillic.glif</string>
 	<key>eng</key>
@@ -816,6 +834,8 @@
 	<string>epsilonclosed.glif</string>
 	<key>equal</key>
 	<string>equal.glif</string>
+	<key>equal.cap</key>
+	<string>equal.cap.glif</string>
 	<key>equalsub</key>
 	<string>equalsub.glif</string>
 	<key>equalsuperior</key>
@@ -860,6 +880,8 @@
 	<string>f.glif</string>
 	<key>figuredash</key>
 	<string>figuredash.glif</string>
+	<key>figuredash.cap</key>
+	<string>figuredash.cap.glif</string>
 	<key>figurespace</key>
 	<string>figurespace.glif</string>
 	<key>finalkaf</key>
@@ -1018,6 +1040,8 @@
 	<string>hv.glif</string>
 	<key>hyphen</key>
 	<string>hyphen.glif</string>
+	<key>hyphen.cap</key>
+	<string>hyphen.cap.glif</string>
 	<key>hyphen__</key>
 	<string>hyphen__.glif</string>
 	<key>hyphenbullet</key>
@@ -1188,6 +1212,8 @@
 	<string>mill.glif</string>
 	<key>minus</key>
 	<string>minus.glif</string>
+	<key>minus.cap</key>
+	<string>minus.cap.glif</string>
 	<key>minusmod</key>
 	<string>minusmod.glif</string>
 	<key>minussub</key>
@@ -1204,6 +1230,8 @@
 	<string>mu.glif</string>
 	<key>multiply</key>
 	<string>multiply.glif</string>
+	<key>multiply.cap</key>
+	<string>multiply.cap.glif</string>
 	<key>n</key>
 	<string>n.glif</string>
 	<key>naira</key>
@@ -1230,6 +1258,8 @@
 	<string>nlfthook.glif</string>
 	<key>notequal</key>
 	<string>notequal.glif</string>
+	<key>notequal.cap</key>
+	<string>notequal.cap.glif</string>
 	<key>nrthook</key>
 	<string>nrthook.glif</string>
 	<key>nsuperior</key>
@@ -1384,6 +1414,8 @@
 	<string>placeofinterestsign.specz.medium.glif</string>
 	<key>plus</key>
 	<string>plus.glif</string>
+	<key>plus.cap</key>
+	<string>plus.cap.glif</string>
 	<key>plusminus</key>
 	<string>plusminus.glif</string>
 	<key>plusmod</key>
diff --git a/src/Interface-Regular.ufo/glyphs/divide.cap.glif b/src/Interface-Regular.ufo/glyphs/divide.cap.glif
new file mode 100644
index 000000000..5e81c3b50
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/divide.cap.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="divide.cap" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="divide" yOffset="136"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8</real>
+        <real>0.94</real>
+        <real>0.95</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.width-adjustments</key>
+      <array>
+        <integer>-16</integer>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/emdash.cap.glif b/src/Interface-Regular.ufo/glyphs/emdash.cap.glif
new file mode 100644
index 000000000..14c9036ad
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/emdash.cap.glif
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="emdash.cap" format="1">
+  <advance width="2560"/>
+  <outline>
+    <component base="emdash" yOffset="148"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>1.0</real>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/endash.cap.glif b/src/Interface-Regular.ufo/glyphs/endash.cap.glif
new file mode 100644
index 000000000..806d2c64b
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/endash.cap.glif
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="endash.cap" format="1">
+  <advance width="1280"/>
+  <outline>
+    <component base="endash" yOffset="148"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>1.0</real>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/equal.cap.glif b/src/Interface-Regular.ufo/glyphs/equal.cap.glif
new file mode 100644
index 000000000..833b6ede1
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/equal.cap.glif
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="equal.cap" format="1">
+  <advance width="1664"/>
+  <outline>
+    <component base="equal" yOffset="144"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8</real>
+        <real>0.94</real>
+        <real>0.95</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1664, 'leftMargin': 256, 'rightMargin': 256}</string>
+      <key>interface.width-adjustments</key>
+      <array>
+        <integer>-16</integer>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/figuredash.cap.glif b/src/Interface-Regular.ufo/glyphs/figuredash.cap.glif
new file mode 100644
index 000000000..16422005b
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/figuredash.cap.glif
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="figuredash.cap" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="figuredash" yOffset="148"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1610, 'leftMargin': 256, 'rightMargin': 330}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/hyphen.cap.glif b/src/Interface-Regular.ufo/glyphs/hyphen.cap.glif
new file mode 100644
index 000000000..4f4846a72
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/hyphen.cap.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="hyphen.cap" format="1">
+  <advance width="1248"/>
+  <outline>
+    <component base="hyphen" yOffset="148"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>0.94</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.width-adjustments</key>
+      <array>
+        <integer>-16</integer>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/minus.cap.glif b/src/Interface-Regular.ufo/glyphs/minus.cap.glif
new file mode 100644
index 000000000..8b733dc62
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/minus.cap.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="minus.cap" format="1">
+  <advance width="1280"/>
+  <outline>
+    <component base="minus" yOffset="140"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8</real>
+        <real>0.94</real>
+        <real>0.95</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.width-adjustments</key>
+      <array>
+        <integer>-16</integer>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/multiply.cap.glif b/src/Interface-Regular.ufo/glyphs/multiply.cap.glif
new file mode 100644
index 000000000..d8f37238e
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/multiply.cap.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="multiply.cap" format="1">
+  <advance width="1536"/>
+  <outline>
+    <component base="multiply" yOffset="96"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8</real>
+        <real>0.94</real>
+        <real>0.95</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.width-adjustments</key>
+      <array>
+        <integer>-16</integer>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/notequal.cap.glif b/src/Interface-Regular.ufo/glyphs/notequal.cap.glif
new file mode 100644
index 000000000..3a773ca9e
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/notequal.cap.glif
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="notequal.cap" format="1">
+  <advance width="1664"/>
+  <outline>
+    <component base="notequal" yOffset="144"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8</real>
+        <real>0.94</real>
+        <real>0.95</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1543, 'leftMargin': 256, 'rightMargin': 135}</string>
+      <key>interface.width-adjustments</key>
+      <array>
+        <integer>-16</integer>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/plus.cap.glif b/src/Interface-Regular.ufo/glyphs/plus.cap.glif
new file mode 100644
index 000000000..229b6ebb0
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/plus.cap.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="plus.cap" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="plus" yOffset="128"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8</real>
+        <real>0.94</real>
+        <real>0.95</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.width-adjustments</key>
+      <array>
+        <integer>-16</integer>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/lib.plist b/src/Interface-Regular.ufo/lib.plist
index d8547ba71..87734e702 100644
--- a/src/Interface-Regular.ufo/lib.plist
+++ b/src/Interface-Regular.ufo/lib.plist
@@ -603,6 +603,7 @@
 				<string>braceright</string>
 				<string>braceright.cap</string>
 				<string>at</string>
+				<string>at.cap</string>
 				<string>numbersign</string>
 				<string>currency</string>
 				<string>slash</string>
@@ -611,10 +612,15 @@
 				<string>backslash</string>
 				<string>hyphenbullet</string>
 				<string>hyphen</string>
+				<string>hyphen.cap</string>
 				<string>endash</string>
+				<string>endash.cap</string>
 				<string>figuredash</string>
+				<string>figuredash.cap</string>
 				<string>emdash</string>
+				<string>emdash.cap</string>
 				<string>bullet</string>
+				<string>bullet.cap</string>
 				<string>quoteleft</string>
 				<string>quoteright</string>
 				<string>primetripl1</string>
@@ -638,11 +644,17 @@
 				<string>lessequal</string>
 				<string>greaterequal</string>
 				<string>equal</string>
+				<string>equal.cap</string>
 				<string>notequal</string>
+				<string>notequal.cap</string>
 				<string>plus</string>
+				<string>plus.cap</string>
 				<string>minus</string>
+				<string>minus.cap</string>
 				<string>multiply</string>
+				<string>multiply.cap</string>
 				<string>divide</string>
+				<string>divide.cap</string>
 				<string>plusminus</string>
 				<string>approxequal</string>
 				<string>asciitilde</string>
@@ -763,9 +775,13 @@
 				<string>hairspace</string>
 				<string>zerowidthspace</string>
 				<string>arrowleft</string>
+				<string>arrowleft.cap</string>
 				<string>arrowup</string>
+				<string>arrowup.cap</string>
 				<string>arrowright</string>
+				<string>arrowright.cap</string>
 				<string>arrowdown</string>
+				<string>arrowdown.cap</string>
 				<string>triagrt</string>
 				<string>triagdn</string>
 				<string>triagup</string>
@@ -2801,6 +2817,7 @@
 		<string>braceright</string>
 		<string>braceright.cap</string>
 		<string>at</string>
+		<string>at.cap</string>
 		<string>numbersign</string>
 		<string>currency</string>
 		<string>slash</string>
@@ -2809,10 +2826,15 @@
 		<string>backslash</string>
 		<string>hyphenbullet</string>
 		<string>hyphen</string>
+		<string>hyphen.cap</string>
 		<string>endash</string>
+		<string>endash.cap</string>
 		<string>figuredash</string>
+		<string>figuredash.cap</string>
 		<string>emdash</string>
+		<string>emdash.cap</string>
 		<string>bullet</string>
+		<string>bullet.cap</string>
 		<string>quoteleft</string>
 		<string>quoteright</string>
 		<string>primetripl1</string>
@@ -2836,11 +2858,17 @@
 		<string>lessequal</string>
 		<string>greaterequal</string>
 		<string>equal</string>
+		<string>equal.cap</string>
 		<string>notequal</string>
+		<string>notequal.cap</string>
 		<string>plus</string>
+		<string>plus.cap</string>
 		<string>minus</string>
+		<string>minus.cap</string>
 		<string>multiply</string>
+		<string>multiply.cap</string>
 		<string>divide</string>
+		<string>divide.cap</string>
 		<string>plusminus</string>
 		<string>approxequal</string>
 		<string>asciitilde</string>
@@ -2961,9 +2989,13 @@
 		<string>hairspace</string>
 		<string>zerowidthspace</string>
 		<string>arrowleft</string>
+		<string>arrowleft.cap</string>
 		<string>arrowup</string>
+		<string>arrowup.cap</string>
 		<string>arrowright</string>
+		<string>arrowright.cap</string>
 		<string>arrowdown</string>
+		<string>arrowdown.cap</string>
 		<string>triagrt</string>
 		<string>triagdn</string>
 		<string>triagup</string>
diff --git a/src/features.fea b/src/features.fea
index 338691e27..3a3bc94f6 100644
--- a/src/features.fea
+++ b/src/features.fea
@@ -21,10 +21,11 @@ languagesystem grek dflt;
 
 @UC_SET1 = [ zero one two three four five six seven eight nine Euro Idotaccent Mu dollar lira sterling afii10023 afii10051 afii10052 afii10053 afii10054 afii10055 afii10056 afii10057 afii10058 afii10059 afii10060 afii10061 afii10062 afii10145 afii10017 afii10018 afii10019 afii10020 afii10021 afii10022 afii10024 afii10025 afii10026 afii10027 afii10029 afii10030 afii10031 afii10032 afii10033 afii10034 afii10035 afii10036 afii10037 afii10038 afii10039 afii10040 afii10041 afii10042 afii10043 afii10044 afii10045 afii10046 afii10047 afii10048 afii10049 afii10050 Ghestrokecyrillic Zhedescendercyrillic Zedescendercyrillic Kadescendercyrillic Kaverticalstrokecyrillic Kabashkircyrillic Endescendercyrillic Haabkhasiancyrillic Esdescendercyrillic Ustraightcyrillic Ustraightstrokecyrillic Hadescendercyrillic Tetsecyrillic Cheverticalstrokecyrillic Shhacyrillic Cheabkhasiancyrillic Chedescenderabkhasiancyrillic Schwacyrillic Dzeabkhasiancyrillic Imacroncyrillic Obarredcyrillic Umacroncyrillic hryvnia tenge uni20BD numero yen ];
 
-@UC = [ @UC_ROMAN @UC_SET1 ];
+@LC_SET1 = [ dotlessi sigma1 mugreek afii10065 becyrillic vecyrillic gecyrillic decyrillic iecyrillic zhecyrillic zecyrillic iicyrillic iishortcyrillic kacyrillic elcyrillic emcyrillic encyrillic ocyrillic pecyrillic ercyrillic escyrillic tecyrillic ucyrillic efcyrillic khacyrillic tsecyrillic checyrillic shacyrillic shchacyrillic hardsigncyrillic yericyrillic softsigncyrillic ereversedcyrillic iucyrillic iacyrillic iocyrillic djecyrillic gjecyrillic ecyrillic dzecyrillic icyrillic yicyrillic jecyrillic ljecyrillic njecyrillic tshecyrillic kjecyrillic ushortcyrillic dzhecyrillic gheupturncyrillic ghestrokecyrillic zhedescendercyrillic zedescendercyrillic kadescendercyrillic kaverticalstrokecyrillic kabashkircyrillic endescendercyrillic haabkhasiancyrillic esdescendercyrillic ustraightcyrillic ustraightstrokecyrillic hadescendercyrillic tetsecyrillic cheverticalstrokecyrillic shhacyrillic cheabkhasiancyrillic chedescenderabkhasiancyrillic schwacyrillic dzeabkhasiancyrillic imacroncyrillic obarredcyrillic umacroncyrillic ];
 
-@LC_SET2 = [ dotlessi sigma1 mugreek afii10065 becyrillic vecyrillic gecyrillic decyrillic iecyrillic zhecyrillic zecyrillic iicyrillic iishortcyrillic kacyrillic elcyrillic emcyrillic encyrillic ocyrillic pecyrillic ercyrillic escyrillic tecyrillic ucyrillic efcyrillic khacyrillic tsecyrillic checyrillic shacyrillic shchacyrillic hardsigncyrillic yericyrillic softsigncyrillic ereversedcyrillic iucyrillic iacyrillic iocyrillic djecyrillic gjecyrillic ecyrillic dzecyrillic icyrillic yicyrillic jecyrillic ljecyrillic njecyrillic tshecyrillic kjecyrillic ushortcyrillic dzhecyrillic gheupturncyrillic ghestrokecyrillic zhedescendercyrillic zedescendercyrillic kadescendercyrillic kaverticalstrokecyrillic kabashkircyrillic endescendercyrillic haabkhasiancyrillic esdescendercyrillic ustraightcyrillic ustraightstrokecyrillic hadescendercyrillic tetsecyrillic cheverticalstrokecyrillic shhacyrillic cheabkhasiancyrillic chedescenderabkhasiancyrillic schwacyrillic dzeabkhasiancyrillic imacroncyrillic obarredcyrillic umacroncyrillic ];
+@NUM = [ zero one two three four five six seven eight nine ];
 
+@SPACE = [ space enspace emspace thirdemspace quarteremspace sixthemspace figurespace punctuationspace thinspace hairspace zerowidthspace ];
 
 @frac1 = [ zero one two three four five six seven eight nine ];
 @frac2 = [ zero.frac onesuperior twosuperior threesuperior four.frac five.frac six.frac seven.frac eight.frac nine.frac ];
@@ -834,6 +835,64 @@ feature numr {
 } numr;
 
 feature calt {
+  @UC = [ @UC_ROMAN @UC_SET1 exclam question ];
+
+  sub @UC at' @UC by at.cap;
+
+  sub @NUM x' by multiply.cap;
+  sub x' @NUM by multiply.cap;
+  sub multiply' @UC by multiply.cap;
+  sub @UC multiply' by multiply.cap;
+
+  sub hyphen' @NUM by minus.cap;
+  sub @NUM hyphen' by minus.cap;
+  sub minus' @UC by minus.cap;
+  sub @UC minus' by minus.cap;
+
+  sub plus' @UC by plus.cap;
+  sub @UC plus' by plus.cap;
+
+  sub divide' @UC by divide.cap;
+  sub @UC divide' by divide.cap;
+
+  sub equal' @UC by equal.cap;
+  sub @UC equal' by equal.cap;
+
+  sub notequal' @UC by notequal.cap;
+  sub @UC notequal' by notequal.cap;
+
+  sub endash' @UC by endash.cap;
+  sub @UC endash' by endash.cap;
+
+  sub figuredash' @UC by figuredash.cap;
+  sub @UC figuredash' by figuredash.cap;
+
+  sub emdash' @UC by emdash.cap;
+  sub @UC emdash' by emdash.cap;
+
+  sub hyphen' @UC by hyphen.cap;
+  sub @UC hyphen' by hyphen.cap;
+
+  sub @UC bullet' by bullet.cap;
+  sub bullet' @SPACE @SPACE @UC by bullet.cap;
+  sub bullet' @SPACE @UC by bullet.cap;
+  sub bullet' @UC by bullet.cap;
+
+  sub arrowleft' @UC by arrowleft.cap;
+  sub @UC arrowleft' by arrowleft.cap;
+
+  sub arrowup' @UC by arrowup.cap;
+  sub @UC arrowup' by arrowup.cap;
+
+  sub arrowright' @UC by arrowright.cap;
+  sub @UC arrowright' by arrowright.cap;
+
+  sub arrowdown' @UC by arrowdown.cap;
+  sub @UC arrowdown' by arrowdown.cap;
+
+  sub notequal' @UC by notequal.cap;
+  sub @UC notequal' by notequal.cap;
+
   sub braceleft' @UC by braceleft.cap;
   sub @UC braceright' by braceright.cap;