[cantarell-fonts/respacing] Redo and space tf numerals

From: Nikolaus Waxweiler <nwaxweiler src gnome org>
To: commits-list gnome org
Cc:
Subject: [cantarell-fonts/respacing] Redo and space tf numerals
Date: Sat, 8 Jun 2019 21:23:21 +0000 (UTC)
commit a3c8dd503b4b7eb016e3f4cc0e0e976eb331b7d9
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Sat Jun 8 22:23:06 2019 +0100

    Redo and space tf numerals

 .../glyphs.J_un 8 19, 20_46/contents.plist         | 22 ++++++++
 .../glyphs.J_un 8 19, 20_46/eight.tf.glif          | 61 ++++++++++++++++++++++
 .../glyphs.J_un 8 19, 20_46/five.tf.glif           | 48 +++++++++++++++++
 .../glyphs.J_un 8 19, 20_46/four.tf.glif           | 29 ++++++++++
 .../glyphs.J_un 8 19, 20_46/layerinfo.plist        | 27 ++++++++++
 .../glyphs.J_un 8 19, 20_46/nine.tf.glif           | 55 +++++++++++++++++++
 .../glyphs.J_un 8 19, 20_46/seven.tf.glif          | 25 +++++++++
 .../glyphs.J_un 8 19, 20_46/six.tf.glif            | 55 +++++++++++++++++++
 .../glyphs.J_un 8 19, 20_46/three.tf.glif          | 57 ++++++++++++++++++++
 .../glyphs.J_un 8 19, 20_46/two.tf.glif            | 41 +++++++++++++++
 .../glyphs.J_un 8 19, 20_55/contents.plist         |  8 +++
 .../glyphs.J_un 8 19, 20_55/layerinfo.plist        | 13 +++++
 .../glyphs.J_un 8 19, 20_55/zero.tf.glif           | 44 ++++++++++++++++
 src/Cantarell-Bold.ufo/glyphs/eight.tf.glif        | 49 +----------------
 src/Cantarell-Bold.ufo/glyphs/five.tf.glif         | 36 +------------
 src/Cantarell-Bold.ufo/glyphs/four.tf.glif         | 26 ++++-----
 src/Cantarell-Bold.ufo/glyphs/nine.tf.glif         | 43 +--------------
 src/Cantarell-Bold.ufo/glyphs/one.tf.glif          | 22 ++++----
 src/Cantarell-Bold.ufo/glyphs/seven.tf.glif        | 18 +++----
 src/Cantarell-Bold.ufo/glyphs/six.tf.glif          | 43 +--------------
 src/Cantarell-Bold.ufo/glyphs/three.tf.glif        | 45 +---------------
 src/Cantarell-Bold.ufo/glyphs/two.tf.glif          | 29 +---------
 src/Cantarell-Bold.ufo/glyphs/zero.tf.glif         | 32 +-----------
 src/Cantarell-Bold.ufo/glyphs/zero.tf.zero.glif    |  4 +-
 src/Cantarell-Bold.ufo/layercontents.plist         |  8 +++
 .../glyphs.J_un 8 19, 20_47/contents.plist         | 22 ++++++++
 .../glyphs.J_un 8 19, 20_47/eight.tf.glif          | 61 ++++++++++++++++++++++
 .../glyphs.J_un 8 19, 20_47/five.tf.glif           | 48 +++++++++++++++++
 .../glyphs.J_un 8 19, 20_47/four.tf.glif           | 29 ++++++++++
 .../glyphs.J_un 8 19, 20_47/layerinfo.plist        | 27 ++++++++++
 .../glyphs.J_un 8 19, 20_47/nine.tf.glif           | 55 +++++++++++++++++++
 .../glyphs.J_un 8 19, 20_47/seven.tf.glif          | 25 +++++++++
 .../glyphs.J_un 8 19, 20_47/six.tf.glif            | 55 +++++++++++++++++++
 .../glyphs.J_un 8 19, 20_47/three.tf.glif          | 57 ++++++++++++++++++++
 .../glyphs.J_un 8 19, 20_47/two.tf.glif            | 41 +++++++++++++++
 .../glyphs.J_un 8 19, 20_55/contents.plist         |  8 +++
 .../glyphs.J_un 8 19, 20_55/layerinfo.plist        | 13 +++++
 .../glyphs.J_un 8 19, 20_55/zero.tf.glif           | 44 ++++++++++++++++
 src/Cantarell-Light.ufo/glyphs/eight.tf.glif       | 49 +----------------
 src/Cantarell-Light.ufo/glyphs/five.tf.glif        | 36 +------------
 src/Cantarell-Light.ufo/glyphs/four.tf.glif        | 26 ++++-----
 src/Cantarell-Light.ufo/glyphs/nine.tf.glif        | 43 +--------------
 src/Cantarell-Light.ufo/glyphs/one.tf.glif         | 26 ++++-----
 src/Cantarell-Light.ufo/glyphs/seven.tf.glif       | 18 +++----
 src/Cantarell-Light.ufo/glyphs/six.tf.glif         | 43 +--------------
 src/Cantarell-Light.ufo/glyphs/three.tf.glif       | 45 +---------------
 src/Cantarell-Light.ufo/glyphs/two.tf.glif         | 29 +---------
 src/Cantarell-Light.ufo/glyphs/zero.tf.glif        | 32 +-----------
 src/Cantarell-Light.ufo/glyphs/zero.tf.zero.glif   |  4 +-
 src/Cantarell-Light.ufo/layercontents.plist        |  8 +++
 .../glyphs.J_un 8 19, 20_47/contents.plist         | 22 ++++++++
 .../glyphs.J_un 8 19, 20_47/eight.tf.glif          | 61 ++++++++++++++++++++++
 .../glyphs.J_un 8 19, 20_47/five.tf.glif           | 48 +++++++++++++++++
 .../glyphs.J_un 8 19, 20_47/four.tf.glif           | 29 ++++++++++
 .../glyphs.J_un 8 19, 20_47/layerinfo.plist        | 27 ++++++++++
 .../glyphs.J_un 8 19, 20_47/nine.tf.glif           | 55 +++++++++++++++++++
 .../glyphs.J_un 8 19, 20_47/seven.tf.glif          | 25 +++++++++
 .../glyphs.J_un 8 19, 20_47/six.tf.glif            | 55 +++++++++++++++++++
 .../glyphs.J_un 8 19, 20_47/three.tf.glif          | 57 ++++++++++++++++++++
 .../glyphs.J_un 8 19, 20_47/two.tf.glif            | 41 +++++++++++++++
 .../glyphs.J_un 8 19, 20_55/contents.plist         |  8 +++
 .../glyphs.J_un 8 19, 20_55/layerinfo.plist        | 13 +++++
 .../glyphs.J_un 8 19, 20_55/zero.tf.glif           | 44 ++++++++++++++++
 src/Cantarell-Regular.ufo/glyphs/eight.tf.glif     | 49 +----------------
 src/Cantarell-Regular.ufo/glyphs/five.tf.glif      | 36 +------------
 src/Cantarell-Regular.ufo/glyphs/four.tf.glif      | 26 ++++-----
 src/Cantarell-Regular.ufo/glyphs/nine.tf.glif      | 43 +--------------
 src/Cantarell-Regular.ufo/glyphs/one.tf.glif       | 26 ++++-----
 src/Cantarell-Regular.ufo/glyphs/seven.tf.glif     | 14 ++---
 src/Cantarell-Regular.ufo/glyphs/six.tf.glif       | 43 +--------------
 src/Cantarell-Regular.ufo/glyphs/three.tf.glif     | 45 +---------------
 src/Cantarell-Regular.ufo/glyphs/two.tf.glif       | 29 +---------
 src/Cantarell-Regular.ufo/glyphs/zero.tf.glif      | 32 +-----------
 src/Cantarell-Regular.ufo/glyphs/zero.tf.zero.glif |  4 +-
 src/Cantarell-Regular.ufo/layercontents.plist      |  8 +++
 75 files changed, 1628 insertions(+), 896 deletions(-)
---
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/contents.plist 
b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/contents.plist
new file mode 100644
index 00000000..8b006235
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/contents.plist     
@@ -0,0 +1,22 @@
+<?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>eight.tf</key>
+    <string>eight.tf.glif</string>
+    <key>five.tf</key>
+    <string>five.tf.glif</string>
+    <key>four.tf</key>
+    <string>four.tf.glif</string>
+    <key>nine.tf</key>
+    <string>nine.tf.glif</string>
+    <key>seven.tf</key>
+    <string>seven.tf.glif</string>
+    <key>six.tf</key>
+    <string>six.tf.glif</string>
+    <key>three.tf</key>
+    <string>three.tf.glif</string>
+    <key>two.tf</key>
+    <string>two.tf.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/eight.tf.glif 
b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/eight.tf.glif
new file mode 100644
index 00000000..eaf84137
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/eight.tf.glif      
@@ -0,0 +1,61 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="eight.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="286" y="-10" type="curve" smooth="yes"/>
+      <point x="451" y="-10"/>
+      <point x="561" y="76"/>
+      <point x="561" y="203" type="curve" smooth="yes"/>
+      <point x="561" y="433"/>
+      <point x="204" y="379"/>
+      <point x="204" y="502" type="curve" smooth="yes"/>
+      <point x="204" y="539"/>
+      <point x="237" y="566"/>
+      <point x="288" y="566" type="curve" smooth="yes"/>
+      <point x="339" y="566"/>
+      <point x="373" y="539"/>
+      <point x="373" y="497" type="curve" smooth="yes"/>
+      <point x="373" y="455"/>
+      <point x="337" y="424"/>
+      <point x="283" y="419" type="curve"/>
+      <point x="399" y="359" type="line"/>
+      <point x="489" y="393"/>
+      <point x="539" y="456"/>
+      <point x="539" y="529" type="curve" smooth="yes"/>
+      <point x="539" y="634"/>
+      <point x="439" y="704"/>
+      <point x="297" y="704" type="curve" smooth="yes"/>
+      <point x="141" y="704"/>
+      <point x="38" y="619"/>
+      <point x="38" y="493" type="curve" smooth="yes"/>
+      <point x="38" y="257"/>
+      <point x="395" y="311"/>
+      <point x="395" y="193" type="curve" smooth="yes"/>
+      <point x="395" y="155"/>
+      <point x="357" y="128"/>
+      <point x="297" y="128" type="curve" smooth="yes"/>
+      <point x="230" y="128"/>
+      <point x="186" y="162"/>
+      <point x="186" y="215" type="curve" smooth="yes"/>
+      <point x="186" y="263"/>
+      <point x="224" y="292"/>
+      <point x="291" y="294" type="curve"/>
+      <point x="194" y="357" type="line"/>
+      <point x="85" y="337"/>
+      <point x="20" y="273"/>
+      <point x="20" y="183" type="curve" smooth="yes"/>
+      <point x="20" y="68"/>
+      <point x="129" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/five.tf.glif b/src/Cantarell-Bold.ufo/glyphs.J_un 
8 19, 20_46/five.tf.glif
new file mode 100644
index 00000000..fc33deeb
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/five.tf.glif       
@@ -0,0 +1,48 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="five.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="250" y="-10" type="curve" smooth="yes"/>
+      <point x="435" y="-10"/>
+      <point x="554" y="80"/>
+      <point x="554" y="230" type="curve" smooth="yes"/>
+      <point x="554" y="362"/>
+      <point x="458" y="436"/>
+      <point x="287" y="436" type="curve" smooth="yes"/>
+      <point x="244" y="436"/>
+      <point x="221" y="431"/>
+      <point x="199" y="418" type="curve"/>
+      <point x="242" y="365" type="line"/>
+      <point x="251" y="543" type="line"/>
+      <point x="517" y="543" type="line"/>
+      <point x="517" y="694" type="line"/>
+      <point x="82" y="694" type="line"/>
+      <point x="64" y="287" type="line"/>
+      <point x="108" y="295"/>
+      <point x="164" y="301"/>
+      <point x="206" y="301" type="curve" smooth="yes"/>
+      <point x="312" y="301"/>
+      <point x="374" y="268"/>
+      <point x="374" y="212" type="curve" smooth="yes"/>
+      <point x="374" y="165"/>
+      <point x="329" y="140"/>
+      <point x="249" y="140" type="curve" smooth="yes"/>
+      <point x="189" y="140"/>
+      <point x="119" y="154"/>
+      <point x="68" y="178" type="curve"/>
+      <point x="21" y="42" type="line"/>
+      <point x="89" y="8"/>
+      <point x="167" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/four.tf.glif b/src/Cantarell-Bold.ufo/glyphs.J_un 
8 19, 20_46/four.tf.glif
new file mode 100644
index 00000000..7520a9df
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/four.tf.glif       
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="four.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="298" y="-5" type="line"/>
+      <point x="464" y="-5" type="line"/>
+      <point x="464" y="694" type="line"/>
+      <point x="303" y="694" type="line"/>
+      <point x="-4" y="215" type="line"/>
+      <point x="-4" y="124" type="line"/>
+      <point x="580" y="124" type="line"/>
+      <point x="580" y="270" type="line"/>
+      <point x="81" y="272" type="line"/>
+      <point x="131" y="217" type="line"/>
+      <point x="319" y="534" type="line"/>
+      <point x="298" y="583" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/layerinfo.plist 
b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/layerinfo.plist
new file mode 100644
index 00000000..2ad1b7b9
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/layerinfo.plist    
@@ -0,0 +1,27 @@
+<?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>EE6BF218-3EC2-4719-A13B-F6E4879C6679</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.eight.tf</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.five.tf</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.four.tf</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.nine.tf</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.seven.tf</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.six.tf</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.three.tf</key>
+      <integer>3</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.two.tf</key>
+      <integer>3</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/nine.tf.glif b/src/Cantarell-Bold.ufo/glyphs.J_un 
8 19, 20_46/nine.tf.glif
new file mode 100644
index 00000000..4c6435df
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/nine.tf.glif       
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="nine.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="285" y="704" type="curve" smooth="yes"/>
+      <point x="129" y="704"/>
+      <point x="25" y="607"/>
+      <point x="25" y="460" type="curve" smooth="yes"/>
+      <point x="25" y="332"/>
+      <point x="105" y="248"/>
+      <point x="227" y="248" type="curve" smooth="yes"/>
+      <point x="316" y="248"/>
+      <point x="387" y="292"/>
+      <point x="429" y="379" type="curve"/>
+      <point x="387" y="439" type="line"/>
+      <point x="357" y="403"/>
+      <point x="316" y="385"/>
+      <point x="280" y="385" type="curve" smooth="yes"/>
+      <point x="227" y="385"/>
+      <point x="191" y="421"/>
+      <point x="191" y="475" type="curve" smooth="yes"/>
+      <point x="191" y="527"/>
+      <point x="224" y="561"/>
+      <point x="273" y="561" type="curve" smooth="yes"/>
+      <point x="347" y="561"/>
+      <point x="388" y="480"/>
+      <point x="388" y="355" type="curve" smooth="yes"/>
+      <point x="388" y="206"/>
+      <point x="329" y="130"/>
+      <point x="219" y="130" type="curve" smooth="yes"/>
+      <point x="176" y="130"/>
+      <point x="119" y="142"/>
+      <point x="79" y="160" type="curve"/>
+      <point x="36" y="31" type="line"/>
+      <point x="88" y="5"/>
+      <point x="152" y="-10"/>
+      <point x="226" y="-10" type="curve" smooth="yes"/>
+      <point x="441" y="-10"/>
+      <point x="556" y="125"/>
+      <point x="556" y="364" type="curve" smooth="yes"/>
+      <point x="556" y="587"/>
+      <point x="457" y="704"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/seven.tf.glif 
b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/seven.tf.glif
new file mode 100644
index 00000000..0bda52ac
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/seven.tf.glif      
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="seven.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="83" y="0" type="line"/>
+      <point x="266" y="0" type="line"/>
+      <point x="563" y="590" type="line"/>
+      <point x="563" y="694" type="line"/>
+      <point x="19" y="694" type="line"/>
+      <point x="19" y="544" type="line"/>
+      <point x="410" y="544" type="line"/>
+      <point x="383" y="587" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/six.tf.glif b/src/Cantarell-Bold.ufo/glyphs.J_un 
8 19, 20_46/six.tf.glif
new file mode 100644
index 00000000..f132ae34
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/six.tf.glif        
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="six.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="296" y="-10" type="curve" smooth="yes"/>
+      <point x="450" y="-10"/>
+      <point x="557" y="84"/>
+      <point x="557" y="233" type="curve" smooth="yes"/>
+      <point x="557" y="362"/>
+      <point x="476" y="446"/>
+      <point x="355" y="446" type="curve" smooth="yes"/>
+      <point x="266" y="446"/>
+      <point x="194" y="402"/>
+      <point x="152" y="315" type="curve"/>
+      <point x="195" y="255" type="line"/>
+      <point x="223" y="289"/>
+      <point x="262" y="309"/>
+      <point x="301" y="309" type="curve" smooth="yes"/>
+      <point x="355" y="309"/>
+      <point x="391" y="273"/>
+      <point x="391" y="219" type="curve" smooth="yes"/>
+      <point x="391" y="167"/>
+      <point x="358" y="133"/>
+      <point x="309" y="133" type="curve" smooth="yes"/>
+      <point x="235" y="133"/>
+      <point x="193" y="212"/>
+      <point x="193" y="338" type="curve" smooth="yes"/>
+      <point x="193" y="489"/>
+      <point x="253" y="564"/>
+      <point x="362" y="564" type="curve" smooth="yes"/>
+      <point x="406" y="564"/>
+      <point x="463" y="552"/>
+      <point x="503" y="534" type="curve"/>
+      <point x="546" y="663" type="line"/>
+      <point x="494" y="689"/>
+      <point x="431" y="704"/>
+      <point x="356" y="704" type="curve" smooth="yes"/>
+      <point x="140" y="704"/>
+      <point x="25" y="569"/>
+      <point x="25" y="330" type="curve" smooth="yes"/>
+      <point x="25" y="107"/>
+      <point x="124" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/three.tf.glif 
b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/three.tf.glif
new file mode 100644
index 00000000..56c252e5
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/three.tf.glif      
@@ -0,0 +1,57 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="three.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="244" y="-10" type="curve" smooth="yes"/>
+      <point x="433" y="-10"/>
+      <point x="559" y="71"/>
+      <point x="559" y="194" type="curve" smooth="yes"/>
+      <point x="559" y="290"/>
+      <point x="486" y="360"/>
+      <point x="376" y="370" type="curve"/>
+      <point x="350" y="360" type="line"/>
+      <point x="452" y="359"/>
+      <point x="519" y="422"/>
+      <point x="519" y="518" type="curve" smooth="yes"/>
+      <point x="519" y="634"/>
+      <point x="424" y="704"/>
+      <point x="269" y="704" type="curve" smooth="yes"/>
+      <point x="185" y="704"/>
+      <point x="102" y="684"/>
+      <point x="24" y="643" type="curve"/>
+      <point x="64" y="514" type="line"/>
+      <point x="127" y="541"/>
+      <point x="183" y="556"/>
+      <point x="234" y="556" type="curve" smooth="yes"/>
+      <point x="297" y="556"/>
+      <point x="339" y="531"/>
+      <point x="339" y="494" type="curve" smooth="yes"/>
+      <point x="339" y="445"/>
+      <point x="271" y="415"/>
+      <point x="158" y="415" type="curve"/>
+      <point x="158" y="285" type="line"/>
+      <point x="294" y="285"/>
+      <point x="379" y="252"/>
+      <point x="379" y="199" type="curve" smooth="yes"/>
+      <point x="379" y="160"/>
+      <point x="332" y="138"/>
+      <point x="251" y="138" type="curve" smooth="yes"/>
+      <point x="186" y="138"/>
+      <point x="116" y="152"/>
+      <point x="59" y="175" type="curve"/>
+      <point x="19" y="40" type="line"/>
+      <point x="94" y="5"/>
+      <point x="161" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/two.tf.glif b/src/Cantarell-Bold.ufo/glyphs.J_un 
8 19, 20_46/two.tf.glif
new file mode 100644
index 00000000..7d8f7fd7
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_46/two.tf.glif        
@@ -0,0 +1,41 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="two.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="43" y="0" type="line"/>
+      <point x="549" y="0" type="line"/>
+      <point x="549" y="150" type="line"/>
+      <point x="246" y="150" type="line"/>
+      <point x="248" y="114" type="line"/>
+      <point x="436" y="244"/>
+      <point x="529" y="368"/>
+      <point x="529" y="489" type="curve" smooth="yes"/>
+      <point x="529" y="619"/>
+      <point x="424" y="704"/>
+      <point x="263" y="704" type="curve" smooth="yes"/>
+      <point x="172" y="704"/>
+      <point x="85" y="676"/>
+      <point x="17" y="621" type="curve"/>
+      <point x="61" y="494" type="line"/>
+      <point x="119" y="533"/>
+      <point x="176" y="553"/>
+      <point x="229" y="553" type="curve" smooth="yes"/>
+      <point x="302" y="553"/>
+      <point x="349" y="516"/>
+      <point x="349" y="462" type="curve" smooth="yes"/>
+      <point x="349" y="376"/>
+      <point x="236" y="272"/>
+      <point x="43" y="122" type="curve"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_55/contents.plist 
b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_55/contents.plist
new file mode 100644
index 00000000..7b74aabe
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_55/contents.plist     
@@ -0,0 +1,8 @@
+<?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>zero.tf</key>
+    <string>zero.tf.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_55/layerinfo.plist 
b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_55/layerinfo.plist
new file mode 100644
index 00000000..bde9041d
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_55/layerinfo.plist    
@@ -0,0 +1,13 @@
+<?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>18EF844F-5B1D-4F8E-AD2A-49C1B78FE60C</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.zero.tf</key>
+      <integer>5</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_55/zero.tf.glif b/src/Cantarell-Bold.ufo/glyphs.J_un 
8 19, 20_55/zero.tf.glif
new file mode 100644
index 00000000..ac86fef2
--- /dev/null
+++ b/src/Cantarell-Bold.ufo/glyphs.J_un 8 19, 20_55/zero.tf.glif       
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="zero.tf" format="2">
+  <advance width="580"/>
+  <anchor x="292" y="345" name="slash"/>
+  <outline>
+    <contour>
+      <point x="288" y="-10" type="curve" smooth="yes"/>
+      <point x="454" y="-10"/>
+      <point x="565" y="136"/>
+      <point x="565" y="349" type="curve" smooth="yes"/>
+      <point x="565" y="562"/>
+      <point x="455" y="704"/>
+      <point x="292" y="704" type="curve" smooth="yes"/>
+      <point x="127" y="704"/>
+      <point x="15" y="560"/>
+      <point x="15" y="344" type="curve" smooth="yes"/>
+      <point x="15" y="133"/>
+      <point x="125" y="-10"/>
+    </contour>
+    <contour>
+      <point x="291" y="138" type="curve" smooth="yes"/>
+      <point x="230" y="138"/>
+      <point x="188" y="222"/>
+      <point x="188" y="349" type="curve" smooth="yes"/>
+      <point x="188" y="474"/>
+      <point x="229" y="556"/>
+      <point x="289" y="556" type="curve" smooth="yes"/>
+      <point x="350" y="556"/>
+      <point x="392" y="471"/>
+      <point x="392" y="343" type="curve" smooth="yes"/>
+      <point x="392" y="220"/>
+      <point x="351" y="138"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eight.tf.glif b/src/Cantarell-Bold.ufo/glyphs/eight.tf.glif
index eaf84137..8bd81220 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eight.tf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eight.tf.glif
@@ -1,53 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight.tf" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <outline>
-    <contour>
-      <point x="286" y="-10" type="curve" smooth="yes"/>
-      <point x="451" y="-10"/>
-      <point x="561" y="76"/>
-      <point x="561" y="203" type="curve" smooth="yes"/>
-      <point x="561" y="433"/>
-      <point x="204" y="379"/>
-      <point x="204" y="502" type="curve" smooth="yes"/>
-      <point x="204" y="539"/>
-      <point x="237" y="566"/>
-      <point x="288" y="566" type="curve" smooth="yes"/>
-      <point x="339" y="566"/>
-      <point x="373" y="539"/>
-      <point x="373" y="497" type="curve" smooth="yes"/>
-      <point x="373" y="455"/>
-      <point x="337" y="424"/>
-      <point x="283" y="419" type="curve"/>
-      <point x="399" y="359" type="line"/>
-      <point x="489" y="393"/>
-      <point x="539" y="456"/>
-      <point x="539" y="529" type="curve" smooth="yes"/>
-      <point x="539" y="634"/>
-      <point x="439" y="704"/>
-      <point x="297" y="704" type="curve" smooth="yes"/>
-      <point x="141" y="704"/>
-      <point x="38" y="619"/>
-      <point x="38" y="493" type="curve" smooth="yes"/>
-      <point x="38" y="257"/>
-      <point x="395" y="311"/>
-      <point x="395" y="193" type="curve" smooth="yes"/>
-      <point x="395" y="155"/>
-      <point x="357" y="128"/>
-      <point x="297" y="128" type="curve" smooth="yes"/>
-      <point x="230" y="128"/>
-      <point x="186" y="162"/>
-      <point x="186" y="215" type="curve" smooth="yes"/>
-      <point x="186" y="263"/>
-      <point x="224" y="292"/>
-      <point x="291" y="294" type="curve"/>
-      <point x="194" y="357" type="line"/>
-      <point x="85" y="337"/>
-      <point x="20" y="273"/>
-      <point x="20" y="183" type="curve" smooth="yes"/>
-      <point x="20" y="68"/>
-      <point x="129" y="-10"/>
-    </contour>
+    <component base="eight" xOffset="2"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/five.tf.glif b/src/Cantarell-Bold.ufo/glyphs/five.tf.glif
index fc33deeb..1768792e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/five.tf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/five.tf.glif
@@ -1,40 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five.tf" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <outline>
-    <contour>
-      <point x="250" y="-10" type="curve" smooth="yes"/>
-      <point x="435" y="-10"/>
-      <point x="554" y="80"/>
-      <point x="554" y="230" type="curve" smooth="yes"/>
-      <point x="554" y="362"/>
-      <point x="458" y="436"/>
-      <point x="287" y="436" type="curve" smooth="yes"/>
-      <point x="244" y="436"/>
-      <point x="221" y="431"/>
-      <point x="199" y="418" type="curve"/>
-      <point x="242" y="365" type="line"/>
-      <point x="251" y="543" type="line"/>
-      <point x="517" y="543" type="line"/>
-      <point x="517" y="694" type="line"/>
-      <point x="82" y="694" type="line"/>
-      <point x="64" y="287" type="line"/>
-      <point x="108" y="295"/>
-      <point x="164" y="301"/>
-      <point x="206" y="301" type="curve" smooth="yes"/>
-      <point x="312" y="301"/>
-      <point x="374" y="268"/>
-      <point x="374" y="212" type="curve" smooth="yes"/>
-      <point x="374" y="165"/>
-      <point x="329" y="140"/>
-      <point x="249" y="140" type="curve" smooth="yes"/>
-      <point x="189" y="140"/>
-      <point x="119" y="154"/>
-      <point x="68" y="178" type="curve"/>
-      <point x="21" y="42" type="line"/>
-      <point x="89" y="8"/>
-      <point x="167" y="-10"/>
-    </contour>
+    <component base="five" xOffset="22"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/four.tf.glif b/src/Cantarell-Bold.ufo/glyphs/four.tf.glif
index 7520a9df..fadecb8c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/four.tf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/four.tf.glif
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four.tf" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <outline>
     <contour>
-      <point x="298" y="-5" type="line"/>
-      <point x="464" y="-5" type="line"/>
-      <point x="464" y="694" type="line"/>
-      <point x="303" y="694" type="line"/>
-      <point x="-4" y="215" type="line"/>
-      <point x="-4" y="124" type="line"/>
-      <point x="580" y="124" type="line"/>
-      <point x="580" y="270" type="line"/>
-      <point x="81" y="272" type="line"/>
-      <point x="131" y="217" type="line"/>
-      <point x="319" y="534" type="line"/>
-      <point x="298" y="583" type="line"/>
+      <point x="308" y="-5" type="line"/>
+      <point x="474" y="-5" type="line"/>
+      <point x="474" y="694" type="line"/>
+      <point x="313" y="694" type="line"/>
+      <point x="6" y="215" type="line"/>
+      <point x="6" y="124" type="line"/>
+      <point x="590" y="124" type="line"/>
+      <point x="590" y="270" type="line"/>
+      <point x="91" y="272" type="line"/>
+      <point x="141" y="217" type="line"/>
+      <point x="329" y="534" type="line"/>
+      <point x="308" y="583" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nine.tf.glif b/src/Cantarell-Bold.ufo/glyphs/nine.tf.glif
index 4c6435df..211b6bdf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nine.tf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nine.tf.glif
@@ -1,47 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine.tf" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <outline>
-    <contour>
-      <point x="285" y="704" type="curve" smooth="yes"/>
-      <point x="129" y="704"/>
-      <point x="25" y="607"/>
-      <point x="25" y="460" type="curve" smooth="yes"/>
-      <point x="25" y="332"/>
-      <point x="105" y="248"/>
-      <point x="227" y="248" type="curve" smooth="yes"/>
-      <point x="316" y="248"/>
-      <point x="387" y="292"/>
-      <point x="429" y="379" type="curve"/>
-      <point x="387" y="439" type="line"/>
-      <point x="357" y="403"/>
-      <point x="316" y="385"/>
-      <point x="280" y="385" type="curve" smooth="yes"/>
-      <point x="227" y="385"/>
-      <point x="191" y="421"/>
-      <point x="191" y="475" type="curve" smooth="yes"/>
-      <point x="191" y="527"/>
-      <point x="224" y="561"/>
-      <point x="273" y="561" type="curve" smooth="yes"/>
-      <point x="347" y="561"/>
-      <point x="388" y="480"/>
-      <point x="388" y="355" type="curve" smooth="yes"/>
-      <point x="388" y="206"/>
-      <point x="329" y="130"/>
-      <point x="219" y="130" type="curve" smooth="yes"/>
-      <point x="176" y="130"/>
-      <point x="119" y="142"/>
-      <point x="79" y="160" type="curve"/>
-      <point x="36" y="31" type="line"/>
-      <point x="88" y="5"/>
-      <point x="152" y="-10"/>
-      <point x="226" y="-10" type="curve" smooth="yes"/>
-      <point x="441" y="-10"/>
-      <point x="556" y="125"/>
-      <point x="556" y="364" type="curve" smooth="yes"/>
-      <point x="556" y="587"/>
-      <point x="457" y="704"/>
-    </contour>
+    <component base="nine" xOffset="5"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/one.tf.glif b/src/Cantarell-Bold.ufo/glyphs/one.tf.glif
index 44a670d7..1ce0b027 100644
--- a/src/Cantarell-Bold.ufo/glyphs/one.tf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/one.tf.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.tf" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <outline>
     <contour>
-      <point x="230" y="131" type="line"/>
-      <point x="404" y="131" type="line"/>
-      <point x="404" y="694" type="line"/>
-      <point x="300" y="694" type="line"/>
+      <point x="239" y="131" type="line"/>
+      <point x="416" y="131" type="line"/>
+      <point x="416" y="694" type="line"/>
+      <point x="309" y="694" type="line"/>
       <point x="33" y="556" type="line"/>
       <point x="98" y="432" type="line"/>
-      <point x="286" y="514" type="line"/>
-      <point x="230" y="569" type="line"/>
+      <point x="295" y="514" type="line"/>
+      <point x="239" y="569" type="line"/>
     </contour>
     <contour>
-      <point x="69" y="0" type="line"/>
-      <point x="550" y="0" type="line"/>
-      <point x="550" y="148" type="line"/>
-      <point x="69" y="148" type="line"/>
+      <point x="87" y="0" type="line"/>
+      <point x="559" y="0" type="line"/>
+      <point x="559" y="148" type="line"/>
+      <point x="87" y="148" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/seven.tf.glif b/src/Cantarell-Bold.ufo/glyphs/seven.tf.glif
index 0bda52ac..6d3a29fd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/seven.tf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/seven.tf.glif
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven.tf" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <outline>
     <contour>
-      <point x="83" y="0" type="line"/>
-      <point x="266" y="0" type="line"/>
-      <point x="563" y="590" type="line"/>
-      <point x="563" y="694" type="line"/>
-      <point x="19" y="694" type="line"/>
-      <point x="19" y="544" type="line"/>
-      <point x="410" y="544" type="line"/>
-      <point x="383" y="587" type="line"/>
+      <point x="93" y="0" type="line"/>
+      <point x="276" y="0" type="line"/>
+      <point x="569" y="612" type="line"/>
+      <point x="569" y="694" type="line"/>
+      <point x="34" y="694" type="line"/>
+      <point x="34" y="544" type="line"/>
+      <point x="416" y="544" type="line"/>
+      <point x="380" y="589" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/six.tf.glif b/src/Cantarell-Bold.ufo/glyphs/six.tf.glif
index f132ae34..0f108a02 100644
--- a/src/Cantarell-Bold.ufo/glyphs/six.tf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/six.tf.glif
@@ -1,47 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six.tf" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <outline>
-    <contour>
-      <point x="296" y="-10" type="curve" smooth="yes"/>
-      <point x="450" y="-10"/>
-      <point x="557" y="84"/>
-      <point x="557" y="233" type="curve" smooth="yes"/>
-      <point x="557" y="362"/>
-      <point x="476" y="446"/>
-      <point x="355" y="446" type="curve" smooth="yes"/>
-      <point x="266" y="446"/>
-      <point x="194" y="402"/>
-      <point x="152" y="315" type="curve"/>
-      <point x="195" y="255" type="line"/>
-      <point x="223" y="289"/>
-      <point x="262" y="309"/>
-      <point x="301" y="309" type="curve" smooth="yes"/>
-      <point x="355" y="309"/>
-      <point x="391" y="273"/>
-      <point x="391" y="219" type="curve" smooth="yes"/>
-      <point x="391" y="167"/>
-      <point x="358" y="133"/>
-      <point x="309" y="133" type="curve" smooth="yes"/>
-      <point x="235" y="133"/>
-      <point x="193" y="212"/>
-      <point x="193" y="338" type="curve" smooth="yes"/>
-      <point x="193" y="489"/>
-      <point x="253" y="564"/>
-      <point x="362" y="564" type="curve" smooth="yes"/>
-      <point x="406" y="564"/>
-      <point x="463" y="552"/>
-      <point x="503" y="534" type="curve"/>
-      <point x="546" y="663" type="line"/>
-      <point x="494" y="689"/>
-      <point x="431" y="704"/>
-      <point x="356" y="704" type="curve" smooth="yes"/>
-      <point x="140" y="704"/>
-      <point x="25" y="569"/>
-      <point x="25" y="330" type="curve" smooth="yes"/>
-      <point x="25" y="107"/>
-      <point x="124" y="-10"/>
-    </contour>
+    <component base="six" xOffset="5"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/three.tf.glif b/src/Cantarell-Bold.ufo/glyphs/three.tf.glif
index 56c252e5..2b497f03 100644
--- a/src/Cantarell-Bold.ufo/glyphs/three.tf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/three.tf.glif
@@ -1,49 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three.tf" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <outline>
-    <contour>
-      <point x="244" y="-10" type="curve" smooth="yes"/>
-      <point x="433" y="-10"/>
-      <point x="559" y="71"/>
-      <point x="559" y="194" type="curve" smooth="yes"/>
-      <point x="559" y="290"/>
-      <point x="486" y="360"/>
-      <point x="376" y="370" type="curve"/>
-      <point x="350" y="360" type="line"/>
-      <point x="452" y="359"/>
-      <point x="519" y="422"/>
-      <point x="519" y="518" type="curve" smooth="yes"/>
-      <point x="519" y="634"/>
-      <point x="424" y="704"/>
-      <point x="269" y="704" type="curve" smooth="yes"/>
-      <point x="185" y="704"/>
-      <point x="102" y="684"/>
-      <point x="24" y="643" type="curve"/>
-      <point x="64" y="514" type="line"/>
-      <point x="127" y="541"/>
-      <point x="183" y="556"/>
-      <point x="234" y="556" type="curve" smooth="yes"/>
-      <point x="297" y="556"/>
-      <point x="339" y="531"/>
-      <point x="339" y="494" type="curve" smooth="yes"/>
-      <point x="339" y="445"/>
-      <point x="271" y="415"/>
-      <point x="158" y="415" type="curve"/>
-      <point x="158" y="285" type="line"/>
-      <point x="294" y="285"/>
-      <point x="379" y="252"/>
-      <point x="379" y="199" type="curve" smooth="yes"/>
-      <point x="379" y="160"/>
-      <point x="332" y="138"/>
-      <point x="251" y="138" type="curve" smooth="yes"/>
-      <point x="186" y="138"/>
-      <point x="116" y="152"/>
-      <point x="59" y="175" type="curve"/>
-      <point x="19" y="40" type="line"/>
-      <point x="94" y="5"/>
-      <point x="161" y="-10"/>
-    </contour>
+    <component base="three" xOffset="23"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/two.tf.glif b/src/Cantarell-Bold.ufo/glyphs/two.tf.glif
index 7d8f7fd7..a6880787 100644
--- a/src/Cantarell-Bold.ufo/glyphs/two.tf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/two.tf.glif
@@ -1,33 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two.tf" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <outline>
-    <contour>
-      <point x="43" y="0" type="line"/>
-      <point x="549" y="0" type="line"/>
-      <point x="549" y="150" type="line"/>
-      <point x="246" y="150" type="line"/>
-      <point x="248" y="114" type="line"/>
-      <point x="436" y="244"/>
-      <point x="529" y="368"/>
-      <point x="529" y="489" type="curve" smooth="yes"/>
-      <point x="529" y="619"/>
-      <point x="424" y="704"/>
-      <point x="263" y="704" type="curve" smooth="yes"/>
-      <point x="172" y="704"/>
-      <point x="85" y="676"/>
-      <point x="17" y="621" type="curve"/>
-      <point x="61" y="494" type="line"/>
-      <point x="119" y="533"/>
-      <point x="176" y="553"/>
-      <point x="229" y="553" type="curve" smooth="yes"/>
-      <point x="302" y="553"/>
-      <point x="349" y="516"/>
-      <point x="349" y="462" type="curve" smooth="yes"/>
-      <point x="349" y="376"/>
-      <point x="236" y="272"/>
-      <point x="43" y="122" type="curve"/>
-    </contour>
+    <component base="two" xOffset="26"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zero.tf.glif b/src/Cantarell-Bold.ufo/glyphs/zero.tf.glif
index ac86fef2..0a5ee818 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zero.tf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zero.tf.glif
@@ -1,36 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.tf" format="2">
-  <advance width="580"/>
-  <anchor x="292" y="345" name="slash"/>
+  <advance width="600"/>
   <outline>
-    <contour>
-      <point x="288" y="-10" type="curve" smooth="yes"/>
-      <point x="454" y="-10"/>
-      <point x="565" y="136"/>
-      <point x="565" y="349" type="curve" smooth="yes"/>
-      <point x="565" y="562"/>
-      <point x="455" y="704"/>
-      <point x="292" y="704" type="curve" smooth="yes"/>
-      <point x="127" y="704"/>
-      <point x="15" y="560"/>
-      <point x="15" y="344" type="curve" smooth="yes"/>
-      <point x="15" y="133"/>
-      <point x="125" y="-10"/>
-    </contour>
-    <contour>
-      <point x="291" y="138" type="curve" smooth="yes"/>
-      <point x="230" y="138"/>
-      <point x="188" y="222"/>
-      <point x="188" y="349" type="curve" smooth="yes"/>
-      <point x="188" y="474"/>
-      <point x="229" y="556"/>
-      <point x="289" y="556" type="curve" smooth="yes"/>
-      <point x="350" y="556"/>
-      <point x="392" y="471"/>
-      <point x="392" y="343" type="curve" smooth="yes"/>
-      <point x="392" y="220"/>
-      <point x="351" y="138"/>
-    </contour>
+    <component base="zero" xOffset="-16"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zero.tf.zero.glif b/src/Cantarell-Bold.ufo/glyphs/zero.tf.zero.glif
index 76455fc2..73691104 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zero.tf.zero.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zero.tf.zero.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.tf.zero" format="2">
-  <advance width="580"/>
+  <advance width="600"/>
   <outline>
     <component base="zero.tf"/>
-    <component base="_slash.zero" xOffset="69" yOffset="104"/>
+    <component base="_slash.zero" xOffset="79" yOffset="104"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/layercontents.plist b/src/Cantarell-Bold.ufo/layercontents.plist
index 0787ed22..fd243473 100644
--- a/src/Cantarell-Bold.ufo/layercontents.plist
+++ b/src/Cantarell-Bold.ufo/layercontents.plist
@@ -42,5 +42,13 @@
       <string>May 11 19, 20:09</string>
       <string>glyphs.M_ay 11 19, 20_09</string>
     </array>
+    <array>
+      <string>Jun 8 19, 20:55</string>
+      <string>glyphs.J_un 8 19, 20_55</string>
+    </array>
+    <array>
+      <string>Jun 8 19, 20:46</string>
+      <string>glyphs.J_un 8 19, 20_46</string>
+    </array>
   </array>
 </plist>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/contents.plist 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/contents.plist
new file mode 100644
index 00000000..8b006235
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/contents.plist    
@@ -0,0 +1,22 @@
+<?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>eight.tf</key>
+    <string>eight.tf.glif</string>
+    <key>five.tf</key>
+    <string>five.tf.glif</string>
+    <key>four.tf</key>
+    <string>four.tf.glif</string>
+    <key>nine.tf</key>
+    <string>nine.tf.glif</string>
+    <key>seven.tf</key>
+    <string>seven.tf.glif</string>
+    <key>six.tf</key>
+    <string>six.tf.glif</string>
+    <key>three.tf</key>
+    <string>three.tf.glif</string>
+    <key>two.tf</key>
+    <string>two.tf.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/eight.tf.glif 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/eight.tf.glif
new file mode 100644
index 00000000..611a5391
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/eight.tf.glif     
@@ -0,0 +1,61 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="eight.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="295" y="-10" type="curve" smooth="yes"/>
+      <point x="425" y="-10"/>
+      <point x="512" y="57"/>
+      <point x="512" y="163" type="curve" smooth="yes"/>
+      <point x="512" y="389"/>
+      <point x="118" y="324"/>
+      <point x="118" y="540" type="curve" smooth="yes"/>
+      <point x="118" y="629"/>
+      <point x="185" y="687"/>
+      <point x="282" y="687" type="curve" smooth="yes"/>
+      <point x="380" y="687"/>
+      <point x="455" y="628"/>
+      <point x="455" y="543" type="curve" smooth="yes"/>
+      <point x="455" y="460"/>
+      <point x="383" y="397"/>
+      <point x="274" y="369" type="curve"/>
+      <point x="290" y="358" type="line"/>
+      <point x="403" y="385"/>
+      <point x="474" y="454"/>
+      <point x="474" y="543" type="curve" smooth="yes"/>
+      <point x="474" y="639"/>
+      <point x="393" y="704"/>
+      <point x="284" y="704" type="curve" smooth="yes"/>
+      <point x="175" y="704"/>
+      <point x="99" y="639"/>
+      <point x="99" y="538" type="curve" smooth="yes"/>
+      <point x="99" y="307"/>
+      <point x="492" y="372"/>
+      <point x="492" y="161" type="curve" smooth="yes"/>
+      <point x="492" y="67"/>
+      <point x="415" y="7"/>
+      <point x="297" y="7" type="curve" smooth="yes"/>
+      <point x="177" y="7"/>
+      <point x="94" y="71"/>
+      <point x="94" y="166" type="curve" smooth="yes"/>
+      <point x="94" y="254"/>
+      <point x="166" y="325"/>
+      <point x="274" y="352" type="curve"/>
+      <point x="258" y="363" type="line"/>
+      <point x="148" y="338"/>
+      <point x="74" y="260"/>
+      <point x="74" y="164" type="curve" smooth="yes"/>
+      <point x="74" y="60"/>
+      <point x="163" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/five.tf.glif 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/five.tf.glif
new file mode 100644
index 00000000..2cd9df74
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/five.tf.glif      
@@ -0,0 +1,48 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="five.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="269" y="-10" type="curve" smooth="yes"/>
+      <point x="415" y="-10"/>
+      <point x="506" y="80"/>
+      <point x="506" y="203" type="curve" smooth="yes"/>
+      <point x="506" y="326"/>
+      <point x="413" y="403"/>
+      <point x="260" y="403" type="curve" smooth="yes"/>
+      <point x="222" y="403"/>
+      <point x="168" y="398"/>
+      <point x="115" y="388" type="curve"/>
+      <point x="127" y="384" type="line"/>
+      <point x="141" y="677" type="line"/>
+      <point x="475" y="677" type="line"/>
+      <point x="475" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
+      <point x="106" y="369" type="line"/>
+      <point x="155" y="379"/>
+      <point x="211" y="385"/>
+      <point x="254" y="385" type="curve" smooth="yes"/>
+      <point x="406" y="385"/>
+      <point x="485" y="310"/>
+      <point x="485" y="201" type="curve" smooth="yes"/>
+      <point x="485" y="88"/>
+      <point x="401" y="9"/>
+      <point x="274" y="9" type="curve" smooth="yes"/>
+      <point x="209" y="9"/>
+      <point x="134" y="28"/>
+      <point x="84" y="58" type="curve"/>
+      <point x="78" y="41" type="line"/>
+      <point x="131" y="9"/>
+      <point x="201" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/four.tf.glif 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/four.tf.glif
new file mode 100644
index 00000000..886b4189
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/four.tf.glif      
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="four.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="400" y="-10" type="line"/>
+      <point x="418" y="-10" type="line"/>
+      <point x="418" y="694" type="line"/>
+      <point x="401" y="694" type="line"/>
+      <point x="39" y="200" type="line"/>
+      <point x="39" y="190" type="line"/>
+      <point x="542" y="190" type="line"/>
+      <point x="542" y="207" type="line"/>
+      <point x="61" y="207" type="line"/>
+      <point x="61" y="202" type="line"/>
+      <point x="400" y="667" type="line"/>
+      <point x="400" y="665" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/layerinfo.plist 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/layerinfo.plist
new file mode 100644
index 00000000..a1972184
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/layerinfo.plist   
@@ -0,0 +1,27 @@
+<?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>CD8E05C2-2F6B-43AC-8E64-00DE41B06201</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.eight.tf</key>
+      <integer>5</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.five.tf</key>
+      <integer>5</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.four.tf</key>
+      <integer>5</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.nine.tf</key>
+      <integer>5</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.seven.tf</key>
+      <integer>5</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.six.tf</key>
+      <integer>5</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.three.tf</key>
+      <integer>5</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.two.tf</key>
+      <integer>5</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/nine.tf.glif 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/nine.tf.glif
new file mode 100644
index 00000000..89afc181
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/nine.tf.glif      
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="nine.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="284" y="704" type="curve" smooth="yes"/>
+      <point x="165" y="704"/>
+      <point x="83" y="617"/>
+      <point x="83" y="488" type="curve" smooth="yes"/>
+      <point x="83" y="361"/>
+      <point x="163" y="284"/>
+      <point x="281" y="284" type="curve" smooth="yes"/>
+      <point x="377" y="284"/>
+      <point x="452" y="333"/>
+      <point x="498" y="424" type="curve"/>
+      <point x="498" y="455" type="line"/>
+      <point x="454" y="357"/>
+      <point x="378" y="302"/>
+      <point x="283" y="302" type="curve" smooth="yes"/>
+      <point x="178" y="302"/>
+      <point x="104" y="372"/>
+      <point x="104" y="491" type="curve" smooth="yes"/>
+      <point x="104" y="608"/>
+      <point x="176" y="686"/>
+      <point x="283" y="686" type="curve" smooth="yes"/>
+      <point x="413" y="686"/>
+      <point x="489" y="569"/>
+      <point x="489" y="372" type="curve" smooth="yes"/>
+      <point x="489" y="134"/>
+      <point x="402" y="8"/>
+      <point x="240" y="8" type="curve" smooth="yes"/>
+      <point x="188" y="8"/>
+      <point x="140" y="21"/>
+      <point x="102" y="44" type="curve"/>
+      <point x="95" y="27" type="line"/>
+      <point x="136" y="3"/>
+      <point x="184" y="-10"/>
+      <point x="238" y="-10" type="curve" smooth="yes"/>
+      <point x="415" y="-10"/>
+      <point x="510" y="124"/>
+      <point x="510" y="375" type="curve" smooth="yes"/>
+      <point x="510" y="581"/>
+      <point x="426" y="704"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/seven.tf.glif 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/seven.tf.glif
new file mode 100644
index 00000000..aa8809de
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/seven.tf.glif     
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="seven.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="178" y="0" type="line"/>
+      <point x="201" y="0" type="line"/>
+      <point x="517" y="682" type="line"/>
+      <point x="517" y="694" type="line"/>
+      <point x="55" y="694" type="line"/>
+      <point x="55" y="676" type="line"/>
+      <point x="500" y="676" type="line"/>
+      <point x="498" y="685" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/six.tf.glif 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/six.tf.glif
new file mode 100644
index 00000000..1b662bd9
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/six.tf.glif       
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="six.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="309" y="-10" type="curve" smooth="yes"/>
+      <point x="428" y="-10"/>
+      <point x="509" y="77"/>
+      <point x="509" y="206" type="curve" smooth="yes"/>
+      <point x="509" y="333"/>
+      <point x="430" y="410"/>
+      <point x="312" y="410" type="curve" smooth="yes"/>
+      <point x="216" y="410"/>
+      <point x="141" y="361"/>
+      <point x="95" y="270" type="curve"/>
+      <point x="95" y="239" type="line"/>
+      <point x="139" y="337"/>
+      <point x="215" y="392"/>
+      <point x="310" y="392" type="curve" smooth="yes"/>
+      <point x="415" y="392"/>
+      <point x="488" y="322"/>
+      <point x="488" y="203" type="curve" smooth="yes"/>
+      <point x="488" y="86"/>
+      <point x="417" y="8"/>
+      <point x="310" y="8" type="curve" smooth="yes"/>
+      <point x="179" y="8"/>
+      <point x="104" y="126"/>
+      <point x="104" y="322" type="curve" smooth="yes"/>
+      <point x="104" y="559"/>
+      <point x="190" y="686"/>
+      <point x="353" y="686" type="curve" smooth="yes"/>
+      <point x="403" y="686"/>
+      <point x="453" y="673"/>
+      <point x="491" y="650" type="curve"/>
+      <point x="498" y="667" type="line"/>
+      <point x="457" y="691"/>
+      <point x="408" y="704"/>
+      <point x="355" y="704" type="curve" smooth="yes"/>
+      <point x="177" y="704"/>
+      <point x="83" y="569"/>
+      <point x="83" y="319" type="curve" smooth="yes"/>
+      <point x="83" y="114"/>
+      <point x="166" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/three.tf.glif 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/three.tf.glif
new file mode 100644
index 00000000..bff0c828
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/three.tf.glif     
@@ -0,0 +1,57 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="three.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="275" y="-10" type="curve" smooth="yes"/>
+      <point x="416" y="-10"/>
+      <point x="507" y="60"/>
+      <point x="507" y="170" type="curve" smooth="yes"/>
+      <point x="507" y="274"/>
+      <point x="426" y="340"/>
+      <point x="274" y="356" type="curve"/>
+      <point x="274" y="352" type="line"/>
+      <point x="391" y="359"/>
+      <point x="469" y="429"/>
+      <point x="469" y="528" type="curve" smooth="yes"/>
+      <point x="469" y="632"/>
+      <point x="385" y="704"/>
+      <point x="264" y="704" type="curve" smooth="yes"/>
+      <point x="198" y="704"/>
+      <point x="130" y="683"/>
+      <point x="75" y="645" type="curve"/>
+      <point x="80" y="629" type="line"/>
+      <point x="144" y="668"/>
+      <point x="201" y="686"/>
+      <point x="260" y="686" type="curve" smooth="yes"/>
+      <point x="372" y="686"/>
+      <point x="448" y="624"/>
+      <point x="448" y="524" type="curve" smooth="yes"/>
+      <point x="448" y="416"/>
+      <point x="362" y="361"/>
+      <point x="194" y="361" type="curve"/>
+      <point x="194" y="344" type="line"/>
+      <point x="382" y="344"/>
+      <point x="487" y="281"/>
+      <point x="487" y="168" type="curve" smooth="yes"/>
+      <point x="487" y="69"/>
+      <point x="406" y="9"/>
+      <point x="276" y="9" type="curve" smooth="yes"/>
+      <point x="202" y="9"/>
+      <point x="123" y="29"/>
+      <point x="61" y="63" type="curve"/>
+      <point x="56" y="45" type="line"/>
+      <point x="116" y="11"/>
+      <point x="199" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/two.tf.glif 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/two.tf.glif
new file mode 100644
index 00000000..8fd0b2ff
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_47/two.tf.glif       
@@ -0,0 +1,41 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="two.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="67" y="0" type="line"/>
+      <point x="506" y="0" type="line"/>
+      <point x="506" y="17" type="line"/>
+      <point x="87" y="17" type="line"/>
+      <point x="91" y="10" type="line"/>
+      <point x="416" y="310"/>
+      <point x="477" y="407"/>
+      <point x="477" y="509" type="curve" smooth="yes"/>
+      <point x="477" y="630"/>
+      <point x="394" y="704"/>
+      <point x="263" y="704" type="curve" smooth="yes"/>
+      <point x="185" y="704"/>
+      <point x="117" y="678"/>
+      <point x="67" y="629" type="curve"/>
+      <point x="77" y="616" type="line"/>
+      <point x="131" y="663"/>
+      <point x="191" y="686"/>
+      <point x="259" y="686" type="curve" smooth="yes"/>
+      <point x="379" y="686"/>
+      <point x="456" y="617"/>
+      <point x="456" y="507" type="curve" smooth="yes"/>
+      <point x="456" y="408"/>
+      <point x="394" y="311"/>
+      <point x="67" y="8" type="curve"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_55/contents.plist 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_55/contents.plist
new file mode 100644
index 00000000..7b74aabe
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_55/contents.plist    
@@ -0,0 +1,8 @@
+<?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>zero.tf</key>
+    <string>zero.tf.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_55/layerinfo.plist 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_55/layerinfo.plist
new file mode 100644
index 00000000..c969e48b
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_55/layerinfo.plist   
@@ -0,0 +1,13 @@
+<?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>411A308B-627F-44DA-B639-BF9140D58A87</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.zero.tf</key>
+      <integer>4</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_55/zero.tf.glif 
b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_55/zero.tf.glif
new file mode 100644
index 00000000..8d3a203c
--- /dev/null
+++ b/src/Cantarell-Light.ufo/glyphs.J_un 8 19, 20_55/zero.tf.glif      
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="zero.tf" format="2">
+  <advance width="580"/>
+  <anchor x="298" y="350" name="slash"/>
+  <outline>
+    <contour>
+      <point x="290" y="-10" type="curve" smooth="yes"/>
+      <point x="417" y="-10"/>
+      <point x="501" y="132"/>
+      <point x="501" y="343" type="curve" smooth="yes"/>
+      <point x="501" y="555"/>
+      <point x="418" y="699"/>
+      <point x="294" y="699" type="curve" smooth="yes"/>
+      <point x="164" y="699"/>
+      <point x="79" y="554"/>
+      <point x="79" y="340" type="curve" smooth="yes"/>
+      <point x="79" y="130"/>
+      <point x="164" y="-10"/>
+    </contour>
+    <contour>
+      <point x="293" y="8" type="curve" smooth="yes"/>
+      <point x="177" y="8"/>
+      <point x="100" y="143"/>
+      <point x="100" y="343" type="curve" smooth="yes"/>
+      <point x="100" y="545"/>
+      <point x="176" y="681"/>
+      <point x="291" y="681" type="curve" smooth="yes"/>
+      <point x="405" y="681"/>
+      <point x="480" y="543"/>
+      <point x="480" y="340" type="curve" smooth="yes"/>
+      <point x="480" y="142"/>
+      <point x="405" y="8"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/eight.tf.glif b/src/Cantarell-Light.ufo/glyphs/eight.tf.glif
index 611a5391..5d362ce2 100644
--- a/src/Cantarell-Light.ufo/glyphs/eight.tf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eight.tf.glif
@@ -1,53 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight.tf" format="2">
-  <advance width="580"/>
+  <advance width="570"/>
   <outline>
-    <contour>
-      <point x="295" y="-10" type="curve" smooth="yes"/>
-      <point x="425" y="-10"/>
-      <point x="512" y="57"/>
-      <point x="512" y="163" type="curve" smooth="yes"/>
-      <point x="512" y="389"/>
-      <point x="118" y="324"/>
-      <point x="118" y="540" type="curve" smooth="yes"/>
-      <point x="118" y="629"/>
-      <point x="185" y="687"/>
-      <point x="282" y="687" type="curve" smooth="yes"/>
-      <point x="380" y="687"/>
-      <point x="455" y="628"/>
-      <point x="455" y="543" type="curve" smooth="yes"/>
-      <point x="455" y="460"/>
-      <point x="383" y="397"/>
-      <point x="274" y="369" type="curve"/>
-      <point x="290" y="358" type="line"/>
-      <point x="403" y="385"/>
-      <point x="474" y="454"/>
-      <point x="474" y="543" type="curve" smooth="yes"/>
-      <point x="474" y="639"/>
-      <point x="393" y="704"/>
-      <point x="284" y="704" type="curve" smooth="yes"/>
-      <point x="175" y="704"/>
-      <point x="99" y="639"/>
-      <point x="99" y="538" type="curve" smooth="yes"/>
-      <point x="99" y="307"/>
-      <point x="492" y="372"/>
-      <point x="492" y="161" type="curve" smooth="yes"/>
-      <point x="492" y="67"/>
-      <point x="415" y="7"/>
-      <point x="297" y="7" type="curve" smooth="yes"/>
-      <point x="177" y="7"/>
-      <point x="94" y="71"/>
-      <point x="94" y="166" type="curve" smooth="yes"/>
-      <point x="94" y="254"/>
-      <point x="166" y="325"/>
-      <point x="274" y="352" type="curve"/>
-      <point x="258" y="363" type="line"/>
-      <point x="148" y="338"/>
-      <point x="74" y="260"/>
-      <point x="74" y="164" type="curve" smooth="yes"/>
-      <point x="74" y="60"/>
-      <point x="163" y="-10"/>
-    </contour>
+    <component base="eight" xOffset="14"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/five.tf.glif b/src/Cantarell-Light.ufo/glyphs/five.tf.glif
index 2cd9df74..c6d8d665 100644
--- a/src/Cantarell-Light.ufo/glyphs/five.tf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/five.tf.glif
@@ -1,40 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five.tf" format="2">
-  <advance width="580"/>
+  <advance width="570"/>
   <outline>
-    <contour>
-      <point x="269" y="-10" type="curve" smooth="yes"/>
-      <point x="415" y="-10"/>
-      <point x="506" y="80"/>
-      <point x="506" y="203" type="curve" smooth="yes"/>
-      <point x="506" y="326"/>
-      <point x="413" y="403"/>
-      <point x="260" y="403" type="curve" smooth="yes"/>
-      <point x="222" y="403"/>
-      <point x="168" y="398"/>
-      <point x="115" y="388" type="curve"/>
-      <point x="127" y="384" type="line"/>
-      <point x="141" y="677" type="line"/>
-      <point x="475" y="677" type="line"/>
-      <point x="475" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
-      <point x="106" y="369" type="line"/>
-      <point x="155" y="379"/>
-      <point x="211" y="385"/>
-      <point x="254" y="385" type="curve" smooth="yes"/>
-      <point x="406" y="385"/>
-      <point x="485" y="310"/>
-      <point x="485" y="201" type="curve" smooth="yes"/>
-      <point x="485" y="88"/>
-      <point x="401" y="9"/>
-      <point x="274" y="9" type="curve" smooth="yes"/>
-      <point x="209" y="9"/>
-      <point x="134" y="28"/>
-      <point x="84" y="58" type="curve"/>
-      <point x="78" y="41" type="line"/>
-      <point x="131" y="9"/>
-      <point x="201" y="-10"/>
-    </contour>
+    <component base="five" xOffset="34"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/four.tf.glif b/src/Cantarell-Light.ufo/glyphs/four.tf.glif
index 886b4189..418d66c4 100644
--- a/src/Cantarell-Light.ufo/glyphs/four.tf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/four.tf.glif
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four.tf" format="2">
-  <advance width="580"/>
+  <advance width="570"/>
   <outline>
     <contour>
-      <point x="400" y="-10" type="line"/>
-      <point x="418" y="-10" type="line"/>
-      <point x="418" y="694" type="line"/>
-      <point x="401" y="694" type="line"/>
-      <point x="39" y="200" type="line"/>
-      <point x="39" y="190" type="line"/>
-      <point x="542" y="190" type="line"/>
-      <point x="542" y="207" type="line"/>
-      <point x="61" y="207" type="line"/>
-      <point x="61" y="202" type="line"/>
-      <point x="400" y="667" type="line"/>
-      <point x="400" y="665" type="line"/>
+      <point x="395" y="-10" type="line"/>
+      <point x="413" y="-10" type="line"/>
+      <point x="413" y="694" type="line"/>
+      <point x="396" y="694" type="line"/>
+      <point x="34" y="200" type="line"/>
+      <point x="34" y="190" type="line"/>
+      <point x="537" y="190" type="line"/>
+      <point x="537" y="207" type="line"/>
+      <point x="56" y="207" type="line"/>
+      <point x="56" y="202" type="line"/>
+      <point x="395" y="667" type="line"/>
+      <point x="395" y="665" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/nine.tf.glif b/src/Cantarell-Light.ufo/glyphs/nine.tf.glif
index 89afc181..3981bfde 100644
--- a/src/Cantarell-Light.ufo/glyphs/nine.tf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nine.tf.glif
@@ -1,47 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine.tf" format="2">
-  <advance width="580"/>
+  <advance width="570"/>
   <outline>
-    <contour>
-      <point x="284" y="704" type="curve" smooth="yes"/>
-      <point x="165" y="704"/>
-      <point x="83" y="617"/>
-      <point x="83" y="488" type="curve" smooth="yes"/>
-      <point x="83" y="361"/>
-      <point x="163" y="284"/>
-      <point x="281" y="284" type="curve" smooth="yes"/>
-      <point x="377" y="284"/>
-      <point x="452" y="333"/>
-      <point x="498" y="424" type="curve"/>
-      <point x="498" y="455" type="line"/>
-      <point x="454" y="357"/>
-      <point x="378" y="302"/>
-      <point x="283" y="302" type="curve" smooth="yes"/>
-      <point x="178" y="302"/>
-      <point x="104" y="372"/>
-      <point x="104" y="491" type="curve" smooth="yes"/>
-      <point x="104" y="608"/>
-      <point x="176" y="686"/>
-      <point x="283" y="686" type="curve" smooth="yes"/>
-      <point x="413" y="686"/>
-      <point x="489" y="569"/>
-      <point x="489" y="372" type="curve" smooth="yes"/>
-      <point x="489" y="134"/>
-      <point x="402" y="8"/>
-      <point x="240" y="8" type="curve" smooth="yes"/>
-      <point x="188" y="8"/>
-      <point x="140" y="21"/>
-      <point x="102" y="44" type="curve"/>
-      <point x="95" y="27" type="line"/>
-      <point x="136" y="3"/>
-      <point x="184" y="-10"/>
-      <point x="238" y="-10" type="curve" smooth="yes"/>
-      <point x="415" y="-10"/>
-      <point x="510" y="124"/>
-      <point x="510" y="375" type="curve" smooth="yes"/>
-      <point x="510" y="581"/>
-      <point x="426" y="704"/>
-    </contour>
+    <component base="nine" xOffset="10"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/one.tf.glif b/src/Cantarell-Light.ufo/glyphs/one.tf.glif
index fad9666d..5f226d71 100644
--- a/src/Cantarell-Light.ufo/glyphs/one.tf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/one.tf.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.tf" format="2">
-  <advance width="580"/>
+  <advance width="570"/>
   <outline>
     <contour>
-      <point x="297" y="7" type="line"/>
-      <point x="316" y="7" type="line"/>
-      <point x="316" y="694" type="line"/>
-      <point x="304" y="694" type="line"/>
-      <point x="91" y="581" type="line"/>
-      <point x="99" y="569" type="line"/>
-      <point x="305" y="672" type="line"/>
-      <point x="297" y="677" type="line"/>
+      <point x="295" y="7" type="line"/>
+      <point x="314" y="7" type="line"/>
+      <point x="314" y="694" type="line"/>
+      <point x="302" y="694" type="line"/>
+      <point x="71" y="575" type="line"/>
+      <point x="80" y="563" type="line"/>
+      <point x="303" y="672" type="line"/>
+      <point x="295" y="677" type="line"/>
     </contour>
     <contour>
-      <point x="90" y="0" type="line"/>
-      <point x="501" y="0" type="line"/>
-      <point x="501" y="17" type="line"/>
-      <point x="90" y="17" type="line"/>
+      <point x="80" y="0" type="line"/>
+      <point x="506" y="0" type="line"/>
+      <point x="506" y="17" type="line"/>
+      <point x="80" y="17" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/seven.tf.glif b/src/Cantarell-Light.ufo/glyphs/seven.tf.glif
index aa8809de..13eb6f38 100644
--- a/src/Cantarell-Light.ufo/glyphs/seven.tf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/seven.tf.glif
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven.tf" format="2">
-  <advance width="580"/>
+  <advance width="570"/>
   <outline>
     <contour>
-      <point x="178" y="0" type="line"/>
-      <point x="201" y="0" type="line"/>
-      <point x="517" y="682" type="line"/>
-      <point x="517" y="694" type="line"/>
-      <point x="55" y="694" type="line"/>
-      <point x="55" y="676" type="line"/>
-      <point x="500" y="676" type="line"/>
-      <point x="498" y="685" type="line"/>
+      <point x="180" y="0" type="line"/>
+      <point x="203" y="0" type="line"/>
+      <point x="501" y="682" type="line"/>
+      <point x="501" y="694" type="line"/>
+      <point x="64" y="694" type="line"/>
+      <point x="64" y="676" type="line"/>
+      <point x="484" y="676" type="line"/>
+      <point x="481" y="685" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/six.tf.glif b/src/Cantarell-Light.ufo/glyphs/six.tf.glif
index 1b662bd9..e6ba213b 100644
--- a/src/Cantarell-Light.ufo/glyphs/six.tf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/six.tf.glif
@@ -1,47 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six.tf" format="2">
-  <advance width="580"/>
+  <advance width="570"/>
   <outline>
-    <contour>
-      <point x="309" y="-10" type="curve" smooth="yes"/>
-      <point x="428" y="-10"/>
-      <point x="509" y="77"/>
-      <point x="509" y="206" type="curve" smooth="yes"/>
-      <point x="509" y="333"/>
-      <point x="430" y="410"/>
-      <point x="312" y="410" type="curve" smooth="yes"/>
-      <point x="216" y="410"/>
-      <point x="141" y="361"/>
-      <point x="95" y="270" type="curve"/>
-      <point x="95" y="239" type="line"/>
-      <point x="139" y="337"/>
-      <point x="215" y="392"/>
-      <point x="310" y="392" type="curve" smooth="yes"/>
-      <point x="415" y="392"/>
-      <point x="488" y="322"/>
-      <point x="488" y="203" type="curve" smooth="yes"/>
-      <point x="488" y="86"/>
-      <point x="417" y="8"/>
-      <point x="310" y="8" type="curve" smooth="yes"/>
-      <point x="179" y="8"/>
-      <point x="104" y="126"/>
-      <point x="104" y="322" type="curve" smooth="yes"/>
-      <point x="104" y="559"/>
-      <point x="190" y="686"/>
-      <point x="353" y="686" type="curve" smooth="yes"/>
-      <point x="403" y="686"/>
-      <point x="453" y="673"/>
-      <point x="491" y="650" type="curve"/>
-      <point x="498" y="667" type="line"/>
-      <point x="457" y="691"/>
-      <point x="408" y="704"/>
-      <point x="355" y="704" type="curve" smooth="yes"/>
-      <point x="177" y="704"/>
-      <point x="83" y="569"/>
-      <point x="83" y="319" type="curve" smooth="yes"/>
-      <point x="83" y="114"/>
-      <point x="166" y="-10"/>
-    </contour>
+    <component base="six" xOffset="10"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/three.tf.glif b/src/Cantarell-Light.ufo/glyphs/three.tf.glif
index bff0c828..7b2f8531 100644
--- a/src/Cantarell-Light.ufo/glyphs/three.tf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/three.tf.glif
@@ -1,49 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three.tf" format="2">
-  <advance width="580"/>
+  <advance width="570"/>
   <outline>
-    <contour>
-      <point x="275" y="-10" type="curve" smooth="yes"/>
-      <point x="416" y="-10"/>
-      <point x="507" y="60"/>
-      <point x="507" y="170" type="curve" smooth="yes"/>
-      <point x="507" y="274"/>
-      <point x="426" y="340"/>
-      <point x="274" y="356" type="curve"/>
-      <point x="274" y="352" type="line"/>
-      <point x="391" y="359"/>
-      <point x="469" y="429"/>
-      <point x="469" y="528" type="curve" smooth="yes"/>
-      <point x="469" y="632"/>
-      <point x="385" y="704"/>
-      <point x="264" y="704" type="curve" smooth="yes"/>
-      <point x="198" y="704"/>
-      <point x="130" y="683"/>
-      <point x="75" y="645" type="curve"/>
-      <point x="80" y="629" type="line"/>
-      <point x="144" y="668"/>
-      <point x="201" y="686"/>
-      <point x="260" y="686" type="curve" smooth="yes"/>
-      <point x="372" y="686"/>
-      <point x="448" y="624"/>
-      <point x="448" y="524" type="curve" smooth="yes"/>
-      <point x="448" y="416"/>
-      <point x="362" y="361"/>
-      <point x="194" y="361" type="curve"/>
-      <point x="194" y="344" type="line"/>
-      <point x="382" y="344"/>
-      <point x="487" y="281"/>
-      <point x="487" y="168" type="curve" smooth="yes"/>
-      <point x="487" y="69"/>
-      <point x="406" y="9"/>
-      <point x="276" y="9" type="curve" smooth="yes"/>
-      <point x="202" y="9"/>
-      <point x="123" y="29"/>
-      <point x="61" y="63" type="curve"/>
-      <point x="56" y="45" type="line"/>
-      <point x="116" y="11"/>
-      <point x="199" y="-10"/>
-    </contour>
+    <component base="three" xOffset="25"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/two.tf.glif b/src/Cantarell-Light.ufo/glyphs/two.tf.glif
index 8fd0b2ff..546d2840 100644
--- a/src/Cantarell-Light.ufo/glyphs/two.tf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/two.tf.glif
@@ -1,33 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two.tf" format="2">
-  <advance width="580"/>
+  <advance width="570"/>
   <outline>
-    <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="506" y="0" type="line"/>
-      <point x="506" y="17" type="line"/>
-      <point x="87" y="17" type="line"/>
-      <point x="91" y="10" type="line"/>
-      <point x="416" y="310"/>
-      <point x="477" y="407"/>
-      <point x="477" y="509" type="curve" smooth="yes"/>
-      <point x="477" y="630"/>
-      <point x="394" y="704"/>
-      <point x="263" y="704" type="curve" smooth="yes"/>
-      <point x="185" y="704"/>
-      <point x="117" y="678"/>
-      <point x="67" y="629" type="curve"/>
-      <point x="77" y="616" type="line"/>
-      <point x="131" y="663"/>
-      <point x="191" y="686"/>
-      <point x="259" y="686" type="curve" smooth="yes"/>
-      <point x="379" y="686"/>
-      <point x="456" y="617"/>
-      <point x="456" y="507" type="curve" smooth="yes"/>
-      <point x="456" y="408"/>
-      <point x="394" y="311"/>
-      <point x="67" y="8" type="curve"/>
-    </contour>
+    <component base="two" xOffset="47"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.tf.glif b/src/Cantarell-Light.ufo/glyphs/zero.tf.glif
index 8d3a203c..3483e27f 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.tf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.tf.glif
@@ -1,36 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.tf" format="2">
-  <advance width="580"/>
-  <anchor x="298" y="350" name="slash"/>
+  <advance width="570"/>
   <outline>
-    <contour>
-      <point x="290" y="-10" type="curve" smooth="yes"/>
-      <point x="417" y="-10"/>
-      <point x="501" y="132"/>
-      <point x="501" y="343" type="curve" smooth="yes"/>
-      <point x="501" y="555"/>
-      <point x="418" y="699"/>
-      <point x="294" y="699" type="curve" smooth="yes"/>
-      <point x="164" y="699"/>
-      <point x="79" y="554"/>
-      <point x="79" y="340" type="curve" smooth="yes"/>
-      <point x="79" y="130"/>
-      <point x="164" y="-10"/>
-    </contour>
-    <contour>
-      <point x="293" y="8" type="curve" smooth="yes"/>
-      <point x="177" y="8"/>
-      <point x="100" y="143"/>
-      <point x="100" y="343" type="curve" smooth="yes"/>
-      <point x="100" y="545"/>
-      <point x="176" y="681"/>
-      <point x="291" y="681" type="curve" smooth="yes"/>
-      <point x="405" y="681"/>
-      <point x="480" y="543"/>
-      <point x="480" y="340" type="curve" smooth="yes"/>
-      <point x="480" y="142"/>
-      <point x="405" y="8"/>
-    </contour>
+    <component base="zero" xOffset="4"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.tf.zero.glif 
b/src/Cantarell-Light.ufo/glyphs/zero.tf.zero.glif
index 4e4a748f..cde96396 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.tf.zero.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.tf.zero.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.tf.zero" format="2">
-  <advance width="580"/>
+  <advance width="570"/>
   <outline>
     <component base="zero.tf"/>
-    <component base="_slash.zero" xOffset="75" yOffset="109"/>
+    <component base="_slash.zero" xOffset="71" yOffset="109"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/layercontents.plist b/src/Cantarell-Light.ufo/layercontents.plist
index 1ef24ea2..0b9ef46e 100644
--- a/src/Cantarell-Light.ufo/layercontents.plist
+++ b/src/Cantarell-Light.ufo/layercontents.plist
@@ -14,5 +14,13 @@
       <string>May 5 19, 13:08</string>
       <string>glyphs.M_ay 5 19, 13_08</string>
     </array>
+    <array>
+      <string>Jun 8 19, 20:55</string>
+      <string>glyphs.J_un 8 19, 20_55</string>
+    </array>
+    <array>
+      <string>Jun 8 19, 20:47</string>
+      <string>glyphs.J_un 8 19, 20_47</string>
+    </array>
   </array>
 </plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/contents.plist 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/contents.plist
new file mode 100644
index 00000000..8b006235
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/contents.plist  
@@ -0,0 +1,22 @@
+<?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>eight.tf</key>
+    <string>eight.tf.glif</string>
+    <key>five.tf</key>
+    <string>five.tf.glif</string>
+    <key>four.tf</key>
+    <string>four.tf.glif</string>
+    <key>nine.tf</key>
+    <string>nine.tf.glif</string>
+    <key>seven.tf</key>
+    <string>seven.tf.glif</string>
+    <key>six.tf</key>
+    <string>six.tf.glif</string>
+    <key>three.tf</key>
+    <string>three.tf.glif</string>
+    <key>two.tf</key>
+    <string>two.tf.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/eight.tf.glif 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/eight.tf.glif
new file mode 100644
index 00000000..822c9e9c
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/eight.tf.glif   
@@ -0,0 +1,61 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="eight.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="292" y="-10" type="curve" smooth="yes"/>
+      <point x="435" y="-10"/>
+      <point x="528" y="63"/>
+      <point x="528" y="176" type="curve" smooth="yes"/>
+      <point x="528" y="401"/>
+      <point x="162" y="359"/>
+      <point x="162" y="534" type="curve" smooth="yes"/>
+      <point x="162" y="595"/>
+      <point x="208" y="633"/>
+      <point x="283" y="633" type="curve" smooth="yes"/>
+      <point x="364" y="633"/>
+      <point x="419" y="589"/>
+      <point x="419" y="523" type="curve" smooth="yes"/>
+      <point x="419" y="459"/>
+      <point x="366" y="402"/>
+      <point x="287" y="387" type="curve"/>
+      <point x="350" y="356" type="line"/>
+      <point x="442" y="384"/>
+      <point x="498" y="454"/>
+      <point x="498" y="537" type="curve" smooth="yes"/>
+      <point x="498" y="637"/>
+      <point x="416" y="704"/>
+      <point x="294" y="704" type="curve" smooth="yes"/>
+      <point x="165" y="704"/>
+      <point x="79" y="631"/>
+      <point x="79" y="521" type="curve" smooth="yes"/>
+      <point x="79" y="290"/>
+      <point x="444" y="344"/>
+      <point x="444" y="169" type="curve" smooth="yes"/>
+      <point x="444" y="102"/>
+      <point x="394" y="63"/>
+      <point x="306" y="63" type="curve" smooth="yes"/>
+      <point x="207" y="63"/>
+      <point x="141" y="112"/>
+      <point x="141" y="185" type="curve" smooth="yes"/>
+      <point x="141" y="257"/>
+      <point x="202" y="315"/>
+      <point x="291" y="328" type="curve"/>
+      <point x="238" y="361" type="line"/>
+      <point x="128" y="346"/>
+      <point x="56" y="270"/>
+      <point x="56" y="174" type="curve" smooth="yes"/>
+      <point x="56" y="64"/>
+      <point x="151" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/five.tf.glif 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/five.tf.glif
new file mode 100644
index 00000000..7cf33f80
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/five.tf.glif    
@@ -0,0 +1,48 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="five.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="259" y="-10" type="curve" smooth="yes"/>
+      <point x="418" y="-10"/>
+      <point x="524" y="77"/>
+      <point x="524" y="215" type="curve" smooth="yes"/>
+      <point x="524" y="346"/>
+      <point x="428" y="427"/>
+      <point x="269" y="427" type="curve" smooth="yes"/>
+      <point x="233" y="427"/>
+      <point x="193" y="423"/>
+      <point x="153" y="415" type="curve"/>
+      <point x="173" y="389" type="line"/>
+      <point x="184" y="622" type="line"/>
+      <point x="490" y="622" type="line"/>
+      <point x="490" y="694" type="line"/>
+      <point x="109" y="694" type="line"/>
+      <point x="92" y="338" type="line"/>
+      <point x="144" y="349"/>
+      <point x="201" y="355"/>
+      <point x="241" y="355" type="curve" smooth="yes"/>
+      <point x="366" y="355"/>
+      <point x="439" y="298"/>
+      <point x="439" y="205" type="curve" smooth="yes"/>
+      <point x="439" y="116"/>
+      <point x="372" y="63"/>
+      <point x="267" y="63" type="curve" smooth="yes"/>
+      <point x="206" y="63"/>
+      <point x="138" y="79"/>
+      <point x="82" y="107" type="curve"/>
+      <point x="58" y="42" type="line"/>
+      <point x="122" y="9"/>
+      <point x="189" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/four.tf.glif 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/four.tf.glif
new file mode 100644
index 00000000..d5428851
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/four.tf.glif    
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="four.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="356" y="-10" type="line"/>
+      <point x="433" y="-10" type="line"/>
+      <point x="433" y="694" type="line"/>
+      <point x="358" y="694" type="line"/>
+      <point x="24" y="206" type="line"/>
+      <point x="24" y="164" type="line"/>
+      <point x="556" y="164" type="line"/>
+      <point x="556" y="232" type="line"/>
+      <point x="108" y="232" type="line"/>
+      <point x="104" y="214" type="line"/>
+      <point x="356" y="584" type="line"/>
+      <point x="356" y="567" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/layerinfo.plist 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/layerinfo.plist
new file mode 100644
index 00000000..e7699aff
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/layerinfo.plist 
@@ -0,0 +1,27 @@
+<?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>12737D36-A4E9-462A-BFB1-BEC6DC631A3E</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.eight.tf</key>
+      <integer>4</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.five.tf</key>
+      <integer>4</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.four.tf</key>
+      <integer>4</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.nine.tf</key>
+      <integer>4</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.seven.tf</key>
+      <integer>4</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.six.tf</key>
+      <integer>4</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.three.tf</key>
+      <integer>4</integer>
+      <key>com.schriftgestaltung.layerOrderInGlyph.two.tf</key>
+      <integer>4</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/nine.tf.glif 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/nine.tf.glif
new file mode 100644
index 00000000..60ef501f
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/nine.tf.glif    
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="nine.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="281" y="704" type="curve" smooth="yes"/>
+      <point x="154" y="704"/>
+      <point x="63" y="614"/>
+      <point x="63" y="481" type="curve" smooth="yes"/>
+      <point x="63" y="356"/>
+      <point x="143" y="270"/>
+      <point x="258" y="270" type="curve" smooth="yes"/>
+      <point x="356" y="270"/>
+      <point x="433" y="331"/>
+      <point x="477" y="438" type="curve"/>
+      <point x="455" y="481" type="line"/>
+      <point x="422" y="392"/>
+      <point x="362" y="342"/>
+      <point x="287" y="342" type="curve" smooth="yes"/>
+      <point x="204" y="342"/>
+      <point x="147" y="403"/>
+      <point x="147" y="495" type="curve" smooth="yes"/>
+      <point x="147" y="579"/>
+      <point x="195" y="631"/>
+      <point x="272" y="631" type="curve" smooth="yes"/>
+      <point x="376" y="631"/>
+      <point x="433" y="535"/>
+      <point x="433" y="360" type="curve" smooth="yes"/>
+      <point x="433" y="159"/>
+      <point x="359" y="63"/>
+      <point x="235" y="63" type="curve" smooth="yes"/>
+      <point x="187" y="63"/>
+      <point x="132" y="76"/>
+      <point x="96" y="99" type="curve"/>
+      <point x="73" y="34" type="line"/>
+      <point x="107" y="7"/>
+      <point x="165" y="-10"/>
+      <point x="227" y="-10" type="curve" smooth="yes"/>
+      <point x="410" y="-10"/>
+      <point x="523" y="127"/>
+      <point x="523" y="366" type="curve" smooth="yes"/>
+      <point x="523" y="583"/>
+      <point x="429" y="704"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/seven.tf.glif 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/seven.tf.glif
new file mode 100644
index 00000000..946e0aa7
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/seven.tf.glif   
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="seven.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="142" y="0" type="line"/>
+      <point x="229" y="0" type="line"/>
+      <point x="531" y="654" type="line"/>
+      <point x="531" y="694" type="line"/>
+      <point x="46" y="694" type="line"/>
+      <point x="46" y="622" type="line"/>
+      <point x="466" y="622" type="line"/>
+      <point x="445" y="652" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/six.tf.glif 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/six.tf.glif
new file mode 100644
index 00000000..3b3d7de2
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/six.tf.glif     
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="six.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="305" y="-10" type="curve" smooth="yes"/>
+      <point x="432" y="-10"/>
+      <point x="523" y="80"/>
+      <point x="523" y="213" type="curve" smooth="yes"/>
+      <point x="523" y="338"/>
+      <point x="443" y="424"/>
+      <point x="328" y="424" type="curve" smooth="yes"/>
+      <point x="231" y="424"/>
+      <point x="153" y="364"/>
+      <point x="109" y="256" type="curve"/>
+      <point x="131" y="213" type="line"/>
+      <point x="163" y="302"/>
+      <point x="225" y="352"/>
+      <point x="299" y="352" type="curve" smooth="yes"/>
+      <point x="382" y="352"/>
+      <point x="439" y="291"/>
+      <point x="439" y="199" type="curve" smooth="yes"/>
+      <point x="439" y="115"/>
+      <point x="391" y="63"/>
+      <point x="314" y="63" type="curve" smooth="yes"/>
+      <point x="210" y="63"/>
+      <point x="152" y="159"/>
+      <point x="152" y="334" type="curve" smooth="yes"/>
+      <point x="152" y="534"/>
+      <point x="226" y="631"/>
+      <point x="351" y="631" type="curve" smooth="yes"/>
+      <point x="399" y="631"/>
+      <point x="454" y="618"/>
+      <point x="490" y="595" type="curve"/>
+      <point x="514" y="660" type="line"/>
+      <point x="479" y="687"/>
+      <point x="422" y="704"/>
+      <point x="359" y="704" type="curve" smooth="yes"/>
+      <point x="176" y="704"/>
+      <point x="63" y="567"/>
+      <point x="63" y="328" type="curve" smooth="yes"/>
+      <point x="63" y="110"/>
+      <point x="157" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/three.tf.glif 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/three.tf.glif
new file mode 100644
index 00000000..0a4628fd
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/three.tf.glif   
@@ -0,0 +1,57 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="three.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="266" y="-10" type="curve" smooth="yes"/>
+      <point x="418" y="-10"/>
+      <point x="523" y="68"/>
+      <point x="523" y="182" type="curve" smooth="yes"/>
+      <point x="523" y="283"/>
+      <point x="442" y="361"/>
+      <point x="321" y="373" type="curve"/>
+      <point x="320" y="358" type="line"/>
+      <point x="418" y="361"/>
+      <point x="485" y="437"/>
+      <point x="485" y="527" type="curve" smooth="yes"/>
+      <point x="485" y="632"/>
+      <point x="397" y="704"/>
+      <point x="271" y="704" type="curve" smooth="yes"/>
+      <point x="201" y="704"/>
+      <point x="126" y="683"/>
+      <point x="63" y="647" type="curve"/>
+      <point x="82" y="586" type="line"/>
+      <point x="142" y="614"/>
+      <point x="203" y="631"/>
+      <point x="254" y="631" type="curve" smooth="yes"/>
+      <point x="342" y="631"/>
+      <point x="400" y="585"/>
+      <point x="400" y="514" type="curve" smooth="yes"/>
+      <point x="400" y="432"/>
+      <point x="323" y="386"/>
+      <point x="182" y="386" type="curve"/>
+      <point x="182" y="318" type="line"/>
+      <point x="344" y="318"/>
+      <point x="438" y="265"/>
+      <point x="438" y="175" type="curve" smooth="yes"/>
+      <point x="438" y="105"/>
+      <point x="377" y="63"/>
+      <point x="274" y="63" type="curve" smooth="yes"/>
+      <point x="208" y="63"/>
+      <point x="131" y="80"/>
+      <point x="68" y="111" type="curve"/>
+      <point x="49" y="44" type="line"/>
+      <point x="115" y="10"/>
+      <point x="192" y="-10"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/two.tf.glif 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/two.tf.glif
new file mode 100644
index 00000000..cf06229d
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_47/two.tf.glif     
@@ -0,0 +1,41 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="two.tf" format="2">
+  <advance width="580"/>
+  <outline>
+    <contour>
+      <point x="64" y="0" type="line"/>
+      <point x="522" y="0" type="line"/>
+      <point x="522" y="72" type="line"/>
+      <point x="149" y="72" type="line"/>
+      <point x="156" y="48" type="line"/>
+      <point x="399" y="266"/>
+      <point x="492" y="383"/>
+      <point x="492" y="510" type="curve" smooth="yes"/>
+      <point x="492" y="630"/>
+      <point x="408" y="704"/>
+      <point x="272" y="704" type="curve" smooth="yes"/>
+      <point x="187" y="704"/>
+      <point x="105" y="674"/>
+      <point x="52" y="625" type="curve"/>
+      <point x="77" y="567" type="line"/>
+      <point x="129" y="607"/>
+      <point x="196" y="631"/>
+      <point x="256" y="631" type="curve" smooth="yes"/>
+      <point x="348" y="631"/>
+      <point x="407" y="579"/>
+      <point x="407" y="496" type="curve" smooth="yes"/>
+      <point x="407" y="397"/>
+      <point x="326" y="291"/>
+      <point x="64" y="55" type="curve"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_55/contents.plist 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_55/contents.plist
new file mode 100644
index 00000000..7b74aabe
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_55/contents.plist  
@@ -0,0 +1,8 @@
+<?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>zero.tf</key>
+    <string>zero.tf.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_55/layerinfo.plist 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_55/layerinfo.plist
new file mode 100644
index 00000000..d0d8cb2e
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_55/layerinfo.plist 
@@ -0,0 +1,13 @@
+<?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>78D59FBE-C6F3-42A5-B1A3-A34A164DA1F5</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.zero.tf</key>
+      <integer>3</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_55/zero.tf.glif 
b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_55/zero.tf.glif
new file mode 100644
index 00000000..1bbc25aa
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.J_un 8 19, 20_55/zero.tf.glif    
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="zero.tf" format="2">
+  <advance width="580"/>
+  <anchor x="290" y="350" name="slash"/>
+  <outline>
+    <contour>
+      <point x="287" y="-10" type="curve" smooth="yes"/>
+      <point x="433" y="-10"/>
+      <point x="521" y="125"/>
+      <point x="521" y="352" type="curve" smooth="yes"/>
+      <point x="521" y="572"/>
+      <point x="436" y="704"/>
+      <point x="294" y="704" type="curve" smooth="yes"/>
+      <point x="146" y="704"/>
+      <point x="57" y="570"/>
+      <point x="57" y="342" type="curve" smooth="yes"/>
+      <point x="57" y="122"/>
+      <point x="143" y="-10"/>
+    </contour>
+    <contour>
+      <point x="293" y="62" type="curve" smooth="yes"/>
+      <point x="198" y="62"/>
+      <point x="141" y="170"/>
+      <point x="141" y="352" type="curve" smooth="yes"/>
+      <point x="141" y="527"/>
+      <point x="196" y="632"/>
+      <point x="288" y="632" type="curve" smooth="yes"/>
+      <point x="381" y="632"/>
+      <point x="437" y="524"/>
+      <point x="437" y="342" type="curve" smooth="yes"/>
+      <point x="437" y="167"/>
+      <point x="384" y="62"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>RMXScaler</key>
+      <dict>
+        <key>monoWidth</key>
+        <integer>580</integer>
+      </dict>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/eight.tf.glif b/src/Cantarell-Regular.ufo/glyphs/eight.tf.glif
index 822c9e9c..d2ac0a30 100644
--- a/src/Cantarell-Regular.ufo/glyphs/eight.tf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/eight.tf.glif
@@ -1,53 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight.tf" format="2">
-  <advance width="580"/>
+  <advance width="570"/>
   <outline>
-    <contour>
-      <point x="292" y="-10" type="curve" smooth="yes"/>
-      <point x="435" y="-10"/>
-      <point x="528" y="63"/>
-      <point x="528" y="176" type="curve" smooth="yes"/>
-      <point x="528" y="401"/>
-      <point x="162" y="359"/>
-      <point x="162" y="534" type="curve" smooth="yes"/>
-      <point x="162" y="595"/>
-      <point x="208" y="633"/>
-      <point x="283" y="633" type="curve" smooth="yes"/>
-      <point x="364" y="633"/>
-      <point x="419" y="589"/>
-      <point x="419" y="523" type="curve" smooth="yes"/>
-      <point x="419" y="459"/>
-      <point x="366" y="402"/>
-      <point x="287" y="387" type="curve"/>
-      <point x="350" y="356" type="line"/>
-      <point x="442" y="384"/>
-      <point x="498" y="454"/>
-      <point x="498" y="537" type="curve" smooth="yes"/>
-      <point x="498" y="637"/>
-      <point x="416" y="704"/>
-      <point x="294" y="704" type="curve" smooth="yes"/>
-      <point x="165" y="704"/>
-      <point x="79" y="631"/>
-      <point x="79" y="521" type="curve" smooth="yes"/>
-      <point x="79" y="290"/>
-      <point x="444" y="344"/>
-      <point x="444" y="169" type="curve" smooth="yes"/>
-      <point x="444" y="102"/>
-      <point x="394" y="63"/>
-      <point x="306" y="63" type="curve" smooth="yes"/>
-      <point x="207" y="63"/>
-      <point x="141" y="112"/>
-      <point x="141" y="185" type="curve" smooth="yes"/>
-      <point x="141" y="257"/>
-      <point x="202" y="315"/>
-      <point x="291" y="328" type="curve"/>
-      <point x="238" y="361" type="line"/>
-      <point x="128" y="346"/>
-      <point x="56" y="270"/>
-      <point x="56" y="174" type="curve" smooth="yes"/>
-      <point x="56" y="64"/>
-      <point x="151" y="-10"/>
-    </contour>
+    <component base="eight" xOffset="-5"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/five.tf.glif b/src/Cantarell-Regular.ufo/glyphs/five.tf.glif
index 7cf33f80..df6294cb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/five.tf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/five.tf.glif
@@ -1,40 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five.tf" format="2">
-  <advance width="580"/>
+  <advance width="570"/>
   <outline>
-    <contour>
-      <point x="259" y="-10" type="curve" smooth="yes"/>
-      <point x="418" y="-10"/>
-      <point x="524" y="77"/>
-      <point x="524" y="215" type="curve" smooth="yes"/>
-      <point x="524" y="346"/>
-      <point x="428" y="427"/>
-      <point x="269" y="427" type="curve" smooth="yes"/>
-      <point x="233" y="427"/>
-      <point x="193" y="423"/>
-      <point x="153" y="415" type="curve"/>
-      <point x="173" y="389" type="line"/>
-      <point x="184" y="622" type="line"/>
-      <point x="490" y="622" type="line"/>
-      <point x="490" y="694" type="line"/>
-      <point x="109" y="694" type="line"/>
-      <point x="92" y="338" type="line"/>
-      <point x="144" y="349"/>
-      <point x="201" y="355"/>
-      <point x="241" y="355" type="curve" smooth="yes"/>
-      <point x="366" y="355"/>
-      <point x="439" y="298"/>
-      <point x="439" y="205" type="curve" smooth="yes"/>
-      <point x="439" y="116"/>
-      <point x="372" y="63"/>
-      <point x="267" y="63" type="curve" smooth="yes"/>
-      <point x="206" y="63"/>
-      <point x="138" y="79"/>
-      <point x="82" y="107" type="curve"/>
-      <point x="58" y="42" type="line"/>
-      <point x="122" y="9"/>
-      <point x="189" y="-10"/>
-    </contour>
+    <component base="five" xOffset="12"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/four.tf.glif b/src/Cantarell-Regular.ufo/glyphs/four.tf.glif
index d5428851..d4842aa4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/four.tf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/four.tf.glif
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four.tf" format="2">
-  <advance width="580"/>
+  <advance width="570"/>
   <outline>
     <contour>
-      <point x="356" y="-10" type="line"/>
-      <point x="433" y="-10" type="line"/>
-      <point x="433" y="694" type="line"/>
-      <point x="358" y="694" type="line"/>
-      <point x="24" y="206" type="line"/>
-      <point x="24" y="164" type="line"/>
-      <point x="556" y="164" type="line"/>
-      <point x="556" y="232" type="line"/>
-      <point x="108" y="232" type="line"/>
-      <point x="104" y="214" type="line"/>
-      <point x="356" y="584" type="line"/>
-      <point x="356" y="567" type="line"/>
+      <point x="351" y="-10" type="line"/>
+      <point x="428" y="-10" type="line"/>
+      <point x="428" y="694" type="line"/>
+      <point x="353" y="694" type="line"/>
+      <point x="19" y="206" type="line"/>
+      <point x="19" y="164" type="line"/>
+      <point x="551" y="164" type="line"/>
+      <point x="551" y="232" type="line"/>
+      <point x="103" y="232" type="line"/>
+      <point x="99" y="214" type="line"/>
+      <point x="351" y="584" type="line"/>
+      <point x="351" y="567" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/nine.tf.glif b/src/Cantarell-Regular.ufo/glyphs/nine.tf.glif
index 60ef501f..617e1098 100644
--- a/src/Cantarell-Regular.ufo/glyphs/nine.tf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/nine.tf.glif
@@ -1,47 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine.tf" format="2">
-  <advance width="580"/>
+  <advance width="570"/>
   <outline>
-    <contour>
-      <point x="281" y="704" type="curve" smooth="yes"/>
-      <point x="154" y="704"/>
-      <point x="63" y="614"/>
-      <point x="63" y="481" type="curve" smooth="yes"/>
-      <point x="63" y="356"/>
-      <point x="143" y="270"/>
-      <point x="258" y="270" type="curve" smooth="yes"/>
-      <point x="356" y="270"/>
-      <point x="433" y="331"/>
-      <point x="477" y="438" type="curve"/>
-      <point x="455" y="481" type="line"/>
-      <point x="422" y="392"/>
-      <point x="362" y="342"/>
-      <point x="287" y="342" type="curve" smooth="yes"/>
-      <point x="204" y="342"/>
-      <point x="147" y="403"/>
-      <point x="147" y="495" type="curve" smooth="yes"/>
-      <point x="147" y="579"/>
-      <point x="195" y="631"/>
-      <point x="272" y="631" type="curve" smooth="yes"/>
-      <point x="376" y="631"/>
-      <point x="433" y="535"/>
-      <point x="433" y="360" type="curve" smooth="yes"/>
-      <point x="433" y="159"/>
-      <point x="359" y="63"/>
-      <point x="235" y="63" type="curve" smooth="yes"/>
-      <point x="187" y="63"/>
-      <point x="132" y="76"/>
-      <point x="96" y="99" type="curve"/>
-      <point x="73" y="34" type="line"/>
-      <point x="107" y="7"/>
-      <point x="165" y="-10"/>
-      <point x="227" y="-10" type="curve" smooth="yes"/>
-      <point x="410" y="-10"/>
-      <point x="523" y="127"/>
-      <point x="523" y="366" type="curve" smooth="yes"/>
-      <point x="523" y="583"/>
-      <point x="429" y="704"/>
-    </contour>
+    <component base="nine" xOffset="-6"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/one.tf.glif b/src/Cantarell-Regular.ufo/glyphs/one.tf.glif
index 24443e5b..a12c64e2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/one.tf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/one.tf.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.tf" format="2">
-  <advance width="580"/>
+  <advance width="570"/>
   <outline>
     <contour>
-      <point x="272" y="55" type="line"/>
-      <point x="355" y="55" type="line"/>
-      <point x="355" y="694" type="line"/>
-      <point x="305" y="694" type="line"/>
-      <point x="75" y="571" type="line"/>
-      <point x="106" y="515" type="line"/>
-      <point x="302" y="610" type="line"/>
-      <point x="272" y="635" type="line"/>
+      <point x="273" y="55" type="line"/>
+      <point x="354" y="55" type="line"/>
+      <point x="354" y="694" type="line"/>
+      <point x="306" y="694" type="line"/>
+      <point x="60" y="566" type="line"/>
+      <point x="90" y="509" type="line"/>
+      <point x="301" y="610" type="line"/>
+      <point x="273" y="635" type="line"/>
     </contour>
     <contour>
-      <point x="93" y="0" type="line"/>
-      <point x="513" y="0" type="line"/>
-      <point x="513" y="71" type="line"/>
-      <point x="93" y="71" type="line"/>
+      <point x="87" y="0" type="line"/>
+      <point x="518" y="0" type="line"/>
+      <point x="518" y="69" type="line"/>
+      <point x="87" y="69" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/seven.tf.glif b/src/Cantarell-Regular.ufo/glyphs/seven.tf.glif
index 946e0aa7..8931f327 100644
--- a/src/Cantarell-Regular.ufo/glyphs/seven.tf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/seven.tf.glif
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven.tf" format="2">
-  <advance width="580"/>
+  <advance width="570"/>
   <outline>
     <contour>
-      <point x="142" y="0" type="line"/>
-      <point x="229" y="0" type="line"/>
-      <point x="531" y="654" type="line"/>
-      <point x="531" y="694" type="line"/>
+      <point x="141" y="0" type="line"/>
+      <point x="226" y="0" type="line"/>
+      <point x="521" y="654" type="line"/>
+      <point x="521" y="694" type="line"/>
       <point x="46" y="694" type="line"/>
       <point x="46" y="622" type="line"/>
-      <point x="466" y="622" type="line"/>
-      <point x="445" y="652" type="line"/>
+      <point x="454" y="622" type="line"/>
+      <point x="437" y="652" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/six.tf.glif b/src/Cantarell-Regular.ufo/glyphs/six.tf.glif
index 3b3d7de2..1ed9f70a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/six.tf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/six.tf.glif
@@ -1,47 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six.tf" format="2">
-  <advance width="580"/>
+  <advance width="570"/>
   <outline>
-    <contour>
-      <point x="305" y="-10" type="curve" smooth="yes"/>
-      <point x="432" y="-10"/>
-      <point x="523" y="80"/>
-      <point x="523" y="213" type="curve" smooth="yes"/>
-      <point x="523" y="338"/>
-      <point x="443" y="424"/>
-      <point x="328" y="424" type="curve" smooth="yes"/>
-      <point x="231" y="424"/>
-      <point x="153" y="364"/>
-      <point x="109" y="256" type="curve"/>
-      <point x="131" y="213" type="line"/>
-      <point x="163" y="302"/>
-      <point x="225" y="352"/>
-      <point x="299" y="352" type="curve" smooth="yes"/>
-      <point x="382" y="352"/>
-      <point x="439" y="291"/>
-      <point x="439" y="199" type="curve" smooth="yes"/>
-      <point x="439" y="115"/>
-      <point x="391" y="63"/>
-      <point x="314" y="63" type="curve" smooth="yes"/>
-      <point x="210" y="63"/>
-      <point x="152" y="159"/>
-      <point x="152" y="334" type="curve" smooth="yes"/>
-      <point x="152" y="534"/>
-      <point x="226" y="631"/>
-      <point x="351" y="631" type="curve" smooth="yes"/>
-      <point x="399" y="631"/>
-      <point x="454" y="618"/>
-      <point x="490" y="595" type="curve"/>
-      <point x="514" y="660" type="line"/>
-      <point x="479" y="687"/>
-      <point x="422" y="704"/>
-      <point x="359" y="704" type="curve" smooth="yes"/>
-      <point x="176" y="704"/>
-      <point x="63" y="567"/>
-      <point x="63" y="328" type="curve" smooth="yes"/>
-      <point x="63" y="110"/>
-      <point x="157" y="-10"/>
-    </contour>
+    <component base="six" xOffset="-6"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/three.tf.glif b/src/Cantarell-Regular.ufo/glyphs/three.tf.glif
index 0a4628fd..3d6838ea 100644
--- a/src/Cantarell-Regular.ufo/glyphs/three.tf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/three.tf.glif
@@ -1,49 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three.tf" format="2">
-  <advance width="580"/>
+  <advance width="570"/>
   <outline>
-    <contour>
-      <point x="266" y="-10" type="curve" smooth="yes"/>
-      <point x="418" y="-10"/>
-      <point x="523" y="68"/>
-      <point x="523" y="182" type="curve" smooth="yes"/>
-      <point x="523" y="283"/>
-      <point x="442" y="361"/>
-      <point x="321" y="373" type="curve"/>
-      <point x="320" y="358" type="line"/>
-      <point x="418" y="361"/>
-      <point x="485" y="437"/>
-      <point x="485" y="527" type="curve" smooth="yes"/>
-      <point x="485" y="632"/>
-      <point x="397" y="704"/>
-      <point x="271" y="704" type="curve" smooth="yes"/>
-      <point x="201" y="704"/>
-      <point x="126" y="683"/>
-      <point x="63" y="647" type="curve"/>
-      <point x="82" y="586" type="line"/>
-      <point x="142" y="614"/>
-      <point x="203" y="631"/>
-      <point x="254" y="631" type="curve" smooth="yes"/>
-      <point x="342" y="631"/>
-      <point x="400" y="585"/>
-      <point x="400" y="514" type="curve" smooth="yes"/>
-      <point x="400" y="432"/>
-      <point x="323" y="386"/>
-      <point x="182" y="386" type="curve"/>
-      <point x="182" y="318" type="line"/>
-      <point x="344" y="318"/>
-      <point x="438" y="265"/>
-      <point x="438" y="175" type="curve" smooth="yes"/>
-      <point x="438" y="105"/>
-      <point x="377" y="63"/>
-      <point x="274" y="63" type="curve" smooth="yes"/>
-      <point x="208" y="63"/>
-      <point x="131" y="80"/>
-      <point x="68" y="111" type="curve"/>
-      <point x="49" y="44" type="line"/>
-      <point x="115" y="10"/>
-      <point x="192" y="-10"/>
-    </contour>
+    <component base="three" xOffset="4"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/two.tf.glif b/src/Cantarell-Regular.ufo/glyphs/two.tf.glif
index cf06229d..1d406d80 100644
--- a/src/Cantarell-Regular.ufo/glyphs/two.tf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/two.tf.glif
@@ -1,33 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two.tf" format="2">
-  <advance width="580"/>
+  <advance width="570"/>
   <outline>
-    <contour>
-      <point x="64" y="0" type="line"/>
-      <point x="522" y="0" type="line"/>
-      <point x="522" y="72" type="line"/>
-      <point x="149" y="72" type="line"/>
-      <point x="156" y="48" type="line"/>
-      <point x="399" y="266"/>
-      <point x="492" y="383"/>
-      <point x="492" y="510" type="curve" smooth="yes"/>
-      <point x="492" y="630"/>
-      <point x="408" y="704"/>
-      <point x="272" y="704" type="curve" smooth="yes"/>
-      <point x="187" y="704"/>
-      <point x="105" y="674"/>
-      <point x="52" y="625" type="curve"/>
-      <point x="77" y="567" type="line"/>
-      <point x="129" y="607"/>
-      <point x="196" y="631"/>
-      <point x="256" y="631" type="curve" smooth="yes"/>
-      <point x="348" y="631"/>
-      <point x="407" y="579"/>
-      <point x="407" y="496" type="curve" smooth="yes"/>
-      <point x="407" y="397"/>
-      <point x="326" y="291"/>
-      <point x="64" y="55" type="curve"/>
-    </contour>
+    <component base="two" xOffset="21"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zero.tf.glif b/src/Cantarell-Regular.ufo/glyphs/zero.tf.glif
index 1bbc25aa..d661b206 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zero.tf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zero.tf.glif
@@ -1,36 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.tf" format="2">
-  <advance width="580"/>
-  <anchor x="290" y="350" name="slash"/>
+  <advance width="570"/>
   <outline>
-    <contour>
-      <point x="287" y="-10" type="curve" smooth="yes"/>
-      <point x="433" y="-10"/>
-      <point x="521" y="125"/>
-      <point x="521" y="352" type="curve" smooth="yes"/>
-      <point x="521" y="572"/>
-      <point x="436" y="704"/>
-      <point x="294" y="704" type="curve" smooth="yes"/>
-      <point x="146" y="704"/>
-      <point x="57" y="570"/>
-      <point x="57" y="342" type="curve" smooth="yes"/>
-      <point x="57" y="122"/>
-      <point x="143" y="-10"/>
-    </contour>
-    <contour>
-      <point x="293" y="62" type="curve" smooth="yes"/>
-      <point x="198" y="62"/>
-      <point x="141" y="170"/>
-      <point x="141" y="352" type="curve" smooth="yes"/>
-      <point x="141" y="527"/>
-      <point x="196" y="632"/>
-      <point x="288" y="632" type="curve" smooth="yes"/>
-      <point x="381" y="632"/>
-      <point x="437" y="524"/>
-      <point x="437" y="342" type="curve" smooth="yes"/>
-      <point x="437" y="167"/>
-      <point x="384" y="62"/>
-    </contour>
+    <component base="zero" xOffset="-22"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zero.tf.zero.glif 
b/src/Cantarell-Regular.ufo/glyphs/zero.tf.zero.glif
index 24f98e05..748ae1bc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zero.tf.zero.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zero.tf.zero.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.tf.zero" format="2">
-  <advance width="580"/>
+  <advance width="570"/>
   <outline>
     <component base="zero.tf"/>
-    <component base="_slash.zero" xOffset="67" yOffset="109"/>
+    <component base="_slash.zero" xOffset="63" yOffset="109"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/layercontents.plist b/src/Cantarell-Regular.ufo/layercontents.plist
index 507ce589..b58a0e12 100644
--- a/src/Cantarell-Regular.ufo/layercontents.plist
+++ b/src/Cantarell-Regular.ufo/layercontents.plist
@@ -18,5 +18,13 @@
       <string>May 5 19, 18:34</string>
       <string>glyphs.M_ay 5 19, 18_34</string>
     </array>
+    <array>
+      <string>Jun 8 19, 20:55</string>
+      <string>glyphs.J_un 8 19, 20_55</string>
+    </array>
+    <array>
+      <string>Jun 8 19, 20:47</string>
+      <string>glyphs.J_un 8 19, 20_47</string>
+    </array>
   </array>
 </plist>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]