[cantarell-fonts/respacing] Respace pass 3



commit f949b45199d5258fd6e6b3d79303f0c01d750ffa
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Sat Oct 19 22:03:44 2019 +0100

    Respace pass 3

 proofs/test.html                                   |  39 +++++-
 .../glyphs.O_utline/S_hcha-cy.glif                 |  37 +++++
 .../glyphs.O_utline/contents.plist                 |  10 ++
 .../glyphs.O_utline/layerinfo.plist                |  15 ++
 .../glyphs.O_utline/shcha-cy.glif                  |  46 ++++++
 .../glyphs.T_emplate/florin.glif                   |   2 +
 .../glyphs/C_hekhakassian-cy.glif                  |   2 +-
 src/Cantarell-Bold.ufo/glyphs/K_abashkir-cy.glif   |  42 +++---
 src/Cantarell-Bold.ufo/glyphs/L_je-cy.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/O_hm.glif            |  66 ++++-----
 src/Cantarell-Bold.ufo/glyphs/P_e-cy.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/S_ha-cy.glif         |   1 +
 src/Cantarell-Bold.ufo/glyphs/S_hcha-cy.glif       |  31 ++---
 src/Cantarell-Bold.ufo/glyphs/U_-cy.glif           |   4 +-
 src/Cantarell-Bold.ufo/glyphs/Y_at-cy.glif         |   8 +-
 .../glyphs/_descenderreverse-cy.case.glif          |   2 +-
 .../glyphs/_descenderreversed-cy.glif              |   2 +-
 src/Cantarell-Bold.ufo/glyphs/ampersand.glif       |  78 +++++------
 src/Cantarell-Bold.ufo/glyphs/at.glif              | 140 +++++++++----------
 src/Cantarell-Bold.ufo/glyphs/blackC_ircle.glif    |  26 ++--
 .../glyphs/chekhakassian-cy.glif                   |   2 +-
 src/Cantarell-Bold.ufo/glyphs/copyright.glif       | 108 ++++++++-------
 src/Cantarell-Bold.ufo/glyphs/dagger.glif          |  30 ++--
 src/Cantarell-Bold.ufo/glyphs/daggerdbl.glif       |  54 ++++----
 src/Cantarell-Bold.ufo/glyphs/degree.glif          |  56 ++++----
 src/Cantarell-Bold.ufo/glyphs/descender-cy.glif    |   4 +-
 src/Cantarell-Bold.ufo/glyphs/downA_rrow.glif      |  12 +-
 src/Cantarell-Bold.ufo/glyphs/emptyset.glif        |  58 ++++----
 src/Cantarell-Bold.ufo/glyphs/estimated.glif       |  62 ++++-----
 src/Cantarell-Bold.ufo/glyphs/increment.glif       |  20 +--
 src/Cantarell-Bold.ufo/glyphs/infinity.glif        |  74 +++++-----
 src/Cantarell-Bold.ufo/glyphs/integral.glif        |  66 ++++-----
 src/Cantarell-Bold.ufo/glyphs/l.ss01.glif          |  22 +--
 src/Cantarell-Bold.ufo/glyphs/leftA_rrow.glif      |  12 +-
 src/Cantarell-Bold.ufo/glyphs/literS_ign.glif      |  70 +++++-----
 src/Cantarell-Bold.ufo/glyphs/lozenge.glif         |  28 ++--
 src/Cantarell-Bold.ufo/glyphs/minute.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/numero.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/ordfeminine.glif     |  76 +++++-----
 src/Cantarell-Bold.ufo/glyphs/ordmasculine.glif    |  50 +++----
 src/Cantarell-Bold.ufo/glyphs/partialdiff.glif     |   2 +-
 src/Cantarell-Bold.ufo/glyphs/percent.glif         | 112 ++++++++-------
 src/Cantarell-Bold.ufo/glyphs/perthousand.glif     | 154 ++++++++++-----------
 src/Cantarell-Bold.ufo/glyphs/radical.glif         |  20 +--
 src/Cantarell-Bold.ufo/glyphs/ratio.glif           |  12 +-
 src/Cantarell-Bold.ufo/glyphs/registered.glif      | 108 ++++++++-------
 src/Cantarell-Bold.ufo/glyphs/rightA_rrow.glif     |  22 +--
 src/Cantarell-Bold.ufo/glyphs/saltillo.glif        |  12 +-
 src/Cantarell-Bold.ufo/glyphs/second.glif          |  14 +-
 src/Cantarell-Bold.ufo/glyphs/section.glif         | 106 +++++++-------
 src/Cantarell-Bold.ufo/glyphs/sha-cy.glif          |   1 +
 src/Cantarell-Bold.ufo/glyphs/shcha-cy.glif        |  31 ++---
 src/Cantarell-Bold.ufo/glyphs/trademark.glif       |  50 +++----
 src/Cantarell-Bold.ufo/glyphs/upA_rrow.glif        |  22 +--
 src/Cantarell-Bold.ufo/glyphs/whiteC_ircle.glif    |  58 ++++----
 src/Cantarell-Bold.ufo/layercontents.plist         |   4 +
 .../glyphs.O_utline/S_hcha-cy.glif                 |  37 +++++
 .../glyphs.O_utline/contents.plist                 |  10 ++
 .../glyphs.O_utline/layerinfo.plist                |  15 ++
 .../glyphs.O_utline/shcha-cy.glif                  |  44 ++++++
 .../glyphs.T_emplate/florin.glif                   |   2 +
 .../glyphs/C_hekhakassian-cy.glif                  |   2 +-
 src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif  |  42 +++---
 src/Cantarell-Light.ufo/glyphs/S_ha-cy.glif        |   1 +
 src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif      |  29 +---
 src/Cantarell-Light.ufo/glyphs/U_-cy.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif        |   4 +-
 .../glyphs/_descenderreverse-cy.case.glif          |   6 +-
 .../glyphs/_descenderreversed-cy.glif              |   8 +-
 .../glyphs/chekhakassian-cy.glif                   |   2 +-
 src/Cantarell-Light.ufo/glyphs/copyright.glif      |   6 +
 src/Cantarell-Light.ufo/glyphs/degree.glif         |   6 +
 src/Cantarell-Light.ufo/glyphs/descender-cy.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/downA_rrow.glif     |  10 +-
 src/Cantarell-Light.ufo/glyphs/en-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/endescender-cy.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/ge-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/gedescender-cy.glif |   2 +-
 src/Cantarell-Light.ufo/glyphs/l.ss01.glif         |  22 +--
 src/Cantarell-Light.ufo/glyphs/leftA_rrow.glif     |  12 +-
 src/Cantarell-Light.ufo/glyphs/lozenge.glif        |   6 +
 src/Cantarell-Light.ufo/glyphs/percent.glif        |   6 +
 src/Cantarell-Light.ufo/glyphs/ratio.glif          |  12 +-
 src/Cantarell-Light.ufo/glyphs/registered.glif     |   6 +
 src/Cantarell-Light.ufo/glyphs/saltillo.glif       |  12 +-
 src/Cantarell-Light.ufo/glyphs/second.glif         |  12 +-
 src/Cantarell-Light.ufo/glyphs/sha-cy.glif         |   1 +
 src/Cantarell-Light.ufo/glyphs/shcha-cy.glif       |  31 ++---
 src/Cantarell-Light.ufo/glyphs/whiteC_ircle.glif   |   8 ++
 src/Cantarell-Light.ufo/layercontents.plist        |   4 +
 .../glyphs.O_utline/S_hcha-cy.glif                 |  37 +++++
 .../glyphs.O_utline/contents.plist                 |  10 ++
 .../glyphs.O_utline/layerinfo.plist                |  15 ++
 .../glyphs.O_utline/shcha-cy.glif                  |  44 ++++++
 .../glyphs.T_emplate/florin.glif                   |   2 +
 .../glyphs/C_hekhakassian-cy.glif                  |   2 +-
 .../glyphs/K_abashkir-cy.glif                      |  42 +++---
 src/Cantarell-Regular.ufo/glyphs/O_hm.glif         |  66 ++++-----
 src/Cantarell-Regular.ufo/glyphs/S_ha-cy.glif      |   1 +
 src/Cantarell-Regular.ufo/glyphs/S_hcha-cy.glif    |  29 +---
 src/Cantarell-Regular.ufo/glyphs/U_-cy.glif        |   4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_at-cy.glif      |  12 +-
 .../glyphs/_descenderreverse-cy.case.glif          |   6 +-
 .../glyphs/_descenderreversed-cy.glif              |   2 +-
 src/Cantarell-Regular.ufo/glyphs/ampersand.glif    |  78 +++++------
 src/Cantarell-Regular.ufo/glyphs/blackC_ircle.glif |  26 ++--
 .../glyphs/chekhakassian-cy.glif                   |   2 +-
 src/Cantarell-Regular.ufo/glyphs/copyright.glif    | 108 ++++++++-------
 src/Cantarell-Regular.ufo/glyphs/dagger.glif       |  30 ++--
 src/Cantarell-Regular.ufo/glyphs/daggerdbl.glif    |  54 ++++----
 src/Cantarell-Regular.ufo/glyphs/degree.glif       |  56 ++++----
 src/Cantarell-Regular.ufo/glyphs/downA_rrow.glif   |  12 +-
 src/Cantarell-Regular.ufo/glyphs/emptyset.glif     |  58 ++++----
 src/Cantarell-Regular.ufo/glyphs/estimated.glif    |  62 ++++-----
 src/Cantarell-Regular.ufo/glyphs/increment.glif    |  20 +--
 src/Cantarell-Regular.ufo/glyphs/infinity.glif     |  74 +++++-----
 src/Cantarell-Regular.ufo/glyphs/integral.glif     |  66 ++++-----
 src/Cantarell-Regular.ufo/glyphs/l.ss01.glif       |   2 +
 src/Cantarell-Regular.ufo/glyphs/leftA_rrow.glif   |  12 +-
 src/Cantarell-Regular.ufo/glyphs/literS_ign.glif   |  70 +++++-----
 src/Cantarell-Regular.ufo/glyphs/lozenge.glif      |  28 ++--
 src/Cantarell-Regular.ufo/glyphs/minute.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/partialdiff.glif  |  78 +++++------
 src/Cantarell-Regular.ufo/glyphs/percent.glif      | 112 ++++++++-------
 src/Cantarell-Regular.ufo/glyphs/perthousand.glif  | 154 ++++++++++-----------
 src/Cantarell-Regular.ufo/glyphs/radical.glif      |  20 +--
 src/Cantarell-Regular.ufo/glyphs/ratio.glif        |  12 +-
 src/Cantarell-Regular.ufo/glyphs/registered.glif   | 108 ++++++++-------
 src/Cantarell-Regular.ufo/glyphs/rightA_rrow.glif  |  22 +--
 src/Cantarell-Regular.ufo/glyphs/saltillo.glif     |  12 +-
 src/Cantarell-Regular.ufo/glyphs/second.glif       |  14 +-
 src/Cantarell-Regular.ufo/glyphs/section.glif      | 106 +++++++-------
 src/Cantarell-Regular.ufo/glyphs/sha-cy.glif       |   1 +
 src/Cantarell-Regular.ufo/glyphs/shcha-cy.glif     |  31 ++---
 src/Cantarell-Regular.ufo/glyphs/summation.glif    |  26 ++--
 src/Cantarell-Regular.ufo/glyphs/trademark.glif    |  50 +++----
 src/Cantarell-Regular.ufo/glyphs/upA_rrow.glif     |  22 +--
 src/Cantarell-Regular.ufo/glyphs/whiteC_ircle.glif |  58 ++++----
 src/Cantarell-Regular.ufo/glyphs/yat-cy.glif       |  12 +-
 src/Cantarell-Regular.ufo/layercontents.plist      |   4 +
 src/Cantarell.designspace                          |   4 +-
 141 files changed, 2440 insertions(+), 1911 deletions(-)
---
diff --git a/proofs/test.html b/proofs/test.html
index db4aae10..701892c2 100644
--- a/proofs/test.html
+++ b/proofs/test.html
@@ -90,7 +90,7 @@
         nn_nnoo_oo nn‚nnoo‚oo nn„nnoo„oo nn“nnoo“oo nn”nnoo”oo<br />
         nn‘nnoo‘oo nn’nnoo’oo nn«nnoo«oo nn»nnoo»oo nn‹nnoo‹oo<br />
         nn›nnoo›oo nn‵nnoo‵oo nn‴nnoo‴oo nn"nnoo"oo nn'nnoo'oo<br />
-        nn⟨nnoo⟨oo nn⟩nnoo⟩oo
+        nn⟨nnoo⟨oo nn⟩nnoo⟩oo nnªnnooªoo nnºnnooºoo
       </p>
 
       <p class="proof" contenteditable="true">
@@ -102,7 +102,7 @@
         HH_HHOO_OO HH‚HHOO‚OO HH„HHOO„OO HH“HHOO“OO HH”HHOO”OO<br />
         HH‘HHOO‘OO HH’HHOO’OO HH«HHOO«OO HH»HHOO»OO HH‹HHOO‹OO<br />
         HH›HHOO›OO HH‵HHOO‵OO HH‴HHOO‴OO HH"HHOO"OO HH'HHOO'OO<br />
-        HH⟨HHOO⟨OO HH⟩HHOO⟩OO
+        HH⟨HHOO⟨OO HH⟩HHOO⟩OO HHªHHOOªOO HHºHHOOºOO
       </p>
 
       <p class="proof" contenteditable="true">
@@ -149,6 +149,41 @@
         ННԜННООԜОО
       </p>
 
+      <p class="proof" contenteditable="true" style="font-feature-settings: 'tnum';">
+        00₵00₵00 00¢00¢00 00₡00₡00 00¤00¤00 00$00$00 00₫00₫00 00€00€00<br />
+        00ƒ00ƒ00 00₣00₣00 00₲00₲00 00₴00₴00 00₭00₭00 00₤00₤00 00₺00₺00<br />
+        00₼00₼00 00₦00₦00 00₧00₧00 00₱00₱00 00₽00₽00 00₹00₹00 00£00£00<br />
+        00₸00₸00 00₮00₮00 00₩00₩00 00¥00¥00 00∙00∙00 00⁒00⁒00 00∕00∕00<br />
+        00≡00≡00 00≢00≢00 00+00+00 00−00−00 00×00×00 00÷00÷00 00=00=00<br />
+        00≠00≠00 00&gt;00&gt;00 00&lt;00&lt;00 00≥00≥00 00≤00≤00<br />
+        00±00±00 00≈00≈00 00~00~00 00¬00¬00 00^00^00
+      </p>
+
+      <p class="proof" contenteditable="true">
+        nn∅nnoo∅oo nn∞nnoo∞oo nn∫nnoo∫oo nnΩnnooΩoo nn∆nnoo∆oo nn∏nnoo∏oo<br />
+        nn∑nnoo∑oo nn√nnoo√oo nn∂nnoo∂oo nnµnnooµoo nn%nnoo%oo nn‰nnoo‰oo<br />
+        nn∶nnoo∶oo nn↑nnoo↑oo nn→nnoo→oo nn↓nnoo↓oo nn←nnoo←oo nn●nnoo●oo<br />
+        nn○nnoo○oo nn◊nnoo◊oo nn@nnoo@oo nn&nnoo&oo nn¶nnoo¶oo nn§nnoo§oo<br />
+        nn©nnoo©oo nn®nnoo®oo nn™nnoo™oo nn°nnoo°oo nn′nnoo′oo nn″nnoo″oo<br />
+        nn|nnoo|oo nn¦nnoo¦oo nn†nnoo†oo nnℓnnooℓoo nn‡nnoo‡oo nn℮nnoo℮oo<br />
+        nn№nnoo№oo nn␣nnoo␣oo nnπnnooπoo<br />
+        <br />
+        HH∅HHOO∅OO HH∞HHOO∞OO HH∫HHOO∫OO HHΩHHOOΩOO HH∆HHOO∆OO HH∏HHOO∏OO<br />
+        HH∑HHOO∑OO HH√HHOO√OO HH∂HHOO∂OO HHµHHOOµOO HH%HHOO%OO HH‰HHOO‰OO<br />
+        HH∶HHOO∶OO HH↑HHOO↑OO HH→HHOO→OO HH↓HHOO↓OO HH←HHOO←OO HH●HHOO●OO<br />
+        HH○HHOO○OO HH◊HHOO◊OO HH@HHOO@OO HH&HHOO&OO HH¶HHOO¶OO HH§HHOO§OO<br />
+        HH©HHOO©OO HH®HHOO®OO HH™HHOO™OO HH°HHOO°OO HH′HHOO′OO HH″HHOO″OO<br />
+        HH|HHOO|OO HH¦HHOO¦OO HH†HHOO†OO HHℓHHOOℓOO HH‡HHOO‡OO HH℮HHOO℮OO<br />
+        HH№HHOO№OO HH␣HHOO␣OO HHπHHOOπOO<br />
+        <br />
+        00∅00∅00 00∞00∞00 00∫00∫00 00Ω00Ω00 00∆00∆00 00∏00∏00 00∑00∑00<br />
+        00√00√00 00∂00∂00 00µ00µ00 00%00%00 00‰00‰00 00∶00∶00 00↑00↑00<br />
+        00→00→00 00↓00↓00 00←00←00 00●00●00 00○00○00 00◊00◊00 00@00@00<br />
+        00&00&00 00¶00¶00 00§00§00 00©00©00 00®00®00 00™00™00 00°00°00<br />
+        00′00′00 00″00″00 00|00|00 00¦00¦00 00†00†00 00ℓ00ℓ00 00‡00‡00<br />
+        00℮00℮00 00№00№00 00␣00␣00 00π00π00
+      </p>
+
       <h2>500 Digits of Pi</h2>
 
       <p class="proof" contenteditable="true">
diff --git a/src/Cantarell-Bold.ufo/glyphs.O_utline/S_hcha-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs.O_utline/S_hcha-cy.glif
new file mode 100644
index 00000000..bc6fa307
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.O_utline/S_hcha-cy.glif
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="Shcha-cy" format="2">
+  <advance width="1127"/>
+  <unicode hex="0429"/>
+  <outline>
+    <contour>
+      <point x="951" y="-187" type="line"/>
+      <point x="1113" y="-187" type="line"/>
+      <point x="1113" y="151" type="line"/>
+      <point x="241" y="151" type="line"/>
+      <point x="241" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="951" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="451" y="72" type="line"/>
+      <point x="621" y="72" type="line"/>
+      <point x="621" y="694" type="line"/>
+      <point x="451" y="694" type="line"/>
+    </contour>
+    <contour>
+      <point x="832" y="72" type="line"/>
+      <point x="1002" y="72" type="line"/>
+      <point x="1002" y="694" type="line"/>
+      <point x="832" y="694" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Tse-cy</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.O_utline/contents.plist 
b/src/Cantarell-Bold.ufo/glyphs.O_utline/contents.plist
new file mode 100644
index 00000000..99caaef1
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.O_utline/contents.plist
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>Shcha-cy</key>
+    <string>S_hcha-cy.glif</string>
+    <key>shcha-cy</key>
+    <string>shcha-cy.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.O_utline/layerinfo.plist 
b/src/Cantarell-Bold.ufo/glyphs.O_utline/layerinfo.plist
new file mode 100644
index 00000000..7a9041e4
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.O_utline/layerinfo.plist
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>0D3BB173-27E2-4765-8DD8-5184598C7BC3</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.Shcha-cy</key>
+      <integer>5</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.shcha-cy</key>
+      <integer>4</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.O_utline/shcha-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs.O_utline/shcha-cy.glif
new file mode 100644
index 00000000..0e07e20c
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.O_utline/shcha-cy.glif
@@ -0,0 +1,46 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="shcha-cy" format="2">
+  <advance width="897"/>
+  <unicode hex="0449"/>
+  <outline>
+    <contour>
+      <point x="730" y="-135" type="line"/>
+      <point x="886" y="-135" type="line"/>
+      <point x="886" y="133" type="line"/>
+      <point x="222" y="133" type="line"/>
+      <point x="222" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="730" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="355" y="68" type="line"/>
+      <point x="515" y="68" type="line"/>
+      <point x="515" y="490" type="line"/>
+      <point x="355" y="490" type="line"/>
+    </contour>
+    <contour>
+      <point x="651" y="68" type="line"/>
+      <point x="810" y="68" type="line"/>
+      <point x="810" y="490" type="line"/>
+      <point x="651" y="490" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>height</key>
+        <integer>70</integer>
+        <key>weight</key>
+        <integer>-10</integer>
+        <key>width</key>
+        <integer>80</integer>
+      </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>tse-cy</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.T_emplate/florin.glif 
b/src/Cantarell-Bold.ufo/glyphs.T_emplate/florin.glif
index 6ca96652..c43603cb 100644
--- a/src/Cantarell-Bold.ufo/glyphs.T_emplate/florin.glif
+++ b/src/Cantarell-Bold.ufo/glyphs.T_emplate/florin.glif
@@ -8,6 +8,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>0</integer>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_hekhakassian-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/C_hekhakassian-cy.glif
index e362f178..a24d9e65 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_hekhakassian-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_hekhakassian-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04CB"/>
   <outline>
     <component base="Che-cy"/>
-    <component base="_descenderreverse-cy.case" xOffset="327"/>
+    <component base="_descenderreverse-cy.case" xOffset="340"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_abashkir-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/K_abashkir-cy.glif
index 197cf564..f4fa42d4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_abashkir-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_abashkir-cy.glif
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kabashkir-cy" format="2">
-  <advance width="864"/>
+  <advance width="807"/>
   <unicode hex="04A0"/>
   <outline>
     <contour>
-      <point x="71" y="542" type="line"/>
-      <point x="409" y="542" type="line"/>
-      <point x="409" y="694" type="line"/>
-      <point x="71" y="694" type="line"/>
+      <point x="14" y="542" type="line"/>
+      <point x="352" y="542" type="line"/>
+      <point x="352" y="694" type="line"/>
+      <point x="14" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="661" y="0" type="line"/>
-      <point x="858" y="0" type="line"/>
-      <point x="633" y="393" type="line"/>
-      <point x="636" y="360" type="line"/>
-      <point x="850" y="694" type="line"/>
-      <point x="660" y="694" type="line"/>
-      <point x="455" y="363" type="line"/>
+      <point x="604" y="0" type="line"/>
+      <point x="801" y="0" type="line"/>
+      <point x="576" y="393" type="line"/>
+      <point x="579" y="360" type="line"/>
+      <point x="793" y="694" type="line"/>
+      <point x="603" y="694" type="line"/>
+      <point x="398" y="363" type="line"/>
     </contour>
     <contour>
-      <point x="234" y="0" type="line"/>
-      <point x="409" y="0" type="line"/>
-      <point x="409" y="694" type="line"/>
-      <point x="234" y="694" type="line"/>
+      <point x="177" y="0" type="line"/>
+      <point x="352" y="0" type="line"/>
+      <point x="352" y="694" type="line"/>
+      <point x="177" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="307" y="285" type="line"/>
-      <point x="511" y="285" type="line"/>
-      <point x="511" y="437" type="line"/>
-      <point x="307" y="437" type="line"/>
+      <point x="250" y="285" type="line"/>
+      <point x="454" y="285" type="line"/>
+      <point x="454" y="437" type="line"/>
+      <point x="250" y="437" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>Ge-cy</string>
+      <string>=|Ge-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>Ka-cy</string>
     </dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_je-cy.glif b/src/Cantarell-Bold.ufo/glyphs/L_je-cy.glif
index 97536dcb..c9c72045 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_je-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_je-cy.glif
@@ -28,8 +28,8 @@
       <point x="287" y="-10"/>
       <point x="360" y="86"/>
       <point x="360" y="284" type="curve" smooth="yes"/>
-      <point x="360" y="543" type="line"/>
-      <point x="548" y="543" type="line"/>
+      <point x="360" y="542" type="line"/>
+      <point x="548" y="542" type="line"/>
       <point x="548" y="0" type="line"/>
       <point x="719" y="0" type="line"/>
       <point x="719" y="694" type="line"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_hm.glif b/src/Cantarell-Bold.ufo/glyphs/O_hm.glif
index 7deb47b7..6e535510 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_hm.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_hm.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohm" format="2">
-  <advance width="791"/>
+  <advance width="815"/>
   <unicode hex="2126"/>
   <outline>
     <contour>
-      <point x="56" y="0" type="line"/>
-      <point x="345" y="0" type="line"/>
-      <point x="345" y="115" type="line"/>
-      <point x="278" y="175"/>
-      <point x="234" y="286"/>
-      <point x="234" y="393" type="curve" smooth="yes"/>
-      <point x="234" y="490"/>
-      <point x="296" y="554"/>
-      <point x="388" y="554" type="curve" smooth="yes"/>
-      <point x="487" y="554"/>
-      <point x="554" y="487"/>
-      <point x="554" y="387" type="curve" smooth="yes"/>
-      <point x="554" y="292"/>
-      <point x="509" y="181"/>
-      <point x="442" y="115" type="curve"/>
-      <point x="442" y="0" type="line"/>
-      <point x="738" y="0" type="line"/>
-      <point x="738" y="156" type="line"/>
-      <point x="596" y="156" type="line"/>
-      <point x="680" y="194"/>
-      <point x="734" y="291"/>
-      <point x="734" y="397" type="curve" smooth="yes"/>
-      <point x="734" y="581"/>
-      <point x="600" y="704"/>
-      <point x="397" y="704" type="curve" smooth="yes"/>
-      <point x="193" y="704"/>
-      <point x="54" y="576"/>
-      <point x="54" y="383" type="curve" smooth="yes"/>
-      <point x="54" y="277"/>
-      <point x="108" y="187"/>
-      <point x="189" y="156" type="curve"/>
-      <point x="56" y="156" type="line"/>
+      <point x="68" y="0" type="line"/>
+      <point x="357" y="0" type="line"/>
+      <point x="357" y="115" type="line"/>
+      <point x="290" y="175"/>
+      <point x="246" y="286"/>
+      <point x="246" y="393" type="curve" smooth="yes"/>
+      <point x="246" y="490"/>
+      <point x="308" y="554"/>
+      <point x="400" y="554" type="curve" smooth="yes"/>
+      <point x="499" y="554"/>
+      <point x="566" y="487"/>
+      <point x="566" y="387" type="curve" smooth="yes"/>
+      <point x="566" y="292"/>
+      <point x="521" y="181"/>
+      <point x="454" y="115" type="curve"/>
+      <point x="454" y="0" type="line"/>
+      <point x="750" y="0" type="line"/>
+      <point x="750" y="156" type="line"/>
+      <point x="608" y="156" type="line"/>
+      <point x="692" y="194"/>
+      <point x="746" y="291"/>
+      <point x="746" y="397" type="curve" smooth="yes"/>
+      <point x="746" y="581"/>
+      <point x="612" y="704"/>
+      <point x="409" y="704" type="curve" smooth="yes"/>
+      <point x="205" y="704"/>
+      <point x="66" y="576"/>
+      <point x="66" y="383" type="curve" smooth="yes"/>
+      <point x="66" y="277"/>
+      <point x="120" y="187"/>
+      <point x="201" y="156" type="curve"/>
+      <point x="68" y="156" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/P_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/P_e-cy.glif
index 179438af..82e770da 100644
--- a/src/Cantarell-Bold.ufo/glyphs/P_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/P_e-cy.glif
@@ -7,8 +7,8 @@
     <contour>
       <point x="71" y="0" type="line"/>
       <point x="242" y="0" type="line"/>
-      <point x="242" y="543" type="line"/>
-      <point x="502" y="543" type="line"/>
+      <point x="242" y="540" type="line"/>
+      <point x="502" y="540" type="line"/>
       <point x="502" y="0" type="line"/>
       <point x="673" y="0" type="line"/>
       <point x="673" y="694" type="line"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_ha-cy.glif b/src/Cantarell-Bold.ufo/glyphs/S_ha-cy.glif
index 501ef127..1311e6af 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_ha-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_ha-cy.glif
@@ -2,6 +2,7 @@
 <glyph name="Sha-cy" format="2">
   <advance width="1073"/>
   <unicode hex="0428"/>
+  <anchor x="939" y="0" name="bottomright"/>
   <outline>
     <contour>
       <point x="71" y="0" type="line"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_hcha-cy.glif b/src/Cantarell-Bold.ufo/glyphs/S_hcha-cy.glif
index bc6fa307..1431467e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_hcha-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_hcha-cy.glif
@@ -1,30 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Shcha-cy" format="2">
-  <advance width="1127"/>
+  <advance width="1117"/>
   <unicode hex="0429"/>
   <outline>
-    <contour>
-      <point x="951" y="-187" type="line"/>
-      <point x="1113" y="-187" type="line"/>
-      <point x="1113" y="151" type="line"/>
-      <point x="241" y="151" type="line"/>
-      <point x="241" y="694" type="line"/>
-      <point x="71" y="694" type="line"/>
-      <point x="71" y="0" type="line"/>
-      <point x="951" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="451" y="72" type="line"/>
-      <point x="621" y="72" type="line"/>
-      <point x="621" y="694" type="line"/>
-      <point x="451" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="832" y="72" type="line"/>
-      <point x="1002" y="72" type="line"/>
-      <point x="1002" y="694" type="line"/>
-      <point x="832" y="694" type="line"/>
-    </contour>
+    <component base="Sha-cy"/>
+    <component base="descender-cy.case" xOffset="843"/>
   </outline>
   <lib>
     <dict>
@@ -32,6 +12,11 @@
       <string>I</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>Tse-cy</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>-1</integer>
+        <integer>0</integer>
+      </array>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_-cy.glif b/src/Cantarell-Bold.ufo/glyphs/U_-cy.glif
index f54497e4..777c4857 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_-cy.glif
@@ -6,8 +6,8 @@
   <outline>
     <contour>
       <point x="122" y="0" type="line"/>
-      <point x="315" y="0" type="line"/>
-      <point x="662" y="694" type="line"/>
+      <point x="321" y="0" type="line"/>
+      <point x="668" y="694" type="line"/>
       <point x="485" y="694" type="line"/>
       <point x="332" y="365" type="line"/>
       <point x="287" y="301" type="line"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_at-cy.glif b/src/Cantarell-Bold.ufo/glyphs/Y_at-cy.glif
index 94ff5391..ee056124 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_at-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_at-cy.glif
@@ -26,10 +26,10 @@
       <point x="92" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="-16" y="493" type="line"/>
-      <point x="405" y="493" type="line"/>
-      <point x="405" y="621" type="line"/>
-      <point x="-16" y="621" type="line"/>
+      <point x="-16" y="492" type="line"/>
+      <point x="405" y="492" type="line"/>
+      <point x="405" y="622" type="line"/>
+      <point x="-16" y="622" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/_descenderreverse-cy.case.glif 
b/src/Cantarell-Bold.ufo/glyphs/_descenderreverse-cy.case.glif
index db38c7c0..664eab9e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/_descenderreverse-cy.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/_descenderreverse-cy.case.glif
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="_descenderreverse-cy.case" format="2">
   <advance width="316"/>
-  <anchor x="201" y="0" name="_bottomright"/>
+  <anchor x="188" y="0" name="_bottomright"/>
   <outline>
     <contour>
       <point x="-20" y="-187" type="line"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/_descenderreversed-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/_descenderreversed-cy.glif
index 194e4a0f..a19d4591 100644
--- a/src/Cantarell-Bold.ufo/glyphs/_descenderreversed-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/_descenderreversed-cy.glif
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="_descenderreversed-cy" format="2">
   <advance width="316"/>
-  <anchor x="233" y="0" name="_bottomright"/>
+  <anchor x="212" y="0" name="_bottomright"/>
   <outline>
     <contour>
       <point x="47" y="-136" type="line"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ampersand.glif b/src/Cantarell-Bold.ufo/glyphs/ampersand.glif
index 8335ce56..919e451e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ampersand.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ampersand.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ampersand" format="2">
-  <advance width="691"/>
+  <advance width="716"/>
   <unicode hex="0026"/>
   <outline>
     <contour>
-      <point x="582" y="-10" type="curve"/>
-      <point x="671" y="92" type="line"/>
-      <point x="376" y="314"/>
-      <point x="275" y="416"/>
-      <point x="275" y="511" type="curve" smooth="yes"/>
-      <point x="275" y="551"/>
-      <point x="295" y="572"/>
-      <point x="331" y="572" type="curve" smooth="yes"/>
-      <point x="364" y="572"/>
-      <point x="387" y="554"/>
-      <point x="387" y="528" type="curve" smooth="yes"/>
-      <point x="387" y="419"/>
-      <point x="27" y="443"/>
-      <point x="27" y="200" type="curve" smooth="yes"/>
-      <point x="27" y="75"/>
-      <point x="125" y="-10"/>
-      <point x="271" y="-10" type="curve" smooth="yes"/>
-      <point x="431" y="-10"/>
-      <point x="567" y="94"/>
-      <point x="657" y="290" type="curve"/>
-      <point x="542" y="358" type="line"/>
-      <point x="476" y="209"/>
-      <point x="393" y="126"/>
-      <point x="294" y="126" type="curve" smooth="yes"/>
-      <point x="234" y="126"/>
-      <point x="193" y="158"/>
-      <point x="193" y="208" type="curve" smooth="yes"/>
-      <point x="193" y="355"/>
-      <point x="541" y="327"/>
-      <point x="541" y="533" type="curve" smooth="yes"/>
-      <point x="541" y="634"/>
-      <point x="457" y="704"/>
-      <point x="333" y="704" type="curve" smooth="yes"/>
-      <point x="207" y="704"/>
-      <point x="120" y="629"/>
-      <point x="120" y="517" type="curve" smooth="yes"/>
-      <point x="120" y="397"/>
-      <point x="218" y="284"/>
+      <point x="594" y="-10" type="curve"/>
+      <point x="683" y="92" type="line"/>
+      <point x="388" y="314"/>
+      <point x="287" y="416"/>
+      <point x="287" y="511" type="curve" smooth="yes"/>
+      <point x="287" y="551"/>
+      <point x="307" y="572"/>
+      <point x="343" y="572" type="curve" smooth="yes"/>
+      <point x="376" y="572"/>
+      <point x="399" y="554"/>
+      <point x="399" y="528" type="curve" smooth="yes"/>
+      <point x="399" y="419"/>
+      <point x="39" y="443"/>
+      <point x="39" y="200" type="curve" smooth="yes"/>
+      <point x="39" y="75"/>
+      <point x="137" y="-10"/>
+      <point x="283" y="-10" type="curve" smooth="yes"/>
+      <point x="443" y="-10"/>
+      <point x="579" y="94"/>
+      <point x="669" y="290" type="curve"/>
+      <point x="554" y="358" type="line"/>
+      <point x="488" y="209"/>
+      <point x="405" y="126"/>
+      <point x="306" y="126" type="curve" smooth="yes"/>
+      <point x="246" y="126"/>
+      <point x="205" y="158"/>
+      <point x="205" y="208" type="curve" smooth="yes"/>
+      <point x="205" y="355"/>
+      <point x="553" y="327"/>
+      <point x="553" y="533" type="curve" smooth="yes"/>
+      <point x="553" y="634"/>
+      <point x="469" y="704"/>
+      <point x="345" y="704" type="curve" smooth="yes"/>
+      <point x="219" y="704"/>
+      <point x="132" y="629"/>
+      <point x="132" y="517" type="curve" smooth="yes"/>
+      <point x="132" y="397"/>
+      <point x="230" y="284"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/at.glif b/src/Cantarell-Bold.ufo/glyphs/at.glif
index 1d08b1bd..411b8bd5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/at.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/at.glif
@@ -1,82 +1,82 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="at" format="2">
-  <advance width="964"/>
+  <advance width="988"/>
   <unicode hex="0040"/>
   <outline>
     <contour>
-      <point x="458" y="-175" type="curve" smooth="yes"/>
-      <point x="535" y="-175"/>
-      <point x="608" y="-159"/>
-      <point x="677" y="-125" type="curve"/>
-      <point x="641" y="-18" type="line"/>
-      <point x="592" y="-43"/>
-      <point x="533" y="-56"/>
-      <point x="474" y="-56" type="curve" smooth="yes"/>
-      <point x="293" y="-56"/>
-      <point x="172" y="68"/>
-      <point x="172" y="255" type="curve" smooth="yes"/>
-      <point x="172" y="446"/>
-      <point x="299" y="580"/>
-      <point x="491" y="580" type="curve" smooth="yes"/>
-      <point x="674" y="580"/>
-      <point x="795" y="459"/>
-      <point x="795" y="272" type="curve" smooth="yes"/>
-      <point x="795" y="189"/>
-      <point x="771" y="132"/>
-      <point x="736" y="132" type="curve" smooth="yes"/>
-      <point x="713" y="132"/>
-      <point x="695" y="157"/>
-      <point x="695" y="191" type="curve"/>
-      <point x="548" y="191" type="line"/>
-      <point x="548" y="91"/>
-      <point x="623" y="22"/>
-      <point x="723" y="22" type="curve" smooth="yes"/>
-      <point x="849" y="22"/>
-      <point x="932" y="132"/>
-      <point x="932" y="300" type="curve" smooth="yes"/>
-      <point x="932" y="541"/>
-      <point x="759" y="704"/>
-      <point x="500" y="704" type="curve" smooth="yes"/>
-      <point x="223" y="704"/>
-      <point x="35" y="522"/>
-      <point x="35" y="251" type="curve" smooth="yes"/>
-      <point x="35" y="-8"/>
-      <point x="208" y="-175"/>
+      <point x="470" y="-175" type="curve" smooth="yes"/>
+      <point x="547" y="-175"/>
+      <point x="620" y="-159"/>
+      <point x="689" y="-125" type="curve"/>
+      <point x="653" y="-18" type="line"/>
+      <point x="604" y="-43"/>
+      <point x="545" y="-56"/>
+      <point x="486" y="-56" type="curve" smooth="yes"/>
+      <point x="305" y="-56"/>
+      <point x="184" y="68"/>
+      <point x="184" y="255" type="curve" smooth="yes"/>
+      <point x="184" y="446"/>
+      <point x="311" y="580"/>
+      <point x="503" y="580" type="curve" smooth="yes"/>
+      <point x="686" y="580"/>
+      <point x="807" y="459"/>
+      <point x="807" y="272" type="curve" smooth="yes"/>
+      <point x="807" y="189"/>
+      <point x="783" y="132"/>
+      <point x="748" y="132" type="curve" smooth="yes"/>
+      <point x="725" y="132"/>
+      <point x="707" y="157"/>
+      <point x="707" y="191" type="curve"/>
+      <point x="560" y="191" type="line"/>
+      <point x="560" y="91"/>
+      <point x="635" y="22"/>
+      <point x="735" y="22" type="curve" smooth="yes"/>
+      <point x="861" y="22"/>
+      <point x="944" y="132"/>
+      <point x="944" y="300" type="curve" smooth="yes"/>
+      <point x="944" y="541"/>
+      <point x="771" y="704"/>
+      <point x="512" y="704" type="curve" smooth="yes"/>
+      <point x="235" y="704"/>
+      <point x="47" y="522"/>
+      <point x="47" y="251" type="curve" smooth="yes"/>
+      <point x="47" y="-8"/>
+      <point x="220" y="-175"/>
     </contour>
     <contour>
-      <point x="435" y="37" type="curve" smooth="yes"/>
-      <point x="495" y="37"/>
-      <point x="552" y="61"/>
-      <point x="595" y="107" type="curve"/>
-      <point x="553" y="205" type="line"/>
-      <point x="534" y="173"/>
-      <point x="504" y="157"/>
-      <point x="479" y="157" type="curve" smooth="yes"/>
-      <point x="437" y="157"/>
-      <point x="413" y="196"/>
-      <point x="413" y="256" type="curve" smooth="yes"/>
-      <point x="413" y="320"/>
-      <point x="441" y="366"/>
-      <point x="482" y="366" type="curve" smooth="yes"/>
-      <point x="516" y="366"/>
-      <point x="546" y="337"/>
-      <point x="553" y="296" type="curve"/>
-      <point x="613" y="359" type="line"/>
-      <point x="609" y="440"/>
-      <point x="557" y="486"/>
-      <point x="471" y="486" type="curve" smooth="yes"/>
-      <point x="342" y="486"/>
-      <point x="245" y="382"/>
-      <point x="245" y="242" type="curve" smooth="yes"/>
-      <point x="245" y="119"/>
-      <point x="321" y="37"/>
+      <point x="447" y="37" type="curve" smooth="yes"/>
+      <point x="507" y="37"/>
+      <point x="564" y="61"/>
+      <point x="607" y="107" type="curve"/>
+      <point x="565" y="205" type="line"/>
+      <point x="546" y="173"/>
+      <point x="516" y="157"/>
+      <point x="491" y="157" type="curve" smooth="yes"/>
+      <point x="449" y="157"/>
+      <point x="425" y="196"/>
+      <point x="425" y="256" type="curve" smooth="yes"/>
+      <point x="425" y="320"/>
+      <point x="453" y="366"/>
+      <point x="494" y="366" type="curve" smooth="yes"/>
+      <point x="528" y="366"/>
+      <point x="558" y="337"/>
+      <point x="565" y="296" type="curve"/>
+      <point x="625" y="359" type="line"/>
+      <point x="621" y="440"/>
+      <point x="569" y="486"/>
+      <point x="483" y="486" type="curve" smooth="yes"/>
+      <point x="354" y="486"/>
+      <point x="257" y="382"/>
+      <point x="257" y="242" type="curve" smooth="yes"/>
+      <point x="257" y="119"/>
+      <point x="333" y="37"/>
     </contour>
     <contour>
-      <point x="545" y="172" type="line"/>
-      <point x="693" y="172" type="line"/>
-      <point x="715" y="474" type="line"/>
-      <point x="592" y="474" type="line"/>
-      <point x="559" y="383" type="line"/>
+      <point x="557" y="172" type="line"/>
+      <point x="705" y="172" type="line"/>
+      <point x="727" y="474" type="line"/>
+      <point x="604" y="474" type="line"/>
+      <point x="571" y="383" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/blackC_ircle.glif b/src/Cantarell-Bold.ufo/glyphs/blackC_ircle.glif
index 24b7fc61..7de1e38f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/blackC_ircle.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/blackC_ircle.glif
@@ -1,24 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="blackCircle" format="2">
-  <advance width="569"/>
+  <advance width="593"/>
   <unicode hex="25CF"/>
   <note>
 H18533
 </note>
   <outline>
     <contour>
-      <point x="282" y="109" type="curve" smooth="yes"/>
-      <point x="427" y="109"/>
-      <point x="524" y="205"/>
-      <point x="524" y="349" type="curve" smooth="yes"/>
-      <point x="524" y="490"/>
-      <point x="430" y="585"/>
-      <point x="287" y="585" type="curve" smooth="yes"/>
-      <point x="142" y="585"/>
-      <point x="45" y="488"/>
-      <point x="45" y="342" type="curve" smooth="yes"/>
-      <point x="45" y="202"/>
-      <point x="140" y="109"/>
+      <point x="294" y="109" type="curve" smooth="yes"/>
+      <point x="439" y="109"/>
+      <point x="536" y="205"/>
+      <point x="536" y="349" type="curve" smooth="yes"/>
+      <point x="536" y="490"/>
+      <point x="442" y="585"/>
+      <point x="299" y="585" type="curve" smooth="yes"/>
+      <point x="154" y="585"/>
+      <point x="57" y="488"/>
+      <point x="57" y="342" type="curve" smooth="yes"/>
+      <point x="57" y="202"/>
+      <point x="152" y="109"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/chekhakassian-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/chekhakassian-cy.glif
index 951ed69f..12f196fe 100644
--- a/src/Cantarell-Bold.ufo/glyphs/chekhakassian-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/chekhakassian-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04CC"/>
   <outline>
     <component base="che-cy"/>
-    <component base="_descenderreversed-cy" xOffset="196"/>
+    <component base="_descenderreversed-cy" xOffset="217"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/copyright.glif b/src/Cantarell-Bold.ufo/glyphs/copyright.glif
index 04221e27..8af29b3f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/copyright.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/copyright.glif
@@ -1,63 +1,69 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="copyright" format="2">
-  <advance width="809"/>
+  <advance width="833"/>
   <unicode hex="00A9"/>
   <outline>
     <contour>
-      <point x="400" y="-10" type="curve" smooth="yes"/>
-      <point x="623" y="-10"/>
-      <point x="771" y="134"/>
-      <point x="771" y="350" type="curve" smooth="yes"/>
-      <point x="771" y="562"/>
-      <point x="626" y="704"/>
-      <point x="408" y="704" type="curve" smooth="yes"/>
-      <point x="186" y="704"/>
-      <point x="38" y="558"/>
-      <point x="38" y="340" type="curve" smooth="yes"/>
-      <point x="38" y="130"/>
-      <point x="183" y="-10"/>
+      <point x="412" y="-10" type="curve" smooth="yes"/>
+      <point x="635" y="-10"/>
+      <point x="783" y="134"/>
+      <point x="783" y="350" type="curve" smooth="yes"/>
+      <point x="783" y="562"/>
+      <point x="638" y="704"/>
+      <point x="420" y="704" type="curve" smooth="yes"/>
+      <point x="198" y="704"/>
+      <point x="50" y="558"/>
+      <point x="50" y="340" type="curve" smooth="yes"/>
+      <point x="50" y="130"/>
+      <point x="195" y="-10"/>
     </contour>
     <contour>
-      <point x="409" y="81" type="curve" smooth="yes"/>
-      <point x="242" y="81"/>
-      <point x="130" y="189"/>
-      <point x="130" y="350" type="curve" smooth="yes"/>
-      <point x="130" y="508"/>
-      <point x="238" y="613"/>
-      <point x="400" y="613" type="curve" smooth="yes"/>
-      <point x="567" y="613"/>
-      <point x="679" y="504"/>
-      <point x="679" y="341" type="curve" smooth="yes"/>
-      <point x="679" y="185"/>
-      <point x="571" y="81"/>
+      <point x="421" y="81" type="curve" smooth="yes"/>
+      <point x="254" y="81"/>
+      <point x="142" y="189"/>
+      <point x="142" y="350" type="curve" smooth="yes"/>
+      <point x="142" y="508"/>
+      <point x="250" y="613"/>
+      <point x="412" y="613" type="curve" smooth="yes"/>
+      <point x="579" y="613"/>
+      <point x="691" y="504"/>
+      <point x="691" y="341" type="curve" smooth="yes"/>
+      <point x="691" y="185"/>
+      <point x="583" y="81"/>
     </contour>
     <contour>
-      <point x="418" y="134" type="curve" smooth="yes"/>
-      <point x="462" y="134"/>
-      <point x="513" y="144"/>
-      <point x="547" y="158" type="curve"/>
-      <point x="510" y="283" type="line"/>
-      <point x="494" y="278"/>
-      <point x="473" y="275"/>
-      <point x="456" y="275" type="curve" smooth="yes"/>
-      <point x="401" y="275"/>
-      <point x="365" y="306"/>
-      <point x="365" y="354" type="curve" smooth="yes"/>
-      <point x="365" y="396"/>
-      <point x="392" y="422"/>
-      <point x="437" y="422" type="curve" smooth="yes"/>
-      <point x="460" y="422"/>
-      <point x="490" y="416"/>
-      <point x="509" y="407" type="curve"/>
-      <point x="553" y="541" type="line"/>
-      <point x="519" y="556"/>
-      <point x="479" y="563"/>
-      <point x="437" y="563" type="curve" smooth="yes"/>
-      <point x="292" y="563"/>
-      <point x="196" y="477"/>
-      <point x="196" y="345" type="curve" smooth="yes"/>
-      <point x="196" y="218"/>
-      <point x="285" y="134"/>
+      <point x="430" y="134" type="curve" smooth="yes"/>
+      <point x="474" y="134"/>
+      <point x="525" y="144"/>
+      <point x="559" y="158" type="curve"/>
+      <point x="522" y="283" type="line"/>
+      <point x="506" y="278"/>
+      <point x="485" y="275"/>
+      <point x="468" y="275" type="curve" smooth="yes"/>
+      <point x="413" y="275"/>
+      <point x="377" y="306"/>
+      <point x="377" y="354" type="curve" smooth="yes"/>
+      <point x="377" y="396"/>
+      <point x="404" y="422"/>
+      <point x="449" y="422" type="curve" smooth="yes"/>
+      <point x="472" y="422"/>
+      <point x="502" y="416"/>
+      <point x="521" y="407" type="curve"/>
+      <point x="565" y="541" type="line"/>
+      <point x="531" y="556"/>
+      <point x="491" y="563"/>
+      <point x="449" y="563" type="curve" smooth="yes"/>
+      <point x="304" y="563"/>
+      <point x="208" y="477"/>
+      <point x="208" y="345" type="curve" smooth="yes"/>
+      <point x="208" y="218"/>
+      <point x="297" y="134"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dagger.glif b/src/Cantarell-Bold.ufo/glyphs/dagger.glif
index 2feb1dac..266ce3fb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dagger.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dagger.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dagger" format="2">
-  <advance width="480"/>
+  <advance width="506"/>
   <unicode hex="2020"/>
   <outline>
     <contour>
-      <point x="152" y="-10" type="line"/>
-      <point x="326" y="-10" type="line"/>
-      <point x="300" y="486" type="line"/>
-      <point x="326" y="704" type="line"/>
-      <point x="152" y="704" type="line"/>
-      <point x="169" y="486" type="line"/>
+      <point x="165" y="-10" type="line"/>
+      <point x="339" y="-10" type="line"/>
+      <point x="313" y="486" type="line"/>
+      <point x="339" y="704" type="line"/>
+      <point x="165" y="704" type="line"/>
+      <point x="182" y="486" type="line"/>
     </contour>
     <contour>
-      <point x="25" y="416" type="line"/>
-      <point x="232" y="430" type="line"/>
-      <point x="232" y="541" type="line"/>
-      <point x="25" y="555" type="line"/>
+      <point x="38" y="416" type="line"/>
+      <point x="245" y="430" type="line"/>
+      <point x="245" y="541" type="line"/>
+      <point x="38" y="555" type="line"/>
     </contour>
     <contour>
-      <point x="455" y="416" type="line"/>
-      <point x="455" y="555" type="line"/>
-      <point x="243" y="541" type="line"/>
-      <point x="243" y="430" type="line"/>
+      <point x="468" y="416" type="line"/>
+      <point x="468" y="555" type="line"/>
+      <point x="256" y="541" type="line"/>
+      <point x="256" y="430" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/daggerdbl.glif b/src/Cantarell-Bold.ufo/glyphs/daggerdbl.glif
index 3f5a2311..f7a87d96 100644
--- a/src/Cantarell-Bold.ufo/glyphs/daggerdbl.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/daggerdbl.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="daggerdbl" format="2">
-  <advance width="508"/>
+  <advance width="532"/>
   <unicode hex="2021"/>
   <outline>
     <contour>
-      <point x="167" y="-10" type="line"/>
-      <point x="340" y="-10" type="line"/>
-      <point x="314" y="175" type="line"/>
-      <point x="329" y="347" type="line"/>
-      <point x="314" y="505" type="line"/>
-      <point x="340" y="704" type="line"/>
-      <point x="167" y="704" type="line"/>
-      <point x="184" y="505" type="line"/>
-      <point x="169" y="347" type="line"/>
-      <point x="184" y="175" type="line"/>
+      <point x="179" y="-10" type="line"/>
+      <point x="352" y="-10" type="line"/>
+      <point x="326" y="175" type="line"/>
+      <point x="341" y="347" type="line"/>
+      <point x="326" y="505" type="line"/>
+      <point x="352" y="704" type="line"/>
+      <point x="179" y="704" type="line"/>
+      <point x="196" y="505" type="line"/>
+      <point x="181" y="347" type="line"/>
+      <point x="196" y="175" type="line"/>
     </contour>
     <contour>
-      <point x="49" y="104" type="line"/>
-      <point x="248" y="118" type="line"/>
-      <point x="248" y="230" type="line"/>
-      <point x="49" y="244" type="line"/>
+      <point x="61" y="104" type="line"/>
+      <point x="260" y="118" type="line"/>
+      <point x="260" y="230" type="line"/>
+      <point x="61" y="244" type="line"/>
     </contour>
     <contour>
-      <point x="459" y="104" type="line"/>
-      <point x="459" y="244" type="line"/>
-      <point x="257" y="230" type="line"/>
-      <point x="257" y="118" type="line"/>
+      <point x="471" y="104" type="line"/>
+      <point x="471" y="244" type="line"/>
+      <point x="269" y="230" type="line"/>
+      <point x="269" y="118" type="line"/>
     </contour>
     <contour>
-      <point x="49" y="448" type="line"/>
-      <point x="248" y="462" type="line"/>
-      <point x="248" y="574" type="line"/>
-      <point x="49" y="588" type="line"/>
+      <point x="61" y="448" type="line"/>
+      <point x="260" y="462" type="line"/>
+      <point x="260" y="574" type="line"/>
+      <point x="61" y="588" type="line"/>
     </contour>
     <contour>
-      <point x="459" y="448" type="line"/>
-      <point x="459" y="588" type="line"/>
-      <point x="257" y="574" type="line"/>
-      <point x="257" y="462" type="line"/>
+      <point x="471" y="448" type="line"/>
+      <point x="471" y="588" type="line"/>
+      <point x="269" y="574" type="line"/>
+      <point x="269" y="462" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/degree.glif b/src/Cantarell-Bold.ufo/glyphs/degree.glif
index 69632663..dd50ee8a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/degree.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/degree.glif
@@ -1,35 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="degree" format="2">
-  <advance width="429"/>
+  <advance width="452"/>
   <unicode hex="00B0"/>
   <outline>
     <contour>
-      <point x="212" y="384" type="curve" smooth="yes"/>
-      <point x="311" y="384"/>
-      <point x="376" y="449"/>
-      <point x="376" y="546" type="curve" smooth="yes"/>
-      <point x="376" y="641"/>
-      <point x="312" y="704"/>
-      <point x="217" y="704" type="curve" smooth="yes"/>
-      <point x="118" y="704"/>
-      <point x="52" y="639"/>
-      <point x="52" y="542" type="curve" smooth="yes"/>
-      <point x="52" y="447"/>
-      <point x="116" y="384"/>
+      <point x="224" y="384" type="curve" smooth="yes"/>
+      <point x="323" y="384"/>
+      <point x="388" y="449"/>
+      <point x="388" y="546" type="curve" smooth="yes"/>
+      <point x="388" y="641"/>
+      <point x="324" y="704"/>
+      <point x="229" y="704" type="curve" smooth="yes"/>
+      <point x="130" y="704"/>
+      <point x="64" y="639"/>
+      <point x="64" y="542" type="curve" smooth="yes"/>
+      <point x="64" y="447"/>
+      <point x="128" y="384"/>
     </contour>
     <contour>
-      <point x="217" y="492" type="curve" smooth="yes"/>
-      <point x="182" y="492"/>
-      <point x="160" y="514"/>
-      <point x="160" y="546" type="curve" smooth="yes"/>
-      <point x="160" y="577"/>
-      <point x="180" y="597"/>
-      <point x="212" y="597" type="curve" smooth="yes"/>
-      <point x="246" y="597"/>
-      <point x="268" y="575"/>
-      <point x="268" y="542" type="curve" smooth="yes"/>
-      <point x="268" y="512"/>
-      <point x="248" y="492"/>
+      <point x="229" y="492" type="curve" smooth="yes"/>
+      <point x="194" y="492"/>
+      <point x="172" y="514"/>
+      <point x="172" y="546" type="curve" smooth="yes"/>
+      <point x="172" y="577"/>
+      <point x="192" y="597"/>
+      <point x="224" y="597" type="curve" smooth="yes"/>
+      <point x="258" y="597"/>
+      <point x="280" y="575"/>
+      <point x="280" y="542" type="curve" smooth="yes"/>
+      <point x="280" y="512"/>
+      <point x="260" y="492"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/descender-cy.glif b/src/Cantarell-Bold.ufo/glyphs/descender-cy.glif
index ed37a911..5134f1f6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/descender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/descender-cy.glif
@@ -6,8 +6,8 @@
     <contour>
       <point x="104" y="-136" type="line"/>
       <point x="252" y="-136" type="line"/>
-      <point x="252" y="128" type="line"/>
-      <point x="77" y="128" type="line"/>
+      <point x="252" y="133" type="line"/>
+      <point x="77" y="133" type="line"/>
       <point x="77" y="0" type="line"/>
       <point x="104" y="0" type="line"/>
     </contour>
diff --git a/src/Cantarell-Bold.ufo/glyphs/downA_rrow.glif b/src/Cantarell-Bold.ufo/glyphs/downA_rrow.glif
index 5a336c4b..63f91612 100644
--- a/src/Cantarell-Bold.ufo/glyphs/downA_rrow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/downA_rrow.glif
@@ -1,11 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="downArrow" format="2">
-  <advance width="619"/>
+  <advance width="643"/>
   <unicode hex="2193"/>
   <note>
 arrowdown
 </note>
   <outline>
-    <component base="upArrow" xScale="-1" yScale="-1" xOffset="635" yOffset="642"/>
+    <component base="upArrow" xScale="-1" yScale="-1" xOffset="643" yOffset="642"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>upArrow</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>upArrow</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/emptyset.glif b/src/Cantarell-Bold.ufo/glyphs/emptyset.glif
index 86fc069e..3422a4bb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/emptyset.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/emptyset.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emptyset" format="2">
-  <advance width="700"/>
+  <advance width="725"/>
   <unicode hex="2205"/>
   <outline>
     <contour>
-      <point x="344" y="33" type="curve" smooth="yes"/>
-      <point x="536" y="33"/>
-      <point x="664" y="158"/>
-      <point x="664" y="345" type="curve" smooth="yes"/>
-      <point x="664" y="528"/>
-      <point x="541" y="650"/>
-      <point x="356" y="650" type="curve" smooth="yes"/>
-      <point x="164" y="650"/>
-      <point x="37" y="523"/>
-      <point x="37" y="334" type="curve" smooth="yes"/>
-      <point x="37" y="153"/>
-      <point x="160" y="33"/>
+      <point x="356" y="33" type="curve" smooth="yes"/>
+      <point x="548" y="33"/>
+      <point x="676" y="158"/>
+      <point x="676" y="345" type="curve" smooth="yes"/>
+      <point x="676" y="528"/>
+      <point x="553" y="650"/>
+      <point x="368" y="650" type="curve" smooth="yes"/>
+      <point x="176" y="650"/>
+      <point x="49" y="523"/>
+      <point x="49" y="334" type="curve" smooth="yes"/>
+      <point x="49" y="153"/>
+      <point x="172" y="33"/>
     </contour>
     <contour>
-      <point x="354" y="193" type="curve" smooth="yes"/>
-      <point x="265" y="193"/>
-      <point x="206" y="253"/>
-      <point x="206" y="344" type="curve" smooth="yes"/>
-      <point x="206" y="432"/>
-      <point x="262" y="490"/>
-      <point x="346" y="490" type="curve" smooth="yes"/>
-      <point x="435" y="490"/>
-      <point x="495" y="429"/>
-      <point x="495" y="337" type="curve" smooth="yes"/>
-      <point x="495" y="251"/>
-      <point x="439" y="193"/>
+      <point x="366" y="193" type="curve" smooth="yes"/>
+      <point x="277" y="193"/>
+      <point x="218" y="253"/>
+      <point x="218" y="344" type="curve" smooth="yes"/>
+      <point x="218" y="432"/>
+      <point x="274" y="490"/>
+      <point x="358" y="490" type="curve" smooth="yes"/>
+      <point x="447" y="490"/>
+      <point x="507" y="429"/>
+      <point x="507" y="337" type="curve" smooth="yes"/>
+      <point x="507" y="251"/>
+      <point x="451" y="193"/>
     </contour>
     <contour>
-      <point x="173" y="-33" type="line"/>
-      <point x="632" y="651" type="line"/>
-      <point x="521" y="725" type="line"/>
-      <point x="62" y="41" type="line"/>
+      <point x="185" y="-33" type="line"/>
+      <point x="644" y="651" type="line"/>
+      <point x="533" y="725" type="line"/>
+      <point x="74" y="41" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/estimated.glif b/src/Cantarell-Bold.ufo/glyphs/estimated.glif
index 095b7645..afe8ce94 100644
--- a/src/Cantarell-Bold.ufo/glyphs/estimated.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/estimated.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="estimated" format="2">
-  <advance width="763"/>
+  <advance width="787"/>
   <unicode hex="212E"/>
   <outline>
     <contour>
-      <point x="385" y="-10" type="curve" smooth="yes"/>
-      <point x="516" y="-10"/>
-      <point x="640" y="42"/>
-      <point x="712" y="119" type="curve"/>
-      <point x="646" y="119" type="line"/>
-      <point x="574" y="62"/>
-      <point x="482" y="36"/>
-      <point x="393" y="36" type="curve" smooth="yes"/>
-      <point x="271" y="36"/>
-      <point x="197" y="84"/>
-      <point x="150" y="145" type="curve"/>
-      <point x="150" y="315" type="line"/>
-      <point x="733" y="315" type="line"/>
-      <point x="733" y="545"/>
-      <point x="616" y="704"/>
-      <point x="388" y="704" type="curve" smooth="yes"/>
-      <point x="157" y="704"/>
-      <point x="39" y="541"/>
-      <point x="39" y="339" type="curve" smooth="yes"/>
-      <point x="39" y="123"/>
-      <point x="175" y="-10"/>
+      <point x="397" y="-10" type="curve" smooth="yes"/>
+      <point x="528" y="-10"/>
+      <point x="652" y="42"/>
+      <point x="724" y="119" type="curve"/>
+      <point x="658" y="119" type="line"/>
+      <point x="586" y="62"/>
+      <point x="494" y="36"/>
+      <point x="405" y="36" type="curve" smooth="yes"/>
+      <point x="283" y="36"/>
+      <point x="209" y="84"/>
+      <point x="162" y="145" type="curve"/>
+      <point x="162" y="315" type="line"/>
+      <point x="745" y="315" type="line"/>
+      <point x="745" y="545"/>
+      <point x="628" y="704"/>
+      <point x="400" y="704" type="curve" smooth="yes"/>
+      <point x="169" y="704"/>
+      <point x="51" y="541"/>
+      <point x="51" y="339" type="curve" smooth="yes"/>
+      <point x="51" y="123"/>
+      <point x="187" y="-10"/>
     </contour>
     <contour>
-      <point x="150" y="358" type="line"/>
-      <point x="150" y="535" type="line"/>
-      <point x="196" y="619"/>
-      <point x="271" y="662"/>
-      <point x="385" y="662" type="curve" smooth="yes"/>
-      <point x="499" y="662"/>
-      <point x="573" y="619"/>
-      <point x="619" y="535" type="curve"/>
-      <point x="619" y="358" type="line"/>
+      <point x="162" y="358" type="line"/>
+      <point x="162" y="535" type="line"/>
+      <point x="208" y="619"/>
+      <point x="283" y="662"/>
+      <point x="397" y="662" type="curve" smooth="yes"/>
+      <point x="511" y="662"/>
+      <point x="585" y="619"/>
+      <point x="631" y="535" type="curve"/>
+      <point x="631" y="358" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/increment.glif b/src/Cantarell-Bold.ufo/glyphs/increment.glif
index 5f84e233..e4a835e0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/increment.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/increment.glif
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="increment" format="2">
-  <advance width="717"/>
+  <advance width="707"/>
   <unicode hex="2206"/>
   <outline>
     <contour>
-      <point x="38" y="1" type="line"/>
-      <point x="678" y="1" type="line"/>
-      <point x="678" y="107" type="line"/>
-      <point x="478" y="694" type="line"/>
-      <point x="261" y="694" type="line"/>
-      <point x="38" y="107" type="line"/>
+      <point x="26" y="1" type="line"/>
+      <point x="679" y="1" type="line"/>
+      <point x="679" y="116" type="line"/>
+      <point x="484" y="694" type="line"/>
+      <point x="247" y="694" type="line"/>
+      <point x="26" y="116" type="line"/>
     </contour>
     <contour>
-      <point x="203" y="136" type="line"/>
-      <point x="354" y="571" type="line"/>
-      <point x="506" y="136" type="line"/>
+      <point x="205" y="148" type="line"/>
+      <point x="349" y="563" type="line"/>
+      <point x="493" y="148" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/infinity.glif b/src/Cantarell-Bold.ufo/glyphs/infinity.glif
index 0413aeaa..9d3f949d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/infinity.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/infinity.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="infinity" format="2">
-  <advance width="950"/>
+  <advance width="970"/>
   <unicode hex="221E"/>
   <outline>
     <contour>
-      <point x="653" y="108" type="curve" smooth="yes"/>
-      <point x="803" y="108"/>
-      <point x="905" y="207"/>
-      <point x="905" y="348" type="curve" smooth="yes"/>
-      <point x="905" y="482"/>
-      <point x="813" y="570"/>
-      <point x="685" y="570" type="curve" smooth="yes"/>
-      <point x="442" y="570"/>
-      <point x="454" y="252"/>
-      <point x="303" y="252" type="curve" smooth="yes"/>
-      <point x="253" y="252"/>
-      <point x="221" y="287"/>
-      <point x="221" y="341" type="curve" smooth="yes"/>
-      <point x="221" y="392"/>
-      <point x="249" y="426"/>
-      <point x="298" y="426" type="curve" smooth="yes"/>
-      <point x="448" y="426"/>
-      <point x="384" y="108"/>
+      <point x="663" y="108" type="curve" smooth="yes"/>
+      <point x="813" y="108"/>
+      <point x="915" y="207"/>
+      <point x="915" y="348" type="curve" smooth="yes"/>
+      <point x="915" y="482"/>
+      <point x="823" y="570"/>
+      <point x="695" y="570" type="curve" smooth="yes"/>
+      <point x="452" y="570"/>
+      <point x="464" y="252"/>
+      <point x="313" y="252" type="curve" smooth="yes"/>
+      <point x="263" y="252"/>
+      <point x="231" y="287"/>
+      <point x="231" y="341" type="curve" smooth="yes"/>
+      <point x="231" y="392"/>
+      <point x="259" y="426"/>
+      <point x="308" y="426" type="curve" smooth="yes"/>
+      <point x="458" y="426"/>
+      <point x="394" y="108"/>
     </contour>
     <contour>
-      <point x="266" y="108" type="curve" smooth="yes"/>
-      <point x="508" y="108"/>
-      <point x="498" y="426"/>
-      <point x="647" y="426" type="curve" smooth="yes"/>
-      <point x="693" y="426"/>
-      <point x="729" y="396"/>
-      <point x="729" y="337" type="curve" smooth="yes"/>
-      <point x="729" y="289"/>
-      <point x="704" y="252"/>
-      <point x="655" y="252" type="curve" smooth="yes"/>
-      <point x="510" y="252"/>
-      <point x="583" y="570"/>
-      <point x="303" y="570" type="curve" smooth="yes"/>
-      <point x="150" y="570"/>
-      <point x="45" y="475"/>
-      <point x="45" y="332" type="curve" smooth="yes"/>
-      <point x="45" y="198"/>
-      <point x="137" y="108"/>
+      <point x="276" y="108" type="curve" smooth="yes"/>
+      <point x="518" y="108"/>
+      <point x="508" y="426"/>
+      <point x="657" y="426" type="curve" smooth="yes"/>
+      <point x="703" y="426"/>
+      <point x="739" y="396"/>
+      <point x="739" y="337" type="curve" smooth="yes"/>
+      <point x="739" y="289"/>
+      <point x="714" y="252"/>
+      <point x="665" y="252" type="curve" smooth="yes"/>
+      <point x="520" y="252"/>
+      <point x="593" y="570"/>
+      <point x="313" y="570" type="curve" smooth="yes"/>
+      <point x="160" y="570"/>
+      <point x="55" y="475"/>
+      <point x="55" y="332" type="curve" smooth="yes"/>
+      <point x="55" y="198"/>
+      <point x="147" y="108"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/integral.glif b/src/Cantarell-Bold.ufo/glyphs/integral.glif
index c98ad079..87660368 100644
--- a/src/Cantarell-Bold.ufo/glyphs/integral.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/integral.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="integral" format="2">
-  <advance width="395"/>
+  <advance width="419"/>
   <unicode hex="222B"/>
   <outline>
     <contour>
-      <point x="135" y="-170" type="curve" smooth="yes"/>
-      <point x="264" y="-170"/>
-      <point x="353" y="-89"/>
-      <point x="353" y="25" type="curve" smooth="yes"/>
-      <point x="353" y="171"/>
-      <point x="223" y="419"/>
-      <point x="223" y="536" type="curve" smooth="yes"/>
-      <point x="223" y="579"/>
-      <point x="239" y="601"/>
-      <point x="270" y="601" type="curve" smooth="yes"/>
-      <point x="285" y="601"/>
-      <point x="303" y="597"/>
-      <point x="316" y="591" type="curve"/>
-      <point x="362" y="731" type="line"/>
-      <point x="327" y="743"/>
-      <point x="291" y="749"/>
-      <point x="260" y="749" type="curve" smooth="yes"/>
-      <point x="136" y="749"/>
-      <point x="48" y="662"/>
-      <point x="48" y="537" type="curve" smooth="yes"/>
-      <point x="48" y="379"/>
-      <point x="176" y="131"/>
-      <point x="176" y="29" type="curve" smooth="yes"/>
-      <point x="176" y="-6"/>
-      <point x="164" y="-22"/>
-      <point x="134" y="-22" type="curve" smooth="yes"/>
-      <point x="116" y="-22"/>
-      <point x="96" y="-17"/>
-      <point x="78" y="-4" type="curve"/>
-      <point x="31" y="-147" type="line"/>
-      <point x="63" y="-164"/>
-      <point x="101" y="-170"/>
+      <point x="147" y="-170" type="curve" smooth="yes"/>
+      <point x="276" y="-170"/>
+      <point x="365" y="-89"/>
+      <point x="365" y="25" type="curve" smooth="yes"/>
+      <point x="365" y="171"/>
+      <point x="235" y="419"/>
+      <point x="235" y="536" type="curve" smooth="yes"/>
+      <point x="235" y="579"/>
+      <point x="251" y="601"/>
+      <point x="282" y="601" type="curve" smooth="yes"/>
+      <point x="297" y="601"/>
+      <point x="315" y="597"/>
+      <point x="328" y="591" type="curve"/>
+      <point x="374" y="731" type="line"/>
+      <point x="339" y="743"/>
+      <point x="303" y="749"/>
+      <point x="272" y="749" type="curve" smooth="yes"/>
+      <point x="148" y="749"/>
+      <point x="60" y="662"/>
+      <point x="60" y="537" type="curve" smooth="yes"/>
+      <point x="60" y="379"/>
+      <point x="188" y="131"/>
+      <point x="188" y="29" type="curve" smooth="yes"/>
+      <point x="188" y="-6"/>
+      <point x="176" y="-22"/>
+      <point x="146" y="-22" type="curve" smooth="yes"/>
+      <point x="128" y="-22"/>
+      <point x="108" y="-17"/>
+      <point x="90" y="-4" type="curve"/>
+      <point x="43" y="-147" type="line"/>
+      <point x="75" y="-164"/>
+      <point x="113" y="-170"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/l.ss01.glif b/src/Cantarell-Bold.ufo/glyphs/l.ss01.glif
index 1d35f4b5..f4ef6f92 100644
--- a/src/Cantarell-Bold.ufo/glyphs/l.ss01.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/l.ss01.glif
@@ -1,24 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="l.ss01" format="2">
-  <advance width="262"/>
+  <advance width="294"/>
   <note>
 l
 </note>
-  <anchor x="168" y="0" name="bottom"/>
-  <anchor x="132" y="366" name="center"/>
-  <anchor x="310" y="363" name="periodcentered"/>
-  <anchor x="127" y="739" name="top"/>
-  <anchor x="325" y="490" name="topright"/>
+  <anchor x="184" y="0" name="bottom"/>
+  <anchor x="148" y="366" name="center"/>
+  <anchor x="326" y="363" name="periodcentered"/>
+  <anchor x="143" y="739" name="top"/>
+  <anchor x="341" y="490" name="topright"/>
   <outline>
     <contour>
-      <point x="46" y="0" type="line"/>
-      <point x="216" y="0" type="line"/>
-      <point x="216" y="739" type="line"/>
-      <point x="46" y="739" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="232" y="0" type="line"/>
+      <point x="232" y="739" type="line"/>
+      <point x="62" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=|</string>
     </dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/leftA_rrow.glif b/src/Cantarell-Bold.ufo/glyphs/leftA_rrow.glif
index 3fb23441..2bfa0632 100644
--- a/src/Cantarell-Bold.ufo/glyphs/leftA_rrow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/leftA_rrow.glif
@@ -1,11 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="leftArrow" format="2">
-  <advance width="646"/>
+  <advance width="672"/>
   <unicode hex="2190"/>
   <note>
 arrowleft
 </note>
   <outline>
-    <component base="rightArrow" xScale="-1" yScale="-1" xOffset="660" yOffset="643"/>
+    <component base="rightArrow" xScale="-1" yScale="-1" xOffset="672" yOffset="643"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|rightArrow</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|rightArrow</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/literS_ign.glif b/src/Cantarell-Bold.ufo/glyphs/literS_ign.glif
index bf615ff4..cfdf5b55 100644
--- a/src/Cantarell-Bold.ufo/glyphs/literS_ign.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/literS_ign.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="literSign" format="2">
-  <advance width="490"/>
+  <advance width="515"/>
   <unicode hex="2113"/>
   <outline>
     <contour>
-      <point x="310" y="-10" type="curve" smooth="yes"/>
-      <point x="356" y="-10"/>
-      <point x="403" y="1"/>
-      <point x="446" y="22" type="curve"/>
-      <point x="407" y="137" type="line"/>
-      <point x="386" y="126"/>
-      <point x="360" y="119"/>
-      <point x="337" y="119" type="curve" smooth="yes"/>
-      <point x="290" y="119"/>
-      <point x="256" y="151"/>
-      <point x="256" y="197" type="curve" smooth="yes"/>
-      <point x="256" y="501" type="line" smooth="yes"/>
-      <point x="256" y="568"/>
-      <point x="270" y="613"/>
-      <point x="290" y="613" type="curve" smooth="yes"/>
-      <point x="309" y="613"/>
-      <point x="321" y="587"/>
-      <point x="321" y="546" type="curve" smooth="yes"/>
-      <point x="321" y="491"/>
-      <point x="310" y="457"/>
-      <point x="11" y="125" type="curve"/>
-      <point x="79" y="57" type="line"/>
-      <point x="358" y="329"/>
-      <point x="451" y="437"/>
-      <point x="451" y="569" type="curve" smooth="yes"/>
-      <point x="451" y="679"/>
-      <point x="387" y="749"/>
-      <point x="286" y="749" type="curve" smooth="yes"/>
-      <point x="165" y="749"/>
-      <point x="87" y="648"/>
-      <point x="87" y="491" type="curve" smooth="yes"/>
-      <point x="87" y="179" type="line" smooth="yes"/>
-      <point x="87" y="72"/>
-      <point x="185" y="-10"/>
+      <point x="323" y="-10" type="curve" smooth="yes"/>
+      <point x="369" y="-10"/>
+      <point x="416" y="1"/>
+      <point x="459" y="22" type="curve"/>
+      <point x="420" y="137" type="line"/>
+      <point x="399" y="126"/>
+      <point x="373" y="119"/>
+      <point x="350" y="119" type="curve" smooth="yes"/>
+      <point x="303" y="119"/>
+      <point x="269" y="151"/>
+      <point x="269" y="197" type="curve" smooth="yes"/>
+      <point x="269" y="501" type="line" smooth="yes"/>
+      <point x="269" y="568"/>
+      <point x="283" y="613"/>
+      <point x="303" y="613" type="curve" smooth="yes"/>
+      <point x="322" y="613"/>
+      <point x="334" y="587"/>
+      <point x="334" y="546" type="curve" smooth="yes"/>
+      <point x="334" y="491"/>
+      <point x="323" y="457"/>
+      <point x="24" y="125" type="curve"/>
+      <point x="92" y="57" type="line"/>
+      <point x="371" y="329"/>
+      <point x="464" y="437"/>
+      <point x="464" y="569" type="curve" smooth="yes"/>
+      <point x="464" y="679"/>
+      <point x="400" y="749"/>
+      <point x="299" y="749" type="curve" smooth="yes"/>
+      <point x="178" y="749"/>
+      <point x="100" y="648"/>
+      <point x="100" y="491" type="curve" smooth="yes"/>
+      <point x="100" y="179" type="line" smooth="yes"/>
+      <point x="100" y="72"/>
+      <point x="198" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lozenge.glif b/src/Cantarell-Bold.ufo/glyphs/lozenge.glif
index 67bf2e2a..9d6538bd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lozenge.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lozenge.glif
@@ -1,21 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lozenge" format="2">
-  <advance width="563"/>
+  <advance width="587"/>
   <unicode hex="25CA"/>
   <outline>
     <contour>
-      <point x="205" y="0" type="line"/>
-      <point x="357" y="0" type="line"/>
-      <point x="544" y="352" type="line"/>
-      <point x="357" y="694" type="line"/>
-      <point x="205" y="694" type="line"/>
-      <point x="19" y="352" type="line"/>
+      <point x="217" y="0" type="line"/>
+      <point x="369" y="0" type="line"/>
+      <point x="556" y="352" type="line"/>
+      <point x="369" y="694" type="line"/>
+      <point x="217" y="694" type="line"/>
+      <point x="31" y="352" type="line"/>
     </contour>
     <contour>
-      <point x="284" y="150" type="line"/>
-      <point x="184" y="349" type="line"/>
-      <point x="284" y="546" type="line"/>
-      <point x="394" y="348" type="line"/>
+      <point x="296" y="150" type="line"/>
+      <point x="196" y="349" type="line"/>
+      <point x="296" y="546" type="line"/>
+      <point x="406" y="348" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/minute.glif b/src/Cantarell-Bold.ufo/glyphs/minute.glif
index 3579a673..e7333a23 100644
--- a/src/Cantarell-Bold.ufo/glyphs/minute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/minute.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="minute" format="2">
-  <advance width="323"/>
+  <advance width="347"/>
   <unicode hex="2032"/>
   <note>
 minute
 </note>
   <outline>
-    <component base="quotesingle" yxScale="0.19201" xOffset="-92"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="-76"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/numero.glif b/src/Cantarell-Bold.ufo/glyphs/numero.glif
index 71c2c239..eef8adc5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/numero.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/numero.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="numero" format="2">
-  <advance width="1216"/>
+  <advance width="1238"/>
   <unicode hex="2116"/>
   <outline>
     <component base="N"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ordfeminine.glif b/src/Cantarell-Bold.ufo/glyphs/ordfeminine.glif
index e1dd63bb..4410514f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ordfeminine.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ordfeminine.glif
@@ -1,48 +1,48 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ordfeminine" format="2">
-  <advance width="399"/>
+  <advance width="429"/>
   <unicode hex="00AA"/>
   <outline>
     <contour>
-      <point x="277" y="376" type="line"/>
-      <point x="364" y="376" type="line"/>
-      <point x="364" y="585" type="line" smooth="yes"/>
-      <point x="364" y="692"/>
-      <point x="304" y="750"/>
-      <point x="186" y="750" type="curve" smooth="yes"/>
-      <point x="130" y="750"/>
-      <point x="71" y="737"/>
-      <point x="26" y="714" type="curve"/>
-      <point x="55" y="630" type="line"/>
-      <point x="97" y="646"/>
-      <point x="132" y="651"/>
-      <point x="161" y="651" type="curve" smooth="yes"/>
-      <point x="214" y="651"/>
-      <point x="245" y="633"/>
-      <point x="245" y="597" type="curve" smooth="yes"/>
-      <point x="245" y="458" type="line"/>
+      <point x="292" y="376" type="line"/>
+      <point x="379" y="376" type="line"/>
+      <point x="379" y="585" type="line" smooth="yes"/>
+      <point x="379" y="692"/>
+      <point x="319" y="750"/>
+      <point x="201" y="750" type="curve" smooth="yes"/>
+      <point x="145" y="750"/>
+      <point x="86" y="737"/>
+      <point x="41" y="714" type="curve"/>
+      <point x="70" y="630" type="line"/>
+      <point x="112" y="646"/>
+      <point x="147" y="651"/>
+      <point x="176" y="651" type="curve" smooth="yes"/>
+      <point x="229" y="651"/>
+      <point x="260" y="633"/>
+      <point x="260" y="597" type="curve" smooth="yes"/>
+      <point x="260" y="458" type="line"/>
     </contour>
     <contour>
-      <point x="151" y="369" type="curve" smooth="yes"/>
-      <point x="234" y="369"/>
-      <point x="293" y="417"/>
-      <point x="309" y="503" type="curve"/>
-      <point x="270" y="518" type="line"/>
-      <point x="263" y="485"/>
-      <point x="229" y="462"/>
-      <point x="192" y="462" type="curve" smooth="yes"/>
-      <point x="164" y="462"/>
-      <point x="143" y="476"/>
-      <point x="143" y="497" type="curve" smooth="yes"/>
-      <point x="143" y="523"/>
-      <point x="176" y="533"/>
-      <point x="265" y="533" type="curve"/>
-      <point x="265" y="598" type="line"/>
-      <point x="96" y="598"/>
-      <point x="21" y="562"/>
-      <point x="21" y="480" type="curve" smooth="yes"/>
-      <point x="21" y="413"/>
-      <point x="71" y="369"/>
+      <point x="166" y="369" type="curve" smooth="yes"/>
+      <point x="249" y="369"/>
+      <point x="308" y="417"/>
+      <point x="324" y="503" type="curve"/>
+      <point x="285" y="518" type="line"/>
+      <point x="278" y="485"/>
+      <point x="244" y="462"/>
+      <point x="207" y="462" type="curve" smooth="yes"/>
+      <point x="179" y="462"/>
+      <point x="158" y="476"/>
+      <point x="158" y="497" type="curve" smooth="yes"/>
+      <point x="158" y="523"/>
+      <point x="191" y="533"/>
+      <point x="280" y="533" type="curve"/>
+      <point x="280" y="598" type="line"/>
+      <point x="111" y="598"/>
+      <point x="36" y="562"/>
+      <point x="36" y="480" type="curve" smooth="yes"/>
+      <point x="36" y="413"/>
+      <point x="86" y="369"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ordmasculine.glif b/src/Cantarell-Bold.ufo/glyphs/ordmasculine.glif
index fca973fe..74f39021 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ordmasculine.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ordmasculine.glif
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ordmasculine" format="2">
-  <advance width="428"/>
+  <advance width="450"/>
   <unicode hex="00BA"/>
   <outline>
     <contour>
-      <point x="207" y="369" type="curve" smooth="yes"/>
-      <point x="327" y="369"/>
-      <point x="409" y="448"/>
-      <point x="409" y="566" type="curve" smooth="yes"/>
-      <point x="409" y="678"/>
-      <point x="335" y="750"/>
-      <point x="221" y="750" type="curve" smooth="yes"/>
-      <point x="100" y="750"/>
-      <point x="19" y="671"/>
-      <point x="19" y="552" type="curve" smooth="yes"/>
-      <point x="19" y="441"/>
-      <point x="92" y="369"/>
+      <point x="218" y="369" type="curve" smooth="yes"/>
+      <point x="338" y="369"/>
+      <point x="420" y="448"/>
+      <point x="420" y="566" type="curve" smooth="yes"/>
+      <point x="420" y="678"/>
+      <point x="346" y="750"/>
+      <point x="232" y="750" type="curve" smooth="yes"/>
+      <point x="111" y="750"/>
+      <point x="30" y="671"/>
+      <point x="30" y="552" type="curve" smooth="yes"/>
+      <point x="30" y="441"/>
+      <point x="103" y="369"/>
     </contour>
     <contour>
-      <point x="217" y="468" type="curve" smooth="yes"/>
-      <point x="169" y="468"/>
-      <point x="139" y="505"/>
-      <point x="139" y="561" type="curve" smooth="yes"/>
-      <point x="139" y="616"/>
-      <point x="166" y="650"/>
-      <point x="211" y="650" type="curve" smooth="yes"/>
-      <point x="258" y="650"/>
-      <point x="289" y="613"/>
-      <point x="289" y="555" type="curve" smooth="yes"/>
-      <point x="289" y="502"/>
-      <point x="262" y="468"/>
+      <point x="228" y="468" type="curve" smooth="yes"/>
+      <point x="180" y="468"/>
+      <point x="150" y="505"/>
+      <point x="150" y="561" type="curve" smooth="yes"/>
+      <point x="150" y="616"/>
+      <point x="177" y="650"/>
+      <point x="222" y="650" type="curve" smooth="yes"/>
+      <point x="269" y="650"/>
+      <point x="300" y="613"/>
+      <point x="300" y="555" type="curve" smooth="yes"/>
+      <point x="300" y="502"/>
+      <point x="273" y="468"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/partialdiff.glif b/src/Cantarell-Bold.ufo/glyphs/partialdiff.glif
index 3a360887..d8cd14e7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/partialdiff.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/partialdiff.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="partialdiff" format="2">
-  <advance width="644"/>
+  <advance width="649"/>
   <unicode hex="2202"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Bold.ufo/glyphs/percent.glif b/src/Cantarell-Bold.ufo/glyphs/percent.glif
index 56b76013..67c927d0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/percent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/percent.glif
@@ -1,69 +1,75 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="percent" format="2">
-  <advance width="1022"/>
+  <advance width="1038"/>
   <unicode hex="0025"/>
   <outline>
     <contour>
-      <point x="241" y="0" type="line"/>
-      <point x="394" y="0" type="line"/>
-      <point x="791" y="694" type="line"/>
-      <point x="621" y="694" type="line"/>
+      <point x="249" y="0" type="line"/>
+      <point x="402" y="0" type="line"/>
+      <point x="799" y="694" type="line"/>
+      <point x="629" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="226" y="259" type="curve" smooth="yes"/>
-      <point x="348" y="259"/>
-      <point x="426" y="346"/>
-      <point x="426" y="486" type="curve" smooth="yes"/>
-      <point x="426" y="621"/>
-      <point x="350" y="704"/>
-      <point x="231" y="704" type="curve" smooth="yes"/>
-      <point x="109" y="704"/>
-      <point x="31" y="618"/>
-      <point x="31" y="479" type="curve" smooth="yes"/>
-      <point x="31" y="343"/>
-      <point x="107" y="259"/>
+      <point x="234" y="259" type="curve" smooth="yes"/>
+      <point x="356" y="259"/>
+      <point x="434" y="346"/>
+      <point x="434" y="486" type="curve" smooth="yes"/>
+      <point x="434" y="621"/>
+      <point x="358" y="704"/>
+      <point x="239" y="704" type="curve" smooth="yes"/>
+      <point x="117" y="704"/>
+      <point x="39" y="618"/>
+      <point x="39" y="479" type="curve" smooth="yes"/>
+      <point x="39" y="343"/>
+      <point x="115" y="259"/>
     </contour>
     <contour>
-      <point x="230" y="377" type="curve" smooth="yes"/>
-      <point x="193" y="377"/>
-      <point x="173" y="418"/>
-      <point x="173" y="486" type="curve" smooth="yes"/>
-      <point x="173" y="549"/>
-      <point x="193" y="585"/>
-      <point x="227" y="585" type="curve" smooth="yes"/>
-      <point x="262" y="585"/>
-      <point x="284" y="546"/>
-      <point x="284" y="479" type="curve" smooth="yes"/>
-      <point x="284" y="414"/>
-      <point x="264" y="377"/>
+      <point x="238" y="377" type="curve" smooth="yes"/>
+      <point x="201" y="377"/>
+      <point x="181" y="418"/>
+      <point x="181" y="486" type="curve" smooth="yes"/>
+      <point x="181" y="549"/>
+      <point x="201" y="585"/>
+      <point x="235" y="585" type="curve" smooth="yes"/>
+      <point x="270" y="585"/>
+      <point x="292" y="546"/>
+      <point x="292" y="479" type="curve" smooth="yes"/>
+      <point x="292" y="414"/>
+      <point x="272" y="377"/>
     </contour>
     <contour>
-      <point x="791" y="-6" type="curve" smooth="yes"/>
-      <point x="913" y="-6"/>
-      <point x="991" y="81"/>
-      <point x="991" y="221" type="curve" smooth="yes"/>
-      <point x="991" y="356"/>
-      <point x="915" y="439"/>
-      <point x="796" y="439" type="curve" smooth="yes"/>
-      <point x="674" y="439"/>
-      <point x="596" y="353"/>
-      <point x="596" y="214" type="curve" smooth="yes"/>
-      <point x="596" y="78"/>
-      <point x="672" y="-6"/>
+      <point x="799" y="-6" type="curve" smooth="yes"/>
+      <point x="921" y="-6"/>
+      <point x="999" y="81"/>
+      <point x="999" y="221" type="curve" smooth="yes"/>
+      <point x="999" y="356"/>
+      <point x="923" y="439"/>
+      <point x="804" y="439" type="curve" smooth="yes"/>
+      <point x="682" y="439"/>
+      <point x="604" y="353"/>
+      <point x="604" y="214" type="curve" smooth="yes"/>
+      <point x="604" y="78"/>
+      <point x="680" y="-6"/>
     </contour>
     <contour>
-      <point x="795" y="112" type="curve" smooth="yes"/>
-      <point x="758" y="112"/>
-      <point x="738" y="153"/>
-      <point x="738" y="221" type="curve" smooth="yes"/>
-      <point x="738" y="284"/>
-      <point x="758" y="320"/>
-      <point x="792" y="320" type="curve" smooth="yes"/>
-      <point x="827" y="320"/>
-      <point x="849" y="281"/>
-      <point x="849" y="214" type="curve" smooth="yes"/>
-      <point x="849" y="149"/>
-      <point x="829" y="112"/>
+      <point x="803" y="112" type="curve" smooth="yes"/>
+      <point x="766" y="112"/>
+      <point x="746" y="153"/>
+      <point x="746" y="221" type="curve" smooth="yes"/>
+      <point x="746" y="284"/>
+      <point x="766" y="320"/>
+      <point x="800" y="320" type="curve" smooth="yes"/>
+      <point x="835" y="320"/>
+      <point x="857" y="281"/>
+      <point x="857" y="214" type="curve" smooth="yes"/>
+      <point x="857" y="149"/>
+      <point x="837" y="112"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/perthousand.glif b/src/Cantarell-Bold.ufo/glyphs/perthousand.glif
index 31cb2d18..aace2694 100644
--- a/src/Cantarell-Bold.ufo/glyphs/perthousand.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/perthousand.glif
@@ -1,97 +1,97 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="perthousand" format="2">
-  <advance width="1451"/>
+  <advance width="1467"/>
   <unicode hex="2030"/>
   <outline>
     <contour>
-      <point x="241" y="0" type="line"/>
-      <point x="394" y="0" type="line"/>
-      <point x="791" y="694" type="line"/>
-      <point x="621" y="694" type="line"/>
+      <point x="249" y="0" type="line"/>
+      <point x="402" y="0" type="line"/>
+      <point x="799" y="694" type="line"/>
+      <point x="629" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="226" y="259" type="curve" smooth="yes"/>
-      <point x="348" y="259"/>
-      <point x="426" y="346"/>
-      <point x="426" y="486" type="curve" smooth="yes"/>
-      <point x="426" y="621"/>
-      <point x="350" y="704"/>
-      <point x="231" y="704" type="curve" smooth="yes"/>
-      <point x="109" y="704"/>
-      <point x="31" y="618"/>
-      <point x="31" y="479" type="curve" smooth="yes"/>
-      <point x="31" y="343"/>
-      <point x="107" y="259"/>
+      <point x="234" y="259" type="curve" smooth="yes"/>
+      <point x="356" y="259"/>
+      <point x="434" y="346"/>
+      <point x="434" y="486" type="curve" smooth="yes"/>
+      <point x="434" y="621"/>
+      <point x="358" y="704"/>
+      <point x="239" y="704" type="curve" smooth="yes"/>
+      <point x="117" y="704"/>
+      <point x="39" y="618"/>
+      <point x="39" y="479" type="curve" smooth="yes"/>
+      <point x="39" y="343"/>
+      <point x="115" y="259"/>
     </contour>
     <contour>
-      <point x="230" y="377" type="curve" smooth="yes"/>
-      <point x="193" y="377"/>
-      <point x="173" y="418"/>
-      <point x="173" y="486" type="curve" smooth="yes"/>
-      <point x="173" y="549"/>
-      <point x="193" y="585"/>
-      <point x="227" y="585" type="curve" smooth="yes"/>
-      <point x="262" y="585"/>
-      <point x="284" y="546"/>
-      <point x="284" y="479" type="curve" smooth="yes"/>
-      <point x="284" y="414"/>
-      <point x="264" y="377"/>
+      <point x="238" y="377" type="curve" smooth="yes"/>
+      <point x="201" y="377"/>
+      <point x="181" y="418"/>
+      <point x="181" y="486" type="curve" smooth="yes"/>
+      <point x="181" y="549"/>
+      <point x="201" y="585"/>
+      <point x="235" y="585" type="curve" smooth="yes"/>
+      <point x="270" y="585"/>
+      <point x="292" y="546"/>
+      <point x="292" y="479" type="curve" smooth="yes"/>
+      <point x="292" y="414"/>
+      <point x="272" y="377"/>
     </contour>
     <contour>
-      <point x="791" y="-6" type="curve" smooth="yes"/>
-      <point x="913" y="-6"/>
-      <point x="991" y="81"/>
-      <point x="991" y="221" type="curve" smooth="yes"/>
-      <point x="991" y="356"/>
-      <point x="915" y="439"/>
-      <point x="796" y="439" type="curve" smooth="yes"/>
-      <point x="674" y="439"/>
-      <point x="596" y="353"/>
-      <point x="596" y="214" type="curve" smooth="yes"/>
-      <point x="596" y="78"/>
-      <point x="672" y="-6"/>
+      <point x="799" y="-6" type="curve" smooth="yes"/>
+      <point x="921" y="-6"/>
+      <point x="999" y="81"/>
+      <point x="999" y="221" type="curve" smooth="yes"/>
+      <point x="999" y="356"/>
+      <point x="923" y="439"/>
+      <point x="804" y="439" type="curve" smooth="yes"/>
+      <point x="682" y="439"/>
+      <point x="604" y="353"/>
+      <point x="604" y="214" type="curve" smooth="yes"/>
+      <point x="604" y="78"/>
+      <point x="680" y="-6"/>
     </contour>
     <contour>
-      <point x="795" y="112" type="curve" smooth="yes"/>
-      <point x="758" y="112"/>
-      <point x="738" y="153"/>
-      <point x="738" y="221" type="curve" smooth="yes"/>
-      <point x="738" y="284"/>
-      <point x="758" y="320"/>
-      <point x="792" y="320" type="curve" smooth="yes"/>
-      <point x="827" y="320"/>
-      <point x="849" y="281"/>
-      <point x="849" y="214" type="curve" smooth="yes"/>
-      <point x="849" y="149"/>
-      <point x="829" y="112"/>
+      <point x="803" y="112" type="curve" smooth="yes"/>
+      <point x="766" y="112"/>
+      <point x="746" y="153"/>
+      <point x="746" y="221" type="curve" smooth="yes"/>
+      <point x="746" y="284"/>
+      <point x="766" y="320"/>
+      <point x="800" y="320" type="curve" smooth="yes"/>
+      <point x="835" y="320"/>
+      <point x="857" y="281"/>
+      <point x="857" y="214" type="curve" smooth="yes"/>
+      <point x="857" y="149"/>
+      <point x="837" y="112"/>
     </contour>
     <contour>
-      <point x="1220" y="-6" type="curve" smooth="yes"/>
-      <point x="1342" y="-6"/>
-      <point x="1420" y="81"/>
-      <point x="1420" y="221" type="curve" smooth="yes"/>
-      <point x="1420" y="356"/>
-      <point x="1344" y="439"/>
-      <point x="1225" y="439" type="curve" smooth="yes"/>
-      <point x="1103" y="439"/>
-      <point x="1025" y="353"/>
-      <point x="1025" y="214" type="curve" smooth="yes"/>
-      <point x="1025" y="78"/>
-      <point x="1101" y="-6"/>
+      <point x="1228" y="-6" type="curve" smooth="yes"/>
+      <point x="1350" y="-6"/>
+      <point x="1428" y="81"/>
+      <point x="1428" y="221" type="curve" smooth="yes"/>
+      <point x="1428" y="356"/>
+      <point x="1352" y="439"/>
+      <point x="1233" y="439" type="curve" smooth="yes"/>
+      <point x="1111" y="439"/>
+      <point x="1033" y="353"/>
+      <point x="1033" y="214" type="curve" smooth="yes"/>
+      <point x="1033" y="78"/>
+      <point x="1109" y="-6"/>
     </contour>
     <contour>
-      <point x="1224" y="112" type="curve" smooth="yes"/>
-      <point x="1187" y="112"/>
-      <point x="1167" y="153"/>
-      <point x="1167" y="221" type="curve" smooth="yes"/>
-      <point x="1167" y="284"/>
-      <point x="1187" y="320"/>
-      <point x="1221" y="320" type="curve" smooth="yes"/>
-      <point x="1256" y="320"/>
-      <point x="1278" y="281"/>
-      <point x="1278" y="214" type="curve" smooth="yes"/>
-      <point x="1278" y="149"/>
-      <point x="1258" y="112"/>
+      <point x="1232" y="112" type="curve" smooth="yes"/>
+      <point x="1195" y="112"/>
+      <point x="1175" y="153"/>
+      <point x="1175" y="221" type="curve" smooth="yes"/>
+      <point x="1175" y="284"/>
+      <point x="1195" y="320"/>
+      <point x="1229" y="320" type="curve" smooth="yes"/>
+      <point x="1264" y="320"/>
+      <point x="1286" y="281"/>
+      <point x="1286" y="214" type="curve" smooth="yes"/>
+      <point x="1286" y="149"/>
+      <point x="1266" y="112"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/radical.glif b/src/Cantarell-Bold.ufo/glyphs/radical.glif
index 73ba2069..ed98305b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/radical.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/radical.glif
@@ -1,18 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="radical" format="2">
-  <advance width="611"/>
+  <advance width="618"/>
   <unicode hex="221A"/>
   <outline>
     <contour>
-      <point x="285" y="-59" type="line"/>
-      <point x="435" y="-59" type="line"/>
-      <point x="595" y="739" type="line"/>
-      <point x="425" y="739" type="line"/>
-      <point x="328" y="190" type="line"/>
-      <point x="271" y="343" type="line"/>
-      <point x="36" y="343" type="line"/>
-      <point x="36" y="193" type="line"/>
-      <point x="178" y="193" type="line"/>
+      <point x="279" y="-59" type="line"/>
+      <point x="429" y="-59" type="line"/>
+      <point x="589" y="739" type="line"/>
+      <point x="419" y="739" type="line"/>
+      <point x="322" y="190" type="line"/>
+      <point x="265" y="343" type="line"/>
+      <point x="30" y="343" type="line"/>
+      <point x="30" y="193" type="line"/>
+      <point x="172" y="193" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ratio.glif b/src/Cantarell-Bold.ufo/glyphs/ratio.glif
index 277873c6..f27841df 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ratio.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ratio.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ratio" format="2">
-  <advance width="323"/>
+  <advance width="286"/>
   <unicode hex="2236"/>
   <outline>
-    <component base="colon" xOffset="26" yOffset="100"/>
+    <component base="colon" yOffset="100"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>colon</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>colon</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/registered.glif b/src/Cantarell-Bold.ufo/glyphs/registered.glif
index fedbc1c1..a518a699 100644
--- a/src/Cantarell-Bold.ufo/glyphs/registered.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/registered.glif
@@ -1,67 +1,73 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="registered" format="2">
-  <advance width="597"/>
+  <advance width="621"/>
   <unicode hex="00AE"/>
   <outline>
     <contour>
-      <point x="296" y="266" type="curve" smooth="yes"/>
-      <point x="450" y="266"/>
-      <point x="553" y="365"/>
-      <point x="553" y="515" type="curve" smooth="yes"/>
-      <point x="553" y="663"/>
-      <point x="452" y="762"/>
-      <point x="301" y="762" type="curve" smooth="yes"/>
-      <point x="147" y="762"/>
-      <point x="44" y="661"/>
-      <point x="44" y="510" type="curve" smooth="yes"/>
-      <point x="44" y="363"/>
-      <point x="145" y="266"/>
+      <point x="308" y="266" type="curve" smooth="yes"/>
+      <point x="462" y="266"/>
+      <point x="565" y="365"/>
+      <point x="565" y="515" type="curve" smooth="yes"/>
+      <point x="565" y="663"/>
+      <point x="464" y="762"/>
+      <point x="313" y="762" type="curve" smooth="yes"/>
+      <point x="159" y="762"/>
+      <point x="56" y="661"/>
+      <point x="56" y="510" type="curve" smooth="yes"/>
+      <point x="56" y="363"/>
+      <point x="157" y="266"/>
     </contour>
     <contour>
-      <point x="302" y="336" type="curve" smooth="yes"/>
-      <point x="191" y="336"/>
-      <point x="115" y="408"/>
-      <point x="115" y="516" type="curve" smooth="yes"/>
-      <point x="115" y="622"/>
-      <point x="188" y="692"/>
-      <point x="296" y="692" type="curve" smooth="yes"/>
-      <point x="407" y="692"/>
-      <point x="482" y="620"/>
-      <point x="482" y="510" type="curve" smooth="yes"/>
-      <point x="482" y="405"/>
-      <point x="409" y="336"/>
+      <point x="314" y="336" type="curve" smooth="yes"/>
+      <point x="203" y="336"/>
+      <point x="127" y="408"/>
+      <point x="127" y="516" type="curve" smooth="yes"/>
+      <point x="127" y="622"/>
+      <point x="200" y="692"/>
+      <point x="308" y="692" type="curve" smooth="yes"/>
+      <point x="419" y="692"/>
+      <point x="494" y="620"/>
+      <point x="494" y="510" type="curve" smooth="yes"/>
+      <point x="494" y="405"/>
+      <point x="421" y="336"/>
     </contour>
     <contour>
-      <point x="190" y="380" type="line"/>
-      <point x="273" y="380" type="line"/>
-      <point x="273" y="658" type="line"/>
-      <point x="190" y="658" type="line"/>
+      <point x="202" y="380" type="line"/>
+      <point x="285" y="380" type="line"/>
+      <point x="285" y="658" type="line"/>
+      <point x="202" y="658" type="line"/>
     </contour>
     <contour>
-      <point x="245" y="471" type="line"/>
-      <point x="306" y="471" type="line" smooth="yes"/>
-      <point x="371" y="471"/>
-      <point x="415" y="513"/>
-      <point x="415" y="570" type="curve" smooth="yes"/>
-      <point x="415" y="625"/>
-      <point x="374" y="658"/>
-      <point x="313" y="658" type="curve" smooth="yes"/>
-      <point x="245" y="658" type="line"/>
-      <point x="245" y="586" type="line"/>
-      <point x="306" y="586" type="line" smooth="yes"/>
-      <point x="321" y="586"/>
-      <point x="331" y="577"/>
-      <point x="331" y="563" type="curve" smooth="yes"/>
-      <point x="331" y="550"/>
-      <point x="323" y="540"/>
-      <point x="312" y="540" type="curve" smooth="yes"/>
-      <point x="245" y="540" type="line"/>
+      <point x="257" y="471" type="line"/>
+      <point x="318" y="471" type="line" smooth="yes"/>
+      <point x="383" y="471"/>
+      <point x="427" y="513"/>
+      <point x="427" y="570" type="curve" smooth="yes"/>
+      <point x="427" y="625"/>
+      <point x="386" y="658"/>
+      <point x="325" y="658" type="curve" smooth="yes"/>
+      <point x="257" y="658" type="line"/>
+      <point x="257" y="586" type="line"/>
+      <point x="318" y="586" type="line" smooth="yes"/>
+      <point x="333" y="586"/>
+      <point x="343" y="577"/>
+      <point x="343" y="563" type="curve" smooth="yes"/>
+      <point x="343" y="550"/>
+      <point x="335" y="540"/>
+      <point x="324" y="540" type="curve" smooth="yes"/>
+      <point x="257" y="540" type="line"/>
     </contour>
     <contour>
-      <point x="341" y="380" type="line"/>
-      <point x="438" y="380" type="line"/>
-      <point x="357" y="516" type="line"/>
-      <point x="263" y="516" type="line"/>
+      <point x="353" y="380" type="line"/>
+      <point x="450" y="380" type="line"/>
+      <point x="369" y="516" type="line"/>
+      <point x="275" y="516" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/rightA_rrow.glif b/src/Cantarell-Bold.ufo/glyphs/rightA_rrow.glif
index 316a0eca..1be3b576 100644
--- a/src/Cantarell-Bold.ufo/glyphs/rightA_rrow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/rightA_rrow.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rightArrow" format="2">
-  <advance width="646"/>
+  <advance width="672"/>
   <unicode hex="2192"/>
   <note>
 arrowright
 </note>
   <outline>
     <contour>
-      <point x="315" y="7" type="line"/>
-      <point x="633" y="311" type="line"/>
-      <point x="633" y="320" type="line"/>
-      <point x="322" y="620" type="line"/>
-      <point x="207" y="510" type="line"/>
-      <point x="373" y="385" type="line"/>
-      <point x="29" y="389" type="line"/>
-      <point x="29" y="239" type="line"/>
-      <point x="373" y="242" type="line"/>
-      <point x="211" y="115" type="line"/>
+      <point x="329" y="7" type="line"/>
+      <point x="647" y="311" type="line"/>
+      <point x="647" y="320" type="line"/>
+      <point x="336" y="620" type="line"/>
+      <point x="221" y="510" type="line"/>
+      <point x="387" y="385" type="line"/>
+      <point x="43" y="389" type="line"/>
+      <point x="43" y="239" type="line"/>
+      <point x="387" y="242" type="line"/>
+      <point x="225" y="115" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/saltillo.glif b/src/Cantarell-Bold.ufo/glyphs/saltillo.glif
index d0e37101..cd28ef81 100644
--- a/src/Cantarell-Bold.ufo/glyphs/saltillo.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/saltillo.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="saltillo" format="2">
-  <advance width="177"/>
+  <advance width="307"/>
   <unicode hex="A78C"/>
   <outline>
-    <component base="quotesingle" yScale="1.40024" xOffset="-51" yOffset="-278"/>
+    <component base="quotesingle" yScale="1.40024" xOffset="11" yOffset="-278"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/second.glif b/src/Cantarell-Bold.ufo/glyphs/second.glif
index dafa36d3..ef27b6d0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/second.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/second.glif
@@ -1,12 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="second" format="2">
-  <advance width="553"/>
+  <advance width="577"/>
   <unicode hex="2033"/>
   <note>
 second
 </note>
   <outline>
-    <component base="quotesingle" yxScale="0.19201" xOffset="-84"/>
-    <component base="quotesingle" yxScale="0.19201" xOffset="146"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="-76"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="154"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minute</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>minute</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/section.glif b/src/Cantarell-Bold.ufo/glyphs/section.glif
index f5a4b17c..e830356e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/section.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/section.glif
@@ -1,63 +1,63 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="section" format="2">
-  <advance width="539"/>
+  <advance width="561"/>
   <unicode hex="00A7"/>
   <outline>
     <contour>
-      <point x="252" y="-61" type="curve" smooth="yes"/>
-      <point x="407" y="-61"/>
-      <point x="489" y="1"/>
-      <point x="489" y="115" type="curve" smooth="yes"/>
-      <point x="489" y="322"/>
-      <point x="227" y="250"/>
-      <point x="227" y="325" type="curve" smooth="yes"/>
-      <point x="227" y="349"/>
-      <point x="251" y="370"/>
-      <point x="281" y="370" type="curve"/>
-      <point x="301" y="453" type="line"/>
-      <point x="148" y="453"/>
-      <point x="58" y="394"/>
-      <point x="58" y="294" type="curve" smooth="yes"/>
-      <point x="58" y="118"/>
-      <point x="320" y="170"/>
-      <point x="320" y="104" type="curve" smooth="yes"/>
-      <point x="320" y="84"/>
-      <point x="296" y="73"/>
-      <point x="252" y="73" type="curve" smooth="yes"/>
-      <point x="202" y="73"/>
-      <point x="141" y="85"/>
-      <point x="88" y="106" type="curve"/>
-      <point x="51" y="-23" type="line"/>
-      <point x="105" y="-47"/>
-      <point x="183" y="-61"/>
+      <point x="263" y="-61" type="curve" smooth="yes"/>
+      <point x="418" y="-61"/>
+      <point x="500" y="1"/>
+      <point x="500" y="115" type="curve" smooth="yes"/>
+      <point x="500" y="322"/>
+      <point x="238" y="250"/>
+      <point x="238" y="325" type="curve" smooth="yes"/>
+      <point x="238" y="349"/>
+      <point x="262" y="370"/>
+      <point x="292" y="370" type="curve"/>
+      <point x="312" y="453" type="line"/>
+      <point x="159" y="453"/>
+      <point x="69" y="394"/>
+      <point x="69" y="294" type="curve" smooth="yes"/>
+      <point x="69" y="118"/>
+      <point x="331" y="170"/>
+      <point x="331" y="104" type="curve" smooth="yes"/>
+      <point x="331" y="84"/>
+      <point x="307" y="73"/>
+      <point x="263" y="73" type="curve" smooth="yes"/>
+      <point x="213" y="73"/>
+      <point x="152" y="85"/>
+      <point x="99" y="106" type="curve"/>
+      <point x="62" y="-23" type="line"/>
+      <point x="116" y="-47"/>
+      <point x="194" y="-61"/>
     </contour>
     <contour>
-      <point x="251" y="199" type="line"/>
-      <point x="404" y="199"/>
-      <point x="489" y="254"/>
-      <point x="489" y="350" type="curve" smooth="yes"/>
-      <point x="489" y="522"/>
-      <point x="227" y="483"/>
-      <point x="227" y="540" type="curve" smooth="yes"/>
-      <point x="227" y="558"/>
-      <point x="253" y="570"/>
-      <point x="291" y="570" type="curve" smooth="yes"/>
-      <point x="333" y="570"/>
-      <point x="383" y="561"/>
-      <point x="430" y="547" type="curve"/>
-      <point x="467" y="676" type="line"/>
-      <point x="413" y="694"/>
-      <point x="356" y="704"/>
-      <point x="301" y="704" type="curve" smooth="yes"/>
-      <point x="148" y="704"/>
-      <point x="58" y="636"/>
-      <point x="58" y="523" type="curve" smooth="yes"/>
-      <point x="58" y="325"/>
-      <point x="320" y="399"/>
-      <point x="320" y="319" type="curve" smooth="yes"/>
-      <point x="320" y="293"/>
-      <point x="295" y="274"/>
-      <point x="262" y="274" type="curve"/>
+      <point x="262" y="199" type="line"/>
+      <point x="415" y="199"/>
+      <point x="500" y="254"/>
+      <point x="500" y="350" type="curve" smooth="yes"/>
+      <point x="500" y="522"/>
+      <point x="238" y="483"/>
+      <point x="238" y="540" type="curve" smooth="yes"/>
+      <point x="238" y="558"/>
+      <point x="264" y="570"/>
+      <point x="302" y="570" type="curve" smooth="yes"/>
+      <point x="344" y="570"/>
+      <point x="394" y="561"/>
+      <point x="441" y="547" type="curve"/>
+      <point x="478" y="676" type="line"/>
+      <point x="424" y="694"/>
+      <point x="367" y="704"/>
+      <point x="312" y="704" type="curve" smooth="yes"/>
+      <point x="159" y="704"/>
+      <point x="69" y="636"/>
+      <point x="69" y="523" type="curve" smooth="yes"/>
+      <point x="69" y="325"/>
+      <point x="331" y="399"/>
+      <point x="331" y="319" type="curve" smooth="yes"/>
+      <point x="331" y="293"/>
+      <point x="306" y="274"/>
+      <point x="273" y="274" type="curve"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/sha-cy.glif b/src/Cantarell-Bold.ufo/glyphs/sha-cy.glif
index 8b681572..61e2a0ef 100644
--- a/src/Cantarell-Bold.ufo/glyphs/sha-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/sha-cy.glif
@@ -2,6 +2,7 @@
 <glyph name="sha-cy" format="2">
   <advance width="870"/>
   <unicode hex="0448"/>
+  <anchor x="728" y="0" name="bottomright"/>
   <outline>
     <contour>
       <point x="62" y="0" type="line"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/shcha-cy.glif b/src/Cantarell-Bold.ufo/glyphs/shcha-cy.glif
index 0e07e20c..5bbd2893 100644
--- a/src/Cantarell-Bold.ufo/glyphs/shcha-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/shcha-cy.glif
@@ -1,30 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="shcha-cy" format="2">
-  <advance width="897"/>
+  <advance width="895"/>
   <unicode hex="0449"/>
   <outline>
-    <contour>
-      <point x="730" y="-135" type="line"/>
-      <point x="886" y="-135" type="line"/>
-      <point x="886" y="133" type="line"/>
-      <point x="222" y="133" type="line"/>
-      <point x="222" y="490" type="line"/>
-      <point x="62" y="490" type="line"/>
-      <point x="62" y="0" type="line"/>
-      <point x="730" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="355" y="68" type="line"/>
-      <point x="515" y="68" type="line"/>
-      <point x="515" y="490" type="line"/>
-      <point x="355" y="490" type="line"/>
-    </contour>
-    <contour>
-      <point x="651" y="68" type="line"/>
-      <point x="810" y="68" type="line"/>
-      <point x="810" y="490" type="line"/>
-      <point x="651" y="490" type="line"/>
-    </contour>
+    <component base="sha-cy"/>
+    <component base="descender-cy" xOffset="632"/>
   </outline>
   <lib>
     <dict>
@@ -41,6 +21,11 @@
       <string>en-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>tse-cy</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>-1</integer>
+        <integer>0</integer>
+      </array>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/trademark.glif b/src/Cantarell-Bold.ufo/glyphs/trademark.glif
index a7622767..a7126af9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/trademark.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/trademark.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="trademark" format="2">
-  <advance width="743"/>
+  <advance width="767"/>
   <unicode hex="2122"/>
   <outline>
     <contour>
-      <point x="122" y="382" type="line"/>
-      <point x="214" y="382" type="line"/>
-      <point x="214" y="658" type="line"/>
-      <point x="122" y="658" type="line"/>
+      <point x="134" y="382" type="line"/>
+      <point x="226" y="382" type="line"/>
+      <point x="226" y="658" type="line"/>
+      <point x="134" y="658" type="line"/>
     </contour>
     <contour>
-      <point x="31" y="613" type="line"/>
-      <point x="306" y="613" type="line"/>
-      <point x="306" y="694" type="line"/>
-      <point x="31" y="694" type="line"/>
+      <point x="43" y="613" type="line"/>
+      <point x="318" y="613" type="line"/>
+      <point x="318" y="694" type="line"/>
+      <point x="43" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="325" y="382" type="line"/>
-      <point x="402" y="382" type="line"/>
-      <point x="402" y="574" type="line"/>
-      <point x="388" y="572" type="line"/>
-      <point x="470" y="430" type="line"/>
-      <point x="522" y="430" type="line"/>
-      <point x="600" y="573" type="line"/>
-      <point x="587" y="574" type="line"/>
-      <point x="587" y="382" type="line"/>
-      <point x="663" y="382" type="line"/>
-      <point x="663" y="694" type="line"/>
-      <point x="586" y="694" type="line"/>
-      <point x="494" y="528" type="line"/>
-      <point x="503" y="528" type="line"/>
-      <point x="408" y="694" type="line"/>
-      <point x="325" y="694" type="line"/>
+      <point x="337" y="382" type="line"/>
+      <point x="414" y="382" type="line"/>
+      <point x="414" y="574" type="line"/>
+      <point x="400" y="572" type="line"/>
+      <point x="482" y="430" type="line"/>
+      <point x="534" y="430" type="line"/>
+      <point x="612" y="573" type="line"/>
+      <point x="599" y="574" type="line"/>
+      <point x="599" y="382" type="line"/>
+      <point x="675" y="382" type="line"/>
+      <point x="675" y="694" type="line"/>
+      <point x="598" y="694" type="line"/>
+      <point x="506" y="528" type="line"/>
+      <point x="515" y="528" type="line"/>
+      <point x="420" y="694" type="line"/>
+      <point x="337" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upA_rrow.glif b/src/Cantarell-Bold.ufo/glyphs/upA_rrow.glif
index dc1b66b5..aeb6cb59 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upA_rrow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upA_rrow.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upArrow" format="2">
-  <advance width="619"/>
+  <advance width="643"/>
   <unicode hex="2191"/>
   <note>
 arrowup
 </note>
   <outline>
     <contour>
-      <point x="228" y="40" type="line"/>
-      <point x="388" y="40" type="line"/>
-      <point x="381" y="331" type="line"/>
-      <point x="500" y="202" type="line"/>
-      <point x="606" y="309" type="line"/>
-      <point x="310" y="608" type="line"/>
-      <point x="306" y="608" type="line"/>
-      <point x="13" y="309" type="line"/>
-      <point x="119" y="205" type="line"/>
-      <point x="236" y="336" type="line"/>
+      <point x="240" y="40" type="line"/>
+      <point x="400" y="40" type="line"/>
+      <point x="393" y="331" type="line"/>
+      <point x="512" y="202" type="line"/>
+      <point x="618" y="309" type="line"/>
+      <point x="322" y="608" type="line"/>
+      <point x="318" y="608" type="line"/>
+      <point x="25" y="309" type="line"/>
+      <point x="131" y="205" type="line"/>
+      <point x="248" y="336" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/whiteC_ircle.glif b/src/Cantarell-Bold.ufo/glyphs/whiteC_ircle.glif
index a62d1e7a..04e3fcdb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/whiteC_ircle.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/whiteC_ircle.glif
@@ -1,38 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="whiteCircle" format="2">
-  <advance width="592"/>
+  <advance width="614"/>
   <unicode hex="25CB"/>
   <note>
 circle
 </note>
   <outline>
     <contour>
-      <point x="293" y="114" type="curve" smooth="yes"/>
-      <point x="452" y="114"/>
-      <point x="546" y="201"/>
-      <point x="546" y="347" type="curve" smooth="yes"/>
-      <point x="546" y="493"/>
-      <point x="455" y="580"/>
-      <point x="300" y="580" type="curve" smooth="yes"/>
-      <point x="140" y="580"/>
-      <point x="46" y="492"/>
-      <point x="46" y="344" type="curve" smooth="yes"/>
-      <point x="46" y="199"/>
-      <point x="138" y="114"/>
+      <point x="304" y="114" type="curve" smooth="yes"/>
+      <point x="463" y="114"/>
+      <point x="557" y="201"/>
+      <point x="557" y="347" type="curve" smooth="yes"/>
+      <point x="557" y="493"/>
+      <point x="466" y="580"/>
+      <point x="311" y="580" type="curve" smooth="yes"/>
+      <point x="151" y="580"/>
+      <point x="57" y="492"/>
+      <point x="57" y="344" type="curve" smooth="yes"/>
+      <point x="57" y="199"/>
+      <point x="149" y="114"/>
     </contour>
     <contour>
-      <point x="301" y="246" type="curve" smooth="yes"/>
-      <point x="240" y="246"/>
-      <point x="199" y="287"/>
-      <point x="199" y="349" type="curve" smooth="yes"/>
-      <point x="199" y="408"/>
-      <point x="237" y="448"/>
-      <point x="293" y="448" type="curve" smooth="yes"/>
-      <point x="353" y="448"/>
-      <point x="393" y="407"/>
-      <point x="393" y="345" type="curve" smooth="yes"/>
-      <point x="393" y="286"/>
-      <point x="356" y="246"/>
+      <point x="312" y="246" type="curve" smooth="yes"/>
+      <point x="251" y="246"/>
+      <point x="210" y="287"/>
+      <point x="210" y="349" type="curve" smooth="yes"/>
+      <point x="210" y="408"/>
+      <point x="248" y="448"/>
+      <point x="304" y="448" type="curve" smooth="yes"/>
+      <point x="364" y="448"/>
+      <point x="404" y="407"/>
+      <point x="404" y="345" type="curve" smooth="yes"/>
+      <point x="404" y="286"/>
+      <point x="367" y="246"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>blackCircle</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>blackCircle</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/layercontents.plist b/src/Cantarell-Bold.ufo/layercontents.plist
index b2f6ca9c..00dc8424 100644
--- a/src/Cantarell-Bold.ufo/layercontents.plist
+++ b/src/Cantarell-Bold.ufo/layercontents.plist
@@ -10,6 +10,10 @@
       <string>Template</string>
       <string>glyphs.T_emplate</string>
     </array>
+    <array>
+      <string>Outline</string>
+      <string>glyphs.O_utline</string>
+    </array>
     <array>
       <string>Wavy</string>
       <string>glyphs.W_avy</string>
diff --git a/src/Cantarell-Light.ufo/glyphs.O_utline/S_hcha-cy.glif 
b/src/Cantarell-Light.ufo/glyphs.O_utline/S_hcha-cy.glif
new file mode 100644
index 00000000..249b1807
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.O_utline/S_hcha-cy.glif
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="Shcha-cy" format="2">
+  <advance width="945"/>
+  <unicode hex="0429"/>
+  <outline>
+    <contour>
+      <point x="893" y="-175" type="line"/>
+      <point x="914" y="-175" type="line"/>
+      <point x="914" y="19" type="line"/>
+      <point x="126" y="19" type="line"/>
+      <point x="126" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
+      <point x="104" y="0" type="line"/>
+      <point x="893" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="468" y="10" type="line"/>
+      <point x="490" y="10" type="line"/>
+      <point x="490" y="694" type="line"/>
+      <point x="468" y="694" type="line"/>
+    </contour>
+    <contour>
+      <point x="816" y="10" type="line"/>
+      <point x="838" y="10" type="line"/>
+      <point x="838" y="694" type="line"/>
+      <point x="816" y="694" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Tse-cy</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.O_utline/contents.plist 
b/src/Cantarell-Light.ufo/glyphs.O_utline/contents.plist
new file mode 100644
index 00000000..99caaef1
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.O_utline/contents.plist
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>Shcha-cy</key>
+    <string>S_hcha-cy.glif</string>
+    <key>shcha-cy</key>
+    <string>shcha-cy.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs.O_utline/layerinfo.plist 
b/src/Cantarell-Light.ufo/glyphs.O_utline/layerinfo.plist
new file mode 100644
index 00000000..f0504dd3
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.O_utline/layerinfo.plist
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>DEF37A5E-EF3C-457A-9F90-2A9B95CC11C6</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.Shcha-cy</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.shcha-cy</key>
+      <integer>5</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs.O_utline/shcha-cy.glif 
b/src/Cantarell-Light.ufo/glyphs.O_utline/shcha-cy.glif
new file mode 100644
index 00000000..17c969d1
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.O_utline/shcha-cy.glif
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="shcha-cy" format="2">
+  <advance width="751"/>
+  <unicode hex="0449"/>
+  <outline>
+    <contour>
+      <point x="695" y="-121" type="line"/>
+      <point x="714" y="-121" type="line"/>
+      <point x="714" y="17" type="line"/>
+      <point x="109" y="17" type="line"/>
+      <point x="109" y="480" type="line"/>
+      <point x="88" y="480" type="line"/>
+      <point x="88" y="0" type="line"/>
+      <point x="695" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="365" y="9" type="line"/>
+      <point x="386" y="9" type="line"/>
+      <point x="386" y="480" type="line"/>
+      <point x="365" y="480" type="line"/>
+    </contour>
+    <contour>
+      <point x="631" y="9" type="line"/>
+      <point x="652" y="9" type="line"/>
+      <point x="652" y="480" type="line"/>
+      <point x="631" y="480" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>height</key>
+        <integer>70</integer>
+        <key>width</key>
+        <integer>80</integer>
+      </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>tse-cy</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.T_emplate/florin.glif 
b/src/Cantarell-Light.ufo/glyphs.T_emplate/florin.glif
index 6ca515c5..cbd23436 100644
--- a/src/Cantarell-Light.ufo/glyphs.T_emplate/florin.glif
+++ b/src/Cantarell-Light.ufo/glyphs.T_emplate/florin.glif
@@ -8,6 +8,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>0</integer>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_hekhakassian-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/C_hekhakassian-cy.glif
index c8df35b9..e3150b6c 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_hekhakassian-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_hekhakassian-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04CB"/>
   <outline>
     <component base="Che-cy"/>
-    <component base="_descenderreverse-cy.case" xOffset="412"/>
+    <component base="_descenderreverse-cy.case" xOffset="399"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif
index 0e307e91..a905c552 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kabashkir-cy" format="2">
-  <advance width="796"/>
+  <advance width="714"/>
   <unicode hex="04A0"/>
   <outline>
     <contour>
-      <point x="104" y="676" type="line"/>
-      <point x="318" y="676" type="line"/>
-      <point x="318" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="22" y="676" type="line"/>
+      <point x="236" y="676" type="line"/>
+      <point x="236" y="694" type="line"/>
+      <point x="22" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="743" y="0" type="line"/>
-      <point x="768" y="0" type="line"/>
-      <point x="473" y="364" type="line"/>
-      <point x="473" y="353" type="line"/>
-      <point x="753" y="694" type="line"/>
-      <point x="729" y="694" type="line"/>
-      <point x="454" y="357" type="line"/>
+      <point x="661" y="0" type="line"/>
+      <point x="686" y="0" type="line"/>
+      <point x="391" y="364" type="line"/>
+      <point x="391" y="353" type="line"/>
+      <point x="671" y="694" type="line"/>
+      <point x="647" y="694" type="line"/>
+      <point x="372" y="357" type="line"/>
     </contour>
     <contour>
-      <point x="298" y="0" type="line"/>
-      <point x="318" y="0" type="line"/>
-      <point x="318" y="694" type="line"/>
-      <point x="298" y="694" type="line"/>
+      <point x="216" y="0" type="line"/>
+      <point x="236" y="0" type="line"/>
+      <point x="236" y="694" type="line"/>
+      <point x="216" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="307" y="348" type="line"/>
-      <point x="468" y="348" type="line"/>
-      <point x="468" y="366" type="line"/>
-      <point x="307" y="366" type="line"/>
+      <point x="225" y="348" type="line"/>
+      <point x="386" y="348" type="line"/>
+      <point x="386" y="366" type="line"/>
+      <point x="225" y="366" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>Ge-cy</string>
+      <string>=|Ge-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>Ka-cy</string>
     </dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_ha-cy.glif b/src/Cantarell-Light.ufo/glyphs/S_ha-cy.glif
index 37aa836d..cecce38b 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_ha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_ha-cy.glif
@@ -2,6 +2,7 @@
 <glyph name="Sha-cy" format="2">
   <advance width="942"/>
   <unicode hex="0428"/>
+  <anchor x="858" y="0" name="bottomright"/>
   <outline>
     <contour>
       <point x="104" y="0" type="line"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif b/src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif
index 249b1807..5d82f519 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif
@@ -3,28 +3,8 @@
   <advance width="945"/>
   <unicode hex="0429"/>
   <outline>
-    <contour>
-      <point x="893" y="-175" type="line"/>
-      <point x="914" y="-175" type="line"/>
-      <point x="914" y="19" type="line"/>
-      <point x="126" y="19" type="line"/>
-      <point x="126" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
-      <point x="104" y="0" type="line"/>
-      <point x="893" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="468" y="10" type="line"/>
-      <point x="490" y="10" type="line"/>
-      <point x="490" y="694" type="line"/>
-      <point x="468" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="816" y="10" type="line"/>
-      <point x="838" y="10" type="line"/>
-      <point x="838" y="694" type="line"/>
-      <point x="816" y="694" type="line"/>
-    </contour>
+    <component base="Sha-cy"/>
+    <component base="descender-cy.case" xOffset="762"/>
   </outline>
   <lib>
     <dict>
@@ -32,6 +12,11 @@
       <string>I</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>Tse-cy</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>-1</integer>
+        <integer>0</integer>
+      </array>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_-cy.glif b/src/Cantarell-Light.ufo/glyphs/U_-cy.glif
index 5424c849..548f1f18 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_-cy.glif
@@ -6,8 +6,8 @@
   <outline>
     <contour>
       <point x="168" y="0" type="line"/>
-      <point x="190" y="0" type="line"/>
-      <point x="560" y="694" type="line"/>
+      <point x="191" y="0" type="line"/>
+      <point x="561" y="694" type="line"/>
       <point x="537" y="694" type="line"/>
       <point x="313" y="263" type="line"/>
       <point x="306" y="253" type="line"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif b/src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif
index 4f867983..a53bc317 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif
@@ -4,7 +4,7 @@
   <unicode hex="0462"/>
   <outline>
     <contour>
-      <point x="191" y="0" type="line"/>
+      <point x="192" y="0" type="line"/>
       <point x="405" y="0" type="line" smooth="yes"/>
       <point x="548" y="0"/>
       <point x="633" y="74"/>
@@ -23,7 +23,7 @@
       <point x="416" y="18" type="curve" smooth="yes"/>
       <point x="213" y="18" type="line"/>
       <point x="213" y="694" type="line"/>
-      <point x="191" y="694" type="line"/>
+      <point x="192" y="694" type="line"/>
     </contour>
     <contour>
       <point x="47" y="545" type="line"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/_descenderreverse-cy.case.glif 
b/src/Cantarell-Light.ufo/glyphs/_descenderreverse-cy.case.glif
index e2135177..f97a8f36 100644
--- a/src/Cantarell-Light.ufo/glyphs/_descenderreverse-cy.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/_descenderreverse-cy.case.glif
@@ -1,14 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="_descenderreverse-cy.case" format="2">
   <advance width="241"/>
-  <anchor x="114" y="0" name="_bottomright"/>
+  <anchor x="127" y="0" name="_bottomright"/>
   <outline>
     <contour>
       <point x="10" y="-175" type="line"/>
       <point x="31" y="-175" type="line"/>
       <point x="31" y="0" type="line"/>
-      <point x="70" y="0" type="line"/>
-      <point x="70" y="19" type="line"/>
+      <point x="86" y="0" type="line"/>
+      <point x="86" y="19" type="line"/>
       <point x="10" y="19" type="line"/>
     </contour>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/_descenderreversed-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/_descenderreversed-cy.glif
index c07e0e5c..56dbb7be 100644
--- a/src/Cantarell-Light.ufo/glyphs/_descenderreversed-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/_descenderreversed-cy.glif
@@ -1,15 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="_descenderreversed-cy" format="2">
   <advance width="205"/>
-  <anchor x="150" y="0" name="_bottomright"/>
+  <anchor x="153" y="0" name="_bottomright"/>
   <outline>
     <contour>
       <point x="44" y="-119" type="line"/>
       <point x="64" y="-119" type="line"/>
       <point x="64" y="0" type="line"/>
-      <point x="117" y="0" type="line"/>
-      <point x="117" y="19" type="line"/>
-      <point x="44" y="19" type="line"/>
+      <point x="106" y="0" type="line"/>
+      <point x="106" y="17" type="line"/>
+      <point x="44" y="17" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/chekhakassian-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/chekhakassian-cy.glif
index 5a388dbe..315b8aed 100644
--- a/src/Cantarell-Light.ufo/glyphs/chekhakassian-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/chekhakassian-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04CC"/>
   <outline>
     <component base="che-cy"/>
-    <component base="_descenderreversed-cy" xOffset="274"/>
+    <component base="_descenderreversed-cy" xOffset="271"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/copyright.glif b/src/Cantarell-Light.ufo/glyphs/copyright.glif
index 15facb82..4f7e193d 100644
--- a/src/Cantarell-Light.ufo/glyphs/copyright.glif
+++ b/src/Cantarell-Light.ufo/glyphs/copyright.glif
@@ -60,4 +60,10 @@
       <point x="335" y="134"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/degree.glif b/src/Cantarell-Light.ufo/glyphs/degree.glif
index 9785a935..d1b67602 100644
--- a/src/Cantarell-Light.ufo/glyphs/degree.glif
+++ b/src/Cantarell-Light.ufo/glyphs/degree.glif
@@ -32,4 +32,10 @@
       <point x="314" y="434"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/descender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/descender-cy.glif
index 7ed4f783..15659909 100644
--- a/src/Cantarell-Light.ufo/glyphs/descender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/descender-cy.glif
@@ -6,8 +6,8 @@
     <contour>
       <point x="106" y="-119" type="line"/>
       <point x="127" y="-119" type="line"/>
-      <point x="127" y="19" type="line"/>
-      <point x="65" y="19" type="line"/>
+      <point x="127" y="17" type="line"/>
+      <point x="65" y="17" type="line"/>
       <point x="65" y="0" type="line"/>
       <point x="106" y="0" type="line"/>
     </contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/downA_rrow.glif b/src/Cantarell-Light.ufo/glyphs/downA_rrow.glif
index d502c2f3..41f830db 100644
--- a/src/Cantarell-Light.ufo/glyphs/downA_rrow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/downA_rrow.glif
@@ -6,6 +6,14 @@
 arrowdown
 </note>
   <outline>
-    <component base="upArrow" xScale="-1" yScale="-1" xOffset="652" yOffset="642"/>
+    <component base="upArrow" xScale="-1" yScale="-1" xOffset="640" yOffset="642"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>upArrow</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>upArrow</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/en-cy.glif b/src/Cantarell-Light.ufo/glyphs/en-cy.glif
index 6c089386..b01aed5f 100644
--- a/src/Cantarell-Light.ufo/glyphs/en-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/en-cy.glif
@@ -2,7 +2,7 @@
 <glyph name="en-cy" format="2">
   <advance width="529"/>
   <unicode hex="043D"/>
-  <anchor x="473" y="0" name="bottomright"/>
+  <anchor x="472" y="0" name="bottomright"/>
   <outline>
     <contour>
       <point x="420" y="0" type="line"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/endescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/endescender-cy.glif
index 3cf7d209..a82c0641 100644
--- a/src/Cantarell-Light.ufo/glyphs/endescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/endescender-cy.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="endescender-cy" format="2">
-  <advance width="541"/>
+  <advance width="540"/>
   <unicode hex="04A3"/>
   <outline>
     <component base="en-cy"/>
-    <component base="descender-cy" xOffset="377"/>
+    <component base="descender-cy" xOffset="376"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/ge-cy.glif b/src/Cantarell-Light.ufo/glyphs/ge-cy.glif
index 6f853a7a..665daaa1 100644
--- a/src/Cantarell-Light.ufo/glyphs/ge-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ge-cy.glif
@@ -2,7 +2,7 @@
 <glyph name="ge-cy" format="2">
   <advance width="401"/>
   <unicode hex="0433"/>
-  <anchor x="143" y="0" name="bottomright"/>
+  <anchor x="140" y="0" name="bottomright"/>
   <anchor x="205" y="480" name="top"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/gedescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/gedescender-cy.glif
index 4798302b..10339b04 100644
--- a/src/Cantarell-Light.ufo/glyphs/gedescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gedescender-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04F7"/>
   <outline>
     <component base="ge-cy"/>
-    <component base="descender-cy" xOffset="47"/>
+    <component base="descender-cy" xOffset="44"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/l.ss01.glif b/src/Cantarell-Light.ufo/glyphs/l.ss01.glif
index 1cf997e5..6bb54bbc 100644
--- a/src/Cantarell-Light.ufo/glyphs/l.ss01.glif
+++ b/src/Cantarell-Light.ufo/glyphs/l.ss01.glif
@@ -1,24 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="l.ss01" format="2">
-  <advance width="192"/>
+  <advance width="196"/>
   <note>
 l
 </note>
-  <anchor x="136" y="0" name="bottom"/>
-  <anchor x="119" y="383" name="center"/>
-  <anchor x="238" y="353" name="periodcentered"/>
-  <anchor x="97" y="739" name="top"/>
-  <anchor x="209" y="480" name="topright"/>
+  <anchor x="138" y="0" name="bottom"/>
+  <anchor x="121" y="383" name="center"/>
+  <anchor x="240" y="353" name="periodcentered"/>
+  <anchor x="99" y="739" name="top"/>
+  <anchor x="211" y="480" name="topright"/>
   <outline>
     <contour>
-      <point x="86" y="0" type="line"/>
-      <point x="106" y="0" type="line"/>
-      <point x="106" y="739" type="line"/>
-      <point x="86" y="739" type="line"/>
+      <point x="88" y="0" type="line"/>
+      <point x="108" y="0" type="line"/>
+      <point x="108" y="739" type="line"/>
+      <point x="88" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=|</string>
     </dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/leftA_rrow.glif b/src/Cantarell-Light.ufo/glyphs/leftA_rrow.glif
index 99e3da21..85c215b3 100644
--- a/src/Cantarell-Light.ufo/glyphs/leftA_rrow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/leftA_rrow.glif
@@ -1,11 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="leftArrow" format="2">
-  <advance width="686"/>
+  <advance width="687"/>
   <unicode hex="2190"/>
   <note>
 arrowleft
 </note>
   <outline>
-    <component base="rightArrow" xScale="-1" yScale="-1" xOffset="698" yOffset="643"/>
+    <component base="rightArrow" xScale="-1" yScale="-1" xOffset="687" yOffset="643"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|rightArrow</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|rightArrow</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/lozenge.glif b/src/Cantarell-Light.ufo/glyphs/lozenge.glif
index 44b56dd7..2f065887 100644
--- a/src/Cantarell-Light.ufo/glyphs/lozenge.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lozenge.glif
@@ -18,4 +18,10 @@
       <point x="448" y="356" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/percent.glif b/src/Cantarell-Light.ufo/glyphs/percent.glif
index b3d1074c..b371a42e 100644
--- a/src/Cantarell-Light.ufo/glyphs/percent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/percent.glif
@@ -66,4 +66,10 @@
       <point x="798" y="10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ratio.glif b/src/Cantarell-Light.ufo/glyphs/ratio.glif
index 18194dfd..fe12f01e 100644
--- a/src/Cantarell-Light.ufo/glyphs/ratio.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ratio.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ratio" format="2">
-  <advance width="314"/>
+  <advance width="196"/>
   <unicode hex="2236"/>
   <outline>
-    <component base="colon" xOffset="48" yOffset="100"/>
+    <component base="colon" yOffset="100"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>colon</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>colon</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/registered.glif b/src/Cantarell-Light.ufo/glyphs/registered.glif
index 5e0016d6..9c0d919b 100644
--- a/src/Cantarell-Light.ufo/glyphs/registered.glif
+++ b/src/Cantarell-Light.ufo/glyphs/registered.glif
@@ -64,4 +64,10 @@
       <point x="348" y="509" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/saltillo.glif b/src/Cantarell-Light.ufo/glyphs/saltillo.glif
index dbf9f51d..f4068d8b 100644
--- a/src/Cantarell-Light.ufo/glyphs/saltillo.glif
+++ b/src/Cantarell-Light.ufo/glyphs/saltillo.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="saltillo" format="2">
-  <advance width="115"/>
+  <advance width="200"/>
   <unicode hex="A78C"/>
   <outline>
-    <component base="quotesingle" yScale="1.40024" xOffset="-53" yOffset="-278"/>
+    <component base="quotesingle" yScale="1.40024" xOffset="2" yOffset="-278"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/second.glif b/src/Cantarell-Light.ufo/glyphs/second.glif
index e5ff8d1f..d61994c0 100644
--- a/src/Cantarell-Light.ufo/glyphs/second.glif
+++ b/src/Cantarell-Light.ufo/glyphs/second.glif
@@ -6,7 +6,15 @@
 second
 </note>
   <outline>
-    <component base="quotesingle" yxScale="0.19201" xOffset="-70"/>
-    <component base="quotesingle" yxScale="0.19201" xOffset="110"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="-64"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="116"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minute</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>minute</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sha-cy.glif b/src/Cantarell-Light.ufo/glyphs/sha-cy.glif
index cd74ba83..78ac1d4f 100644
--- a/src/Cantarell-Light.ufo/glyphs/sha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sha-cy.glif
@@ -2,6 +2,7 @@
 <glyph name="sha-cy" format="2">
   <advance width="738"/>
   <unicode hex="0448"/>
+  <anchor x="681" y="0" name="bottomright"/>
   <outline>
     <contour>
       <point x="88" y="0" type="line"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/shcha-cy.glif b/src/Cantarell-Light.ufo/glyphs/shcha-cy.glif
index 17c969d1..5525bda1 100644
--- a/src/Cantarell-Light.ufo/glyphs/shcha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/shcha-cy.glif
@@ -1,30 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="shcha-cy" format="2">
-  <advance width="751"/>
+  <advance width="749"/>
   <unicode hex="0449"/>
   <outline>
-    <contour>
-      <point x="695" y="-121" type="line"/>
-      <point x="714" y="-121" type="line"/>
-      <point x="714" y="17" type="line"/>
-      <point x="109" y="17" type="line"/>
-      <point x="109" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
-      <point x="88" y="0" type="line"/>
-      <point x="695" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="365" y="9" type="line"/>
-      <point x="386" y="9" type="line"/>
-      <point x="386" y="480" type="line"/>
-      <point x="365" y="480" type="line"/>
-    </contour>
-    <contour>
-      <point x="631" y="9" type="line"/>
-      <point x="652" y="9" type="line"/>
-      <point x="652" y="480" type="line"/>
-      <point x="631" y="480" type="line"/>
-    </contour>
+    <component base="sha-cy"/>
+    <component base="descender-cy" xOffset="585"/>
   </outline>
   <lib>
     <dict>
@@ -39,6 +19,11 @@
       <string>en-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>tse-cy</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>-1</integer>
+        <integer>0</integer>
+      </array>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/whiteC_ircle.glif 
b/src/Cantarell-Light.ufo/glyphs/whiteC_ircle.glif
index 7b46f87a..c9bb2d78 100644
--- a/src/Cantarell-Light.ufo/glyphs/whiteC_ircle.glif
+++ b/src/Cantarell-Light.ufo/glyphs/whiteC_ircle.glif
@@ -35,4 +35,12 @@ circle
       <point x="461" y="127"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>blackCircle</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>blackCircle</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/layercontents.plist b/src/Cantarell-Light.ufo/layercontents.plist
index c854887b..b194474c 100644
--- a/src/Cantarell-Light.ufo/layercontents.plist
+++ b/src/Cantarell-Light.ufo/layercontents.plist
@@ -10,6 +10,10 @@
       <string>Template</string>
       <string>glyphs.T_emplate</string>
     </array>
+    <array>
+      <string>Outline</string>
+      <string>glyphs.O_utline</string>
+    </array>
     <array>
       <string>Wavy</string>
       <string>glyphs.W_avy</string>
diff --git a/src/Cantarell-Regular.ufo/glyphs.O_utline/S_hcha-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs.O_utline/S_hcha-cy.glif
new file mode 100644
index 00000000..08e5342c
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.O_utline/S_hcha-cy.glif
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="Shcha-cy" format="2">
+  <advance width="1021"/>
+  <unicode hex="0429"/>
+  <outline>
+    <contour>
+      <point x="917" y="-178" type="line"/>
+      <point x="993" y="-178" type="line"/>
+      <point x="993" y="71" type="line"/>
+      <point x="174" y="71" type="line"/>
+      <point x="174" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="917" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="458" y="30" type="line"/>
+      <point x="540" y="30" type="line"/>
+      <point x="540" y="694" type="line"/>
+      <point x="458" y="694" type="line"/>
+    </contour>
+    <contour>
+      <point x="824" y="30" type="line"/>
+      <point x="906" y="30" type="line"/>
+      <point x="906" y="694" type="line"/>
+      <point x="824" y="694" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>Tse-cy</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.O_utline/contents.plist 
b/src/Cantarell-Regular.ufo/glyphs.O_utline/contents.plist
new file mode 100644
index 00000000..99caaef1
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.O_utline/contents.plist
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>Shcha-cy</key>
+    <string>S_hcha-cy.glif</string>
+    <key>shcha-cy</key>
+    <string>shcha-cy.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.O_utline/layerinfo.plist 
b/src/Cantarell-Regular.ufo/glyphs.O_utline/layerinfo.plist
new file mode 100644
index 00000000..6443fefa
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.O_utline/layerinfo.plist
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>C75345F8-91F9-4FA9-88A3-6EE91922D2A5</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.Shcha-cy</key>
+      <integer>4</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.shcha-cy</key>
+      <integer>3</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.O_utline/shcha-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs.O_utline/shcha-cy.glif
new file mode 100644
index 00000000..0f768059
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.O_utline/shcha-cy.glif
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="shcha-cy" format="2">
+  <advance width="821"/>
+  <unicode hex="0449"/>
+  <outline>
+    <contour>
+      <point x="718" y="-126" type="line"/>
+      <point x="793" y="-126" type="line"/>
+      <point x="793" y="66" type="line"/>
+      <point x="163" y="66" type="line"/>
+      <point x="163" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
+      <point x="83" y="0" type="line"/>
+      <point x="718" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="365" y="32" type="line"/>
+      <point x="444" y="32" type="line"/>
+      <point x="444" y="482" type="line"/>
+      <point x="365" y="482" type="line"/>
+    </contour>
+    <contour>
+      <point x="646" y="32" type="line"/>
+      <point x="726" y="32" type="line"/>
+      <point x="726" y="482" type="line"/>
+      <point x="646" y="482" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>height</key>
+        <integer>70</integer>
+        <key>width</key>
+        <integer>80</integer>
+      </dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>en-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>tse-cy</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.T_emplate/florin.glif 
b/src/Cantarell-Regular.ufo/glyphs.T_emplate/florin.glif
index a653e1f1..ff3aeeda 100644
--- a/src/Cantarell-Regular.ufo/glyphs.T_emplate/florin.glif
+++ b/src/Cantarell-Regular.ufo/glyphs.T_emplate/florin.glif
@@ -8,6 +8,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>0</integer>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_hekhakassian-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/C_hekhakassian-cy.glif
index 5ed092a6..058a0cd8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_hekhakassian-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_hekhakassian-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04CB"/>
   <outline>
     <component base="Che-cy"/>
-    <component base="_descenderreverse-cy.case" xOffset="376"/>
+    <component base="_descenderreverse-cy.case" xOffset="364"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_abashkir-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/K_abashkir-cy.glif
index 4c5342d6..124bc4d3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_abashkir-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_abashkir-cy.glif
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kabashkir-cy" format="2">
-  <advance width="812"/>
+  <advance width="749"/>
   <unicode hex="04A0"/>
   <outline>
     <contour>
-      <point x="92" y="622" type="line"/>
-      <point x="350" y="622" type="line"/>
-      <point x="350" y="694" type="line"/>
-      <point x="92" y="694" type="line"/>
+      <point x="29" y="622" type="line"/>
+      <point x="287" y="622" type="line"/>
+      <point x="287" y="694" type="line"/>
+      <point x="29" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="703" y="0" type="line"/>
-      <point x="798" y="0" type="line"/>
-      <point x="540" y="380" type="line"/>
-      <point x="545" y="358" type="line"/>
-      <point x="785" y="694" type="line"/>
-      <point x="697" y="694" type="line"/>
-      <point x="456" y="361" type="line"/>
+      <point x="640" y="0" type="line"/>
+      <point x="735" y="0" type="line"/>
+      <point x="477" y="380" type="line"/>
+      <point x="482" y="358" type="line"/>
+      <point x="722" y="694" type="line"/>
+      <point x="634" y="694" type="line"/>
+      <point x="393" y="361" type="line"/>
     </contour>
     <contour>
-      <point x="268" y="0" type="line"/>
-      <point x="350" y="0" type="line"/>
-      <point x="350" y="694" type="line"/>
-      <point x="268" y="694" type="line"/>
+      <point x="205" y="0" type="line"/>
+      <point x="287" y="0" type="line"/>
+      <point x="287" y="694" type="line"/>
+      <point x="205" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="301" y="323" type="line"/>
-      <point x="506" y="323" type="line"/>
-      <point x="506" y="395" type="line"/>
-      <point x="301" y="395" type="line"/>
+      <point x="238" y="323" type="line"/>
+      <point x="443" y="323" type="line"/>
+      <point x="443" y="395" type="line"/>
+      <point x="238" y="395" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>Ge-cy</string>
+      <string>=|Ge-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>Ka-cy</string>
     </dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_hm.glif b/src/Cantarell-Regular.ufo/glyphs/O_hm.glif
index c719df21..e78d6583 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_hm.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_hm.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohm" format="2">
-  <advance width="818"/>
+  <advance width="814"/>
   <unicode hex="2126"/>
   <outline>
     <contour>
-      <point x="84" y="0" type="line"/>
-      <point x="337" y="0" type="line"/>
-      <point x="337" y="53" type="line"/>
-      <point x="246" y="124"/>
-      <point x="185" y="260"/>
-      <point x="185" y="394" type="curve" smooth="yes"/>
-      <point x="185" y="538"/>
-      <point x="271" y="631"/>
-      <point x="402" y="631" type="curve" smooth="yes"/>
-      <point x="538" y="631"/>
-      <point x="635" y="529"/>
-      <point x="635" y="388" type="curve" smooth="yes"/>
-      <point x="635" y="266"/>
-      <point x="573" y="132"/>
-      <point x="481" y="53" type="curve"/>
-      <point x="481" y="0" type="line"/>
-      <point x="733" y="0" type="line"/>
-      <point x="733" y="72" type="line"/>
-      <point x="569" y="72" type="line"/>
-      <point x="658" y="135"/>
-      <point x="717" y="265"/>
-      <point x="717" y="397" type="curve" smooth="yes"/>
-      <point x="717" y="581"/>
-      <point x="595" y="704"/>
-      <point x="413" y="704" type="curve" smooth="yes"/>
-      <point x="226" y="704"/>
-      <point x="102" y="576"/>
-      <point x="102" y="385" type="curve" smooth="yes"/>
-      <point x="102" y="247"/>
-      <point x="161" y="122"/>
-      <point x="250" y="72" type="curve"/>
-      <point x="84" y="72" type="line"/>
+      <point x="82" y="0" type="line"/>
+      <point x="335" y="0" type="line"/>
+      <point x="335" y="53" type="line"/>
+      <point x="244" y="124"/>
+      <point x="183" y="260"/>
+      <point x="183" y="394" type="curve" smooth="yes"/>
+      <point x="183" y="538"/>
+      <point x="269" y="631"/>
+      <point x="400" y="631" type="curve" smooth="yes"/>
+      <point x="536" y="631"/>
+      <point x="633" y="529"/>
+      <point x="633" y="388" type="curve" smooth="yes"/>
+      <point x="633" y="266"/>
+      <point x="571" y="132"/>
+      <point x="479" y="53" type="curve"/>
+      <point x="479" y="0" type="line"/>
+      <point x="731" y="0" type="line"/>
+      <point x="731" y="72" type="line"/>
+      <point x="567" y="72" type="line"/>
+      <point x="656" y="135"/>
+      <point x="715" y="265"/>
+      <point x="715" y="397" type="curve" smooth="yes"/>
+      <point x="715" y="581"/>
+      <point x="593" y="704"/>
+      <point x="411" y="704" type="curve" smooth="yes"/>
+      <point x="224" y="704"/>
+      <point x="100" y="576"/>
+      <point x="100" y="385" type="curve" smooth="yes"/>
+      <point x="100" y="247"/>
+      <point x="159" y="122"/>
+      <point x="248" y="72" type="curve"/>
+      <point x="82" y="72" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_ha-cy.glif b/src/Cantarell-Regular.ufo/glyphs/S_ha-cy.glif
index 4ed0307e..06612a03 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_ha-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_ha-cy.glif
@@ -2,6 +2,7 @@
 <glyph name="Sha-cy" format="2">
   <advance width="998"/>
   <unicode hex="0428"/>
+  <anchor x="918" y="0" name="bottomright"/>
   <outline>
     <contour>
       <point x="92" y="0" type="line"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_hcha-cy.glif b/src/Cantarell-Regular.ufo/glyphs/S_hcha-cy.glif
index 08e5342c..42a2ad69 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_hcha-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_hcha-cy.glif
@@ -3,28 +3,8 @@
   <advance width="1021"/>
   <unicode hex="0429"/>
   <outline>
-    <contour>
-      <point x="917" y="-178" type="line"/>
-      <point x="993" y="-178" type="line"/>
-      <point x="993" y="71" type="line"/>
-      <point x="174" y="71" type="line"/>
-      <point x="174" y="694" type="line"/>
-      <point x="92" y="694" type="line"/>
-      <point x="92" y="0" type="line"/>
-      <point x="917" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="458" y="30" type="line"/>
-      <point x="540" y="30" type="line"/>
-      <point x="540" y="694" type="line"/>
-      <point x="458" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="824" y="30" type="line"/>
-      <point x="906" y="30" type="line"/>
-      <point x="906" y="694" type="line"/>
-      <point x="824" y="694" type="line"/>
-    </contour>
+    <component base="Sha-cy"/>
+    <component base="descender-cy.case" xOffset="811"/>
   </outline>
   <lib>
     <dict>
@@ -32,6 +12,11 @@
       <string>I</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>Tse-cy</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>-1</integer>
+        <integer>0</integer>
+      </array>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_-cy.glif b/src/Cantarell-Regular.ufo/glyphs/U_-cy.glif
index a8854a8f..01e869f2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_-cy.glif
@@ -6,8 +6,8 @@
   <outline>
     <contour>
       <point x="144" y="0" type="line"/>
-      <point x="232" y="0" type="line"/>
-      <point x="591" y="694" type="line"/>
+      <point x="237" y="0" type="line"/>
+      <point x="596" y="694" type="line"/>
       <point x="507" y="694" type="line"/>
       <point x="311" y="301" type="line"/>
       <point x="282" y="256" type="line"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_at-cy.glif b/src/Cantarell-Regular.ufo/glyphs/Y_at-cy.glif
index 8d007628..71cefe05 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_at-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_at-cy.glif
@@ -4,7 +4,7 @@
   <unicode hex="0462"/>
   <outline>
     <contour>
-      <point x="134" y="0" type="line"/>
+      <point x="136" y="0" type="line"/>
       <point x="376" y="0" type="line" smooth="yes"/>
       <point x="530" y="0"/>
       <point x="630" y="85"/>
@@ -23,13 +23,13 @@
       <point x="386" y="72" type="curve" smooth="yes"/>
       <point x="217" y="72" type="line"/>
       <point x="217" y="694" type="line"/>
-      <point x="134" y="694" type="line"/>
+      <point x="136" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="9" y="523" type="line"/>
-      <point x="389" y="523" type="line"/>
-      <point x="389" y="588" type="line"/>
-      <point x="9" y="588" type="line"/>
+      <point x="9" y="522" type="line"/>
+      <point x="389" y="522" type="line"/>
+      <point x="389" y="590" type="line"/>
+      <point x="9" y="590" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/_descenderreverse-cy.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/_descenderreverse-cy.case.glif
index e162e361..c08e7354 100644
--- a/src/Cantarell-Regular.ufo/glyphs/_descenderreverse-cy.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/_descenderreverse-cy.case.glif
@@ -1,14 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="_descenderreverse-cy.case" format="2">
   <advance width="321"/>
-  <anchor x="179" y="0" name="_bottomright"/>
+  <anchor x="191" y="0" name="_bottomright"/>
   <outline>
     <contour>
       <point x="10" y="-178" type="line"/>
       <point x="85" y="-178" type="line"/>
       <point x="85" y="0" type="line"/>
-      <point x="142" y="0" type="line"/>
-      <point x="142" y="72" type="line"/>
+      <point x="117" y="0" type="line"/>
+      <point x="117" y="72" type="line"/>
       <point x="10" y="72" type="line"/>
     </contour>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/_descenderreversed-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/_descenderreversed-cy.glif
index 57afedc9..4fdb9d66 100644
--- a/src/Cantarell-Regular.ufo/glyphs/_descenderreversed-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/_descenderreversed-cy.glif
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="_descenderreversed-cy" format="2">
   <advance width="267"/>
-  <anchor x="184" y="0" name="_bottomright"/>
+  <anchor x="185" y="0" name="_bottomright"/>
   <outline>
     <contour>
       <point x="45" y="-120" type="line"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ampersand.glif b/src/Cantarell-Regular.ufo/glyphs/ampersand.glif
index 67a459b7..734be7c3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ampersand.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ampersand.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ampersand" format="2">
-  <advance width="708"/>
+  <advance width="702"/>
   <unicode hex="0026"/>
   <outline>
     <contour>
-      <point x="586" y="-10" type="curve"/>
-      <point x="637" y="50" type="line"/>
-      <point x="302" y="326"/>
-      <point x="225" y="415"/>
-      <point x="225" y="524" type="curve" smooth="yes"/>
-      <point x="225" y="598"/>
-      <point x="260" y="638"/>
-      <point x="322" y="638" type="curve" smooth="yes"/>
-      <point x="380" y="638"/>
-      <point x="422" y="602"/>
-      <point x="422" y="553" type="curve" smooth="yes"/>
-      <point x="422" y="401"/>
-      <point x="72" y="426"/>
-      <point x="72" y="187" type="curve" smooth="yes"/>
-      <point x="72" y="69"/>
-      <point x="159" y="-12"/>
-      <point x="283" y="-12" type="curve" smooth="yes"/>
-      <point x="424" y="-12"/>
-      <point x="560" y="95"/>
-      <point x="639" y="277" type="curve"/>
-      <point x="578" y="313" type="line"/>
-      <point x="494" y="141"/>
-      <point x="396" y="57"/>
-      <point x="293" y="57" type="curve" smooth="yes"/>
-      <point x="210" y="57"/>
-      <point x="150" y="114"/>
-      <point x="150" y="194" type="curve" smooth="yes"/>
-      <point x="150" y="388"/>
-      <point x="498" y="353"/>
-      <point x="498" y="554" type="curve" smooth="yes"/>
-      <point x="498" y="643"/>
-      <point x="430" y="704"/>
-      <point x="331" y="704" type="curve" smooth="yes"/>
-      <point x="221" y="704"/>
-      <point x="149" y="630"/>
-      <point x="149" y="517" type="curve" smooth="yes"/>
-      <point x="149" y="386"/>
-      <point x="245" y="274"/>
+      <point x="583" y="-10" type="curve"/>
+      <point x="634" y="50" type="line"/>
+      <point x="299" y="326"/>
+      <point x="222" y="415"/>
+      <point x="222" y="524" type="curve" smooth="yes"/>
+      <point x="222" y="598"/>
+      <point x="257" y="638"/>
+      <point x="319" y="638" type="curve" smooth="yes"/>
+      <point x="377" y="638"/>
+      <point x="419" y="602"/>
+      <point x="419" y="553" type="curve" smooth="yes"/>
+      <point x="419" y="401"/>
+      <point x="69" y="426"/>
+      <point x="69" y="187" type="curve" smooth="yes"/>
+      <point x="69" y="69"/>
+      <point x="156" y="-12"/>
+      <point x="280" y="-12" type="curve" smooth="yes"/>
+      <point x="421" y="-12"/>
+      <point x="557" y="95"/>
+      <point x="636" y="277" type="curve"/>
+      <point x="575" y="313" type="line"/>
+      <point x="491" y="141"/>
+      <point x="393" y="57"/>
+      <point x="290" y="57" type="curve" smooth="yes"/>
+      <point x="207" y="57"/>
+      <point x="147" y="114"/>
+      <point x="147" y="194" type="curve" smooth="yes"/>
+      <point x="147" y="388"/>
+      <point x="495" y="353"/>
+      <point x="495" y="554" type="curve" smooth="yes"/>
+      <point x="495" y="643"/>
+      <point x="427" y="704"/>
+      <point x="328" y="704" type="curve" smooth="yes"/>
+      <point x="218" y="704"/>
+      <point x="146" y="630"/>
+      <point x="146" y="517" type="curve" smooth="yes"/>
+      <point x="146" y="386"/>
+      <point x="242" y="274"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/blackC_ircle.glif 
b/src/Cantarell-Regular.ufo/glyphs/blackC_ircle.glif
index 15164e68..f8d987b0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/blackC_ircle.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/blackC_ircle.glif
@@ -1,24 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="blackCircle" format="2">
-  <advance width="659"/>
+  <advance width="655"/>
   <unicode hex="25CF"/>
   <note>
 H18533
 </note>
   <outline>
     <contour>
-      <point x="327" y="109" type="curve" smooth="yes"/>
-      <point x="472" y="109"/>
-      <point x="569" y="205"/>
-      <point x="569" y="349" type="curve" smooth="yes"/>
-      <point x="569" y="490"/>
-      <point x="475" y="585"/>
-      <point x="332" y="585" type="curve" smooth="yes"/>
-      <point x="187" y="585"/>
-      <point x="90" y="488"/>
-      <point x="90" y="342" type="curve" smooth="yes"/>
-      <point x="90" y="202"/>
-      <point x="185" y="109"/>
+      <point x="325" y="109" type="curve" smooth="yes"/>
+      <point x="470" y="109"/>
+      <point x="567" y="205"/>
+      <point x="567" y="349" type="curve" smooth="yes"/>
+      <point x="567" y="490"/>
+      <point x="473" y="585"/>
+      <point x="330" y="585" type="curve" smooth="yes"/>
+      <point x="185" y="585"/>
+      <point x="88" y="488"/>
+      <point x="88" y="342" type="curve" smooth="yes"/>
+      <point x="88" y="202"/>
+      <point x="183" y="109"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/chekhakassian-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/chekhakassian-cy.glif
index 3b1bef3f..8037be7f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/chekhakassian-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/chekhakassian-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04CC"/>
   <outline>
     <component base="che-cy"/>
-    <component base="_descenderreversed-cy" xOffset="255"/>
+    <component base="_descenderreversed-cy" xOffset="254"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/copyright.glif b/src/Cantarell-Regular.ufo/glyphs/copyright.glif
index a005dcec..b906f82b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/copyright.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/copyright.glif
@@ -1,63 +1,69 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="copyright" format="2">
-  <advance width="885"/>
+  <advance width="881"/>
   <unicode hex="00A9"/>
   <outline>
     <contour>
-      <point x="438" y="-3" type="curve" smooth="yes"/>
-      <point x="656" y="-3"/>
-      <point x="802" y="140"/>
-      <point x="802" y="354" type="curve" smooth="yes"/>
-      <point x="802" y="564"/>
-      <point x="660" y="704"/>
-      <point x="446" y="704" type="curve" smooth="yes"/>
-      <point x="228" y="704"/>
-      <point x="83" y="560"/>
-      <point x="83" y="344" type="curve" smooth="yes"/>
-      <point x="83" y="136"/>
-      <point x="225" y="-3"/>
+      <point x="436" y="-3" type="curve" smooth="yes"/>
+      <point x="654" y="-3"/>
+      <point x="800" y="140"/>
+      <point x="800" y="354" type="curve" smooth="yes"/>
+      <point x="800" y="564"/>
+      <point x="658" y="704"/>
+      <point x="444" y="704" type="curve" smooth="yes"/>
+      <point x="226" y="704"/>
+      <point x="81" y="560"/>
+      <point x="81" y="344" type="curve" smooth="yes"/>
+      <point x="81" y="136"/>
+      <point x="223" y="-3"/>
     </contour>
     <contour>
-      <point x="448" y="59" type="curve" smooth="yes"/>
-      <point x="266" y="59"/>
-      <point x="145" y="177"/>
-      <point x="145" y="354" type="curve" smooth="yes"/>
-      <point x="145" y="527"/>
-      <point x="262" y="642"/>
-      <point x="438" y="642" type="curve" smooth="yes"/>
-      <point x="619" y="642"/>
-      <point x="740" y="523"/>
-      <point x="740" y="344" type="curve" smooth="yes"/>
-      <point x="740" y="173"/>
-      <point x="623" y="59"/>
+      <point x="446" y="59" type="curve" smooth="yes"/>
+      <point x="264" y="59"/>
+      <point x="143" y="177"/>
+      <point x="143" y="354" type="curve" smooth="yes"/>
+      <point x="143" y="527"/>
+      <point x="260" y="642"/>
+      <point x="436" y="642" type="curve" smooth="yes"/>
+      <point x="617" y="642"/>
+      <point x="738" y="523"/>
+      <point x="738" y="344" type="curve" smooth="yes"/>
+      <point x="738" y="173"/>
+      <point x="621" y="59"/>
     </contour>
     <contour>
-      <point x="453" y="134" type="curve" smooth="yes"/>
-      <point x="496" y="134"/>
-      <point x="543" y="143"/>
-      <point x="580" y="160" type="curve"/>
-      <point x="562" y="219" type="line"/>
-      <point x="534" y="209"/>
-      <point x="500" y="202"/>
-      <point x="471" y="202" type="curve" smooth="yes"/>
-      <point x="381" y="202"/>
-      <point x="323" y="262"/>
-      <point x="323" y="355" type="curve" smooth="yes"/>
-      <point x="323" y="442"/>
-      <point x="374" y="494"/>
-      <point x="462" y="494" type="curve" smooth="yes"/>
-      <point x="494" y="494"/>
-      <point x="531" y="487"/>
-      <point x="562" y="475" type="curve"/>
-      <point x="583" y="538" type="line"/>
-      <point x="548" y="554"/>
-      <point x="508" y="562"/>
-      <point x="466" y="562" type="curve" smooth="yes"/>
-      <point x="331" y="562"/>
-      <point x="241" y="475"/>
-      <point x="241" y="343" type="curve" smooth="yes"/>
-      <point x="241" y="217"/>
-      <point x="325" y="134"/>
+      <point x="451" y="134" type="curve" smooth="yes"/>
+      <point x="494" y="134"/>
+      <point x="541" y="143"/>
+      <point x="578" y="160" type="curve"/>
+      <point x="560" y="219" type="line"/>
+      <point x="532" y="209"/>
+      <point x="498" y="202"/>
+      <point x="469" y="202" type="curve" smooth="yes"/>
+      <point x="379" y="202"/>
+      <point x="321" y="262"/>
+      <point x="321" y="355" type="curve" smooth="yes"/>
+      <point x="321" y="442"/>
+      <point x="372" y="494"/>
+      <point x="460" y="494" type="curve" smooth="yes"/>
+      <point x="492" y="494"/>
+      <point x="529" y="487"/>
+      <point x="560" y="475" type="curve"/>
+      <point x="581" y="538" type="line"/>
+      <point x="546" y="554"/>
+      <point x="506" y="562"/>
+      <point x="464" y="562" type="curve" smooth="yes"/>
+      <point x="329" y="562"/>
+      <point x="239" y="475"/>
+      <point x="239" y="343" type="curve" smooth="yes"/>
+      <point x="239" y="217"/>
+      <point x="323" y="134"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dagger.glif b/src/Cantarell-Regular.ufo/glyphs/dagger.glif
index 5514837b..daf82d06 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dagger.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dagger.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dagger" format="2">
-  <advance width="458"/>
+  <advance width="454"/>
   <unicode hex="2020"/>
   <outline>
     <contour>
-      <point x="186" y="0" type="line"/>
-      <point x="270" y="0" type="line"/>
-      <point x="257" y="510" type="line"/>
-      <point x="270" y="694" type="line"/>
-      <point x="186" y="694" type="line"/>
-      <point x="194" y="510" type="line"/>
+      <point x="184" y="0" type="line"/>
+      <point x="268" y="0" type="line"/>
+      <point x="255" y="510" type="line"/>
+      <point x="268" y="694" type="line"/>
+      <point x="184" y="694" type="line"/>
+      <point x="192" y="510" type="line"/>
     </contour>
     <contour>
-      <point x="64" y="475" type="line"/>
-      <point x="223" y="482" type="line"/>
-      <point x="223" y="538" type="line"/>
-      <point x="64" y="545" type="line"/>
+      <point x="62" y="475" type="line"/>
+      <point x="221" y="482" type="line"/>
+      <point x="221" y="538" type="line"/>
+      <point x="62" y="545" type="line"/>
     </contour>
     <contour>
-      <point x="394" y="475" type="line"/>
-      <point x="394" y="545" type="line"/>
-      <point x="231" y="538" type="line"/>
-      <point x="231" y="482" type="line"/>
+      <point x="392" y="475" type="line"/>
+      <point x="392" y="545" type="line"/>
+      <point x="229" y="538" type="line"/>
+      <point x="229" y="482" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/daggerdbl.glif b/src/Cantarell-Regular.ufo/glyphs/daggerdbl.glif
index d0f5a62d..d720767b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/daggerdbl.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/daggerdbl.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="daggerdbl" format="2">
-  <advance width="470"/>
+  <advance width="466"/>
   <unicode hex="2021"/>
   <outline>
     <contour>
-      <point x="193" y="0" type="line"/>
-      <point x="276" y="0" type="line"/>
-      <point x="264" y="175" type="line"/>
-      <point x="272" y="346" type="line"/>
-      <point x="264" y="506" type="line"/>
-      <point x="276" y="694" type="line"/>
-      <point x="193" y="694" type="line"/>
-      <point x="201" y="506" type="line"/>
-      <point x="193" y="346" type="line"/>
-      <point x="201" y="175" type="line"/>
+      <point x="191" y="0" type="line"/>
+      <point x="274" y="0" type="line"/>
+      <point x="262" y="175" type="line"/>
+      <point x="270" y="346" type="line"/>
+      <point x="262" y="506" type="line"/>
+      <point x="274" y="694" type="line"/>
+      <point x="191" y="694" type="line"/>
+      <point x="199" y="506" type="line"/>
+      <point x="191" y="346" type="line"/>
+      <point x="199" y="175" type="line"/>
     </contour>
     <contour>
-      <point x="80" y="139" type="line"/>
-      <point x="229" y="146" type="line"/>
-      <point x="229" y="202" type="line"/>
-      <point x="80" y="209" type="line"/>
+      <point x="78" y="139" type="line"/>
+      <point x="227" y="146" type="line"/>
+      <point x="227" y="202" type="line"/>
+      <point x="78" y="209" type="line"/>
     </contour>
     <contour>
-      <point x="390" y="139" type="line"/>
-      <point x="390" y="209" type="line"/>
-      <point x="238" y="202" type="line"/>
-      <point x="238" y="146" type="line"/>
+      <point x="388" y="139" type="line"/>
+      <point x="388" y="209" type="line"/>
+      <point x="236" y="202" type="line"/>
+      <point x="236" y="146" type="line"/>
     </contour>
     <contour>
-      <point x="80" y="485" type="line"/>
-      <point x="229" y="492" type="line"/>
-      <point x="229" y="548" type="line"/>
-      <point x="80" y="555" type="line"/>
+      <point x="78" y="485" type="line"/>
+      <point x="227" y="492" type="line"/>
+      <point x="227" y="548" type="line"/>
+      <point x="78" y="555" type="line"/>
     </contour>
     <contour>
-      <point x="390" y="485" type="line"/>
-      <point x="390" y="555" type="line"/>
-      <point x="238" y="548" type="line"/>
-      <point x="238" y="492" type="line"/>
+      <point x="388" y="485" type="line"/>
+      <point x="388" y="555" type="line"/>
+      <point x="236" y="548" type="line"/>
+      <point x="236" y="492" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/degree.glif b/src/Cantarell-Regular.ufo/glyphs/degree.glif
index 89724225..ae351d80 100644
--- a/src/Cantarell-Regular.ufo/glyphs/degree.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/degree.glif
@@ -1,35 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="degree" format="2">
-  <advance width="486"/>
+  <advance width="481"/>
   <unicode hex="00B0"/>
   <outline>
     <contour>
-      <point x="241" y="417" type="curve" smooth="yes"/>
-      <point x="327" y="417"/>
-      <point x="385" y="475"/>
-      <point x="385" y="562" type="curve" smooth="yes"/>
-      <point x="385" y="647"/>
-      <point x="329" y="704"/>
-      <point x="244" y="704" type="curve" smooth="yes"/>
-      <point x="158" y="704"/>
-      <point x="100" y="646"/>
-      <point x="100" y="559" type="curve" smooth="yes"/>
-      <point x="100" y="474"/>
-      <point x="156" y="417"/>
+      <point x="239" y="417" type="curve" smooth="yes"/>
+      <point x="325" y="417"/>
+      <point x="383" y="475"/>
+      <point x="383" y="562" type="curve" smooth="yes"/>
+      <point x="383" y="647"/>
+      <point x="327" y="704"/>
+      <point x="242" y="704" type="curve" smooth="yes"/>
+      <point x="156" y="704"/>
+      <point x="98" y="646"/>
+      <point x="98" y="559" type="curve" smooth="yes"/>
+      <point x="98" y="474"/>
+      <point x="154" y="417"/>
     </contour>
     <contour>
-      <point x="244" y="484" type="curve" smooth="yes"/>
-      <point x="197" y="484"/>
-      <point x="165" y="515"/>
-      <point x="165" y="562" type="curve" smooth="yes"/>
-      <point x="165" y="608"/>
-      <point x="195" y="639"/>
-      <point x="241" y="639" type="curve" smooth="yes"/>
-      <point x="288" y="639"/>
-      <point x="320" y="607"/>
-      <point x="320" y="559" type="curve" smooth="yes"/>
-      <point x="320" y="514"/>
-      <point x="290" y="484"/>
+      <point x="242" y="484" type="curve" smooth="yes"/>
+      <point x="195" y="484"/>
+      <point x="163" y="515"/>
+      <point x="163" y="562" type="curve" smooth="yes"/>
+      <point x="163" y="608"/>
+      <point x="193" y="639"/>
+      <point x="239" y="639" type="curve" smooth="yes"/>
+      <point x="286" y="639"/>
+      <point x="318" y="607"/>
+      <point x="318" y="559" type="curve" smooth="yes"/>
+      <point x="318" y="514"/>
+      <point x="288" y="484"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/downA_rrow.glif 
b/src/Cantarell-Regular.ufo/glyphs/downA_rrow.glif
index 83834f29..41f830db 100644
--- a/src/Cantarell-Regular.ufo/glyphs/downA_rrow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/downA_rrow.glif
@@ -1,11 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="downArrow" format="2">
-  <advance width="656"/>
+  <advance width="640"/>
   <unicode hex="2193"/>
   <note>
 arrowdown
 </note>
   <outline>
-    <component base="upArrow" xScale="-1" yScale="-1" xOffset="656" yOffset="642"/>
+    <component base="upArrow" xScale="-1" yScale="-1" xOffset="640" yOffset="642"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>upArrow</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>upArrow</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/emptyset.glif b/src/Cantarell-Regular.ufo/glyphs/emptyset.glif
index 0f66529d..7b256023 100644
--- a/src/Cantarell-Regular.ufo/glyphs/emptyset.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/emptyset.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emptyset" format="2">
-  <advance width="724"/>
+  <advance width="719"/>
   <unicode hex="2205"/>
   <outline>
     <contour>
-      <point x="357" y="68" type="curve" smooth="yes"/>
-      <point x="527" y="68"/>
-      <point x="641" y="179"/>
-      <point x="641" y="345" type="curve" smooth="yes"/>
-      <point x="641" y="507"/>
-      <point x="531" y="615"/>
-      <point x="367" y="615" type="curve" smooth="yes"/>
-      <point x="197" y="615"/>
-      <point x="84" y="503"/>
-      <point x="84" y="335" type="curve" smooth="yes"/>
-      <point x="84" y="175"/>
-      <point x="193" y="68"/>
+      <point x="354" y="68" type="curve" smooth="yes"/>
+      <point x="524" y="68"/>
+      <point x="638" y="179"/>
+      <point x="638" y="345" type="curve" smooth="yes"/>
+      <point x="638" y="507"/>
+      <point x="528" y="615"/>
+      <point x="364" y="615" type="curve" smooth="yes"/>
+      <point x="194" y="615"/>
+      <point x="81" y="503"/>
+      <point x="81" y="335" type="curve" smooth="yes"/>
+      <point x="81" y="175"/>
+      <point x="190" y="68"/>
     </contour>
     <contour>
-      <point x="367" y="138" type="curve" smooth="yes"/>
-      <point x="245" y="138"/>
-      <point x="164" y="221"/>
-      <point x="164" y="345" type="curve" smooth="yes"/>
-      <point x="164" y="465"/>
-      <point x="241" y="545"/>
-      <point x="357" y="545" type="curve" smooth="yes"/>
-      <point x="479" y="545"/>
-      <point x="561" y="461"/>
-      <point x="561" y="335" type="curve" smooth="yes"/>
-      <point x="561" y="217"/>
-      <point x="483" y="138"/>
+      <point x="364" y="138" type="curve" smooth="yes"/>
+      <point x="242" y="138"/>
+      <point x="161" y="221"/>
+      <point x="161" y="345" type="curve" smooth="yes"/>
+      <point x="161" y="465"/>
+      <point x="238" y="545"/>
+      <point x="354" y="545" type="curve" smooth="yes"/>
+      <point x="476" y="545"/>
+      <point x="558" y="461"/>
+      <point x="558" y="335" type="curve" smooth="yes"/>
+      <point x="558" y="217"/>
+      <point x="480" y="138"/>
     </contour>
     <contour>
-      <point x="186" y="32" type="line"/>
-      <point x="591" y="630" type="line"/>
-      <point x="535" y="667" type="line"/>
-      <point x="130" y="69" type="line"/>
+      <point x="183" y="32" type="line"/>
+      <point x="588" y="630" type="line"/>
+      <point x="532" y="667" type="line"/>
+      <point x="127" y="69" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/estimated.glif b/src/Cantarell-Regular.ufo/glyphs/estimated.glif
index 3c4ac963..93f9c4ce 100644
--- a/src/Cantarell-Regular.ufo/glyphs/estimated.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/estimated.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="estimated" format="2">
-  <advance width="853"/>
+  <advance width="849"/>
   <unicode hex="212E"/>
   <outline>
     <contour>
-      <point x="430" y="-10" type="curve" smooth="yes"/>
-      <point x="561" y="-10"/>
-      <point x="685" y="42"/>
-      <point x="757" y="119" type="curve"/>
-      <point x="691" y="119" type="line"/>
-      <point x="619" y="62"/>
-      <point x="527" y="36"/>
-      <point x="438" y="36" type="curve" smooth="yes"/>
-      <point x="316" y="36"/>
-      <point x="242" y="84"/>
-      <point x="195" y="145" type="curve"/>
-      <point x="195" y="315" type="line"/>
-      <point x="778" y="315" type="line"/>
-      <point x="778" y="545"/>
-      <point x="661" y="704"/>
-      <point x="433" y="704" type="curve" smooth="yes"/>
-      <point x="202" y="704"/>
-      <point x="84" y="541"/>
-      <point x="84" y="339" type="curve" smooth="yes"/>
-      <point x="84" y="123"/>
-      <point x="220" y="-10"/>
+      <point x="428" y="-10" type="curve" smooth="yes"/>
+      <point x="559" y="-10"/>
+      <point x="683" y="42"/>
+      <point x="755" y="119" type="curve"/>
+      <point x="689" y="119" type="line"/>
+      <point x="617" y="62"/>
+      <point x="525" y="36"/>
+      <point x="436" y="36" type="curve" smooth="yes"/>
+      <point x="314" y="36"/>
+      <point x="240" y="84"/>
+      <point x="193" y="145" type="curve"/>
+      <point x="193" y="315" type="line"/>
+      <point x="776" y="315" type="line"/>
+      <point x="776" y="545"/>
+      <point x="659" y="704"/>
+      <point x="431" y="704" type="curve" smooth="yes"/>
+      <point x="200" y="704"/>
+      <point x="82" y="541"/>
+      <point x="82" y="339" type="curve" smooth="yes"/>
+      <point x="82" y="123"/>
+      <point x="218" y="-10"/>
     </contour>
     <contour>
-      <point x="195" y="358" type="line"/>
-      <point x="195" y="535" type="line"/>
-      <point x="241" y="619"/>
-      <point x="316" y="662"/>
-      <point x="430" y="662" type="curve" smooth="yes"/>
-      <point x="544" y="662"/>
-      <point x="618" y="619"/>
-      <point x="664" y="535" type="curve"/>
-      <point x="664" y="358" type="line"/>
+      <point x="193" y="358" type="line"/>
+      <point x="193" y="535" type="line"/>
+      <point x="239" y="619"/>
+      <point x="314" y="662"/>
+      <point x="428" y="662" type="curve" smooth="yes"/>
+      <point x="542" y="662"/>
+      <point x="616" y="619"/>
+      <point x="662" y="535" type="curve"/>
+      <point x="662" y="358" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/increment.glif b/src/Cantarell-Regular.ufo/glyphs/increment.glif
index 1133393b..b93f5890 100644
--- a/src/Cantarell-Regular.ufo/glyphs/increment.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/increment.glif
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="increment" format="2">
-  <advance width="692"/>
+  <advance width="686"/>
   <unicode hex="2206"/>
   <outline>
     <contour>
-      <point x="66" y="1" type="line"/>
-      <point x="626" y="1" type="line"/>
-      <point x="626" y="54" type="line"/>
-      <point x="396" y="694" type="line"/>
-      <point x="299" y="694" type="line"/>
-      <point x="66" y="54" type="line"/>
+      <point x="63" y="1" type="line"/>
+      <point x="623" y="1" type="line"/>
+      <point x="623" y="54" type="line"/>
+      <point x="393" y="694" type="line"/>
+      <point x="296" y="694" type="line"/>
+      <point x="63" y="54" type="line"/>
     </contour>
     <contour>
-      <point x="149" y="68" type="line"/>
-      <point x="342" y="616" type="line"/>
-      <point x="536" y="68" type="line"/>
+      <point x="146" y="68" type="line"/>
+      <point x="339" y="616" type="line"/>
+      <point x="533" y="68" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/infinity.glif b/src/Cantarell-Regular.ufo/glyphs/infinity.glif
index c004faa4..211c2354 100644
--- a/src/Cantarell-Regular.ufo/glyphs/infinity.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/infinity.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="infinity" format="2">
-  <advance width="955"/>
+  <advance width="948"/>
   <unicode hex="221E"/>
   <outline>
     <contour>
-      <point x="676" y="145" type="curve" smooth="yes"/>
-      <point x="786" y="145"/>
-      <point x="859" y="224"/>
-      <point x="859" y="343" type="curve" smooth="yes"/>
-      <point x="859" y="457"/>
-      <point x="790" y="533"/>
-      <point x="685" y="533" type="curve" smooth="yes"/>
-      <point x="469" y="533"/>
-      <point x="428" y="215"/>
-      <point x="276" y="215" type="curve" smooth="yes"/>
-      <point x="215" y="215"/>
-      <point x="175" y="266"/>
-      <point x="175" y="342" type="curve" smooth="yes"/>
-      <point x="175" y="415"/>
-      <point x="215" y="463"/>
-      <point x="275" y="463" type="curve" smooth="yes"/>
-      <point x="433" y="463"/>
-      <point x="459" y="145"/>
+      <point x="673" y="145" type="curve" smooth="yes"/>
+      <point x="783" y="145"/>
+      <point x="856" y="224"/>
+      <point x="856" y="343" type="curve" smooth="yes"/>
+      <point x="856" y="457"/>
+      <point x="787" y="533"/>
+      <point x="682" y="533" type="curve" smooth="yes"/>
+      <point x="466" y="533"/>
+      <point x="425" y="215"/>
+      <point x="273" y="215" type="curve" smooth="yes"/>
+      <point x="212" y="215"/>
+      <point x="172" y="266"/>
+      <point x="172" y="342" type="curve" smooth="yes"/>
+      <point x="172" y="415"/>
+      <point x="212" y="463"/>
+      <point x="272" y="463" type="curve" smooth="yes"/>
+      <point x="430" y="463"/>
+      <point x="456" y="145"/>
     </contour>
     <contour>
-      <point x="266" y="145" type="curve" smooth="yes"/>
-      <point x="479" y="145"/>
-      <point x="519" y="463"/>
-      <point x="676" y="463" type="curve" smooth="yes"/>
-      <point x="739" y="463"/>
-      <point x="779" y="411"/>
-      <point x="779" y="331" type="curve" smooth="yes"/>
-      <point x="779" y="258"/>
-      <point x="742" y="215"/>
-      <point x="681" y="215" type="curve" smooth="yes"/>
-      <point x="515" y="215"/>
-      <point x="504" y="533"/>
-      <point x="282" y="533" type="curve" smooth="yes"/>
-      <point x="170" y="533"/>
-      <point x="95" y="453"/>
-      <point x="95" y="333" type="curve" smooth="yes"/>
-      <point x="95" y="220"/>
-      <point x="163" y="145"/>
+      <point x="263" y="145" type="curve" smooth="yes"/>
+      <point x="476" y="145"/>
+      <point x="516" y="463"/>
+      <point x="673" y="463" type="curve" smooth="yes"/>
+      <point x="736" y="463"/>
+      <point x="776" y="411"/>
+      <point x="776" y="331" type="curve" smooth="yes"/>
+      <point x="776" y="258"/>
+      <point x="739" y="215"/>
+      <point x="678" y="215" type="curve" smooth="yes"/>
+      <point x="512" y="215"/>
+      <point x="501" y="533"/>
+      <point x="279" y="533" type="curve" smooth="yes"/>
+      <point x="167" y="533"/>
+      <point x="92" y="453"/>
+      <point x="92" y="333" type="curve" smooth="yes"/>
+      <point x="92" y="220"/>
+      <point x="160" y="145"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/integral.glif b/src/Cantarell-Regular.ufo/glyphs/integral.glif
index 7607cd52..9cb68266 100644
--- a/src/Cantarell-Regular.ufo/glyphs/integral.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/integral.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="integral" format="2">
-  <advance width="412"/>
+  <advance width="407"/>
   <unicode hex="222B"/>
   <outline>
     <contour>
-      <point x="158" y="-170" type="curve" smooth="yes"/>
-      <point x="256" y="-170"/>
-      <point x="319" y="-104"/>
-      <point x="319" y="0" type="curve" smooth="yes"/>
-      <point x="319" y="155"/>
-      <point x="179" y="424"/>
-      <point x="179" y="578" type="curve" smooth="yes"/>
-      <point x="179" y="643"/>
-      <point x="204" y="676"/>
-      <point x="254" y="676" type="curve" smooth="yes"/>
-      <point x="271" y="676"/>
-      <point x="290" y="674"/>
-      <point x="317" y="664" type="curve"/>
-      <point x="341" y="729" type="line"/>
-      <point x="315" y="742"/>
-      <point x="292" y="749"/>
-      <point x="263" y="749" type="curve" smooth="yes"/>
-      <point x="161" y="749"/>
-      <point x="99" y="680"/>
-      <point x="99" y="566" type="curve" smooth="yes"/>
-      <point x="99" y="394"/>
-      <point x="238" y="123"/>
-      <point x="238" y="-9" type="curve" smooth="yes"/>
-      <point x="238" y="-65"/>
-      <point x="212" y="-97"/>
-      <point x="167" y="-97" type="curve" smooth="yes"/>
-      <point x="140" y="-97"/>
-      <point x="110" y="-91"/>
-      <point x="92" y="-82" type="curve"/>
-      <point x="68" y="-148" type="line"/>
-      <point x="97" y="-162"/>
-      <point x="130" y="-170"/>
+      <point x="156" y="-170" type="curve" smooth="yes"/>
+      <point x="254" y="-170"/>
+      <point x="317" y="-104"/>
+      <point x="317" y="0" type="curve" smooth="yes"/>
+      <point x="317" y="155"/>
+      <point x="177" y="424"/>
+      <point x="177" y="578" type="curve" smooth="yes"/>
+      <point x="177" y="643"/>
+      <point x="202" y="676"/>
+      <point x="252" y="676" type="curve" smooth="yes"/>
+      <point x="269" y="676"/>
+      <point x="288" y="674"/>
+      <point x="315" y="664" type="curve"/>
+      <point x="339" y="729" type="line"/>
+      <point x="313" y="742"/>
+      <point x="290" y="749"/>
+      <point x="261" y="749" type="curve" smooth="yes"/>
+      <point x="159" y="749"/>
+      <point x="97" y="680"/>
+      <point x="97" y="566" type="curve" smooth="yes"/>
+      <point x="97" y="394"/>
+      <point x="236" y="123"/>
+      <point x="236" y="-9" type="curve" smooth="yes"/>
+      <point x="236" y="-65"/>
+      <point x="210" y="-97"/>
+      <point x="165" y="-97" type="curve" smooth="yes"/>
+      <point x="138" y="-97"/>
+      <point x="108" y="-91"/>
+      <point x="90" y="-82" type="curve"/>
+      <point x="66" y="-148" type="line"/>
+      <point x="95" y="-162"/>
+      <point x="128" y="-170"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/l.ss01.glif b/src/Cantarell-Regular.ufo/glyphs/l.ss01.glif
index 21c49b4e..9499a412 100644
--- a/src/Cantarell-Regular.ufo/glyphs/l.ss01.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/l.ss01.glif
@@ -19,6 +19,8 @@ l
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=|</string>
     </dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/leftA_rrow.glif 
b/src/Cantarell-Regular.ufo/glyphs/leftA_rrow.glif
index 3b6865d0..b1945763 100644
--- a/src/Cantarell-Regular.ufo/glyphs/leftA_rrow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/leftA_rrow.glif
@@ -1,11 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="leftArrow" format="2">
-  <advance width="690"/>
+  <advance width="677"/>
   <unicode hex="2190"/>
   <note>
 arrowleft
 </note>
   <outline>
-    <component base="rightArrow" xScale="-1" yScale="-1" xOffset="691" yOffset="643"/>
+    <component base="rightArrow" xScale="-1" yScale="-1" xOffset="677" yOffset="643"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|rightArrow</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|rightArrow</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/literS_ign.glif 
b/src/Cantarell-Regular.ufo/glyphs/literS_ign.glif
index ee7e277f..d08b04c4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/literS_ign.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/literS_ign.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="literSign" format="2">
-  <advance width="484"/>
+  <advance width="479"/>
   <unicode hex="2113"/>
   <outline>
     <contour>
-      <point x="309" y="-10" type="curve" smooth="yes"/>
-      <point x="341" y="-10"/>
-      <point x="371" y="-2"/>
-      <point x="397" y="14" type="curve"/>
-      <point x="379" y="69" type="line"/>
-      <point x="360" y="60"/>
-      <point x="340" y="55"/>
-      <point x="323" y="55" type="curve" smooth="yes"/>
-      <point x="279" y="55"/>
-      <point x="247" y="88"/>
-      <point x="247" y="135" type="curve" smooth="yes"/>
-      <point x="247" y="554" type="line" smooth="yes"/>
-      <point x="247" y="630"/>
-      <point x="264" y="679"/>
-      <point x="291" y="679" type="curve" smooth="yes"/>
-      <point x="312" y="679"/>
-      <point x="331" y="652"/>
-      <point x="331" y="610" type="curve" smooth="yes"/>
-      <point x="331" y="510"/>
-      <point x="259" y="390"/>
-      <point x="57" y="134" type="curve"/>
-      <point x="101" y="98" type="line"/>
-      <point x="326" y="379"/>
-      <point x="405" y="513"/>
-      <point x="405" y="622" type="curve" smooth="yes"/>
-      <point x="405" y="700"/>
-      <point x="364" y="749"/>
-      <point x="298" y="749" type="curve" smooth="yes"/>
-      <point x="215" y="749"/>
-      <point x="167" y="673"/>
-      <point x="167" y="544" type="curve" smooth="yes"/>
-      <point x="167" y="117" type="line" smooth="yes"/>
-      <point x="167" y="42"/>
-      <point x="226" y="-10"/>
+      <point x="306" y="-10" type="curve" smooth="yes"/>
+      <point x="338" y="-10"/>
+      <point x="368" y="-2"/>
+      <point x="394" y="14" type="curve"/>
+      <point x="376" y="69" type="line"/>
+      <point x="357" y="60"/>
+      <point x="337" y="55"/>
+      <point x="320" y="55" type="curve" smooth="yes"/>
+      <point x="276" y="55"/>
+      <point x="244" y="88"/>
+      <point x="244" y="135" type="curve" smooth="yes"/>
+      <point x="244" y="554" type="line" smooth="yes"/>
+      <point x="244" y="630"/>
+      <point x="261" y="679"/>
+      <point x="288" y="679" type="curve" smooth="yes"/>
+      <point x="309" y="679"/>
+      <point x="328" y="652"/>
+      <point x="328" y="610" type="curve" smooth="yes"/>
+      <point x="328" y="510"/>
+      <point x="256" y="390"/>
+      <point x="54" y="134" type="curve"/>
+      <point x="98" y="98" type="line"/>
+      <point x="323" y="379"/>
+      <point x="402" y="513"/>
+      <point x="402" y="622" type="curve" smooth="yes"/>
+      <point x="402" y="700"/>
+      <point x="361" y="749"/>
+      <point x="295" y="749" type="curve" smooth="yes"/>
+      <point x="212" y="749"/>
+      <point x="164" y="673"/>
+      <point x="164" y="544" type="curve" smooth="yes"/>
+      <point x="164" y="117" type="line" smooth="yes"/>
+      <point x="164" y="42"/>
+      <point x="223" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lozenge.glif b/src/Cantarell-Regular.ufo/glyphs/lozenge.glif
index 3d5e3a37..c9afb94b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lozenge.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lozenge.glif
@@ -1,21 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lozenge" format="2">
-  <advance width="574"/>
+  <advance width="569"/>
   <unicode hex="25CA"/>
   <outline>
     <contour>
-      <point x="243" y="0" type="line"/>
-      <point x="315" y="0" type="line"/>
-      <point x="510" y="357" type="line"/>
-      <point x="315" y="694" type="line"/>
-      <point x="243" y="694" type="line"/>
-      <point x="65" y="357" type="line"/>
+      <point x="240" y="0" type="line"/>
+      <point x="312" y="0" type="line"/>
+      <point x="507" y="357" type="line"/>
+      <point x="312" y="694" type="line"/>
+      <point x="240" y="694" type="line"/>
+      <point x="62" y="357" type="line"/>
     </contour>
     <contour>
-      <point x="280" y="84" type="line"/>
-      <point x="146" y="356" type="line"/>
-      <point x="280" y="612" type="line"/>
-      <point x="427" y="356" type="line"/>
+      <point x="277" y="84" type="line"/>
+      <point x="143" y="356" type="line"/>
+      <point x="277" y="612" type="line"/>
+      <point x="424" y="356" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/minute.glif b/src/Cantarell-Regular.ufo/glyphs/minute.glif
index 66446802..d5ea0fda 100644
--- a/src/Cantarell-Regular.ufo/glyphs/minute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/minute.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="minute" format="2">
-  <advance width="330"/>
+  <advance width="322"/>
   <unicode hex="2032"/>
   <note>
 minute
 </note>
   <outline>
-    <component base="quotesingle" yxScale="0.19201" xOffset="-70"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="-68"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/partialdiff.glif 
b/src/Cantarell-Regular.ufo/glyphs/partialdiff.glif
index 2c37ec1a..5a998b91 100644
--- a/src/Cantarell-Regular.ufo/glyphs/partialdiff.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/partialdiff.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="partialdiff" format="2">
-  <advance width="649"/>
+  <advance width="639"/>
   <unicode hex="2202"/>
   <outline>
     <contour>
-      <point x="290" y="-12" type="curve" smooth="yes"/>
-      <point x="459" y="-12"/>
-      <point x="558" y="128"/>
-      <point x="558" y="365" type="curve" smooth="yes"/>
-      <point x="558" y="584"/>
-      <point x="472" y="701"/>
-      <point x="312" y="701" type="curve" smooth="yes"/>
-      <point x="250" y="701"/>
-      <point x="184" y="684"/>
-      <point x="134" y="655" type="curve"/>
-      <point x="153" y="594" type="line"/>
-      <point x="202" y="617"/>
-      <point x="258" y="631"/>
-      <point x="303" y="631" type="curve" smooth="yes"/>
-      <point x="418" y="631"/>
-      <point x="478" y="534"/>
-      <point x="478" y="349" type="curve" smooth="yes"/>
-      <point x="478" y="160"/>
-      <point x="416" y="58"/>
-      <point x="300" y="58" type="curve" smooth="yes"/>
-      <point x="211" y="58"/>
-      <point x="155" y="117"/>
-      <point x="155" y="211" type="curve" smooth="yes"/>
-      <point x="155" y="302"/>
-      <point x="207" y="359"/>
-      <point x="292" y="359" type="curve" smooth="yes"/>
-      <point x="366" y="359"/>
-      <point x="438" y="316"/>
-      <point x="480" y="249" type="curve"/>
-      <point x="486" y="342" type="line"/>
-      <point x="444" y="399"/>
-      <point x="382" y="429"/>
-      <point x="306" y="429" type="curve" smooth="yes"/>
-      <point x="171" y="429"/>
-      <point x="75" y="332"/>
-      <point x="75" y="197" type="curve" smooth="yes"/>
-      <point x="75" y="70"/>
-      <point x="160" y="-12"/>
+      <point x="284" y="-12" type="curve" smooth="yes"/>
+      <point x="453" y="-12"/>
+      <point x="552" y="128"/>
+      <point x="552" y="365" type="curve" smooth="yes"/>
+      <point x="552" y="584"/>
+      <point x="466" y="701"/>
+      <point x="306" y="701" type="curve" smooth="yes"/>
+      <point x="244" y="701"/>
+      <point x="178" y="684"/>
+      <point x="128" y="655" type="curve"/>
+      <point x="147" y="594" type="line"/>
+      <point x="196" y="617"/>
+      <point x="252" y="631"/>
+      <point x="297" y="631" type="curve" smooth="yes"/>
+      <point x="412" y="631"/>
+      <point x="472" y="534"/>
+      <point x="472" y="349" type="curve" smooth="yes"/>
+      <point x="472" y="160"/>
+      <point x="410" y="58"/>
+      <point x="294" y="58" type="curve" smooth="yes"/>
+      <point x="205" y="58"/>
+      <point x="149" y="117"/>
+      <point x="149" y="211" type="curve" smooth="yes"/>
+      <point x="149" y="302"/>
+      <point x="201" y="359"/>
+      <point x="286" y="359" type="curve" smooth="yes"/>
+      <point x="360" y="359"/>
+      <point x="432" y="316"/>
+      <point x="474" y="249" type="curve"/>
+      <point x="480" y="342" type="line"/>
+      <point x="438" y="399"/>
+      <point x="376" y="429"/>
+      <point x="300" y="429" type="curve" smooth="yes"/>
+      <point x="165" y="429"/>
+      <point x="69" y="332"/>
+      <point x="69" y="197" type="curve" smooth="yes"/>
+      <point x="69" y="70"/>
+      <point x="154" y="-12"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/percent.glif b/src/Cantarell-Regular.ufo/glyphs/percent.glif
index e73e1c17..e47c439a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/percent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/percent.glif
@@ -1,69 +1,75 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="percent" format="2">
-  <advance width="991"/>
+  <advance width="987"/>
   <unicode hex="0025"/>
   <outline>
     <contour>
-      <point x="265" y="0" type="line"/>
-      <point x="342" y="0" type="line"/>
-      <point x="724" y="694" type="line"/>
-      <point x="641" y="694" type="line"/>
+      <point x="263" y="0" type="line"/>
+      <point x="340" y="0" type="line"/>
+      <point x="722" y="694" type="line"/>
+      <point x="639" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="244" y="262" type="curve" smooth="yes"/>
-      <point x="345" y="262"/>
-      <point x="411" y="349"/>
-      <point x="411" y="485" type="curve" smooth="yes"/>
-      <point x="411" y="618"/>
-      <point x="347" y="704"/>
-      <point x="247" y="704" type="curve" smooth="yes"/>
-      <point x="144" y="704"/>
-      <point x="78" y="617"/>
-      <point x="78" y="481" type="curve" smooth="yes"/>
-      <point x="78" y="347"/>
-      <point x="143" y="262"/>
+      <point x="242" y="262" type="curve" smooth="yes"/>
+      <point x="343" y="262"/>
+      <point x="409" y="349"/>
+      <point x="409" y="485" type="curve" smooth="yes"/>
+      <point x="409" y="618"/>
+      <point x="345" y="704"/>
+      <point x="245" y="704" type="curve" smooth="yes"/>
+      <point x="142" y="704"/>
+      <point x="76" y="617"/>
+      <point x="76" y="481" type="curve" smooth="yes"/>
+      <point x="76" y="347"/>
+      <point x="141" y="262"/>
     </contour>
     <contour>
-      <point x="246" y="328" type="curve" smooth="yes"/>
-      <point x="192" y="328"/>
-      <point x="157" y="389"/>
-      <point x="157" y="485" type="curve" smooth="yes"/>
-      <point x="157" y="579"/>
-      <point x="191" y="638"/>
-      <point x="244" y="638" type="curve" smooth="yes"/>
-      <point x="298" y="638"/>
-      <point x="333" y="577"/>
-      <point x="333" y="480" type="curve" smooth="yes"/>
-      <point x="333" y="387"/>
-      <point x="299" y="328"/>
+      <point x="244" y="328" type="curve" smooth="yes"/>
+      <point x="190" y="328"/>
+      <point x="155" y="389"/>
+      <point x="155" y="485" type="curve" smooth="yes"/>
+      <point x="155" y="579"/>
+      <point x="189" y="638"/>
+      <point x="242" y="638" type="curve" smooth="yes"/>
+      <point x="296" y="638"/>
+      <point x="331" y="577"/>
+      <point x="331" y="480" type="curve" smooth="yes"/>
+      <point x="331" y="387"/>
+      <point x="297" y="328"/>
     </contour>
     <contour>
-      <point x="746" y="-6" type="curve" smooth="yes"/>
-      <point x="847" y="-6"/>
-      <point x="913" y="81"/>
-      <point x="913" y="217" type="curve" smooth="yes"/>
-      <point x="913" y="350"/>
-      <point x="849" y="436"/>
-      <point x="749" y="436" type="curve" smooth="yes"/>
-      <point x="646" y="436"/>
-      <point x="580" y="349"/>
-      <point x="580" y="213" type="curve" smooth="yes"/>
-      <point x="580" y="79"/>
-      <point x="645" y="-6"/>
+      <point x="744" y="-6" type="curve" smooth="yes"/>
+      <point x="845" y="-6"/>
+      <point x="911" y="81"/>
+      <point x="911" y="217" type="curve" smooth="yes"/>
+      <point x="911" y="350"/>
+      <point x="847" y="436"/>
+      <point x="747" y="436" type="curve" smooth="yes"/>
+      <point x="644" y="436"/>
+      <point x="578" y="349"/>
+      <point x="578" y="213" type="curve" smooth="yes"/>
+      <point x="578" y="79"/>
+      <point x="643" y="-6"/>
     </contour>
     <contour>
-      <point x="748" y="60" type="curve" smooth="yes"/>
-      <point x="694" y="60"/>
-      <point x="659" y="121"/>
-      <point x="659" y="217" type="curve" smooth="yes"/>
-      <point x="659" y="311"/>
-      <point x="693" y="370"/>
-      <point x="746" y="370" type="curve" smooth="yes"/>
-      <point x="800" y="370"/>
-      <point x="835" y="309"/>
-      <point x="835" y="212" type="curve" smooth="yes"/>
-      <point x="835" y="119"/>
-      <point x="801" y="60"/>
+      <point x="746" y="60" type="curve" smooth="yes"/>
+      <point x="692" y="60"/>
+      <point x="657" y="121"/>
+      <point x="657" y="217" type="curve" smooth="yes"/>
+      <point x="657" y="311"/>
+      <point x="691" y="370"/>
+      <point x="744" y="370" type="curve" smooth="yes"/>
+      <point x="798" y="370"/>
+      <point x="833" y="309"/>
+      <point x="833" y="212" type="curve" smooth="yes"/>
+      <point x="833" y="119"/>
+      <point x="799" y="60"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/perthousand.glif 
b/src/Cantarell-Regular.ufo/glyphs/perthousand.glif
index 6d7a8029..c03a93af 100644
--- a/src/Cantarell-Regular.ufo/glyphs/perthousand.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/perthousand.glif
@@ -1,97 +1,97 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="perthousand" format="2">
-  <advance width="1383"/>
+  <advance width="1379"/>
   <unicode hex="2030"/>
   <outline>
     <contour>
-      <point x="265" y="0" type="line"/>
-      <point x="342" y="0" type="line"/>
-      <point x="724" y="694" type="line"/>
-      <point x="641" y="694" type="line"/>
+      <point x="263" y="0" type="line"/>
+      <point x="340" y="0" type="line"/>
+      <point x="722" y="694" type="line"/>
+      <point x="639" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="244" y="262" type="curve" smooth="yes"/>
-      <point x="345" y="262"/>
-      <point x="411" y="349"/>
-      <point x="411" y="485" type="curve" smooth="yes"/>
-      <point x="411" y="618"/>
-      <point x="347" y="704"/>
-      <point x="247" y="704" type="curve" smooth="yes"/>
-      <point x="144" y="704"/>
-      <point x="78" y="617"/>
-      <point x="78" y="481" type="curve" smooth="yes"/>
-      <point x="78" y="347"/>
-      <point x="143" y="262"/>
+      <point x="242" y="262" type="curve" smooth="yes"/>
+      <point x="343" y="262"/>
+      <point x="409" y="349"/>
+      <point x="409" y="485" type="curve" smooth="yes"/>
+      <point x="409" y="618"/>
+      <point x="345" y="704"/>
+      <point x="245" y="704" type="curve" smooth="yes"/>
+      <point x="142" y="704"/>
+      <point x="76" y="617"/>
+      <point x="76" y="481" type="curve" smooth="yes"/>
+      <point x="76" y="347"/>
+      <point x="141" y="262"/>
     </contour>
     <contour>
-      <point x="246" y="328" type="curve" smooth="yes"/>
-      <point x="192" y="328"/>
-      <point x="157" y="389"/>
-      <point x="157" y="485" type="curve" smooth="yes"/>
-      <point x="157" y="579"/>
-      <point x="191" y="638"/>
-      <point x="244" y="638" type="curve" smooth="yes"/>
-      <point x="298" y="638"/>
-      <point x="333" y="577"/>
-      <point x="333" y="480" type="curve" smooth="yes"/>
-      <point x="333" y="387"/>
-      <point x="299" y="328"/>
+      <point x="244" y="328" type="curve" smooth="yes"/>
+      <point x="190" y="328"/>
+      <point x="155" y="389"/>
+      <point x="155" y="485" type="curve" smooth="yes"/>
+      <point x="155" y="579"/>
+      <point x="189" y="638"/>
+      <point x="242" y="638" type="curve" smooth="yes"/>
+      <point x="296" y="638"/>
+      <point x="331" y="577"/>
+      <point x="331" y="480" type="curve" smooth="yes"/>
+      <point x="331" y="387"/>
+      <point x="297" y="328"/>
     </contour>
     <contour>
-      <point x="746" y="-6" type="curve" smooth="yes"/>
-      <point x="847" y="-6"/>
-      <point x="913" y="81"/>
-      <point x="913" y="217" type="curve" smooth="yes"/>
-      <point x="913" y="350"/>
-      <point x="849" y="436"/>
-      <point x="749" y="436" type="curve" smooth="yes"/>
-      <point x="646" y="436"/>
-      <point x="580" y="349"/>
-      <point x="580" y="213" type="curve" smooth="yes"/>
-      <point x="580" y="79"/>
-      <point x="645" y="-6"/>
+      <point x="744" y="-6" type="curve" smooth="yes"/>
+      <point x="845" y="-6"/>
+      <point x="911" y="81"/>
+      <point x="911" y="217" type="curve" smooth="yes"/>
+      <point x="911" y="350"/>
+      <point x="847" y="436"/>
+      <point x="747" y="436" type="curve" smooth="yes"/>
+      <point x="644" y="436"/>
+      <point x="578" y="349"/>
+      <point x="578" y="213" type="curve" smooth="yes"/>
+      <point x="578" y="79"/>
+      <point x="643" y="-6"/>
     </contour>
     <contour>
-      <point x="748" y="60" type="curve" smooth="yes"/>
-      <point x="694" y="60"/>
-      <point x="659" y="121"/>
-      <point x="659" y="217" type="curve" smooth="yes"/>
-      <point x="659" y="311"/>
-      <point x="693" y="370"/>
-      <point x="746" y="370" type="curve" smooth="yes"/>
-      <point x="800" y="370"/>
-      <point x="835" y="309"/>
-      <point x="835" y="212" type="curve" smooth="yes"/>
-      <point x="835" y="119"/>
-      <point x="801" y="60"/>
+      <point x="746" y="60" type="curve" smooth="yes"/>
+      <point x="692" y="60"/>
+      <point x="657" y="121"/>
+      <point x="657" y="217" type="curve" smooth="yes"/>
+      <point x="657" y="311"/>
+      <point x="691" y="370"/>
+      <point x="744" y="370" type="curve" smooth="yes"/>
+      <point x="798" y="370"/>
+      <point x="833" y="309"/>
+      <point x="833" y="212" type="curve" smooth="yes"/>
+      <point x="833" y="119"/>
+      <point x="799" y="60"/>
     </contour>
     <contour>
-      <point x="1138" y="-6" type="curve" smooth="yes"/>
-      <point x="1239" y="-6"/>
-      <point x="1305" y="81"/>
-      <point x="1305" y="217" type="curve" smooth="yes"/>
-      <point x="1305" y="350"/>
-      <point x="1241" y="436"/>
-      <point x="1141" y="436" type="curve" smooth="yes"/>
-      <point x="1038" y="436"/>
-      <point x="972" y="349"/>
-      <point x="972" y="213" type="curve" smooth="yes"/>
-      <point x="972" y="79"/>
-      <point x="1037" y="-6"/>
+      <point x="1136" y="-6" type="curve" smooth="yes"/>
+      <point x="1237" y="-6"/>
+      <point x="1303" y="81"/>
+      <point x="1303" y="217" type="curve" smooth="yes"/>
+      <point x="1303" y="350"/>
+      <point x="1239" y="436"/>
+      <point x="1139" y="436" type="curve" smooth="yes"/>
+      <point x="1036" y="436"/>
+      <point x="970" y="349"/>
+      <point x="970" y="213" type="curve" smooth="yes"/>
+      <point x="970" y="79"/>
+      <point x="1035" y="-6"/>
     </contour>
     <contour>
-      <point x="1140" y="60" type="curve" smooth="yes"/>
-      <point x="1086" y="60"/>
-      <point x="1051" y="121"/>
-      <point x="1051" y="217" type="curve" smooth="yes"/>
-      <point x="1051" y="311"/>
-      <point x="1085" y="370"/>
-      <point x="1138" y="370" type="curve" smooth="yes"/>
-      <point x="1192" y="370"/>
-      <point x="1227" y="309"/>
-      <point x="1227" y="212" type="curve" smooth="yes"/>
-      <point x="1227" y="119"/>
-      <point x="1193" y="60"/>
+      <point x="1138" y="60" type="curve" smooth="yes"/>
+      <point x="1084" y="60"/>
+      <point x="1049" y="121"/>
+      <point x="1049" y="217" type="curve" smooth="yes"/>
+      <point x="1049" y="311"/>
+      <point x="1083" y="370"/>
+      <point x="1136" y="370" type="curve" smooth="yes"/>
+      <point x="1190" y="370"/>
+      <point x="1225" y="309"/>
+      <point x="1225" y="212" type="curve" smooth="yes"/>
+      <point x="1225" y="119"/>
+      <point x="1191" y="60"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/radical.glif b/src/Cantarell-Regular.ufo/glyphs/radical.glif
index bef91794..eba9da75 100644
--- a/src/Cantarell-Regular.ufo/glyphs/radical.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/radical.glif
@@ -1,18 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="radical" format="2">
-  <advance width="582"/>
+  <advance width="576"/>
   <unicode hex="221A"/>
   <outline>
     <contour>
-      <point x="284" y="-59" type="line"/>
-      <point x="364" y="-59" type="line"/>
-      <point x="514" y="739" type="line"/>
-      <point x="427" y="739" type="line"/>
-      <point x="316" y="59" type="line"/>
-      <point x="240" y="303" type="line"/>
-      <point x="62" y="303" type="line"/>
-      <point x="62" y="231" type="line"/>
-      <point x="178" y="231" type="line"/>
+      <point x="281" y="-59" type="line"/>
+      <point x="361" y="-59" type="line"/>
+      <point x="511" y="739" type="line"/>
+      <point x="424" y="739" type="line"/>
+      <point x="313" y="59" type="line"/>
+      <point x="237" y="303" type="line"/>
+      <point x="59" y="303" type="line"/>
+      <point x="59" y="231" type="line"/>
+      <point x="175" y="231" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ratio.glif b/src/Cantarell-Regular.ufo/glyphs/ratio.glif
index c48478f5..9450dfa7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ratio.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ratio.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ratio" format="2">
-  <advance width="336"/>
+  <advance width="256"/>
   <unicode hex="2236"/>
   <outline>
-    <component base="colon" xOffset="76" yOffset="100"/>
+    <component base="colon" yOffset="100"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>colon</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>colon</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/registered.glif 
b/src/Cantarell-Regular.ufo/glyphs/registered.glif
index 1f4503a2..3280644d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/registered.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/registered.glif
@@ -1,67 +1,73 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="registered" format="2">
-  <advance width="659"/>
+  <advance width="655"/>
   <unicode hex="00AE"/>
   <outline>
     <contour>
-      <point x="327" y="279" type="curve" smooth="yes"/>
-      <point x="469" y="279"/>
-      <point x="570" y="377"/>
-      <point x="570" y="515" type="curve" smooth="yes"/>
-      <point x="570" y="652"/>
-      <point x="471" y="749"/>
-      <point x="332" y="749" type="curve" smooth="yes"/>
-      <point x="190" y="749"/>
-      <point x="89" y="649"/>
-      <point x="89" y="510" type="curve" smooth="yes"/>
-      <point x="89" y="374"/>
-      <point x="187" y="279"/>
+      <point x="325" y="279" type="curve" smooth="yes"/>
+      <point x="467" y="279"/>
+      <point x="568" y="377"/>
+      <point x="568" y="515" type="curve" smooth="yes"/>
+      <point x="568" y="652"/>
+      <point x="469" y="749"/>
+      <point x="330" y="749" type="curve" smooth="yes"/>
+      <point x="188" y="749"/>
+      <point x="87" y="649"/>
+      <point x="87" y="510" type="curve" smooth="yes"/>
+      <point x="87" y="374"/>
+      <point x="185" y="279"/>
     </contour>
     <contour>
-      <point x="333" y="325" type="curve" smooth="yes"/>
-      <point x="218" y="325"/>
-      <point x="136" y="405"/>
-      <point x="136" y="516" type="curve" smooth="yes"/>
-      <point x="136" y="625"/>
-      <point x="215" y="703"/>
-      <point x="327" y="703" type="curve" smooth="yes"/>
-      <point x="441" y="703"/>
-      <point x="523" y="622"/>
-      <point x="523" y="510" type="curve" smooth="yes"/>
-      <point x="523" y="401"/>
-      <point x="445" y="325"/>
+      <point x="331" y="325" type="curve" smooth="yes"/>
+      <point x="216" y="325"/>
+      <point x="134" y="405"/>
+      <point x="134" y="516" type="curve" smooth="yes"/>
+      <point x="134" y="625"/>
+      <point x="213" y="703"/>
+      <point x="325" y="703" type="curve" smooth="yes"/>
+      <point x="439" y="703"/>
+      <point x="521" y="622"/>
+      <point x="521" y="510" type="curve" smooth="yes"/>
+      <point x="521" y="401"/>
+      <point x="443" y="325"/>
     </contour>
     <contour>
-      <point x="237" y="380" type="line"/>
-      <point x="298" y="380" type="line"/>
-      <point x="298" y="658" type="line"/>
-      <point x="237" y="658" type="line"/>
+      <point x="235" y="380" type="line"/>
+      <point x="296" y="380" type="line"/>
+      <point x="296" y="658" type="line"/>
+      <point x="235" y="658" type="line"/>
     </contour>
     <contour>
-      <point x="280" y="476" type="line"/>
-      <point x="328" y="476" type="line" smooth="yes"/>
-      <point x="395" y="476"/>
-      <point x="440" y="513"/>
-      <point x="440" y="569" type="curve" smooth="yes"/>
-      <point x="440" y="622"/>
-      <point x="396" y="658"/>
-      <point x="331" y="658" type="curve" smooth="yes"/>
-      <point x="280" y="658" type="line"/>
-      <point x="280" y="605" type="line"/>
-      <point x="328" y="605" type="line" smooth="yes"/>
-      <point x="357" y="605"/>
-      <point x="376" y="589"/>
-      <point x="376" y="566" type="curve" smooth="yes"/>
-      <point x="376" y="542"/>
-      <point x="362" y="528"/>
-      <point x="331" y="528" type="curve" smooth="yes"/>
-      <point x="280" y="528" type="line"/>
+      <point x="278" y="476" type="line"/>
+      <point x="326" y="476" type="line" smooth="yes"/>
+      <point x="393" y="476"/>
+      <point x="438" y="513"/>
+      <point x="438" y="569" type="curve" smooth="yes"/>
+      <point x="438" y="622"/>
+      <point x="394" y="658"/>
+      <point x="329" y="658" type="curve" smooth="yes"/>
+      <point x="278" y="658" type="line"/>
+      <point x="278" y="605" type="line"/>
+      <point x="326" y="605" type="line" smooth="yes"/>
+      <point x="355" y="605"/>
+      <point x="374" y="589"/>
+      <point x="374" y="566" type="curve" smooth="yes"/>
+      <point x="374" y="542"/>
+      <point x="360" y="528"/>
+      <point x="329" y="528" type="curve" smooth="yes"/>
+      <point x="278" y="528" type="line"/>
     </contour>
     <contour>
-      <point x="395" y="380" type="line"/>
-      <point x="460" y="380" type="line"/>
-      <point x="399" y="501" type="line"/>
-      <point x="340" y="501" type="line"/>
+      <point x="393" y="380" type="line"/>
+      <point x="458" y="380" type="line"/>
+      <point x="397" y="501" type="line"/>
+      <point x="338" y="501" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/rightA_rrow.glif 
b/src/Cantarell-Regular.ufo/glyphs/rightA_rrow.glif
index 79c5123d..9799a01e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/rightA_rrow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/rightA_rrow.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rightArrow" format="2">
-  <advance width="681"/>
+  <advance width="677"/>
   <unicode hex="2192"/>
   <note>
 arrowright
 </note>
   <outline>
     <contour>
-      <point x="350" y="54" type="line"/>
-      <point x="621" y="319" type="line"/>
-      <point x="621" y="329" type="line"/>
-      <point x="353" y="590" type="line"/>
-      <point x="299" y="535" type="line"/>
-      <point x="506" y="355" type="line"/>
-      <point x="68" y="355" type="line"/>
-      <point x="68" y="288" type="line"/>
-      <point x="505" y="288" type="line"/>
-      <point x="299" y="105" type="line"/>
+      <point x="348" y="54" type="line"/>
+      <point x="619" y="319" type="line"/>
+      <point x="619" y="329" type="line"/>
+      <point x="351" y="590" type="line"/>
+      <point x="297" y="535" type="line"/>
+      <point x="504" y="355" type="line"/>
+      <point x="66" y="355" type="line"/>
+      <point x="66" y="288" type="line"/>
+      <point x="503" y="288" type="line"/>
+      <point x="297" y="105" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/saltillo.glif b/src/Cantarell-Regular.ufo/glyphs/saltillo.glif
index 1f5abdc5..6ee8673b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/saltillo.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/saltillo.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="saltillo" format="2">
-  <advance width="141"/>
+  <advance width="252"/>
   <unicode hex="A78C"/>
   <outline>
-    <component base="quotesingle" yScale="1.40024" xOffset="-53" yOffset="-278"/>
+    <component base="quotesingle" yScale="1.40024" xOffset="4" yOffset="-278"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/second.glif b/src/Cantarell-Regular.ufo/glyphs/second.glif
index 4eb4eb16..ad0b376e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/second.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/second.glif
@@ -1,12 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="second" format="2">
-  <advance width="510"/>
+  <advance width="502"/>
   <unicode hex="2033"/>
   <note>
 second
 </note>
   <outline>
-    <component base="quotesingle" yxScale="0.19201" xOffset="-70"/>
-    <component base="quotesingle" yxScale="0.19201" xOffset="110"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="-68"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="112"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>minute</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>minute</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/section.glif b/src/Cantarell-Regular.ufo/glyphs/section.glif
index 5ac9625c..0cf25866 100644
--- a/src/Cantarell-Regular.ufo/glyphs/section.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/section.glif
@@ -1,63 +1,63 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="section" format="2">
-  <advance width="554"/>
+  <advance width="550"/>
   <unicode hex="00A7"/>
   <outline>
     <contour>
-      <point x="265" y="-60" type="curve" smooth="yes"/>
-      <point x="387" y="-60"/>
-      <point x="465" y="0"/>
-      <point x="465" y="95" type="curve" smooth="yes"/>
-      <point x="465" y="282"/>
-      <point x="177" y="219"/>
-      <point x="177" y="331" type="curve" smooth="yes"/>
-      <point x="177" y="376"/>
-      <point x="225" y="413"/>
-      <point x="282" y="413" type="curve"/>
-      <point x="296" y="454" type="line"/>
-      <point x="177" y="454"/>
-      <point x="97" y="401"/>
-      <point x="97" y="317" type="curve" smooth="yes"/>
-      <point x="97" y="151"/>
-      <point x="385" y="214"/>
-      <point x="385" y="86" type="curve" smooth="yes"/>
-      <point x="385" y="38"/>
-      <point x="344" y="10"/>
-      <point x="274" y="10" type="curve" smooth="yes"/>
-      <point x="219" y="10"/>
-      <point x="153" y="26"/>
-      <point x="108" y="48" type="curve"/>
-      <point x="89" y="-19" type="line"/>
-      <point x="143" y="-44"/>
-      <point x="206" y="-60"/>
+      <point x="263" y="-60" type="curve" smooth="yes"/>
+      <point x="385" y="-60"/>
+      <point x="463" y="0"/>
+      <point x="463" y="95" type="curve" smooth="yes"/>
+      <point x="463" y="282"/>
+      <point x="175" y="219"/>
+      <point x="175" y="331" type="curve" smooth="yes"/>
+      <point x="175" y="376"/>
+      <point x="223" y="413"/>
+      <point x="280" y="413" type="curve"/>
+      <point x="294" y="454" type="line"/>
+      <point x="175" y="454"/>
+      <point x="95" y="401"/>
+      <point x="95" y="317" type="curve" smooth="yes"/>
+      <point x="95" y="151"/>
+      <point x="383" y="214"/>
+      <point x="383" y="86" type="curve" smooth="yes"/>
+      <point x="383" y="38"/>
+      <point x="342" y="10"/>
+      <point x="272" y="10" type="curve" smooth="yes"/>
+      <point x="217" y="10"/>
+      <point x="151" y="26"/>
+      <point x="106" y="48" type="curve"/>
+      <point x="87" y="-19" type="line"/>
+      <point x="141" y="-44"/>
+      <point x="204" y="-60"/>
     </contour>
     <contour>
-      <point x="264" y="191" type="line"/>
-      <point x="385" y="191"/>
-      <point x="465" y="250"/>
-      <point x="465" y="338" type="curve" smooth="yes"/>
-      <point x="465" y="505"/>
-      <point x="177" y="445"/>
-      <point x="177" y="562" type="curve" smooth="yes"/>
-      <point x="177" y="606"/>
-      <point x="218" y="634"/>
-      <point x="282" y="634" type="curve" smooth="yes"/>
-      <point x="324" y="634"/>
-      <point x="379" y="623"/>
-      <point x="420" y="607" type="curve"/>
-      <point x="439" y="672" type="line"/>
-      <point x="396" y="693"/>
-      <point x="346" y="704"/>
-      <point x="295" y="704" type="curve" smooth="yes"/>
-      <point x="175" y="704"/>
-      <point x="97" y="644"/>
-      <point x="97" y="553" type="curve" smooth="yes"/>
-      <point x="97" y="376"/>
-      <point x="385" y="441"/>
-      <point x="385" y="316" type="curve" smooth="yes"/>
-      <point x="385" y="269"/>
-      <point x="346" y="241"/>
-      <point x="278" y="241" type="curve"/>
+      <point x="262" y="191" type="line"/>
+      <point x="383" y="191"/>
+      <point x="463" y="250"/>
+      <point x="463" y="338" type="curve" smooth="yes"/>
+      <point x="463" y="505"/>
+      <point x="175" y="445"/>
+      <point x="175" y="562" type="curve" smooth="yes"/>
+      <point x="175" y="606"/>
+      <point x="216" y="634"/>
+      <point x="280" y="634" type="curve" smooth="yes"/>
+      <point x="322" y="634"/>
+      <point x="377" y="623"/>
+      <point x="418" y="607" type="curve"/>
+      <point x="437" y="672" type="line"/>
+      <point x="394" y="693"/>
+      <point x="344" y="704"/>
+      <point x="293" y="704" type="curve" smooth="yes"/>
+      <point x="173" y="704"/>
+      <point x="95" y="644"/>
+      <point x="95" y="553" type="curve" smooth="yes"/>
+      <point x="95" y="376"/>
+      <point x="383" y="441"/>
+      <point x="383" y="316" type="curve" smooth="yes"/>
+      <point x="383" y="269"/>
+      <point x="344" y="241"/>
+      <point x="276" y="241" type="curve"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/sha-cy.glif b/src/Cantarell-Regular.ufo/glyphs/sha-cy.glif
index 7db02f53..b96da7f6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/sha-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/sha-cy.glif
@@ -2,6 +2,7 @@
 <glyph name="sha-cy" format="2">
   <advance width="807"/>
   <unicode hex="0448"/>
+  <anchor x="717" y="0" name="bottomright"/>
   <outline>
     <contour>
       <point x="83" y="0" type="line"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/shcha-cy.glif b/src/Cantarell-Regular.ufo/glyphs/shcha-cy.glif
index 0f768059..ee5db52b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/shcha-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/shcha-cy.glif
@@ -1,30 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="shcha-cy" format="2">
-  <advance width="821"/>
+  <advance width="820"/>
   <unicode hex="0449"/>
   <outline>
-    <contour>
-      <point x="718" y="-126" type="line"/>
-      <point x="793" y="-126" type="line"/>
-      <point x="793" y="66" type="line"/>
-      <point x="163" y="66" type="line"/>
-      <point x="163" y="482" type="line"/>
-      <point x="83" y="482" type="line"/>
-      <point x="83" y="0" type="line"/>
-      <point x="718" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="365" y="32" type="line"/>
-      <point x="444" y="32" type="line"/>
-      <point x="444" y="482" type="line"/>
-      <point x="365" y="482" type="line"/>
-    </contour>
-    <contour>
-      <point x="646" y="32" type="line"/>
-      <point x="726" y="32" type="line"/>
-      <point x="726" y="482" type="line"/>
-      <point x="646" y="482" type="line"/>
-    </contour>
+    <component base="sha-cy"/>
+    <component base="descender-cy" xOffset="610"/>
   </outline>
   <lib>
     <dict>
@@ -39,6 +19,11 @@
       <string>en-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>tse-cy</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>-1</integer>
+        <integer>0</integer>
+      </array>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/summation.glif b/src/Cantarell-Regular.ufo/glyphs/summation.glif
index a0a33d0d..551e4892 100644
--- a/src/Cantarell-Regular.ufo/glyphs/summation.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/summation.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="summation" format="2">
-  <advance width="647"/>
+  <advance width="641"/>
   <unicode hex="2211"/>
   <outline>
     <contour>
-      <point x="68" y="-95" type="line"/>
-      <point x="578" y="-95" type="line"/>
-      <point x="578" y="-24" type="line"/>
-      <point x="169" y="-24" type="line"/>
-      <point x="453" y="299" type="line"/>
-      <point x="172" y="622" type="line"/>
-      <point x="578" y="622" type="line"/>
-      <point x="578" y="694" type="line"/>
-      <point x="68" y="694" type="line"/>
-      <point x="68" y="638" type="line"/>
-      <point x="357" y="299" type="line"/>
-      <point x="68" y="-39" type="line"/>
+      <point x="65" y="-95" type="line"/>
+      <point x="575" y="-95" type="line"/>
+      <point x="575" y="-24" type="line"/>
+      <point x="166" y="-24" type="line"/>
+      <point x="450" y="299" type="line"/>
+      <point x="169" y="622" type="line"/>
+      <point x="575" y="622" type="line"/>
+      <point x="575" y="694" type="line"/>
+      <point x="65" y="694" type="line"/>
+      <point x="65" y="638" type="line"/>
+      <point x="354" y="299" type="line"/>
+      <point x="65" y="-39" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/trademark.glif b/src/Cantarell-Regular.ufo/glyphs/trademark.glif
index 40f29438..765e09df 100644
--- a/src/Cantarell-Regular.ufo/glyphs/trademark.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/trademark.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="trademark" format="2">
-  <advance width="811"/>
+  <advance width="806"/>
   <unicode hex="2122"/>
   <outline>
     <contour>
-      <point x="173" y="382" type="line"/>
-      <point x="228" y="382" type="line"/>
-      <point x="228" y="693" type="line"/>
-      <point x="173" y="693" type="line"/>
+      <point x="170" y="382" type="line"/>
+      <point x="225" y="382" type="line"/>
+      <point x="225" y="693" type="line"/>
+      <point x="170" y="693" type="line"/>
     </contour>
     <contour>
-      <point x="69" y="645" type="line"/>
-      <point x="332" y="645" type="line"/>
-      <point x="332" y="694" type="line"/>
-      <point x="69" y="694" type="line"/>
+      <point x="66" y="645" type="line"/>
+      <point x="329" y="645" type="line"/>
+      <point x="329" y="694" type="line"/>
+      <point x="66" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="359" y="382" type="line"/>
-      <point x="409" y="382" type="line"/>
-      <point x="409" y="621" type="line"/>
-      <point x="402" y="614" type="line"/>
-      <point x="511" y="427" type="line"/>
-      <point x="535" y="427" type="line"/>
-      <point x="642" y="616" type="line"/>
-      <point x="636" y="621" type="line"/>
-      <point x="636" y="382" type="line"/>
-      <point x="686" y="382" type="line"/>
-      <point x="686" y="694" type="line"/>
-      <point x="630" y="694" type="line"/>
-      <point x="513" y="482" type="line"/>
-      <point x="537" y="482" type="line"/>
-      <point x="418" y="694" type="line"/>
-      <point x="359" y="694" type="line"/>
+      <point x="356" y="382" type="line"/>
+      <point x="406" y="382" type="line"/>
+      <point x="406" y="621" type="line"/>
+      <point x="399" y="614" type="line"/>
+      <point x="508" y="427" type="line"/>
+      <point x="532" y="427" type="line"/>
+      <point x="639" y="616" type="line"/>
+      <point x="633" y="621" type="line"/>
+      <point x="633" y="382" type="line"/>
+      <point x="683" y="382" type="line"/>
+      <point x="683" y="694" type="line"/>
+      <point x="627" y="694" type="line"/>
+      <point x="510" y="482" type="line"/>
+      <point x="534" y="482" type="line"/>
+      <point x="415" y="694" type="line"/>
+      <point x="356" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upA_rrow.glif b/src/Cantarell-Regular.ufo/glyphs/upA_rrow.glif
index 76f014ba..67498e54 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upA_rrow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upA_rrow.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upArrow" format="2">
-  <advance width="646"/>
+  <advance width="640"/>
   <unicode hex="2191"/>
   <note>
 arrowup
 </note>
   <outline>
     <contour>
-      <point x="284" y="44" type="line"/>
-      <point x="360" y="44" type="line"/>
-      <point x="358" y="464" type="line"/>
-      <point x="536" y="278" type="line"/>
-      <point x="587" y="329" type="line"/>
-      <point x="324" y="598" type="line"/>
-      <point x="320" y="598" type="line"/>
-      <point x="59" y="329" type="line"/>
-      <point x="110" y="279" type="line"/>
-      <point x="286" y="466" type="line"/>
+      <point x="281" y="44" type="line"/>
+      <point x="357" y="44" type="line"/>
+      <point x="355" y="464" type="line"/>
+      <point x="533" y="278" type="line"/>
+      <point x="584" y="329" type="line"/>
+      <point x="321" y="598" type="line"/>
+      <point x="317" y="598" type="line"/>
+      <point x="56" y="329" type="line"/>
+      <point x="107" y="279" type="line"/>
+      <point x="283" y="466" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/whiteC_ircle.glif 
b/src/Cantarell-Regular.ufo/glyphs/whiteC_ircle.glif
index b77b0224..d0bf46c0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/whiteC_ircle.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/whiteC_ircle.glif
@@ -1,38 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="whiteCircle" format="2">
-  <advance width="664"/>
+  <advance width="662"/>
   <unicode hex="25CB"/>
   <note>
 circle
 </note>
   <outline>
     <contour>
-      <point x="330" y="110" type="curve" smooth="yes"/>
-      <point x="474" y="110"/>
-      <point x="575" y="207"/>
-      <point x="575" y="349" type="curve" smooth="yes"/>
-      <point x="575" y="488"/>
-      <point x="476" y="584"/>
-      <point x="334" y="584" type="curve" smooth="yes"/>
-      <point x="189" y="584"/>
-      <point x="89" y="485"/>
-      <point x="89" y="343" type="curve" smooth="yes"/>
-      <point x="89" y="205"/>
-      <point x="188" y="110"/>
+      <point x="329" y="110" type="curve" smooth="yes"/>
+      <point x="473" y="110"/>
+      <point x="574" y="207"/>
+      <point x="574" y="349" type="curve" smooth="yes"/>
+      <point x="574" y="488"/>
+      <point x="475" y="584"/>
+      <point x="333" y="584" type="curve" smooth="yes"/>
+      <point x="188" y="584"/>
+      <point x="88" y="485"/>
+      <point x="88" y="343" type="curve" smooth="yes"/>
+      <point x="88" y="205"/>
+      <point x="187" y="110"/>
     </contour>
     <contour>
-      <point x="335" y="178" type="curve" smooth="yes"/>
-      <point x="236" y="178"/>
-      <point x="167" y="248"/>
-      <point x="167" y="349" type="curve" smooth="yes"/>
-      <point x="167" y="447"/>
-      <point x="233" y="516"/>
-      <point x="330" y="516" type="curve" smooth="yes"/>
-      <point x="428" y="516"/>
-      <point x="497" y="445"/>
-      <point x="497" y="343" type="curve" smooth="yes"/>
-      <point x="497" y="245"/>
-      <point x="430" y="178"/>
+      <point x="334" y="178" type="curve" smooth="yes"/>
+      <point x="235" y="178"/>
+      <point x="166" y="248"/>
+      <point x="166" y="349" type="curve" smooth="yes"/>
+      <point x="166" y="447"/>
+      <point x="232" y="516"/>
+      <point x="329" y="516" type="curve" smooth="yes"/>
+      <point x="427" y="516"/>
+      <point x="496" y="445"/>
+      <point x="496" y="343" type="curve" smooth="yes"/>
+      <point x="496" y="245"/>
+      <point x="429" y="178"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>blackCircle</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>blackCircle</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/yat-cy.glif b/src/Cantarell-Regular.ufo/glyphs/yat-cy.glif
index 2591c8d3..19c4dc6c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/yat-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/yat-cy.glif
@@ -4,7 +4,7 @@
   <unicode hex="0463"/>
   <outline>
     <contour>
-      <point x="91" y="0" type="line"/>
+      <point x="92" y="0" type="line"/>
       <point x="273" y="0" type="line" smooth="yes"/>
       <point x="399" y="0"/>
       <point x="476" y="62"/>
@@ -23,13 +23,13 @@
       <point x="284" y="67" type="curve" smooth="yes"/>
       <point x="167" y="67" type="line"/>
       <point x="167" y="739" type="line"/>
-      <point x="91" y="739" type="line"/>
+      <point x="92" y="739" type="line"/>
     </contour>
     <contour>
-      <point x="23" y="457" type="line"/>
-      <point x="310" y="457" type="line"/>
-      <point x="310" y="524" type="line"/>
-      <point x="23" y="524" type="line"/>
+      <point x="23" y="458" type="line"/>
+      <point x="310" y="458" type="line"/>
+      <point x="310" y="523" type="line"/>
+      <point x="23" y="523" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/layercontents.plist b/src/Cantarell-Regular.ufo/layercontents.plist
index d2e6eabe..e45fe871 100644
--- a/src/Cantarell-Regular.ufo/layercontents.plist
+++ b/src/Cantarell-Regular.ufo/layercontents.plist
@@ -10,6 +10,10 @@
       <string>Template</string>
       <string>glyphs.T_emplate</string>
     </array>
+    <array>
+      <string>Outline</string>
+      <string>glyphs.O_utline</string>
+    </array>
     <array>
       <string>Wavy</string>
       <string>glyphs.W_avy</string>
diff --git a/src/Cantarell.designspace b/src/Cantarell.designspace
index 91763e48..f179b43c 100644
--- a/src/Cantarell.designspace
+++ b/src/Cantarell.designspace
@@ -120,9 +120,9 @@
           <key>HV</key>
           <string>176</string>
           <key>OH</key>
-          <string>150</string>
+          <string>152</string>
           <key>OV</key>
-          <string>180</string>
+          <string>182</string>
           <key>nV</key>
           <string>173</string>
           <key>nd</key>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]